feat: Add publisher for inference state updates

Author: hellotunamayo

macLlama/Services/ChatService/ChatService.swift

@@ -11,6 +11,7 @@ import Combine
 actor OllamaChatService {
     private(set) var messages: [APIChatMessage] = []
     private let currentResponseSubject: PassthroughSubject<String, Never> = .init()
+    private let answeringSubject: PassthroughSubject<Bool, Never> = .init()
 
     func sendMessage(model: String, userInput: String, images: [NSImage]?, showThink: Bool,
                      predict: Double? = nil, temperature: Double? = nil) async throws -> AsyncStream<String> {
@@ -55,6 +56,9 @@ actor OllamaChatService {
         let stream = AsyncStream { continuation in
             Task {
                 do {
+                    //start thinking
+                    self.sendToAnsweringSubject(true)
+                    
                     for try await line in bytesStream.lines {
                         guard let data = line.data(using: .utf8),
                               let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
@@ -76,6 +80,9 @@ actor OllamaChatService {
                     let finalMessage = APIChatMessage(role: "assistant", content: assistantContent, images: nil, options: nil, assistantThink: assistantThink)
                     messages.append(finalMessage)
 
+                    //end thinking
+                    self.sendToAnsweringSubject(false)
+                    
                     #if DEBUG
                     debugPrint(assistantThink)
                     debugPrint("Request options: \(options)")
@@ -95,10 +102,18 @@ actor OllamaChatService {
         currentResponseSubject.send(value)
     }
 
+    private func sendToAnsweringSubject(_ value: Bool) {
+        answeringSubject.send(value)
+    }
+    
     public func currentResponsePublisher() -> AnyPublisher<String, Never> {
         return currentResponseSubject.eraseToAnyPublisher()
     }
 
+    public func answeringPublisher() -> AnyPublisher<Bool, Never> {
+        return answeringSubject.eraseToAnyPublisher()
+    }
+    
     ///Convert NSImage array to Base64 String array
     private func nsImageArrayToBase64Array(_ images: [NSImage]?) async -> [String]? {
         var base64Strings: [String] = []

macLlama/Views/ConversationView/ChatInterfaceView/ChatInterfaceView.swift

@@ -230,6 +230,11 @@ struct ChatInterfaceView: View {
                 await chatService.currentResponsePublisher().receive(on: RunLoop.main).sink { message in
                     self.currentGeneratingResponse = message
                 }.store(in: &cancellables)
+                
+                //subscribe currently generating response
+                await chatService.answeringPublisher().receive(on: RunLoop.main).sink { thinking in
+                    self.isThinking = thinking
+                }.store(in: &cancellables)
             }
         }
         .frame(minWidth: Units.chatWindowWidth)
@@ -324,7 +329,7 @@ extension ChatInterfaceView {
 
                 //Reset state
                 await MainActor.run {
-                    self.isThinking = false
+//                    self.isThinking = false
                     self.isAutoScrolling = false
                     self.autoScrollTask = nil
                 }