🐛 Bug: Fix the bug where tools continue to be called when the tools j…

…son returned by OpenAI is empty. 💻 Code: Upgrade ModelMerge version to 0.11.45
yym68686 · Sep 27, 2024 · 564e02c · 564e02c
1 parent 1b1e685
commit 564e02c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name="modelmerge",
-    version="0.11.44",
+    version="0.11.45",
     description="modelmerge is a multi-large language model API aggregator.",
     long_description=Path.open(Path("README.md"), encoding="utf-8").read(),
     long_description_content_type="text/markdown",

diff --git a/src/ModelMerge/models/chatgpt.py b/src/ModelMerge/models/chatgpt.py
@@ -542,7 +542,7 @@ def ask_stream(
                 self.function_calls_counter[function_call_name] = 1
             else:
                 self.function_calls_counter[function_call_name] += 1
-            if self.function_calls_counter[function_call_name] <= self.function_call_max_loop:
+            if self.function_calls_counter[function_call_name] <= self.function_call_max_loop and function_full_response != {}:
                 function_call_max_tokens = self.truncate_limit - message_token["total"] - 1000
                 if function_call_max_tokens <= 0:
                     function_call_max_tokens = int(self.truncate_limit / 2)
@@ -775,7 +775,7 @@ async def ask_stream_async(
                 self.function_calls_counter[function_call_name] = 1
             else:
                 self.function_calls_counter[function_call_name] += 1
-            if self.function_calls_counter[function_call_name] <= self.function_call_max_loop:
+            if self.function_calls_counter[function_call_name] <= self.function_call_max_loop and function_full_response != {}:
                 function_call_max_tokens = self.truncate_limit - message_token["total"] - 1000
                 if function_call_max_tokens <= 0:
                     function_call_max_tokens = int(self.truncate_limit / 2)