Merge remote-tracking branch 'origin/main' into nc/recaptcha-1

Author: ncooke3

.github/workflows/infra.health_metrics.yml

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Firebase'
-  s.version          = '12.14.0'
+  s.version          = '12.15.0'
   s.summary          = 'Firebase'
 
   s.description      = <<-DESC
@@ -36,14 +36,14 @@ Simplify your app development, grow your user base, and monetize more effectivel
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
     ss.tvos.deployment_target = '15.0'
-    ss.ios.dependency 'FirebaseAnalytics', '~> 12.14.0'
-    ss.osx.dependency 'FirebaseAnalytics', '~> 12.14.0'
-    ss.tvos.dependency 'FirebaseAnalytics', '~> 12.14.0'
+    ss.ios.dependency 'FirebaseAnalytics', '~> 12.15.0'
+    ss.osx.dependency 'FirebaseAnalytics', '~> 12.15.0'
+    ss.tvos.dependency 'FirebaseAnalytics', '~> 12.15.0'
     ss.dependency 'Firebase/CoreOnly'
   end
 
   s.subspec 'CoreOnly' do |ss|
-    ss.dependency 'FirebaseCore', '~> 12.14.0'
+    ss.dependency 'FirebaseCore', '~> 12.15.0'
     ss.source_files = 'CoreOnly/Sources/Firebase.h'
     ss.preserve_paths = 'CoreOnly/Sources/module.modulemap'
     if ENV['FIREBASE_POD_REPO_FOR_DEV_POD'] then
@@ -70,7 +70,7 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'ABTesting' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseABTesting', '~> 12.14.0'
+    ss.dependency 'FirebaseABTesting', '~> 12.15.0'
     # Standard platforms PLUS watchOS.
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
@@ -80,13 +80,13 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'AppDistribution' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.ios.dependency 'FirebaseAppDistribution', '~> 12.14.0-beta'
+    ss.ios.dependency 'FirebaseAppDistribution', '~> 12.15.0-beta'
     ss.ios.deployment_target = '15.0'
   end
 
   s.subspec 'AppCheck' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseAppCheck', '~> 12.14.0'
+    ss.dependency 'FirebaseAppCheck', '~> 12.15.0'
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
     ss.tvos.deployment_target = '15.0'
@@ -95,7 +95,7 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'Auth' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseAuth', '~> 12.14.0'
+    ss.dependency 'FirebaseAuth', '~> 12.15.0'
     # Standard platforms PLUS watchOS.
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
@@ -105,7 +105,7 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'Crashlytics' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseCrashlytics', '~> 12.14.0'
+    ss.dependency 'FirebaseCrashlytics', '~> 12.15.0'
     # Standard platforms PLUS watchOS.
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
@@ -115,7 +115,7 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'Database' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseDatabase', '~> 12.14.0'
+    ss.dependency 'FirebaseDatabase', '~> 12.15.0'
     # Standard platforms PLUS watchOS 7.
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
@@ -125,15 +125,15 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'Firestore' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseFirestore', '~> 12.14.0'
+    ss.dependency 'FirebaseFirestore', '~> 12.15.0'
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
     ss.tvos.deployment_target = '15.0'
   end
 
   s.subspec 'Functions' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseFunctions', '~> 12.14.0'
+    ss.dependency 'FirebaseFunctions', '~> 12.15.0'
     # Standard platforms PLUS watchOS.
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
@@ -143,20 +143,20 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'InAppMessaging' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.ios.dependency 'FirebaseInAppMessaging', '~> 12.14.0-beta'
-    ss.tvos.dependency 'FirebaseInAppMessaging', '~> 12.14.0-beta'
+    ss.ios.dependency 'FirebaseInAppMessaging', '~> 12.15.0-beta'
+    ss.tvos.dependency 'FirebaseInAppMessaging', '~> 12.15.0-beta'
     ss.ios.deployment_target = '15.0'
     ss.tvos.deployment_target = '15.0'
   end
 
   s.subspec 'Installations' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseInstallations', '~> 12.14.0'
