WIP

intitni · intitni · commit d4c9c242edff · 2024-08-20T14:59:04.000+08:00
diff --git a/Core/Sources/ChatPlugin/AITerminalChatPlugin.swift b/Core/Sources/ChatPlugin/AITerminalChatPlugin.swift
@@ -6,14 +6,14 @@ public actor AITerminalChatPlugin: ChatPlugin {
     public static var command: String { "airun" }
     public nonisolated var name: String { "AI Terminal" }
 
-    let chatGPTService: any ChatGPTServiceType
+    let chatGPTService: any LegacyChatGPTServiceType
     var terminal: TerminalType = Terminal()
     var isCancelled = false
     weak var delegate: ChatPluginDelegate?
     var isStarted = false
     var command: String?
 
-    public init(inside chatGPTService: any ChatGPTServiceType, delegate: ChatPluginDelegate) {
+    public init(inside chatGPTService: any LegacyChatGPTServiceType, delegate: ChatPluginDelegate) {
         self.chatGPTService = chatGPTService
         self.delegate = delegate
     }
diff --git a/Core/Sources/ChatPlugin/AskChatGPT.swift b/Core/Sources/ChatPlugin/AskChatGPT.swift
@@ -14,7 +14,7 @@ public func askChatGPT(
         configuration: configuration,
         functionProvider: NoChatGPTFunctionProvider()
     )
-    let service = ChatGPTService(
+    let service = LegacyChatGPTService(
         memory: memory,
         configuration: configuration
     )
diff --git a/Core/Sources/ChatPlugin/CallAIFunction.swift b/Core/Sources/ChatPlugin/CallAIFunction.swift
@@ -18,7 +18,7 @@ func callAIFunction(
     let argsString = args.joined(separator: ", ")
     let configuration = UserPreferenceChatGPTConfiguration()
         .overriding(.init(temperature: 0))
-    let service = ChatGPTService(
+    let service = LegacyChatGPTService(
         memory: AutoManagedChatGPTMemory(
             systemPrompt: "You are now the following python function: ```# \(description)\n\(function)```\n\nOnly respond with your `return` value.",
             configuration: configuration,
diff --git a/Core/Sources/ChatPlugin/ChatPlugin.swift b/Core/Sources/ChatPlugin/ChatPlugin.swift
@@ -6,7 +6,7 @@ public protocol ChatPlugin: AnyObject {
     static var command: String { get }
     var name: String { get }
 
-    init(inside chatGPTService: any ChatGPTServiceType, delegate: ChatPluginDelegate)
+    init(inside chatGPTService: any LegacyChatGPTServiceType, delegate: ChatPluginDelegate)
     func send(content: String, originalMessage: String) async
     func cancel() async
     func stopResponding() async
diff --git a/Core/Sources/ChatPlugin/TerminalChatPlugin.swift b/Core/Sources/ChatPlugin/TerminalChatPlugin.swift
@@ -7,12 +7,12 @@ public actor TerminalChatPlugin: ChatPlugin {
     public static var command: String { "run" }
     public nonisolated var name: String { "Terminal" }
 
-    let chatGPTService: any ChatGPTServiceType
+    let chatGPTService: any LegacyChatGPTServiceType
     var terminal: TerminalType = Terminal()
     var isCancelled = false
     weak var delegate: ChatPluginDelegate?
 
-    public init(inside chatGPTService: any ChatGPTServiceType, delegate: ChatPluginDelegate) {
+    public init(inside chatGPTService: any LegacyChatGPTServiceType, delegate: ChatPluginDelegate) {
         self.chatGPTService = chatGPTService
         self.delegate = delegate
     }
diff --git a/Core/Sources/ChatPlugins/MathChatPlugin/MathChatPlugin.swift b/Core/Sources/ChatPlugins/MathChatPlugin/MathChatPlugin.swift
@@ -7,11 +7,11 @@ public actor MathChatPlugin: ChatPlugin {
     public static var command: String { "math" }
     public nonisolated var name: String { "Math" }
 
-    let chatGPTService: any ChatGPTServiceType
+    let chatGPTService: any LegacyChatGPTServiceType
     var isCancelled = false
     weak var delegate: ChatPluginDelegate?
 
-    public init(inside chatGPTService: any ChatGPTServiceType, delegate: ChatPluginDelegate) {
+    public init(inside chatGPTService: any LegacyChatGPTServiceType, delegate: ChatPluginDelegate) {
         self.chatGPTService = chatGPTService
         self.delegate = delegate
     }
diff --git a/Core/Sources/ChatPlugins/SearchChatPlugin/SearchChatPlugin.swift b/Core/Sources/ChatPlugins/SearchChatPlugin/SearchChatPlugin.swift
@@ -6,11 +6,11 @@ public actor SearchChatPlugin: ChatPlugin {
     public static var command: String { "search" }
     public nonisolated var name: String { "Search" }
 
-    let chatGPTService: any ChatGPTServiceType
+    let chatGPTService: any LegacyChatGPTServiceType
     var isCancelled = false
     weak var delegate: ChatPluginDelegate?
 
-    public init(inside chatGPTService: any ChatGPTServiceType, delegate: ChatPluginDelegate) {
+    public init(inside chatGPTService: any LegacyChatGPTServiceType, delegate: ChatPluginDelegate) {
         self.chatGPTService = chatGPTService
         self.delegate = delegate
     }
diff --git a/Core/Sources/ChatPlugins/ShortcutChatPlugin/ShortcutChatPlugin.swift b/Core/Sources/ChatPlugins/ShortcutChatPlugin/ShortcutChatPlugin.swift
@@ -8,12 +8,12 @@ public actor ShortcutChatPlugin: ChatPlugin {
     public static var command: String { "shortcut" }
     public nonisolated var name: String { "Shortcut" }
 
-    let chatGPTService: any ChatGPTServiceType
+    let chatGPTService: any LegacyChatGPTServiceType
     var terminal: TerminalType = Terminal()
     var isCancelled = false
     weak var delegate: ChatPluginDelegate?
 
-    public init(inside chatGPTService: any ChatGPTServiceType, delegate: ChatPluginDelegate) {
+    public init(inside chatGPTService: any LegacyChatGPTServiceType, delegate: ChatPluginDelegate) {
         self.chatGPTService = chatGPTService
         self.delegate = delegate
     }
diff --git a/Core/Sources/ChatPlugins/ShortcutChatPlugin/ShortcutInputChatPlugin.swift b/Core/Sources/ChatPlugins/ShortcutChatPlugin/ShortcutInputChatPlugin.swift
@@ -8,12 +8,12 @@ public actor ShortcutInputChatPlugin: ChatPlugin {
     public static var command: String { "shortcutInput" }
     public nonisolated var name: String { "Shortcut Input" }
 
-    let chatGPTService: any ChatGPTServiceType
+    let chatGPTService: any LegacyChatGPTServiceType
     var terminal: TerminalType = Terminal()
     var isCancelled = false
     weak var delegate: ChatPluginDelegate?
 
-    public init(inside chatGPTService: any ChatGPTServiceType, delegate: ChatPluginDelegate) {
+    public init(inside chatGPTService: any LegacyChatGPTServiceType, delegate: ChatPluginDelegate) {
         self.chatGPTService = chatGPTService
         self.delegate = delegate
     }
diff --git a/Core/Sources/ChatService/ChatPluginController.swift b/Core/Sources/ChatService/ChatPluginController.swift
@@ -4,12 +4,12 @@ import Foundation
 import OpenAIService
 
 final class ChatPluginController {
-    let chatGPTService: any ChatGPTServiceType
+    let chatGPTService: any LegacyChatGPTServiceType
     let plugins: [String: ChatPlugin.Type]
     var runningPlugin: ChatPlugin?
     weak var chatService: ChatService?
     
-    init(chatGPTService: any ChatGPTServiceType, plugins: [ChatPlugin.Type]) {
+    init(chatGPTService: any LegacyChatGPTServiceType, plugins: [ChatPlugin.Type]) {
         self.chatGPTService = chatGPTService
         var all = [String: ChatPlugin.Type]()
         for plugin in plugins {
@@ -18,7 +18,7 @@ final class ChatPluginController {
         self.plugins = all
     }
 
-    convenience init(chatGPTService: any ChatGPTServiceType, plugins: ChatPlugin.Type...) {
+    convenience init(chatGPTService: any LegacyChatGPTServiceType, plugins: ChatPlugin.Type...) {
         self.init(chatGPTService: chatGPTService, plugins: plugins)
     }
 
diff --git a/Core/Sources/ChatService/ChatService.swift b/Core/Sources/ChatService/ChatService.swift
@@ -10,7 +10,7 @@ public final class ChatService: ObservableObject {
     
     public let memory: ContextAwareAutoManagedChatGPTMemory
     public let configuration: OverridingChatGPTConfiguration
-    public let chatGPTService: any ChatGPTServiceType
+    public let chatGPTService: any LegacyChatGPTServiceType
     public var allPluginCommands: [String] { allPlugins.map { $0.command } }
     @Published public internal(set) var chatHistory: [ChatMessage] = []
     @Published public internal(set) var isReceivingMessage = false
@@ -22,7 +22,7 @@ public final class ChatService: ObservableObject {
     let pluginController: ChatPluginController
     var cancellable = Set<AnyCancellable>()
 
-    init<T: ChatGPTServiceType>(
+    init<T: LegacyChatGPTServiceType>(
         memory: ContextAwareAutoManagedChatGPTMemory,
         configuration: OverridingChatGPTConfiguration,
         chatGPTService: T
@@ -53,7 +53,7 @@ public final class ChatService: ObservableObject {
         self.init(
             memory: memory,
             configuration: configuration,
-            chatGPTService: ChatGPTService(
+            chatGPTService: LegacyChatGPTService(
                 memory: memory,
                 configuration: extraConfiguration,
                 functionProvider: memory.functionProvider
diff --git a/Core/Sources/HostApp/AccountSettings/ChatModelManagement/ChatModelEdit.swift b/Core/Sources/HostApp/AccountSettings/ChatModelManagement/ChatModelEdit.swift
@@ -85,7 +85,7 @@ struct ChatModelEdit {
                 let model = ChatModel(state: state)
                 return .run { send in
                     do {
-                        let service = ChatGPTService(
+                        let service = LegacyChatGPTService(
                             configuration: UserPreferenceChatGPTConfiguration()
                                 .overriding {
                                     $0.model = model
diff --git a/Core/Sources/PromptToCodeService/OpenAIPromptToCodeService.swift b/Core/Sources/PromptToCodeService/OpenAIPromptToCodeService.swift
@@ -5,7 +5,7 @@ import SuggestionBasic
 import XcodeInspector
 
 public final class OpenAIPromptToCodeService: PromptToCodeServiceType {
-    var service: (any ChatGPTServiceType)?
+    var service: (any LegacyChatGPTServiceType)?
 
     public init() {}
 
@@ -181,7 +181,7 @@ public final class OpenAIPromptToCodeService: PromptToCodeServiceType {
             configuration: configuration,
             functionProvider: NoChatGPTFunctionProvider()
         )
-        let chatGPTService = ChatGPTService(
+        let chatGPTService = LegacyChatGPTService(
             memory: memory,
             configuration: configuration
         )
diff --git a/Tool/Sources/LangChain/ChatModel/OpenAIChat.swift b/Tool/Sources/LangChain/ChatModel/OpenAIChat.swift
@@ -26,7 +26,7 @@ public struct OpenAIChat: ChatModel {
     ) async throws -> ChatMessage {
         let memory = memory ?? EmptyChatGPTMemory()
         
-        let service = ChatGPTService(
+        let service = LegacyChatGPTService(
             memory: memory,
             configuration: configuration,
             functionProvider: functionProvider
diff --git a/Tool/Sources/OpenAIService/APIs/ChatCompletionsAPIBuilder.swift b/Tool/Sources/OpenAIService/APIs/ChatCompletionsAPIBuilder.swift
@@ -0,0 +1,129 @@
+import AIModel
+import ChatBasic
+import Dependencies
+import Foundation
+
+protocol ChatCompletionsAPIBuilder {
+    func buildStreamAPI(
+        model: ChatModel,
+        endpoint: URL,
+        apiKey: String,
+        requestBody: ChatCompletionsRequestBody,
+        prompt: ChatGPTPrompt
+    ) -> any ChatCompletionsStreamAPI
+
+    func buildNonStreamAPI(
+        model: ChatModel,
+        endpoint: URL,
+        apiKey: String,
+        requestBody: ChatCompletionsRequestBody,
+        prompt: ChatGPTPrompt
+    ) -> any ChatCompletionsAPI
+}
+
+struct DefaultChatCompletionsAPIBuilder: ChatCompletionsAPIBuilder {
+    func buildStreamAPI(
+        model: ChatModel,
+        endpoint: URL,
+        apiKey: String,
+        requestBody: ChatCompletionsRequestBody,
+        prompt: ChatGPTPrompt
+    ) -> any ChatCompletionsStreamAPI {
+        if model.id == "com.github.copilot" {
+            return BuiltinExtensionChatCompletionsService(
+                extensionIdentifier: model.id,
+                requestBody: requestBody
+            )
+        }
+
+        switch model.format {
+        case .googleAI:
+            return GoogleAIChatCompletionsService(
+                apiKey: apiKey,
+                model: model,
+                requestBody: requestBody,
+                prompt: prompt,
+                baseURL: endpoint.absoluteString
+            )
+        case .openAI, .openAICompatible, .azureOpenAI:
+            return OpenAIChatCompletionsService(
+                apiKey: apiKey,
+                model: model,
+                endpoint: endpoint,
+                requestBody: requestBody
+            )
+        case .ollama:
+            return OllamaChatCompletionsService(
+                apiKey: apiKey,
+                model: model,
+                endpoint: endpoint,
+                requestBody: requestBody
+            )
+        case .claude:
+            return ClaudeChatCompletionsService(
+                apiKey: apiKey,
+                model: model,
+                endpoint: endpoint,
+                requestBody: requestBody
+            )
+        }
+    }
+
+    func buildNonStreamAPI(
+        model: ChatModel,
+        endpoint: URL,
+        apiKey: String,
+        requestBody: ChatCompletionsRequestBody,
+        prompt: ChatGPTPrompt
+    ) -> any ChatCompletionsAPI {
+        if model.id == "com.github.copilot" {
+            return BuiltinExtensionChatCompletionsService(
+                extensionIdentifier: model.id,
+                requestBody: requestBody
+            )
+        }
+
+        switch model.format {
+        case .googleAI:
+            return GoogleAIChatCompletionsService(
+                apiKey: apiKey,
+                model: model,
+                requestBody: requestBody,
+                prompt: prompt,
+                baseURL: endpoint.absoluteString
+            )
+        case .openAI, .openAICompatible, .azureOpenAI:
+            return OpenAIChatCompletionsService(
+                apiKey: apiKey,
+                model: model,
+                endpoint: endpoint,
+                requestBody: requestBody
+            )
+        case .ollama:
+            return OllamaChatCompletionsService(
+                apiKey: apiKey,
+                model: model,
+                endpoint: endpoint,
+                requestBody: requestBody
+            )
+        case .claude:
+            return ClaudeChatCompletionsService(
+                apiKey: apiKey,
+                model: model,
+                endpoint: endpoint,
+                requestBody: requestBody
+            )
+        }
+    }
+}
+
+struct ChatCompletionsAPIBuilderDependencyKey: DependencyKey {
+    static var liveValue = DefaultChatCompletionsAPIBuilder()
+}
+
+extension DependencyValues {
+    var chatCompletionsAPIBuilder: ChatCompletionsAPIBuilder {
+        get { self[ChatCompletionsAPIBuilderDependencyKey.self] }
+        set { self[ChatCompletionsAPIBuilderDependencyKey.self] = newValue }
+    }
+}
diff --git a/Tool/Sources/OpenAIService/ChatGPTService.swift b/Tool/Sources/OpenAIService/ChatGPTService.swift
diff --git a/Tool/Sources/OpenAIService/LegacyChatGPTService.swift b/Tool/Sources/OpenAIService/LegacyChatGPTService.swift
diff --git a/Tool/Sources/RAGChatAgent/RAGChatAgent.swift b/Tool/Sources/RAGChatAgent/RAGChatAgent.swift
diff --git a/Tool/Tests/OpenAIServiceTests/ChatGPTServiceFieldTests.swift b/Tool/Tests/OpenAIServiceTests/ChatGPTServiceFieldTests.swift
diff --git a/Tool/Tests/OpenAIServiceTests/ChatGPTStreamTests.swift b/Tool/Tests/OpenAIServiceTests/ChatGPTStreamTests.swift

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public func askChatGPT(`
`14`	`14`	`configuration: configuration,`
`15`	`15`	`functionProvider: NoChatGPTFunctionProvider()`
`16`	`16`	`)`
`17`		`- let service = ChatGPTService(`
	`17`	`+ let service = LegacyChatGPTService(`
`18`	`18`	`memory: memory,`
`19`	`19`	`configuration: configuration`
`20`	`20`	`)`