Adjust overriding configuration interface

intitni · intitni · commit a2bf1bc9ff6f · 2023-06-18T01:53:28.000+08:00
diff --git a/Core/Sources/ChatPlugin/AskChatGPT.swift b/Core/Sources/ChatPlugin/AskChatGPT.swift
@@ -7,15 +7,13 @@ public func askChatGPT(
     question: String,
     temperature: Double? = nil
 ) async throws -> String? {
-    let configuration = OverridingUserPreferenceChatGPTConfiguration(
-        overriding: .init(temperature: temperature)
-    )
+    let configuration = UserPreferenceChatGPTConfiguration()
+        .overriding(.init(temperature: temperature))
     let memory = AutoManagedChatGPTMemory(systemPrompt: systemPrompt, configuration: configuration)
     let service = ChatGPTService(
         memory: memory,
-        configuration: OverridingUserPreferenceChatGPTConfiguration(
-            overriding: .init(temperature: temperature)
-        )
+        configuration: UserPreferenceChatGPTConfiguration()
+            .overriding(.init(temperature: temperature))
     )
     return try await service.sendAndWait(content: question)
 }
diff --git a/Core/Sources/ChatPlugin/CallAIFunction.swift b/Core/Sources/ChatPlugin/CallAIFunction.swift
@@ -16,9 +16,8 @@ func callAIFunction(
         }
     }
     let argsString = args.joined(separator: ", ")