+    ss.dependency 'FirebaseInstallations', '~> 12.15.0'
   end
 
   s.subspec 'Messaging' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseMessaging', '~> 12.14.0'
+    ss.dependency 'FirebaseMessaging', '~> 12.15.0'
     # Standard platforms PLUS watchOS.
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
@@ -166,7 +166,7 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'MLModelDownloader' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseMLModelDownloader', '~> 12.14.0-beta'
+    ss.dependency 'FirebaseMLModelDownloader', '~> 12.15.0-beta'
     # Standard platforms PLUS watchOS.
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
@@ -176,15 +176,15 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'Performance' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.ios.dependency 'FirebasePerformance', '~> 12.14.0'
-    ss.tvos.dependency 'FirebasePerformance', '~> 12.14.0'
+    ss.ios.dependency 'FirebasePerformance', '~> 12.15.0'
+    ss.tvos.dependency 'FirebasePerformance', '~> 12.15.0'
     ss.ios.deployment_target = '15.0'
     ss.tvos.deployment_target = '15.0'
   end
 
   s.subspec 'RemoteConfig' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseRemoteConfig', '~> 12.14.0'
+    ss.dependency 'FirebaseRemoteConfig', '~> 12.15.0'
     # Standard platforms PLUS watchOS.
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'
@@ -194,7 +194,7 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'Storage' do |ss|
     ss.dependency 'Firebase/CoreOnly'
-    ss.dependency 'FirebaseStorage', '~> 12.14.0'
+    ss.dependency 'FirebaseStorage', '~> 12.15.0'
     # Standard platforms PLUS watchOS.
     ss.ios.deployment_target = '15.0'
     ss.osx.deployment_target = '10.15'

Firebase.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseABTesting'
-  s.version          = '12.14.0'
+  s.version          = '12.15.0'
   s.summary          = 'Firebase ABTesting'
 
   s.description      = <<-DESC
@@ -51,7 +51,7 @@ Firebase Cloud Messaging and Firebase Remote Config in your app.
   s.pod_target_xcconfig = {
     'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
   }
-  s.dependency 'FirebaseCore', '~> 12.14.0'
+  s.dependency 'FirebaseCore', '~> 12.15.0'
 
   s.test_spec 'unit' do |unit_tests|
     unit_tests.scheme = { :code_coverage => true }

FirebaseABTesting.podspec

