Change ChatGPTEndpoint to OpenAIBaseURL

Author: intitni

Core/Package.swift

@@ -42,6 +42,7 @@ let package = Package(
                 "LaunchAgentManager",
                 "Logger",
                 "UpdateChecker",
+                "OpenAIService",
             ]
         ),
     ],

Core/Sources/HostApp/AccountSettings/OpenAIView.swift

@@ -1,4 +1,5 @@
 import AppKit
+import OpenAIService
 import Client
 import Preferences
 import SuggestionModel
@@ -8,7 +9,7 @@ final class OpenAIViewSettings: ObservableObject {
     static let availableLocalizedLocales = Locale.availableLocalizedLocales
     @AppStorage(\.openAIAPIKey) var openAIAPIKey: String
     @AppStorage(\.chatGPTModel) var chatGPTModel: String
-    @AppStorage(\.chatGPTEndpoint) var chatGPTEndpoint: String
+    @AppStorage(\.openAIBaseURL) var openAIBaseURL: String
     @AppStorage(\.chatGPTLanguage) var chatGPTLanguage: String
     @AppStorage(\.chatGPTMaxToken) var chatGPTMaxToken: Int
     @AppStorage(\.chatGPTTemperature) var chatGPTTemperature: Double
@@ -22,6 +23,7 @@ struct OpenAIView: View {
         string: "https://platform.openai.com/docs/models/model-endpoint-compatibility"
     )!
     @Environment(\.openURL) var openURL
+    @Environment(\.toast) var toast
     @StateObject var settings = OpenAIViewSettings()
     @State var maxTokenOverLimit = false
 
@@ -39,6 +41,27 @@ struct OpenAIView: View {
                 }.buttonStyle(.plain)
             }
 
+            HStack {
+                TextField(
+                    text: $settings.openAIBaseURL,
+                    prompt: Text("https://api.openai.com")
+                ) {
+                    Text("OpenAI Base URL")
+                }.textFieldStyle(.roundedBorder)
+
+                Button("Test") {
+                    Task {
+                        do {
+                            let reply = try await ChatGPTService()
+                                .sendAndWait(content: "Hello", summary: nil)
+                            toast(Text("ChatGPT replied: \(reply ?? "N/A")"), .info)
+                        } catch {
+                            toast(Text(error.localizedDescription), .error)
+                        }
+                    }
+                }
+            }
+
             HStack {
                 Picker(selection: $settings.chatGPTModel) {
                     if !settings.chatGPTModel.isEmpty,
@@ -59,13 +82,6 @@ struct OpenAIView: View {
                 }.buttonStyle(.plain)
             }
 
-            TextField(
-                text: $settings.chatGPTEndpoint,
-                prompt: Text("https://api.openai.com/v1/chat/completions")
-            ) {
-                Text("ChatGPT Server")
-            }.textFieldStyle(.roundedBorder)
-
             if #available(macOS 13.0, *) {
                 LabeledContent("Reply in Language") {
                     languagePicker
@@ -107,7 +123,7 @@ struct OpenAIView: View {
                 .labelsHidden()
                 .textFieldStyle(.roundedBorder)
                 .foregroundColor(maxTokenOverLimit ? .red : .primary)
-                
+
                 if let model = ChatGPTModel(rawValue: settings.chatGPTModel) {
                     Text("Max: \(model.maxToken)")
                 }

Core/Sources/OpenAIService/ChatGPTService.swift

@@ -69,10 +69,9 @@ public actor ChatGPTService: ChatGPTServiceType {
     }
 
     public var endpoint: String {
-        let value = UserDefaults.shared.value(for: \.chatGPTEndpoint)
-        if value.isEmpty { return "https://api.openai.com/v1/chat/completions" }
-
-        return value
+        var baseURL = UserDefaults.shared.value(for: \.openAIBaseURL)
+        if baseURL.isEmpty { return "https://api.openai.com/v1/chat/completions" }
+        return "\(baseURL)/v1/chat/completions"
     }
 
     public var apiKey: String {

Core/Sources/Preferences/Keys.swift

@@ -69,10 +69,15 @@ public extension UserDefaultPreferenceKeys {
         .init(defaultValue: "", key: "OpenAIAPIKey")
     }
 
+    @available(*, deprecated, message: "Use `openAIBaseURL` instead.")
     var chatGPTEndpoint: PreferenceKey<String> {
         .init(defaultValue: "", key: "ChatGPTEndpoint")
     }
 
+    var openAIBaseURL: PreferenceKey<String> {
+        .init(defaultValue: "", key: "OpenAIBaseURL")
+    }
+
     var chatGPTModel: PreferenceKey<String> {
         .init(defaultValue: Preferences.ChatGPTModel.gpt35Turbo.rawValue, key: "ChatGPTModel")
     }
@@ -196,7 +201,7 @@ public extension UserDefaultPreferenceKeys {
     var embedFileContentInChatContextIfNoSelection: PreferenceKey<Bool> {
         .init(defaultValue: false, key: "EmbedFileContentInChatContextIfNoSelection")
     }
-    
+
     var maxEmbeddableFileInChatContextLineCount: PreferenceKey<Int> {
         .init(defaultValue: 100, key: "MaxEmbeddableFileInChatContextLineCount")
     }

Core/Sources/Preferences/UserDefaults.swift

@@ -13,6 +13,12 @@ public extension UserDefaults {
         shared.setupDefaultValue(for: \.widgetColorScheme)
         shared.setupDefaultValue(for: \.customCommands)
         shared.setupDefaultValue(for: \.runNodeWith, defaultValue: .env)
+        shared.setupDefaultValue(for: \.openAIBaseURL, defaultValue: {
+            guard let url = URL(string: shared.value(for: \.chatGPTEndpoint)) else { return "" }
+            let scheme = url.scheme ?? "https"
+            guard let host = url.host else { return "" }
+            return "\(scheme)://\(host)"
+        }() as String)
     }
 }
 
@@ -71,6 +77,16 @@ public extension UserDefaults {
             set(key.defaultValue, forKey: key.key)
         }
     }
+    
+    func setupDefaultValue<K: UserDefaultPreferenceKey>(
+        for keyPath: KeyPath<UserDefaultPreferenceKeys, K>,
+        defaultValue: K.Value
+    ) where K.Value: UserDefaultsStorable {
+        let key = UserDefaultPreferenceKeys()[keyPath: keyPath]
+        if value(forKey: key.key) == nil {
+            set(defaultValue, forKey: key.key)
+        }
+    }
 
     // MARK: - Raw Representable