Cleaning up for open source release (#2)

Author: peterfriese

Examples/AIChatDemo/AIChatDemo.xcodeproj/project.pbxproj

@@ -104,8 +104,8 @@
 			mainGroup = 889CF9A42E1C5BB4000EE62F;
 			minimizedProjectReferenceProxies = 1;
 			packageReferences = (
-				889CF9BB2E1C5BED000EE62F /* XCLocalSwiftPackageReference "../../../ConversationKit" */,
 				889CF9C22E1C6219000EE62F /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
+				88156EF52E397722004CE19F /* XCLocalSwiftPackageReference "../../../ConversationKit" */,
 			);
 			preferredProjectObjectVersion = 77;
 			productRefGroup = 889CF9AE2E1C5BB4000EE62F /* Products */;
@@ -345,7 +345,7 @@
 /* End XCConfigurationList section */
 
 /* Begin XCLocalSwiftPackageReference section */
-		889CF9BB2E1C5BED000EE62F /* XCLocalSwiftPackageReference "../../../ConversationKit" */ = {
+		88156EF52E397722004CE19F /* XCLocalSwiftPackageReference "../../../ConversationKit" */ = {
 			isa = XCLocalSwiftPackageReference;
 			relativePath = ../../../ConversationKit;
 		};
@@ -357,7 +357,7 @@
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 11.15.0;
+				minimumVersion = 12.0.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

Examples/AIChatDemo/AIChatDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -27,7 +27,7 @@ struct AIChatDemoApp: App {
   var body: some Scene {
     WindowGroup {
       TabView {
-        ContentView()
+        FoundationModelChatView()
           .tabItem {
             Label("On-Device", systemImage: "cpu")
           }

Examples/AIChatDemo/AIChatDemo/AIChatDemoApp.swift

@@ -17,23 +17,56 @@
 // limitations under the License.
 
 import ConversationKit
-import SwiftUI
 import FirebaseAI
+import SwiftUI
+
+@Observable
+class FirebaseAILogicChatViewModel {
+  var messages: [Message] = []
+
+  private let model: GenerativeModel
+  private let chat: Chat
+
+  init() {
+    let firstMessage = Message(
+      content: "Hello! How can I help you today?",
+      participant: .other
+    )
+    self.messages = [firstMessage]
+
+    model =
+      FirebaseAI
+      .firebaseAI(backend: .googleAI())
+      .generativeModel(modelName: "gemini-2.5-flash")
+
+    let history = [
+      ModelContent(role: "model", parts: firstMessage.content ?? "")
+    ]
+    chat = model.startChat(history: history)
+  }
+
+  func sendMessage(_ message: Message) async {
+    if let content = message.content {
+      var responseText: String
+      do {
+        let response = try await chat.sendMessage(content)
+        responseText = response.text ?? ""
+      } catch {
+        responseText =
+          "I'm sorry, I don't understand that. Please try again. \(error.localizedDescription)"
+      }
+      let response = Message(content: responseText, participant: .other)
+      messages.append(response)
+    }
+  }
+}
 
 struct FirebaseAILogicChatView: View {
-  @State private var messages: [Message] = [
-    Message(content: "Hello! How can I help you today?", participant: .other)
-  ]
-  
-  let model = {
-    let ai = FirebaseAI.firebaseAI(backend: .googleAI())
-    let model = ai.generativeModel(modelName: "gemini-2.5-flash")
-    return model
-  }()
-  
+  @State private var viewModel = FirebaseAILogicChatViewModel()
+
   var body: some View {
     NavigationStack {
-      ConversationView(messages: $messages)
+      ConversationView(messages: $viewModel.messages)
         .attachmentActions {
           Button(action: {}) {
             Label("Photos", systemImage: "photo.on.rectangle.angled")
@@ -45,20 +78,7 @@ struct FirebaseAILogicChatView: View {
         .navigationTitle("Chat")
         .navigationBarTitleDisplayMode(.inline)
         .onSendMessage { message in
-          Task {
-            if let content = message.content {
-              var responseText: String
-              do {
-                let response = try await model.generateContent(content)
-                responseText = response.text ?? ""
-              }
-              catch {
-                responseText = "I'm sorry, I don't understand that. Please try again. \(error.localizedDescription)"
-              }
-              let response = Message(content: responseText, participant: .other)
-              messages.append(response)
-            }
-          }
+          await viewModel.sendMessage(message)
         }
     }
   }

Examples/AIChatDemo/AIChatDemo/FirebaseAILogicChatView.swift

@@ -17,43 +17,41 @@
 // limitations under the License.
 
 import ConversationKit
-import SwiftUI
 import FoundationModels
+import SwiftUI
 
-struct ContentView: View {
+struct FoundationModelChatView {
   @State private var messages: [Message] = [
     Message(content: "Hello! How can I help you today?", participant: .other)
   ]
 
   let session = LanguageModelSession()
+}
 
+extension FoundationModelChatView: View {
   var body: some View {
     NavigationStack {
       ConversationView(messages: $messages)
         .navigationTitle("Chat")
         .navigationBarTitleDisplayMode(.inline)
         .onSendMessage { message in
-          Task {
-            // In a real application, you would pass the message to your model
-            // and handle the response. For now, we'll just echo it back.
-            if let content = message.content {
-              var responseText: String
-              do {
-                let response = try await session.respond(to: content)
-                responseText = response.content
-              }
-              catch {
-                responseText = "I'm sorry, I don't understand that. Please try again. \(error.localizedDescription)"
-              }
-              let response = Message(content: responseText, participant: .other)
-              messages.append(response)
+          if let content = message.content {
+            var responseText: String
+            do {
+              let response = try await session.respond(to: content)
+              responseText = response.content
+            } catch {
+              responseText =
+                "I'm sorry, I don't understand that. Please try again. \(error.localizedDescription)"
             }
+            let response = Message(content: responseText, participant: .other)
+            messages.append(response)
           }
         }
     }
   }
 }
 
 #Preview {
-  ContentView()
+  FoundationModelChatView()
 }

…/AIChatDemo/AIChatDemo/ContentView.swift …AIChatDemo/FoundationModelChatView.swiftExamples/AIChatDemo/AIChatDemo/ContentView.swift renamed to Examples/AIChatDemo/AIChatDemo/FoundationModelChatView.swift Examples/AIChatDemo/AIChatDemo/ContentView.swift renamed to Examples/AIChatDemo/AIChatDemo/FoundationModelChatView.swift

@@ -42,6 +42,12 @@ struct ContentView: View {
             await generateResponse(for: userMessage)
           }
         }
+        .attachmentActions {
+          Button("Image", systemImage: "photo.on.rectangle.angled") {
+          }
+          Button("Camera", systemImage: "camera") {
+          }
+        }
         .navigationTitle("Chat")
         .navigationBarTitleDisplayMode(.inline)
     }