Initial Commit

Author: hellotunamayo

Localizable.xcstrings

@@ -1111,6 +1111,9 @@
     },
     "Reload model list" : {
 
+    },
+    "Resume this conversation" : {
+
     },
     "Scroll to Top" : {
       "localizations" : {

macLlama/Views/ChatHistoryView/ChatHistoryView.swift

@@ -10,6 +10,7 @@ import SwiftData
 
 struct ChatHistoryView: View {
     @Environment(\.modelContext) private var modelContext
+    @Environment(\.openWindow) private var openWindow
     @Query(sort: \SwiftDataChatHistory.createdDate, order: .reverse) private var chatHistory: [SwiftDataChatHistory]
 
     @State private var selectedId: String = ""
@@ -58,6 +59,15 @@ struct ChatHistoryView: View {
         .toolbar {
             ToolbarItemGroup {
                 if !selectedId.isEmpty {
+                    //Continue from dedicated conversation button
+                    Button {
+                        openWindow(id: "newConversationWindow", value: selectedId)
+                    } label: {
+                        Label("Resume this conversation", systemImage: "chevron.forward.dotted.chevron.forward")
+                            .labelStyle(.titleAndIcon)
+                            .foregroundStyle(Color.green)
+                    }
+                    
                     Button {
                         try? deleteChatHistory(conversationID: selectedId)
                     } label: {

macLlama/Views/ConversationView/ChatBubbleView.swift

@@ -12,11 +12,13 @@ struct ChatBubbleView: View {
     @Environment(\.colorScheme) var colorScheme
     @AppStorage("chatFontSize") var chatFontSize: Int = AppSettings.chatFontSize
     @AppStorage("markdownTheme") var markdownTheme: String = AppSettings.markdownTheme
+    
     @Binding var isThinking: Bool
+    
+    @State var chatMessage: String
     @State private var messageAnimationFactor: CGFloat = 0.0
     @State private var messageAnimated: Bool = false
     @State private var isMarkdownEnabled: Bool = false
-    @State private var chatMessage: String = ""
     @State private var showAssistantThink: Bool = false
 
     var assistantThinkContext: String? {

macLlama/Views/ConversationView/ChatInterfaceView/ChatInterfaceView.swift

@@ -31,14 +31,14 @@ struct ChatInterfaceView: View {
     @State private var temperature: Double = 0.7
 
     //Chat history state
-    @State private var history: [LocalChatHistory] = []
+    @State var history: [LocalChatHistory]
 
     //Auto scrolling state
     @State private var isAutoScrolling: Bool = false
     @State private var autoScrollTask: Task<Void, Never>?
 
     //Extra state
-    @State private var conversationId: UUID = UUID()
+    @State var conversationId: UUID
     @State private var hoveredTopButtonTag: Int? = nil
     @State private var showThink: Bool = false
     @State private var isSettingOn: Bool = false
@@ -102,8 +102,8 @@ struct ChatInterfaceView: View {
                         ScrollView {
                             ForEach(0..<self.history.count, id: \.self) { index in
                                 VStack {
-                                    if history[index].message != "" {
-                                        ChatBubbleView(isThinking: self.$isThinking, chatData: $history[index])
+                                    if history[index].message.count > 0 {
+                                        ChatBubbleView(isThinking: self.$isThinking, chatMessage: self.history[index].message ,chatData: $history[index])
                                             .padding(EdgeInsets(top: index == 0 ? Units.normalGap * 4 : Units.normalGap,
                                                                 leading: Units.normalGap,
                                                                 bottom: Units.normalGap, trailing: Units.normalGap))
@@ -261,13 +261,14 @@ extension ChatInterfaceView {
                     self.isFetchingWebSearch = true
                     if let summary = await self.viewModel.getWebResponse(from: prompt) {
                         let searchedPrompt = """
-                        You are a helpful AI assistant dedicated to answering questions. Combine the information provided below with your existing knowledge to provide context and clarify details, but *all factual claims* must be directly supported by the provided text, meaning they must be either a direct quote or a paraphrase that accurately reflects the text’s meaning. Always cite the source (e.g., paragraph number, section title) whenever possible.  If the provided text contains conflicting information, acknowledge the conflict and present both perspectives without taking a definitive stance.  You will be asked factual and explanatory questions based on the provided text. Do *not* speculate, offer opinions, or generate information not found within the provided text.
+                        You are a helpful AI assistant dedicated to answering questions. Combine the information provided below with your existing knowledge to provide context and clarify details, but *all factual claims* must be directly supported by the provided text, meaning they must be either a direct quote or a paraphrase that accurately reflects the text’s meaning. Always cite the source (e.g., paragraph number, section title) whenever possible. If the provided text contains conflicting information, acknowledge the conflict and present both perspectives without taking a definitive stance.  You will be asked factual and explanatory questions based on the provided text. Do *not* speculate, offer opinions, or generate information not found within the provided text.
                     
                         If the question cannot be answered using the provided text, please respond with: "I'm sorry, the answer to this question isn't available in the provided information."
                     
                         When answering, please cite the source and provide the URL for reference.  Format your answers and citations like this:
                     
                         Answer derived *directly* from the provided text
+                        Answer *must* answered in the language user questioned
                     
                         Source: [A brief description of the provided text, e.g., "A summary from the World Wildlife Fund about polar bear populations."]
                         Reference URL: \(summary.1)  (This URL is for reference and does not need to be displayed in the answer.)

macLlama/Views/ConversationView/ConversationWindowView.swift

@@ -11,20 +11,57 @@ import SwiftData
 struct ConversationWindowView: View {
     @Environment(\.colorScheme) var colorScheme
     @EnvironmentObject var serverStatus: ServerStatus
+    @Query(sort: \SwiftDataChatHistory.createdDate, order: .forward) private var chatHistory: [SwiftDataChatHistory]
+    
+    var history: [LocalChatHistory] {
+        fetchHistory()
+    }
+    
+    let conversationId: String?
+    var conversationUUID: UUID {
+        if let idString = conversationId {
+            return UUID(uuidString: idString) ?? UUID()
+        } else {
+            return UUID()
+        }
+    }
 
     var body: some View {
         if serverStatus.isOnline {
-            ChatInterfaceView()
+            ChatInterfaceView(history: history, conversationId: conversationUUID)
                 .environmentObject(serverStatus)
         } else {
             StartServerView()
                 .environmentObject(serverStatus)
                 .padding(.top, Units.normalGap * -3)
         }
     }
+    
+    ///Get conversation from history
+    private func fetchHistory() -> [LocalChatHistory] {
+        var conversationHistory: [LocalChatHistory] = []
+        guard let conversationId = self.conversationId else {
+            return conversationHistory
+        }
+        let result = chatHistory.filter({$0.conversationId.uuidString == conversationId}).sorted(by: { $0.conversationDate < $1.conversationDate })
+        
+        
+        if result.count == 0 {
+            return conversationHistory
+        }
+        
+        result.forEach { history in
+            let isUser = history.chatData.role == "user" ? true : false
+            let message = history.chatData.content
+            let history: LocalChatHistory = .init(isUser: isUser, modelName: "macLlama History", message: message)
+            conversationHistory.append(history)
+        }
+        
+        return conversationHistory
+    }
 }
 
 #Preview {
-    ConversationWindowView()
+    ConversationWindowView(conversationId: nil)
         .modelContainer(for: Item.self, inMemory: true)
 }

macLlama/macLlamaApp.swift

@@ -42,7 +42,7 @@ struct macLlamaApp: App {
 
     var body: some Scene {
         WindowGroup {
-            ConversationWindowView()
+            ConversationWindowView(conversationId: nil)
                 .environmentObject(serverStatus)
                 .frame(minWidth: Units.appFrameMinWidth, minHeight: Units.appFrameMinHeight)
                 .task {
@@ -171,5 +171,11 @@ struct macLlamaApp: App {
         .keyboardShortcut("h", modifiers: [.command, .shift], localization: .automatic)
         .modelContainer(for: SwiftDataChatHistory.self)
         .windowResizability(.contentSize)
+        
+        WindowGroup(id: "newConversationWindow", for: String.self) { string in
+            ConversationWindowView(conversationId: string.wrappedValue)
+                .environmentObject(serverStatus)
+        }
+        .modelContainer(for: SwiftDataChatHistory.self)
     }
 }