Merge branch 'feature/google-generative-ai-custom-baseurl' into develop

Author: intitni

Core/Sources/HostApp/AccountSettings/ChatModelManagement/ChatModelEditView.swift

@@ -328,6 +328,10 @@ struct ChatModelEditView: View {
 
     @ViewBuilder
     var googleAI: some View {
+        baseURLTextField(prompt: Text("https://generativelanguage.googleapis.com")) {
+            Text("/v1")
+        }
+        
         apiKeyNamePicker
 
         WithViewStore(

Pro

@@ -65,7 +65,11 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-syntax.git", exact: "509.0.2"),
         .package(url: "https://github.com/GottaGetSwifty/CodableWrappers", from: "2.0.7"),
         .package(url: "https://github.com/krzyzanowskim/STTextView", from: "0.8.21"),
-        .package(url: "https://github.com/google/generative-ai-swift", from: "0.4.4"),
+        // A fork of https://github.com/google/generative-ai-swift to support setting base url.
+        .package(
+            url: "https://github.com/intitni/generative-ai-swift",
+            branch: "support-setting-base-url"
+        ),
         .package(url: "https://github.com/intitni/CopilotForXcodeKit", from: "0.4.0"),
 
         // TreeSitter
@@ -90,7 +94,7 @@ let package = Package(
         .target(
             name: "CustomAsyncAlgorithms",
             dependencies: [
-                .product(name: "AsyncAlgorithms", package: "swift-async-algorithms")
+                .product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
             ]
         ),
 

Tool/Package.swift

@@ -102,8 +102,8 @@ public struct ChatModel: Codable, Equatable, Identifiable {
             return "\(baseURL)/openai/deployments/\(deployment)/chat/completions?api-version=\(version)"
         case .googleAI:
             let baseURL = info.baseURL
-            if baseURL.isEmpty { return "https://generativelanguage.googleapis.com/v1" }
-            return "\(baseURL)/v1/chat/completions"
+            if baseURL.isEmpty { return "https://generativelanguage.googleapis.com" }
+            return "\(baseURL)"
         case .ollama:
             let baseURL = info.baseURL
             if baseURL.isEmpty { return "http://localhost:11434/api/chat" }

Tool/Sources/AIModel/ChatModel.swift

@@ -8,17 +8,20 @@ actor GoogleAIChatCompletionsService: ChatCompletionsAPI, ChatCompletionsStreamA
     let model: ChatModel
     var requestBody: ChatCompletionsRequestBody
     let prompt: ChatGPTPrompt
+    let baseURL: String
 
     init(
         apiKey: String,
         model: ChatModel,
         requestBody: ChatCompletionsRequestBody,
-        prompt: ChatGPTPrompt
+        prompt: ChatGPTPrompt,
+        baseURL: String
     ) {
         self.apiKey = apiKey
         self.model = model
         self.requestBody = requestBody
         self.prompt = prompt
+        self.baseURL = baseURL
     }
 
     func callAsFunction() async throws -> ChatCompletionResponseBody {
@@ -27,7 +30,8 @@ actor GoogleAIChatCompletionsService: ChatCompletionsAPI, ChatCompletionsStreamA
             apiKey: apiKey,
             generationConfig: .init(GenerationConfig(
                 temperature: requestBody.temperature.map(Float.init)
-            ))
+            )), 
+            baseURL: baseURL
         )
         let history = prompt.googleAICompatible.history.map { message in
             ModelContent(message)
@@ -53,6 +57,12 @@ actor GoogleAIChatCompletionsService: ChatCompletionsAPI, ChatCompletionsStreamA
                 throw error
             case .responseStoppedEarly:
                 throw error
+            case .promptImageContentError:
+                throw error
+            case let .invalidAPIKey(message: message):
+                throw error
+            case .unsupportedUserLocation:
+                throw error
             }
         } catch {
             throw error
@@ -67,7 +77,8 @@ actor GoogleAIChatCompletionsService: ChatCompletionsAPI, ChatCompletionsStreamA
             apiKey: apiKey,
             generationConfig: .init(GenerationConfig(
                 temperature: requestBody.temperature.map(Float.init)
-            ))
+            )), 
+            baseURL: baseURL
         )
         let history = prompt.googleAICompatible.history.map { message in
             ModelContent(message)
@@ -100,6 +111,12 @@ actor GoogleAIChatCompletionsService: ChatCompletionsAPI, ChatCompletionsStreamA
                         continuation.finish(throwing: error)
                     case .responseStoppedEarly:
                         continuation.finish(throwing: error)
+                    case let .promptImageContentError(underlying: underlying):
+                        continuation.finish(throwing: error)
+                    case let .invalidAPIKey(message: message):
+                        continuation.finish(throwing: error)
+                    case .unsupportedUserLocation:
+                        continuation.finish(throwing: error)
                     }
                 } catch {
                     continuation.finish(throwing: error)

Tool/Sources/OpenAIService/APIs/GoogleAIChatCompletionsService.swift

@@ -95,7 +95,8 @@ public class ChatGPTService: ChatGPTServiceType {
                 apiKey: apiKey,
                 model: model,
                 requestBody: requestBody,
-                prompt: prompt
+                prompt: prompt, 
+                baseURL: endpoint.absoluteString
             )
         case .openAI, .openAICompatible, .azureOpenAI:
             return OpenAIChatCompletionsService(
@@ -129,7 +130,8 @@ public class ChatGPTService: ChatGPTServiceType {
                 apiKey: apiKey,
                 model: model,
                 requestBody: requestBody,
-                prompt: prompt
+                prompt: prompt,
+                baseURL: endpoint.absoluteString
             )
         case .openAI, .openAICompatible, .azureOpenAI:
             return OpenAIChatCompletionsService(