Merge remote-tracking branch 'origin/main' into revert-1811-pb-restore-legacy

Author: ncooke3

Gemfile.lock

@@ -1,10 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.7)
-      base64
-      nkf
-      rexml
+    CFPropertyList (3.0.9)
     activesupport (7.1.6)
       base64
       benchmark (>= 0.3)
@@ -89,7 +86,6 @@ GEM
     nanaimo (0.4.0)
     nap (1.1.0)
     netrc (0.11.0)
-    nkf (0.2.0)
     public_suffix (4.0.7)
     rexml (3.4.4)
     ruby-macho (2.5.1)

firebaseai/FirebaseAIExample/ChatExample/Screens/ConversationScreen.swift

@@ -30,7 +30,7 @@ struct ConversationScreen: View {
 
   init(firebaseService: FirebaseAI, title: String, searchGroundingEnabled: Bool = false) {
     let model = firebaseService.generativeModel(
-      modelName: "gemini-2.0-flash-001",
+      modelName: "gemini-2.5-flash-lite",
       tools: searchGroundingEnabled ? [.googleSearch()] : []
     )
     self.title = title

firebaseai/FirebaseAIExample/ChatExample/ViewModels/ConversationViewModel.swift

@@ -44,7 +44,7 @@ class ConversationViewModel: ObservableObject {
       self.model = model
     } else {
       self.model = firebaseService.generativeModel(
-        modelName: "gemini-2.0-flash-001"
+        modelName: "gemini-2.5-flash-lite"
       )
     }
     chat = self.model.startChat()

firebaseai/FirebaseAIExample/FunctionCallingExample/ViewModels/FunctionCallingViewModel.swift

@@ -43,7 +43,7 @@ class FunctionCallingViewModel: ObservableObject {
 
   init(firebaseService: FirebaseAI) { // Accept FirebaseAI instance
       model = firebaseService.generativeModel(
-          modelName: "gemini-2.0-flash-001",
+        modelName: "gemini-2.5-flash-lite",
           tools: [.functionDeclarations([
               FunctionDeclaration(
           name: "get_exchange_rate",

firebaseai/FirebaseAIExample/GenerativeAIMultimodalExample/ViewModels/PhotoReasoningViewModel.swift

@@ -48,7 +48,7 @@ class PhotoReasoningViewModel: ObservableObject {
   private var model: GenerativeModel?
 
   init(firebaseService: FirebaseAI) {
-    model = firebaseService.generativeModel(modelName: "gemini-2.0-flash-001")
+    model = firebaseService.generativeModel(modelName: "gemini-2.5-flash-lite")
   }
 
   func reason() async {

firebaseai/FirebaseAIExample/GenerativeAITextExample/ViewModels/GenerateContentViewModel.swift

@@ -36,7 +36,7 @@ class GenerateContentViewModel: ObservableObject {
   private var model: GenerativeModel?
 
   init(firebaseService: FirebaseAI) {
-    model = firebaseService.generativeModel(modelName: "gemini-2.0-flash-001")
+    model = firebaseService.generativeModel(modelName: "gemini-2.5-flash-lite")
   }
 
   func generateContent(inputText: String) async {

firebaseai/FirebaseAIExample/ImagenExample/ImagenViewModel.swift

@@ -42,13 +42,13 @@ class ImagenViewModel: ObservableObject {
   private var generateImagesTask: Task<Void, Never>?
 
   init(firebaseService: FirebaseAI) {
-    let modelName = "imagen-3.0-generate-002"
+    let modelName = "imagen-4.0-fast-generate-001"
     let safetySettings = ImagenSafetySettings(
       safetyFilterLevel: .blockLowAndAbove
     )
     var generationConfig = ImagenGenerationConfig()
     generationConfig.numberOfImages = 4
-    generationConfig.aspectRatio = .landscape4x3
+    generationConfig.aspectRatio = .square1x1
 
     model = firebaseService.imagenModel(
       modelName: modelName,