Pass location through service

Author: daymxn

FirebaseAI/Sources/FirebaseAI.swift

@@ -195,9 +195,8 @@ public final class FirebaseAI: Sendable {
   private nonisolated(unsafe) static var instancesLock: os_unfair_lock = .init()
 
   static let defaultVertexAIAPIConfig = APIConfig(
-    service: .vertexAI(endpoint: .firebaseProxyProd),
+    service: .vertexAI(endpoint: .firebaseProxyProd, location: "us-central1"),
     version: .v1beta,
-    location: "us-central1"
   )
 
   static func createInstance(app: FirebaseApp?,
@@ -263,17 +262,14 @@ public final class FirebaseAI: Sendable {
     }
 
     switch apiConfig.service {
-    case .vertexAI:
-      return vertexAIModelResourceName(modelName: modelName)
+    case let .vertexAI(endpoint: _, location: location):
+      return vertexAIModelResourceName(modelName: modelName, location: location)
     case .googleAI:
       return developerModelResourceName(modelName: modelName)
     }
   }
 
-  private func vertexAIModelResourceName(modelName: String) -> String {
-    guard let location = apiConfig.location else {
-      fatalError("Location must be specified for the Firebase AI service.")
-    }
+  private func vertexAIModelResourceName(modelName: String, location: String) -> String {
     guard !location.isEmpty && location
       .allSatisfy({ !$0.isWhitespace && !$0.isNewline && $0 != "/" }) else {
       fatalError("""

FirebaseAI/Sources/Types/Internal/APIConfig.swift

@@ -22,19 +22,15 @@ struct APIConfig: Sendable, Hashable, Encodable {
   /// The version of the selected API to use, e.g., "v1".
   let version: Version
 
-  /// The server location to use, e.g., "us-central1"
-  let location: String?
-
   /// Initializes an API configuration.
   ///
   /// - Parameters:
   ///   - service: The API service to use for generative AI.
   ///   - version: The version of the API to use.
   ///   - location: The server location to use.
-  init(service: Service, version: Version, location: String?) {
+  init(service: Service, version: Version) {
     self.service = service
     self.version = version
-    self.location = location
   }
 }
 
@@ -50,7 +46,7 @@ extension APIConfig {
     /// See the [Cloud
     /// docs](https://cloud.google.com/vertex-ai/generative-ai/docs/model-reference/inference) for
     /// more details.
-    case vertexAI(endpoint: Endpoint)
+    case vertexAI(endpoint: Endpoint, location: String)
 
     /// The Gemini Developer API provided by Google AI.
     ///
@@ -62,7 +58,7 @@ extension APIConfig {
     /// This must correspond with the API set in `service`.
     var endpoint: Endpoint {
       switch self {
-      case let .vertexAI(endpoint: endpoint):
+      case let .vertexAI(endpoint: endpoint, location: _):
         return endpoint
       case let .googleAI(endpoint: endpoint):
         return endpoint

FirebaseAI/Sources/Types/Internal/Live/LiveSessionService.swift

@@ -310,8 +310,8 @@ actor LiveSessionService {
   private nonisolated func createWebsocket() async throws -> AsyncWebSocket {
     let host = apiConfig.service.endpoint.rawValue.withoutPrefix("https://")
     let urlString = switch apiConfig.service {
-    case .vertexAI:
-      "wss://\(host)/ws/google.firebase.vertexai.v1beta.LlmBidiService/BidiGenerateContent/locations/\(apiConfig.location ?? "us-central1")"
+    case let .vertexAI(endpoint: _, location: location):
+      "wss://\(host)/ws/google.firebase.vertexai.v1beta.LlmBidiService/BidiGenerateContent/locations/\(location)"
     case .googleAI:
       "wss://\(host)/ws/google.firebase.vertexai.v1beta.GenerativeService/BidiGenerateContent"
     }

FirebaseAI/Sources/Types/Public/Backend.swift

@@ -26,9 +26,8 @@ public struct Backend {
   public static func vertexAI(location: String = "us-central1") -> Backend {
     return Backend(
       apiConfig: APIConfig(
-        service: .vertexAI(endpoint: .firebaseProxyProd),
+        service: .vertexAI(endpoint: .firebaseProxyProd, location: location),
         version: .v1beta,
-        location: location
       )
     )
   }
@@ -39,7 +38,6 @@ public struct Backend {
       apiConfig: APIConfig(
         service: .googleAI(endpoint: .firebaseProxyProd),
         version: .v1beta,
-        location: nil
       )
     )
   }