@@ -1,4 +1,4 @@
-# Unreleased
+# 12.14.0
 - [fixed] Fixed a race condition that could lead to a crash in ABTesting when
   updating experiments. (#16145)
 

FirebaseABTesting/CHANGELOG.md

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseAI'
-  s.version          = '12.14.0'
+  s.version          = '12.15.0'
   s.summary          = 'Firebase AI SDK'
 
   s.description      = <<-DESC
@@ -43,8 +43,8 @@ Build AI-powered apps and features with the Gemini API using the Firebase AI SDK
   s.tvos.framework = 'UIKit'
   s.watchos.framework = 'WatchKit'
 
-  s.dependency 'FirebaseAILogic', '12.14.0'
-  s.dependency 'FirebaseCore', '~> 12.14.0'
+  s.dependency 'FirebaseAILogic', '12.15.0'
+  s.dependency 'FirebaseCore', '~> 12.15.0'
 
   s.test_spec 'unit' do |unit_tests|
     unit_tests_dir = 'FirebaseAI/Wrapper/Tests/'

FirebaseAI.podspec

@@ -1,3 +1,8 @@
+# 12.14.0
+- [fixed] Fixed an issue in `GenerativeModelSession` where `String` generation
+  used the wrong overload for `respond(to:)` and `streamResponse(to:)`,
+  resulting in occasional prompt refusals. (#16165)
+
 # 12.13.0
 - [feature] **Public Preview**: Added support for hybrid inference, enabling
   fallback between on-device (Foundation Models) and cloud (Gemini) models. (#16111)

FirebaseAI/CHANGELOG.md

@@ -49,33 +49,36 @@
       -> _ModelSessionResponse {
       let prompt = try prompt.toFoundationModelsPrompt()
 
-      let response: FoundationModels.LanguageModelSession
-        .Response<FoundationModels.GeneratedContent>
+      let rawContent: FoundationModels.GeneratedContent
+      let transcriptEntries: ArraySlice<FoundationModels.Transcript.Entry>
       if let schema {
-        response = try await respond(
+        let response = try await respond(
           to: prompt,
           schema: schema.generationSchema,
           includeSchemaInPrompt: includeSchemaInPrompt,
           options: options.generationOptions
         )
+        rawContent = response.rawContent
+        transcriptEntries = response.transcriptEntries
       } else {
-        response = try await respond(
+        let response = try await respond(
           to: prompt,
-          schema: String.generationSchema,
           options: options.generationOptions
         )
+        rawContent = response.rawContent
+        transcriptEntries = response.transcriptEntries
       }
 
       #if DEBUG
         if AILog.additionalLoggingEnabled() {
           AILog.debug(
             code: .foundationModelsResponseTranscript,
-            "Foundation Models Transcript: \(response.transcriptEntries)"
+            "Foundation Models Transcript: \(transcriptEntries)"
           )
         }
       #endif // DEBUG
 
-      return makeResponse(from: response.rawContent, schema: schema)
+      return makeResponse(from: rawContent, schema: schema)
     }
 
     /// Sends a prompt to the model and streams the model's response.
@@ -99,42 +102,43 @@
           return
         }
 
-        let stream: FoundationModels.LanguageModelSession
-          .ResponseStream<FoundationModels.GeneratedContent>
-        if let schema {
-          stream = streamResponse(
-            to: foundationModelsPrompt,
-            schema: schema.generationSchema,
-            includeSchemaInPrompt: includeSchemaInPrompt,
-            options: options.generationOptions
-          )
-        } else {
-          stream = streamResponse(
-            to: foundationModelsPrompt,
-            schema: String.generationSchema,
-            options: options.generationOptions
-          )
-        }
-
         let task = Task {
           do {
-            for try await snapshot in stream {
-              let response = makeResponse(from: snapshot.rawContent, schema: schema)
+            func processStream<T>(_ stream: LanguageModelSession.ResponseStream<T>) async throws {
+              for try await snapshot in stream {
+                let response = makeResponse(from: snapshot.rawContent, schema: schema)
 
-              continuation.yield(response)
+                continuation.yield(response)
+              }
+
+              #if DEBUG
+                if AILog.additionalLoggingEnabled() {
+                  // Streaming has completed but we call `collect()` to get a
+                  // `LanguageModelSession.Response`, which contains `transcriptEntries`.
+                  let response = try await stream.collect()
+                  AILog.debug(
+                    code: .foundationModelsStreamResponseTranscript,
+                    "Foundation Models Transcript: \(response.transcriptEntries)"
+                  )
+                }
+              #endif // DEBUG
             }
 
-            #if DEBUG
-              if AILog.additionalLoggingEnabled() {
-                // Streaming has completed but we call `collect()` to get a
-                // `LanguageModelSession.Response`, which contains `transcriptEntries`.
-                let response = try await stream.collect()
-                AILog.debug(
-                  code: .foundationModelsStreamResponseTranscript,
-                  "Foundation Models Transcript: \(response.transcriptEntries)"
-                )
-              }
-            #endif // DEBUG
+            if let schema {
+              let stream = streamResponse(
+                to: foundationModelsPrompt,
+                schema: schema.generationSchema,
+                includeSchemaInPrompt: includeSchemaInPrompt,
+                options: options.generationOptions
+              )
+              try await processStream(stream)
+            } else {
+              let stream = streamResponse(
+                to: foundationModelsPrompt,
+                options: options.generationOptions
+              )
+              try await processStream(stream)
+            }
 
             continuation.finish()
           } catch {

FirebaseAI/Sources/Extensions/Internal/LanguageModelSession+ModelSession.swift

@@ -540,12 +540,16 @@ extension GenerateContentResponse: Decodable {
   public init(from decoder: Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
 
-    guard container.contains(CodingKeys.candidates) || container
-      .contains(CodingKeys.promptFeedback) else {
+    guard container.contains(CodingKeys.candidates)
+      || container.contains(CodingKeys.promptFeedback)
+      || container.contains(CodingKeys.usageMetadata) else {
+      let keys = container.allKeys.map { $0.stringValue }.sorted().joined(separator: ", ")
       let context = DecodingError.Context(
-        codingPath: [],
-        debugDescription: "Failed to decode GenerateContentResponse;" +
-          " missing keys 'candidates' and 'promptFeedback'."
+        codingPath: decoder.codingPath,
+        debugDescription: """
+        Failed to decode GenerateContentResponse; missing keys 'candidates', 'promptFeedback' or \
+        'usageMetadata'. Found keys: \(keys.isEmpty ? "none" : keys)
+        """
       )
       throw DecodingError.dataCorrupted(context)
     }

FirebaseAI/Sources/GenerateContentResponse.swift

@@ -35,8 +35,9 @@ public final class TemplateGenerativeModel: Sendable {
   ///   - templateID: The ID of the prompt template to use.
   ///   - inputs: A dictionary of variables to substitute into the template.
   ///   - options: The ``RequestOptions`` for the request, currently used to override default
-  /// request timeout.
-  ///   - toolConfig: The ``TemplateToolConfig`` for the request, e.g. for Maps Grounding.
+  ///     request timeout.
+  ///   - toolConfig: The ``TemplateToolConfig`` for the request (for example, if it uses the
+  ///     Grounding with Google Maps tool).
   /// - Returns: The content generated by the model.
   /// - Throws: A ``GenerateContentError`` if the request failed.
   public func generateContent(templateID: String,
@@ -61,7 +62,8 @@ public final class TemplateGenerativeModel: Sendable {
   ///   - template: The prompt template to use.
   ///   - inputs: A dictionary of variables to substitute into the template.
   ///   - options: The ``RequestOptions`` for the request.
-  ///   - toolConfig: The ``TemplateToolConfig`` for the request, e.g. for Maps Grounding.
+  ///   - toolConfig: The ``TemplateToolConfig`` for the request (for example, if it uses the
+  ///     Grounding with Google Maps tool).
   /// - Returns: The content generated by the model.
   /// - Throws: A ``GenerateContentError`` if the request failed.
   func generateContentWithHistory(history: [ModelContent], template: String,
@@ -92,8 +94,9 @@ public final class TemplateGenerativeModel: Sendable {
   ///   - templateID: The ID of the prompt template to use.
   ///   - inputs: A dictionary of variables to substitute into the template.
   ///   - options: The ``RequestOptions`` for the request, currently used to override default
-  /// request timeout.
-  ///   - toolConfig: The ``TemplateToolConfig`` for the request, e.g. for Maps Grounding.
+  ///     request timeout.
+  ///   - toolConfig: The ``TemplateToolConfig`` for the request (for example, if it uses the
+  ///     Grounding with Google Maps tool).
   /// - Returns: An `AsyncThrowingStream` that yields `GenerateContentResponse` objects.
   /// - Throws: A ``GenerateContentError`` if the request failed.
   @available(macOS 12.0, watchOS 8.0, *)
@@ -123,7 +126,8 @@ public final class TemplateGenerativeModel: Sendable {
   ///   - template: The prompt template to use.
   ///   - inputs: A dictionary of variables to substitute into the template.
   ///   - options: The ``RequestOptions`` for the request.
-  ///   - toolConfig: The ``TemplateToolConfig`` for the request, e.g. for Maps Grounding.
+  ///   - toolConfig: The ``TemplateToolConfig`` for the request (for example, if it uses the
+  ///     Grounding with Google Maps tool).
   /// - Returns: An `AsyncThrowingStream` that yields `GenerateContentResponse` objects.
   /// - Throws: A ``GenerateContentError`` if the request failed.
   @available(macOS 12.0, watchOS 8.0, *)