-    let configuration = OverridingUserPreferenceChatGPTConfiguration(
-        overriding: .init(temperature: 0)
-    )
+    let configuration = UserPreferenceChatGPTConfiguration()
+        .overriding(.init(temperature: 0))
     let service = ChatGPTService(
         memory: AutoManagedChatGPTMemory(
             systemPrompt: "You are now the following python function: ```# \(description)\n\(function)```\n\nOnly respond with your `return` value.",
diff --git a/Core/Sources/ChatService/ChatService.swift b/Core/Sources/ChatService/ChatService.swift
@@ -6,7 +6,7 @@ import OpenAIService
 
 public final class ChatService: ObservableObject {
     public let memory: AutoManagedChatGPTMemory
-    public let configuration: OverridingUserPreferenceChatGPTConfiguration
+    public let configuration: OverridingChatGPTConfiguration<UserPreferenceChatGPTConfiguration>
     public let chatGPTService: any ChatGPTServiceType
     public var allPluginCommands: [String] { allPlugins.map { $0.command } }
     @Published public internal(set) var isReceivingMessage = false
@@ -20,7 +20,7 @@ public final class ChatService: ObservableObject {
 
     init<T: ChatGPTServiceType>(
         memory: AutoManagedChatGPTMemory,
-        configuration: OverridingUserPreferenceChatGPTConfiguration,
+        configuration: OverridingChatGPTConfiguration<UserPreferenceChatGPTConfiguration>,
         chatGPTService: T
     ) {
         self.memory = memory
@@ -36,7 +36,7 @@ public final class ChatService: ObservableObject {
     }
 
     public init() {
-        configuration = OverridingUserPreferenceChatGPTConfiguration()
+        configuration = UserPreferenceChatGPTConfiguration().overriding()
         memory = AutoManagedChatGPTMemory(systemPrompt: "", configuration: configuration)
         chatGPTService = ChatGPTService(memory: memory, configuration: configuration)
         pluginController = ChatPluginController(chatGPTService: chatGPTService, plugins: allPlugins)
diff --git a/Core/Sources/PromptToCodeService/OpenAIPromptToCodeAPI.swift b/Core/Sources/PromptToCodeService/OpenAIPromptToCodeAPI.swift
@@ -147,9 +147,8 @@ final class OpenAIPromptToCodeAPI: PromptToCodeAPI {
         ###
         """
 
-        let configuration = OverridingUserPreferenceChatGPTConfiguration(
-            overriding: .init(temperature: 0)
-        )
+        let configuration =  UserPreferenceChatGPTConfiguration()
+            .overriding(.init(temperature: 0))
         let memory = AutoManagedChatGPTMemory(
             systemPrompt: systemPrompt,
             configuration: configuration
diff --git a/Tool/Sources/LangChain/ChatModel/OpenAIChat.swift b/Tool/Sources/LangChain/ChatModel/OpenAIChat.swift
@@ -18,12 +18,10 @@ public struct OpenAIChat: ChatModel {
         stops: [String],
         callbackManagers: [ChainCallbackManager]
     ) async throws -> String {
-        let configuration = OverridingUserPreferenceChatGPTConfiguration(
-            overriding: .init(
-                temperature: temperature,
-                stop: stops
-            )
-        )
+        let configuration = UserPreferenceChatGPTConfiguration().overriding(.init(
+            temperature: temperature,
+            stop: stops
+        ))
         let memory = AutoManagedChatGPTMemory(systemPrompt: "", configuration: configuration)
         let service = ChatGPTService(memory: memory, configuration: configuration)
         for message in prompt {
@@ -39,7 +37,7 @@ public struct OpenAIChat: ChatModel {
             }()
             await memory.appendMessage(.init(role: role, content: message.content))
         }
-        
+
         if stream {
             let stream = try await service.send(content: "")
             var message = ""
diff --git a/Tool/Sources/OpenAIService/Configuration/ChatGPTConfiguration.swift b/Tool/Sources/OpenAIService/Configuration/ChatGPTConfiguration.swift
@@ -12,7 +12,7 @@ public protocol ChatGPTConfiguration {
     var minimumReplyTokens: Int { get }
 }
 
-extension ChatGPTConfiguration {
+public extension ChatGPTConfiguration {
     func endpoint(for provider: ChatFeatureProvider) -> String {
         switch provider {
         case .openAI:
@@ -36,4 +36,11 @@ extension ChatGPTConfiguration {
             return UserDefaults.shared.value(for: \.azureOpenAIAPIKey)
         }
     }
+
+    func overriding(
+        _ overrides: OverridingChatGPTConfiguration<Self>.Overriding = .init()
+    ) -> OverridingChatGPTConfiguration<Self> {
+        .init(overriding: self, with: overrides)
+    }
 }
+
diff --git a/Tool/Sources/OpenAIService/Configuration/UserPreferenceChatGPTConfiguration.swift b/Tool/Sources/OpenAIService/Configuration/UserPreferenceChatGPTConfiguration.swift
@@ -39,7 +39,9 @@ public struct UserPreferenceChatGPTConfiguration: ChatGPTConfiguration {
     public init() {}
 }
 
-public class OverridingUserPreferenceChatGPTConfiguration: ChatGPTConfiguration {
+public class OverridingChatGPTConfiguration<
+    Configuration: ChatGPTConfiguration
+>: ChatGPTConfiguration {
     public struct Overriding {
         var featureProvider: ChatFeatureProvider?
         var temperature: Double?
@@ -71,47 +73,48 @@ public class OverridingUserPreferenceChatGPTConfiguration: ChatGPTConfiguration
         }
     }
 
-    private let userPreference = UserPreferenceChatGPTConfiguration()
+    private let configuration: Configuration
     public var overriding = Overriding()
 
-    public init(overriding: Overriding = .init()) {
-        self.overriding = overriding
+    public init(overriding configuration: Configuration, with overrides: Overriding = .init()) {
+        self.overriding = overrides
+        self.configuration = configuration
     }
 
     public var featureProvider: ChatFeatureProvider {
-        overriding.featureProvider ?? userPreference.featureProvider
+        overriding.featureProvider ?? configuration.featureProvider
     }
 
     public var temperature: Double {
-        overriding.temperature ?? userPreference.temperature
+        overriding.temperature ?? configuration.temperature
     }
 
     public var model: String {
-        overriding.model ?? userPreference.model
+        overriding.model ?? configuration.model
     }
 
     public var endpoint: String {
         overriding.endPoint
             ?? overriding.featureProvider.map(endpoint(for:))
-            ?? userPreference.endpoint
+            ?? configuration.endpoint
     }
 
     public var apiKey: String {
         overriding.apiKey
             ?? overriding.featureProvider.map(apiKey(for:))
-            ?? userPreference.apiKey
+            ?? configuration.apiKey
     }
 
     public var stop: [String] {
-        overriding.stop ?? userPreference.stop
+        overriding.stop ?? configuration.stop
     }
 
     public var maxTokens: Int {
-        overriding.maxTokens ?? userPreference.maxTokens
+        overriding.maxTokens ?? configuration.maxTokens
     }
 
     public var minimumReplyTokens: Int {
-        overriding.minimumReplyTokens ?? userPreference.minimumReplyTokens
+        overriding.minimumReplyTokens ?? configuration.minimumReplyTokens
     }
 }
 
diff --git a/Tool/Sources/OpenAIService/FucntionCall/ChatGPTFuntionProvider.swift b/Tool/Sources/OpenAIService/FucntionCall/ChatGPTFuntionProvider.swift
@@ -2,12 +2,12 @@ import Foundation
 
 public protocol ChatGPTFunctionProvider {
     var functionSchemas: [String] { get }
-    func function(named: String) -> ChatGPTFunction?
+    func function(named: String) -> (any ChatGPTFunction)?
 }
 
 public struct NoChatGPTFunctionProvider: ChatGPTFunctionProvider {
     public init() {}
 
     public var functionSchemas: [String] { [] }
-    public func function(named: String) -> ChatGPTFunction? { nil }
+    public func function(named: String) -> (any ChatGPTFunction)? { nil }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,8 @@ func callAIFunction(`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`let argsString = args.joined(separator: ", ")`
`19`		`- let configuration = OverridingUserPreferenceChatGPTConfiguration(`
`20`		`- overriding: .init(temperature: 0)`
`21`		`- )`
	`19`	`+ let configuration = UserPreferenceChatGPTConfiguration()`
	`20`	`+ .overriding(.init(temperature: 0))`
`22`	`21`	`let service = ChatGPTService(`
`23`	`22`	`memory: AutoManagedChatGPTMemory(`
`24`	`23`	systemPrompt: "You are now the following python function: ```# \(description)\n\(function)```\n\nOnly respond with your `return` value.",
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public protocol ChatGPTConfiguration {`
`12`	`12`	`var minimumReplyTokens: Int { get }`
`13`	`13`	`}`
`14`	`14`
`15`		`-extension ChatGPTConfiguration {`
	`15`	`+public extension ChatGPTConfiguration {`
`16`	`16`	`func endpoint(for provider: ChatFeatureProvider) -> String {`
`17`	`17`	`switch provider {`
`18`	`18`	`case .openAI:`
`@@ -36,4 +36,11 @@ extension ChatGPTConfiguration {`
`36`	`36`	`return UserDefaults.shared.value(for: \.azureOpenAIAPIKey)`
`37`	`37`	`}`
`38`	`38`	`}`
	`39`	`+`
	`40`	`+ func overriding(`
	`41`	`+ _ overrides: OverridingChatGPTConfiguration<Self>.Overriding = .init()`
	`42`	`+ ) -> OverridingChatGPTConfiguration<Self> {`
	`43`	`+ .init(overriding: self, with: overrides)`
	`44`	`+ }`
`39`	`45`	`}`
	`46`	`+`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,9 @@ public struct UserPreferenceChatGPTConfiguration: ChatGPTConfiguration {`
`39`	`39`	`public init() {}`
`40`	`40`	`}`
`41`	`41`
`42`		`-public class OverridingUserPreferenceChatGPTConfiguration: ChatGPTConfiguration {`
	`42`	`+public class OverridingChatGPTConfiguration<`
	`43`	`+ Configuration: ChatGPTConfiguration`
	`44`	`+>: ChatGPTConfiguration {`
`43`	`45`	`public struct Overriding {`
`44`	`46`	`var featureProvider: ChatFeatureProvider?`
`45`	`47`	`var temperature: Double?`
`@@ -71,47 +73,48 @@ public class OverridingUserPreferenceChatGPTConfiguration: ChatGPTConfiguration`
`71`	`73`	`}`
`72`	`74`	`}`
`73`	`75`
`74`		`- private let userPreference = UserPreferenceChatGPTConfiguration()`
	`76`	`+ private let configuration: Configuration`
`75`	`77`	`public var overriding = Overriding()`
`76`	`78`
`77`		`- public init(overriding: Overriding = .init()) {`
`78`		`- self.overriding = overriding`
	`79`	`+ public init(overriding configuration: Configuration, with overrides: Overriding = .init()) {`
	`80`	`+ self.overriding = overrides`
	`81`	`+ self.configuration = configuration`
`79`	`82`	`}`
`80`	`83`
`81`	`84`	`public var featureProvider: ChatFeatureProvider {`
`82`		`- overriding.featureProvider ?? userPreference.featureProvider`
	`85`	`+ overriding.featureProvider ?? configuration.featureProvider`
`83`	`86`	`}`
`84`	`87`
`85`	`88`	`public var temperature: Double {`
`86`		`- overriding.temperature ?? userPreference.temperature`
	`89`	`+ overriding.temperature ?? configuration.temperature`
`87`	`90`	`}`
`88`	`91`
`89`	`92`	`public var model: String {`
`90`		`- overriding.model ?? userPreference.model`
	`93`	`+ overriding.model ?? configuration.model`
`91`	`94`	`}`
`92`	`95`
`93`	`96`	`public var endpoint: String {`
`94`	`97`	`overriding.endPoint`
`95`	`98`	`?? overriding.featureProvider.map(endpoint(for:))`
`96`		`- ?? userPreference.endpoint`
	`99`	`+ ?? configuration.endpoint`
`97`	`100`	`}`
`98`	`101`
`99`	`102`	`public var apiKey: String {`
`100`	`103`	`overriding.apiKey`
`101`	`104`	`?? overriding.featureProvider.map(apiKey(for:))`
`102`		`- ?? userPreference.apiKey`
	`105`	`+ ?? configuration.apiKey`
`103`	`106`	`}`
`104`	`107`
`105`	`108`	`public var stop: [String] {`
`106`		`- overriding.stop ?? userPreference.stop`
	`109`	`+ overriding.stop ?? configuration.stop`
`107`	`110`	`}`
`108`	`111`
`109`	`112`	`public var maxTokens: Int {`
`110`		`- overriding.maxTokens ?? userPreference.maxTokens`
	`113`	`+ overriding.maxTokens ?? configuration.maxTokens`
`111`	`114`	`}`
`112`	`115`
`113`	`116`	`public var minimumReplyTokens: Int {`
`114`		`- overriding.minimumReplyTokens ?? userPreference.minimumReplyTokens`
	`117`	`+ overriding.minimumReplyTokens ?? configuration.minimumReplyTokens`
`115`	`118`	`}`
`116`	`119`	`}`
`117`	`120`
Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,12 @@ import Foundation`
`2`	`2`
`3`	`3`	`public protocol ChatGPTFunctionProvider {`
`4`	`4`	`var functionSchemas: [String] { get }`
`5`		`- func function(named: String) -> ChatGPTFunction?`
	`5`	`+ func function(named: String) -> (any ChatGPTFunction)?`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`public struct NoChatGPTFunctionProvider: ChatGPTFunctionProvider {`
`9`	`9`	`public init() {}`
`10`	`10`
`11`	`11`	`public var functionSchemas: [String] { [] }`
`12`		`- public func function(named: String) -> ChatGPTFunction? { nil }`
	`12`	`+ public func function(named: String) -> (any ChatGPTFunction)? { nil }`
`13`	`13`	`}`