Merge branch 'hotfix/0.35.6'

Author: intitni

Tool/Sources/OpenAIService/APIs/OpenAIChatCompletionsService.swift

@@ -311,7 +311,25 @@ actor OpenAIChatCompletionsService: ChatCompletionsStreamAPI, ChatCompletionsAPI
                 .requiresBeginWithUserMessage,
             canUseTool: model.info.supportsFunctionCalling,
             supportsImage: model.info.supportsImage,
-            supportsAudio: model.info.supportsAudio
+            supportsAudio: model.info.supportsAudio,
+            supportsTemperature: {
+                guard model.format == .openAI else { return true }
+                if let chatGPTModel = ChatGPTModel(rawValue: model.info.modelName) {
+                    return chatGPTModel.supportsTemperature
+                } else if model.info.modelName.hasPrefix("o") {
+                    return false
+                }
+                return true
+            }(),
+            supportsSystemPrompt: {
+                guard model.format == .openAI else { return true }
+                if let chatGPTModel = ChatGPTModel(rawValue: model.info.modelName) {
+                    return chatGPTModel.supportsSystemPrompt
+                } else if model.info.modelName.hasPrefix("o") {
+                    return false
+                }
+                return true
+            }()
         )
         self.model = model
         self.requestModifier = requestModifier
@@ -714,7 +732,9 @@ extension OpenAIChatCompletionsService.RequestBody {
         requiresBeginWithUserMessage: Bool,
         canUseTool: Bool,
         supportsImage: Bool,
-        supportsAudio: Bool
+        supportsAudio: Bool,
+        supportsTemperature: Bool,
+        supportsSystemPrompt: Bool
     ) {
         temperature = body.temperature
         stream = body.stream
@@ -737,6 +757,17 @@ extension OpenAIChatCompletionsService.RequestBody {
 
         var body = body
 
+        if !supportsTemperature {
+            temperature = nil
+        }
+        if !supportsSystemPrompt {
+            for (index, message) in body.messages.enumerated() {
+                if message.role == .system {
+                    body.messages[index].role = .user
+                }
+            }
+        }
+
         if requiresBeginWithUserMessage {
             let firstUserIndex = body.messages.firstIndex(where: { $0.role == .user }) ?? 0
             let endIndex = firstUserIndex

Tool/Sources/Preferences/Types/ChatGPTModel.swift

@@ -86,5 +86,23 @@ public extension ChatGPTModel {
             return false
         }
     }
+    
+    var supportsTemperature: Bool {
+        switch self {
+        case .o1Preview, .o1Preview20240912, .o1Mini, .o1Mini20240912, .o1, .o3Mini:
+            return false
+        default:
+            return true
+        }
+    }
+    
+    var supportsSystemPrompt: Bool {
+        switch self {
+        case .o1Preview, .o1Preview20240912, .o1Mini, .o1Mini20240912, .o1, .o3Mini:
+            return false
+        default:
+            return true
+        }
+    }
 }
 

Version.xcconfig

@@ -1,4 +1,4 @@
-APP_VERSION = 0.35.5
-APP_BUILD = 443
+APP_VERSION = 0.35.6
+APP_BUILD = 451
 RELEASE_CHANNEL =
 RELEASE_NUMBER = 1