Make OverrideChatGPTConfiguration non-generic

Author: intitni

Core/Sources/ChatService/ChatService.swift

@@ -7,7 +7,7 @@ import Preferences
 
 public final class ChatService: ObservableObject {
     public let memory: ContextAwareAutoManagedChatGPTMemory
-    public let configuration: OverridingChatGPTConfiguration<UserPreferenceChatGPTConfiguration>
+    public let configuration: ChatGPTConfiguration
     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: ContextAwareAutoManagedChatGPTMemory,
-        configuration: OverridingChatGPTConfiguration<UserPreferenceChatGPTConfiguration>,
+        configuration: ChatGPTConfiguration,
         chatGPTService: T
     ) {
         self.memory = memory

Tool/Sources/OpenAIService/Configuration/ChatGPTConfiguration.swift

@@ -39,15 +39,15 @@ public extension ChatGPTConfiguration {
     }
 
     func overriding(
-        _ overrides: OverridingChatGPTConfiguration<Self>.Overriding
-    ) -> OverridingChatGPTConfiguration<Self> {
+        _ overrides: OverridingChatGPTConfiguration.Overriding
+    ) -> OverridingChatGPTConfiguration {
         .init(overriding: self, with: overrides)
     }
 
     func overriding(
-        _ update: (inout OverridingChatGPTConfiguration<Self>.Overriding) -> Void = { _ in }
-    ) -> OverridingChatGPTConfiguration<Self> {
-        var overrides = OverridingChatGPTConfiguration<Self>.Overriding()
+        _ update: (inout OverridingChatGPTConfiguration.Overriding) -> Void = { _ in }
+    ) -> OverridingChatGPTConfiguration {
+        var overrides = OverridingChatGPTConfiguration.Overriding()
         update(&overrides)
         return .init(overriding: self, with: overrides)
     }

Tool/Sources/OpenAIService/Configuration/UserPreferenceChatGPTConfiguration.swift

@@ -43,9 +43,7 @@ public struct UserPreferenceChatGPTConfiguration: ChatGPTConfiguration {
     public init() {}
 }
 
-public class OverridingChatGPTConfiguration<
-    Configuration: ChatGPTConfiguration
->: ChatGPTConfiguration {
+public class OverridingChatGPTConfiguration: ChatGPTConfiguration {
     public struct Overriding {
         public var featureProvider: ChatFeatureProvider?
         public var temperature: Double?
@@ -80,10 +78,13 @@ public class OverridingChatGPTConfiguration<
         }
     }
 
-    private let configuration: Configuration
+    private let configuration: ChatGPTConfiguration
     public var overriding = Overriding()
 
-    public init(overriding configuration: Configuration, with overrides: Overriding = .init()) {
+    public init(
+        overriding configuration: any ChatGPTConfiguration,
+        with overrides: Overriding = .init()
+    ) {
         overriding = overrides
         self.configuration = configuration
     }
@@ -123,7 +124,7 @@ public class OverridingChatGPTConfiguration<
     public var minimumReplyTokens: Int {
         overriding.minimumReplyTokens ?? configuration.minimumReplyTokens
     }
-    
+
     public var runFunctionsAutomatically: Bool {
         overriding.runFunctionsAutomatically ?? configuration.runFunctionsAutomatically
     }