Adjust overriding configuration interface

Author: intitni

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)
 }

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.",

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)

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

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 = ""

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)
+    }
 }
+

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
     }
 }
 

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 }
 }