Update model format to match CopilotForXcode

Author: intitni

Core/Sources/CodeCompletionService/CodeCompletionService.swift

@@ -121,7 +121,7 @@ public struct CodeCompletionService {
                 endpoint: .chatCompletion,
                 modelName: model.info.modelName,
                 stopWords: prompt.stopWords,
-                keepAlive: model.info.ollamaKeepAlive,
+                keepAlive: model.info.ollamaInfo.keepAlive,
                 format: .none
             )
             let result = try await service.getCompletions(prompt, count: count)
@@ -168,7 +168,7 @@ public struct CodeCompletionService {
                 endpoint: .completion,
                 modelName: model.info.modelName,
                 stopWords: prompt.stopWords,
-                keepAlive: model.info.ollamaKeepAlive,
+                keepAlive: model.info.ollamaInfo.keepAlive,
                 format: .none
             )
             let result = try await service.getCompletions(prompt, count: count)

Core/Sources/Fundamental/Models/ChatModel.swift

@@ -23,11 +23,29 @@ public struct ChatModel: Codable, Equatable, Identifiable {
         case openAICompatible
         case googleAI
         case ollama
-        
+
         case unknown
     }
 
     public struct Info: Codable, Equatable {
+        public struct OllamaInfo: Codable, Equatable {
+            @FallbackDecoding<EmptyString>
+            public var keepAlive: String
+
+            public init(keepAlive: String = "") {
+                self.keepAlive = keepAlive
+            }
+        }
+
+        public struct OpenAIInfo: Codable, Equatable {
+            @FallbackDecoding<EmptyString>
+            public var organizationID: String
+
+            public init(organizationID: String = "") {
+                self.organizationID = organizationID
+            }
+        }
+
         @FallbackDecoding<EmptyString>
         public var apiKeyName: String
         @FallbackDecoding<EmptyString>
@@ -38,35 +56,32 @@ public struct ChatModel: Codable, Equatable, Identifiable {
         public var maxTokens: Int
         @FallbackDecoding<EmptyBool>
         public var supportsFunctionCalling: Bool
-        @FallbackDecoding<EmptyBool>
-        public var supportsOpenAIAPI2023_11: Bool
         @FallbackDecoding<EmptyString>
         public var modelName: String
-        public var azureOpenAIDeploymentName: String {
-            get { modelName }
-            set { modelName = newValue }
-        }
-        @FallbackDecoding<EmptyString>
-        public var ollamaKeepAlive: String
+
+        @FallbackDecoding<EmptyChatModelOpenAIInfo>
+        public var openAIInfo: OpenAIInfo
+        @FallbackDecoding<EmptyChatModelOllamaInfo>
+        public var ollamaInfo: OllamaInfo
 
         public init(
             apiKeyName: String = "",
             baseURL: String = "",
             isFullURL: Bool = false,
             maxTokens: Int = 4000,
             supportsFunctionCalling: Bool = true,
-            supportsOpenAIAPI2023_11: Bool = false,
             modelName: String = "",
-            ollamaKeepAlive: String = ""
+            openAIInfo: OpenAIInfo = OpenAIInfo(),
+            ollamaInfo: OllamaInfo = OllamaInfo()
         ) {
             self.apiKeyName = apiKeyName
             self.baseURL = baseURL
             self.isFullURL = isFullURL
             self.maxTokens = maxTokens
             self.supportsFunctionCalling = supportsFunctionCalling
-            self.supportsOpenAIAPI2023_11 = supportsOpenAIAPI2023_11
             self.modelName = modelName
-            self.ollamaKeepAlive = ollamaKeepAlive
+            self.openAIInfo = openAIInfo
+            self.ollamaInfo = ollamaInfo
         }
     }
 
@@ -83,7 +98,7 @@ public struct ChatModel: Codable, Equatable, Identifiable {
             return "\(baseURL)/v1/chat/completions"
         case .azureOpenAI:
             let baseURL = info.baseURL
-            let deployment = info.azureOpenAIDeploymentName
+            let deployment = info.modelName
             let version = "2023-07-01-preview"
             if baseURL.isEmpty { return "" }
             return "\(baseURL)/openai/deployments/\(deployment)/chat/completions?api-version=\(version)"
@@ -109,3 +124,11 @@ public struct EmptyChatModelFormat: FallbackValueProvider {
     public static var defaultValue: ChatModel.Format { .unknown }
 }
 
+public struct EmptyChatModelOllamaInfo: FallbackValueProvider {
+    public static var defaultValue: ChatModel.Info.OllamaInfo { .init() }
+}
+
+public struct EmptyChatModelOpenAIInfo: FallbackValueProvider {
+    public static var defaultValue: ChatModel.Info.OpenAIInfo { .init() }
+}
+

Core/Sources/Fundamental/Models/CompletionModel.swift

@@ -27,6 +27,9 @@ public struct CompletionModel: Codable, Equatable, Identifiable {
     }
 
     public struct Info: Codable, Equatable {
+        public typealias OllamaInfo = ChatModel.Info.OllamaInfo
+        public typealias OpenAIInfo = ChatModel.Info.OpenAIInfo
+        
         @FallbackDecoding<EmptyString>
         public var apiKeyName: String
         @FallbackDecoding<EmptyString>
@@ -37,27 +40,28 @@ public struct CompletionModel: Codable, Equatable, Identifiable {
         public var maxTokens: Int
         @FallbackDecoding<EmptyString>
         public var modelName: String
-        public var azureOpenAIDeploymentName: String {
-            get { modelName }
-            set { modelName = newValue }
-        }
-        @FallbackDecoding<EmptyString>
-        public var ollamaKeepAlive: String
+       
+        @FallbackDecoding<EmptyChatModelOpenAIInfo>
+        public var openAIInfo: OpenAIInfo
+        @FallbackDecoding<EmptyChatModelOllamaInfo>
+        public var ollamaInfo: OllamaInfo
 
         public init(
             apiKeyName: String = "",
             baseURL: String = "",
             isFullURL: Bool = false,
             maxTokens: Int = 4000,
             modelName: String = "",
-            ollamaKeepAlive: String = ""
+            openAIInfo: OpenAIInfo = OpenAIInfo(),
+            ollamaInfo: OllamaInfo = OllamaInfo()
         ) {
             self.apiKeyName = apiKeyName
             self.baseURL = baseURL
             self.isFullURL = isFullURL
             self.maxTokens = maxTokens
             self.modelName = modelName
-            self.ollamaKeepAlive = ollamaKeepAlive
+            self.openAIInfo = openAIInfo
+            self.ollamaInfo = ollamaInfo
         }
     }
 
@@ -74,7 +78,7 @@ public struct CompletionModel: Codable, Equatable, Identifiable {
             return "\(baseURL)/v1/completions"
         case .azureOpenAI:
             let baseURL = info.baseURL
-            let deployment = info.azureOpenAIDeploymentName
+            let deployment = info.modelName
             let version = "2023-07-01-preview"
             if baseURL.isEmpty { return "" }
             return "\(baseURL)/openai/deployments/\(deployment)/completions?api-version=\(version)"

CustomSuggestionService/ChatModelManagement/ChatModelEdit.swift

@@ -154,7 +154,7 @@ extension ChatModel {
                 apiKeyManagement: .init(availableAPIKeyNames: [info.apiKeyName])
             ),
             baseURLSelection: .init(baseURL: info.baseURL),
-            ollamaKeepAlive: info.ollamaKeepAlive
+            ollamaKeepAlive: info.ollamaInfo.keepAlive
         )
     }
 
@@ -169,7 +169,7 @@ extension ChatModel {
                 maxTokens: state.maxTokens,
                 supportsFunctionCalling: false,
                 modelName: state.modelName.trimmingCharacters(in: .whitespacesAndNewlines),
-                ollamaKeepAlive: state.ollamaKeepAlive
+                ollamaInfo: .init(keepAlive: state.ollamaKeepAlive)
             )
         )
     }

CustomSuggestionService/ChatModelManagement/CompletionModelEdit.swift

@@ -145,7 +145,7 @@ extension CompletionModel {
                 apiKeyManagement: .init(availableAPIKeyNames: [info.apiKeyName])
             ),
             baseURLSelection: .init(baseURL: info.baseURL),
-            ollamaKeepAlive: info.ollamaKeepAlive
+            ollamaKeepAlive: info.ollamaInfo.keepAlive
         )
     }
 
@@ -159,7 +159,7 @@ extension CompletionModel {
                 baseURL: state.baseURL.trimmingCharacters(in: .whitespacesAndNewlines),
                 maxTokens: state.maxTokens,
                 modelName: state.modelName.trimmingCharacters(in: .whitespacesAndNewlines),
-                ollamaKeepAlive: state.ollamaKeepAlive
+                ollamaInfo: .init(keepAlive: state.ollamaKeepAlive)
             )
         )
     }