Allow disabling auto function calling handling

Author: intitni

Tool/Sources/OpenAIService/ChatGPTService.swift

@@ -98,9 +98,12 @@ public class ChatGPTService: ChatGPTServiceType {
                     var functionCall: ChatMessage.FunctionCall?
                     var functionCallMessageID = ""
                     var isInitialCall = true
-                    while functionCall != nil || isInitialCall {
+                    loop: while functionCall != nil || isInitialCall {
                         isInitialCall = false
                         if let call = functionCall {
+                            if !configuration.runFunctionsAutomatically {
+                                break loop
+                            }
                             functionCall = nil
                             await runFunctionCall(call, messageId: functionCallMessageID)
                         }
@@ -148,6 +151,9 @@ public class ChatGPTService: ChatGPTServiceType {
         var finalResult = message?.content
         var functionCall = message?.functionCall
         while let call = functionCall {
+            if !configuration.runFunctionsAutomatically {
+                break
+            }
             functionCall = nil
             await runFunctionCall(call)
             guard let nextMessage = try await sendMemoryAndWait() else { break }
@@ -375,23 +381,23 @@ extension ChatGPTService {
             content: nil,
             name: call.name
         )
-        
+
         await memory.appendMessage(responseMessage)
 
         function.reportProgress = { [weak self] summary in
             await self?.memory.updateMessage(id: messageId) { message in
                 message.summary = summary
             }
         }
-        
+
         do {
             // Run the function
             let result = try await function.call(argumentsJsonString: call.arguments)
 
             await memory.updateMessage(id: messageId) { message in
                 message.content = result.botReadableContent
             }
-            
+
             return result.botReadableContent
         } catch {
             // For errors, use the error message as the result.

Tool/Sources/OpenAIService/Configuration/ChatGPTConfiguration.swift

@@ -10,6 +10,7 @@ public protocol ChatGPTConfiguration {
     var stop: [String] { get }
     var maxTokens: Int { get }
     var minimumReplyTokens: Int { get }
+    var runFunctionsAutomatically: Bool { get }
 }
 
 public extension ChatGPTConfiguration {
@@ -38,9 +39,17 @@ public extension ChatGPTConfiguration {
     }
 
     func overriding(
-        _ overrides: OverridingChatGPTConfiguration<Self>.Overriding = .init()
+        _ overrides: OverridingChatGPTConfiguration<Self>.Overriding
     ) -> OverridingChatGPTConfiguration<Self> {
         .init(overriding: self, with: overrides)
     }
+
+    func overriding(
+        _ update: (inout OverridingChatGPTConfiguration<Self>.Overriding) -> Void = { _ in }
+    ) -> OverridingChatGPTConfiguration<Self> {
+        var overrides = OverridingChatGPTConfiguration<Self>.Overriding()
+        update(&overrides)
+        return .init(overriding: self, with: overrides)
+    }
 }
 

Tool/Sources/OpenAIService/Configuration/UserPreferenceChatGPTConfiguration.swift

@@ -36,21 +36,26 @@ public struct UserPreferenceChatGPTConfiguration: ChatGPTConfiguration {
         300
     }
 
+    public var runFunctionsAutomatically: Bool {
+        true
+    }
+
     public init() {}
 }
 
 public class OverridingChatGPTConfiguration<
     Configuration: ChatGPTConfiguration
 >: ChatGPTConfiguration {
     public struct Overriding {
-        var featureProvider: ChatFeatureProvider?
-        var temperature: Double?
-        var model: String?
-        var endPoint: String?
-        var apiKey: String?
-        var stop: [String]?
-        var maxTokens: Int?
-        var minimumReplyTokens: Int?
+        public var featureProvider: ChatFeatureProvider?
+        public var temperature: Double?
+        public var model: String?
+        public var endPoint: String?
+        public var apiKey: String?
+        public var stop: [String]?
+        public var maxTokens: Int?
+        public var minimumReplyTokens: Int?
+        public var runFunctionsAutomatically: Bool?
 
         public init(
             temperature: Double? = nil,
@@ -60,7 +65,8 @@ public class OverridingChatGPTConfiguration<
             minimumReplyTokens: Int? = nil,
             featureProvider: ChatFeatureProvider? = nil,
             endPoint: String? = nil,
-            apiKey: String? = nil
+            apiKey: String? = nil,
+            runFunctionsAutomatically: Bool? = nil
         ) {
             self.temperature = temperature
             self.model = model
@@ -70,14 +76,15 @@ public class OverridingChatGPTConfiguration<
             self.featureProvider = featureProvider
             self.endPoint = endPoint
             self.apiKey = apiKey
+            self.runFunctionsAutomatically = runFunctionsAutomatically
         }
     }
 
     private let configuration: Configuration
     public var overriding = Overriding()
 
     public init(overriding configuration: Configuration, with overrides: Overriding = .init()) {
-        self.overriding = overrides
+        overriding = overrides
         self.configuration = configuration
     }
 
@@ -116,5 +123,9 @@ public class OverridingChatGPTConfiguration<
     public var minimumReplyTokens: Int {
         overriding.minimumReplyTokens ?? configuration.minimumReplyTokens
     }
+    
+    public var runFunctionsAutomatically: Bool {
+        overriding.runFunctionsAutomatically ?? configuration.runFunctionsAutomatically
+    }
 }