[Firebase AI] Rename module to FirebaseAILogic

.github/workflows/firebaseai.yml

@@ -27,9 +27,12 @@ permissions:
 
 jobs:
   spm:
+    strategy:
+      matrix:
+        target: [FirebaseAILogicUnit, FirebaseAIUnit]
     uses: ./.github/workflows/common.yml
     with:
-      target: FirebaseAIUnit
+      target: ${{  matrix.target }}
       setup_command: scripts/update_vertexai_responses.sh
 
   testapp-integration:
@@ -77,9 +80,12 @@ jobs:
         retention-days: 2
 
   pod_lib_lint:
+    strategy:
+      matrix:
+        product: [FirebaseAILogic, FirebaseAI]
     uses: ./.github/workflows/common_cocoapods.yml
     with:
-      product: FirebaseAI
+      product: ${{  matrix.product }}
       supports_swift6: true
       setup_command: scripts/update_vertexai_responses.sh
 

.github/workflows/zip.yml

@@ -398,6 +398,57 @@ jobs:
         name: quickstart_artifacts database
         path: quickstart-ios/
 
+  quickstart_framework_firebaseai:
+    needs: package-head
+    if: ${{ !cancelled() && (success() || github.event.inputs.zip_run_id != '') }}
+    env:
+      plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
+      SDK: "FirebaseAI"
+      # This is a workaround to use the FirebaseAIExampleZip scheme that does not have the SPM dependency.
+      SWIFT_SUFFIX: "Zip"
+    strategy:
+      matrix:
+        artifact: [Firebase-actions-dir, Firebase-actions-dir-dynamic]
+        build-env:
+          - os: macos-15
+            xcode: Xcode_16.4
+    runs-on: ${{ matrix.build-env.os }}
+    steps:
+    - uses: actions/checkout@v4
+    - name: Get framework dir
+      uses: actions/download-artifact@v4.1.7
+      with:
+        name: ${{ matrix.artifact }}
+        run-id: ${{ github.event.inputs.zip_run_id || github.run_id }}
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+    - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
+    - name: Xcode
+      run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
+    - name: Setup Bundler
+      run: ./scripts/setup_bundler.sh
+    - name: Move frameworks
+      run: |
+        mkdir -p "${HOME}"/ios_frameworks/
+        find "${GITHUB_WORKSPACE}" -name "Firebase*latest.zip" -exec unzip -d "${HOME}"/ios_frameworks/ {} +
+    - uses: actions/checkout@v4
+    - name: Setup quickstart
+      run: SAMPLE="$SDK" TARGET="${SDK}ExampleZip" scripts/setup_quickstart_framework.sh \
+                                               "${HOME}"/ios_frameworks/Firebase/FirebaseAILogic/* \
+                                               "${HOME}"/ios_frameworks/Firebase/FirebaseAnalytics/*
+    - name: Install Secret GoogleService-Info.plist
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/FirebaseAI/TestApp-GoogleService-Info.plist.gpg \
+        quickstart-ios/firebaseai/GoogleService-Info.plist "$plist_secret"
+    - name: Test Quickstart
+      run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_framework.sh "${SDK}")
+    - name: Remove data before upload
+      if: ${{ failure() }}
+      run: scripts/remove_data.sh firebaseai
+    - uses: actions/upload-artifact@v4
+      if: ${{ failure() }}
+      with:
+        name: quickstart_artifacts_firebaseai
+        path: quickstart-ios/
+
   quickstart_framework_firestore:
     needs: package-head
     if: ${{ !cancelled() && (success() || github.event.inputs.zip_run_id != '') }}

FirebaseAI.podspec

@@ -32,7 +32,7 @@ Build AI-powered apps and features with the Gemini API using the Firebase AI SDK
   s.prefix_header_file = false
 
   s.source_files = [
-    'FirebaseAI/Sources/**/*.swift',
+    'FirebaseAI/Wrapper/Sources/**/*.swift',
   ]
 
   s.swift_version = '5.9'
@@ -43,13 +43,11 @@ 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 'FirebaseAppCheckInterop', '~> 12.5.0'
-  s.dependency 'FirebaseAuthInterop', '~> 12.5.0'
+  s.dependency 'FirebaseAILogic', '12.5.0'
   s.dependency 'FirebaseCore', '~> 12.5.0'
