bug

Author: nathanborror

Sources/GenKit/Services/Llama/LlamaDecoders.swift

@@ -19,14 +19,13 @@ extension GenKit.Message.Content {
     init?(_ content: Llama.ChatResponse.CompletionMessage.Content) {
         if let text = content.text {
             self = .text(text)
-        }
-        if let reasoning = content.reasoning {
+        } else if let reasoning = content.reasoning {
             self = .text(reasoning)
-        }
-        if let answer = content.answer {
+        } else if let answer = content.answer {
             self = .text(answer)
+        } else {
+            return nil
         }
-        return nil
     }
 }
 
@@ -62,24 +61,25 @@ extension GenKit.Message.FinishReason {
 
 extension GenKit.Message {
     mutating func patch(with resp: Llama.ChatStreamResponse) {
+        var contents = self.contents ?? []
 
-        // Get the last item in the contents array so it can be patched
-        if var contents = self.contents {
-            if resp.event.event_type == "text" {
-                if case .text(let text) = contents.last, let delta = resp.event.delta.text {
-                    if let patched = GenKit.patch(string: text, with: delta) {
-                        contents[contents.count-1] = .text(patched)
-                        self.contents = contents
-                    }
+        if resp.event.event_type == "progress" {
+            if case .text(let text) = contents.last, let delta = resp.event.delta.text {
+                if let patched = GenKit.patch(string: text, with: delta) {
+                    contents[contents.count-1] = .text(patched)
                 }
+            } else if let delta = resp.event.delta.text {
+                contents.append(.text(delta))
             }
-            if resp.event.event_type == "reasoning" {
-                print("not implemented")
-            }
-            if resp.event.event_type == "function" {
-                print("not implemented")
-            }
         }
+        if resp.event.event_type == "reasoning" {
+            print("not implemented")
+        }
+        if resp.event.event_type == "function" {
+            print("not implemented")
+        }
+
+        self.contents = (contents.isEmpty) ? nil : contents
 
         // Patch remaining properties
         self.toolCalls = []

Sources/GenKit/Services/Llama/LlamaEncoders.swift

@@ -18,13 +18,15 @@ extension Llama.ChatRequest.Message.Content {
     init?(_ content: GenKit.Message.Content) {
         switch content {
         case .text(let text):
-            self.init(text: text)
+            self = .init(text: text)
+            return
         case .image(let image):
             if let data = try? Data(contentsOf: image.url) {
-                self.init(image: "data:image/\(image.format);base64,\(data.base64EncodedString())")
+                self = .init(image: "data:image/\(image.format);base64,\(data.base64EncodedString())")
+                return
             }
-        default:
-            fatalError("Unknown message content type")
+        case .audio, .json:
+            return nil
         }
         return nil
     }

Sources/GenKit/Sessions/ChatSession.swift

@@ -41,6 +41,9 @@ public class ChatSession {
                             break
                         }
                         let lastMessage = messages.last!
+                        guard (lastMessage.toolCalls?.count ?? 0) > 0 else {
+                            break
+                        }
                         let (toolMessages, shouldContinue) = try await processToolCalls(in: lastMessage, callback: request.toolCallback, maxConcurrent: maxConcurrentToolCalls)
                         for message in toolMessages {
                             let message = apply(runID: runID, message: message)
@@ -93,6 +96,9 @@ public class ChatSession {
             guard request.toolCallback != nil else {
                 break
             }
+            guard (message.toolCalls?.count ?? 0) > 0 else {
+                break
+            }
             let (toolMessages, shouldContinue) = try await processToolCalls(in: message, callback: request.toolCallback, maxConcurrent: maxConcurrentToolCalls)
             for message in toolMessages {
                 let message = apply(runID: runID, message: message)