Add settings for temperature and max message count

Author: intitni

Copilot for Xcode/OpenAIView.swift

@@ -11,6 +11,8 @@ final class OpenAIViewSettings: ObservableObject {
     @AppStorage(\.chatGPTEndpoint) var chatGPTEndpoint: String
     @AppStorage(\.chatGPTLanguage) var chatGPTLanguage: String
     @AppStorage(\.chatGPTMaxToken) var chatGPTMaxToken: Int
+    @AppStorage(\.chatGPTTemperature) var chatGPTTemperature: Double
+    @AppStorage(\.chatGPTMaxMessageCount) var chatGPTMaxMessageCount: Int
     init() {}
 }
 
@@ -112,16 +114,34 @@ struct OpenAIView: View {
                             .textFieldStyle(.roundedBorder)
                         }
                     }
+
+                    HStack {
+                        Slider(value: $settings.chatGPTTemperature, in: 0...2, step: 0.1) {
+                            Text("Temperature")
+                        }
+
+                        Text(
+                            "\(settings.chatGPTTemperature.formatted(.number.precision(.fractionLength(1))))"
+                        )
+                        .monospacedDigit()
+                    }
+
+                    Picker("Max Message Count Sending to the Bot", selection: $settings.chatGPTMaxMessageCount) {
+                        Text("No Limit").tag(0)
+                        Text("3 Messages").tag(3)
+                        Text("5 Messages").tag(5)
+                        Text("7 Messages").tag(7)
+                    }
                 }
             }
         }
     }
-    
+
     var languagePicker: some View {
         Menu {
             if !settings.chatGPTLanguage.isEmpty,
                !OpenAIViewSettings.availableLocalizedLocales
-                .contains(settings.chatGPTLanguage)
+               .contains(settings.chatGPTLanguage)
             {
                 Button(
                     settings.chatGPTLanguage,
@@ -144,8 +164,8 @@ struct OpenAIView: View {
         } label: {
             Text(
                 settings.chatGPTLanguage.isEmpty
-                ? "Auto-detected by ChatGPT"
-                : settings.chatGPTLanguage
+                    ? "Auto-detected by ChatGPT"
+                    : settings.chatGPTLanguage
             )
         }
     }

Core/Sources/OpenAIService/ChatGPTService.swift

@@ -55,7 +55,12 @@ public struct ChatGPTError: Error, Codable, LocalizedError {
 
 public actor ChatGPTService: ChatGPTServiceType {
     public var systemPrompt: String
-    public var temperature: Double
+
+    public var defaultTemperature: Double {
+        min(max(0, UserDefaults.shared.value(for: \.chatGPTTemperature)), 2)
+    }
+    
+    var temperature: Double?
 
     public var model: String {
         let value = UserDefaults.shared.value(for: \.chatGPTModel)
@@ -93,7 +98,7 @@ public actor ChatGPTService: ChatGPTServiceType {
 
     public init(
         systemPrompt: String = "",
-        temperature: Double = 0.7
+        temperature: Double? = nil
     ) {
         self.systemPrompt = systemPrompt
         self.temperature = temperature
@@ -114,11 +119,11 @@ public actor ChatGPTService: ChatGPTServiceType {
         history.append(newMessage)
 
         let (messages, remainingTokens) = combineHistoryWithSystemPrompt()
-        
+
         let requestBody = CompletionRequestBody(
             model: model,
             messages: messages,
-            temperature: temperature,
+            temperature: temperature ?? defaultTemperature,
             stream: true,
             max_tokens: remainingTokens
         )
@@ -194,11 +199,11 @@ public actor ChatGPTService: ChatGPTServiceType {
         history.append(newMessage)
 
         let (messages, remainingTokens) = combineHistoryWithSystemPrompt()
-        
+
         let requestBody = CompletionRequestBody(
             model: model,
             messages: messages,
-            temperature: temperature,
+            temperature: temperature ?? defaultTemperature,
             stream: true,
             max_tokens: remainingTokens
         )
@@ -257,16 +262,16 @@ extension ChatGPTService {
 
     func combineHistoryWithSystemPrompt(
         minimumReplyTokens: Int = 200,
-        maxNumberOfMessages: Int = 5,
-        maxTokens: Int =  UserDefaults.shared.value(for: \.chatGPTMaxToken),
+        maxNumberOfMessages: Int = UserDefaults.shared.value(for: \.chatGPTMaxMessageCount),
+        maxTokens: Int = UserDefaults.shared.value(for: \.chatGPTMaxToken),
         encoder: TokenEncoder = GPTEncoder()
     )
         -> (messages: [CompletionRequestBody.Message], remainingTokens: Int)
     {
         var all: [CompletionRequestBody.Message] = []
         var allTokensCount = encoder.encode(text: systemPrompt).count
         for message in history.reversed() {
-            if all.count >= maxNumberOfMessages { break }
+            if maxNumberOfMessages > 0, all.count >= maxNumberOfMessages { break }
             if message.content.isEmpty { continue }
             let tokensCount = encoder.encode(text: message.content).count
             if tokensCount + allTokensCount > maxTokens - minimumReplyTokens {

Core/Sources/Preferences/Keys.swift

@@ -193,7 +193,7 @@ public extension UserDefaultPreferenceKeys {
     var chatGPTModel: ChatGPTModel { .init() }
 
     struct ChatGPTMaxToken: UserDefaultPreferenceKey {
-        public let defaultValue = 2048
+        public let defaultValue = 4000
         public let key = "ChatGPTMaxToken"
     }
 
@@ -205,6 +205,20 @@ public extension UserDefaultPreferenceKeys {
     }
 
     var chatGPTLanguage: ChatGPTLanguage { .init() }
+    
+    struct ChatGPTMaxMessageCount: UserDefaultPreferenceKey {
+        public let defaultValue = 5
+        public let key = "ChatGPTMaxMessageCount"
+    }
+
+    var chatGPTMaxMessageCount: ChatGPTMaxMessageCount { .init() }
+    
+    struct ChatGPTTemperature: UserDefaultPreferenceKey {
+        public let defaultValue = 0.7
+        public let key = "ChatGPTTemperature"
+    }
+
+    var chatGPTTemperature: ChatGPTTemperature { .init() }
 }
 
 // MARK: - Custom Commands

Core/Tests/OpenAIServiceTests/LimitMessagesTests.swift

@@ -14,7 +14,7 @@ final class LimitMessagesTests: XCTestCase {
         let (messages, remainingTokens) = await runService(
             service,
             minimumReplyTokens: 200,
-            maxNumberOfMessages: 100,
+            maxNumberOfMessages: 0, // smaller than 1 means no limit
             maxTokens: 10000
         )
         XCTAssertEqual(messages, [