-  s.dependency 'FirebaseCoreExtension', '~> 12.5.0'
 
   s.test_spec 'unit' do |unit_tests|
-    unit_tests_dir = 'FirebaseAI/Tests/Unit/'
+    unit_tests_dir = 'FirebaseAI/Wrapper/Tests/'
     unit_tests.scheme = { :code_coverage => true }
     unit_tests.platforms = {
       :ios => ios_deployment_target,
@@ -59,12 +57,5 @@ Build AI-powered apps and features with the Gemini API using the Firebase AI SDK
     unit_tests.source_files = [
       unit_tests_dir + '**/*.swift',
     ]
-    unit_tests.exclude_files = [
-      unit_tests_dir + 'Snippets/**/*.swift',
-    ]
-    unit_tests.resources = [
-      unit_tests_dir + 'vertexai-sdk-test-data/mock-responses',
-      unit_tests_dir + 'Resources/**/*',
-    ]
   end
 end

FirebaseAI/Tests/TestApp/Tests/Integration/CountTokensIntegrationTests.swift

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseAI
+import FirebaseAILogic
 import FirebaseAITestApp
 import FirebaseAuth
 import FirebaseCore
 import FirebaseStorage
 import Testing
 
-@testable import struct FirebaseAI.APIConfig
+@testable import struct FirebaseAILogic.APIConfig
 
 @Suite(.serialized)
 struct CountTokensIntegrationTests {

FirebaseAI/Tests/TestApp/Tests/Integration/GenerateContentIntegrationTests.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseAI
+import FirebaseAILogic
 import FirebaseAITestApp
 import FirebaseAuth
 import FirebaseCore
@@ -23,7 +23,7 @@ import Testing
   import UIKit
 #endif // canImport(UIKit)
 
-@testable import struct FirebaseAI.BackendError
+@testable import struct FirebaseAILogic.BackendError
 
 @Suite(.serialized)
 struct GenerateContentIntegrationTests {

FirebaseAI/Tests/TestApp/Tests/Integration/ImagenIntegrationTests.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseAI
+import FirebaseAILogic
 import FirebaseAITestApp
 import FirebaseAuth
 import FirebaseCore
@@ -24,7 +24,7 @@ import Testing
 #endif // canImport(UIKit)
 
 // TODO(#14452): Remove `@testable import` when `generateImages(prompt:gcsURI:)` is public.
-@testable import class FirebaseAI.ImagenModel
+@testable import class FirebaseAILogic.ImagenModel
 
 @Suite(
   .enabled(

FirebaseAI/Tests/TestApp/Tests/Integration/IntegrationTests.swift

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseAI
+import FirebaseAILogic
 import FirebaseAITestApp
 import FirebaseAuth
 import FirebaseCore
 import FirebaseStorage
 import XCTest
 
-@testable import struct FirebaseAI.CountTokensRequest
+@testable import struct FirebaseAILogic.CountTokensRequest
 
 // TODO(#14405): Migrate to Swift Testing and parameterize tests.
 final class IntegrationTests: XCTestCase {

FirebaseAI/Tests/TestApp/Tests/Integration/LiveSessionTests.swift

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseAI
+import FirebaseAILogic
 import FirebaseAITestApp
 import SwiftUI
 import Testing
 
-@testable import struct FirebaseAI.APIConfig
+@testable import struct FirebaseAILogic.APIConfig
 
 @Suite(.serialized)
 struct LiveSessionTests {

FirebaseAI/Tests/TestApp/Tests/Integration/SchemaTests.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseAI
+import FirebaseAILogic
 import FirebaseAITestApp
 import FirebaseAuth
 import FirebaseCore
@@ -23,7 +23,7 @@ import Testing
   import UIKit
 #endif // canImport(UIKit)
 
-@testable import struct FirebaseAI.BackendError
+@testable import struct FirebaseAILogic.BackendError
 
 /// Test the schema fields.
 @Suite(.serialized)

FirebaseAI/Tests/TestApp/Tests/Utilities/InstanceConfig.swift

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseAI
+import FirebaseAILogic
 import FirebaseAITestApp
 import FirebaseCore
 import Testing
 
-@testable import struct FirebaseAI.APIConfig
+@testable import struct FirebaseAILogic.APIConfig
 
 struct InstanceConfig: Equatable, Encodable {
   static let vertexAI_v1beta = InstanceConfig(

FirebaseAI/Tests/Unit/APITests.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseAI
+import FirebaseAILogic
 import FirebaseCore
 import XCTest
 #if canImport(AppKit)

FirebaseAI/Tests/Unit/ChatTests.swift

@@ -16,7 +16,7 @@ import FirebaseCore
 import Foundation
 import XCTest
 
-@testable import FirebaseAI
+@testable import FirebaseAILogic
 
 @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
 final class ChatTests: XCTestCase {

FirebaseAI/Tests/Unit/GenerationConfigTests.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseAI
+import FirebaseAILogic
 import Foundation
 import XCTest
 

FirebaseAI/Tests/Unit/GenerativeModelGoogleAITests.swift

@@ -17,7 +17,7 @@ import FirebaseAuthInterop
 import FirebaseCore
 import XCTest
 
-@testable import FirebaseAI
+@testable import FirebaseAILogic
 
 @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
 final class GenerativeModelGoogleAITests: XCTestCase {

FirebaseAI/Tests/Unit/GenerativeModelVertexAITests.swift

@@ -17,7 +17,7 @@ import FirebaseAuthInterop
 import FirebaseCore
 import XCTest
 
-@testable import FirebaseAI
+@testable import FirebaseAILogic
 
 @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
 final class GenerativeModelVertexAITests: XCTestCase {

FirebaseAI/Tests/Unit/JSONValueTests.swift

@@ -13,7 +13,7 @@
 // limitations under the License.
 import XCTest
 
-@testable import FirebaseAI
+@testable import FirebaseAILogic
 
 @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
 final class JSONValueTests: XCTestCase {

FirebaseAI/Tests/Unit/PartTests.swift

@@ -15,7 +15,7 @@
 import Foundation
 import XCTest
 
-@testable import FirebaseAI
+@testable import FirebaseAILogic
 
 @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
 final class PartTests: XCTestCase {

FirebaseAI/Tests/Unit/PartsRepresentableTests.swift

@@ -23,7 +23,7 @@ import XCTest
   import CoreImage
 #endif // canImport(CoreImage)
 
-@testable import FirebaseAI
+@testable import FirebaseAILogic
 
 @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
 final class PartsRepresentableTests: XCTestCase {

FirebaseAI/Tests/Unit/RequestOptionsTest.swift

@@ -14,7 +14,7 @@
 
 import XCTest
 
-@testable import FirebaseAI
+@testable import FirebaseAILogic
 
 @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
 final class RequestOptionsTests: XCTestCase {

FirebaseAI/Tests/Unit/SafetyTests.swift

@@ -14,7 +14,7 @@
 
 import XCTest
 
-@testable import FirebaseAI
+@testable import FirebaseAILogic
 
 @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
 final class SafetyTests: XCTestCase {

FirebaseAI/Tests/Unit/Snippets/ChatSnippets.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseAI
+import FirebaseAILogic
 import FirebaseCore
 import XCTest
 

FirebaseAI/Tests/Unit/Snippets/CloudStorageSnippets.swift

@@ -14,7 +14,7 @@
 
 #if SWIFT_PACKAGE // The FirebaseStorage dependency has only been added in Package.swift.
 
-  import FirebaseAI
+  import FirebaseAILogic
   import FirebaseCore
   import FirebaseStorage
 

FirebaseAI/Tests/Unit/Snippets/CountTokensSnippets.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseAI
+import FirebaseAILogic
 import FirebaseCore
 import XCTest
 

FirebaseAI/Tests/Unit/Snippets/FunctionCallingSnippets.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseAI
+import FirebaseAILogic
 import FirebaseCore
 import XCTest
 

FirebaseAI/Tests/Unit/Snippets/LiveSnippets.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseAI
+import FirebaseAILogic
 import FirebaseCore
 import XCTest
 

FirebaseAI/Tests/Unit/Snippets/MultimodalSnippets.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseAI
+import FirebaseAILogic
 import FirebaseCore
 import XCTest
 

FirebaseAI/Tests/Unit/Snippets/StructuredOutputSnippets.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseAI
+import FirebaseAILogic
 import FirebaseCore
 import XCTest