beswarm 0.1.31__py3-none-any.whl → 0.1.32__py3-none-any.whl

beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.0.90",
+    version="1.0.91",
     description="Aient: The Awakening of Agent.",
     long_description=Path.open(Path("README.md"), encoding="utf-8").read(),
     long_description_content_type="text/markdown",

beswarm/aient/src/aient/models/chatgpt.py

@@ -125,9 +125,9 @@ class chatgpt(BaseLLM):
         # print("role", role, "function_name", function_name, "message", message)
         if convo_id not in self.conversation:
             self.reset(convo_id=convo_id)
-        if function_name == "" and message and message != None:
+        if function_name == "" and message:
             self.conversation[convo_id].append({"role": role, "content": message})
-        elif function_name != "" and message and message != None:
+        elif function_name != "" and message:
             # 删除从 cut_history_by_function_name 以后的所有历史记录
             if function_name == self.cut_history_by_function_name:
                 matching_message = next(filter(lambda x: safe_get(x, "tool_calls", 0, "function", "name", default="") == 'get_next_pdf', self.conversation[convo_id]), None)
@@ -429,26 +429,27 @@ class chatgpt(BaseLLM):
         if response_role is None:
             response_role = "assistant"
 
-        function_parameter = parse_function_xml(full_response)
-        if function_parameter:
-            invalid_tools = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") not in self.plugins.keys()]
-            function_parameter = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") in self.plugins.keys()]
-            for tool_dict in invalid_tools:
-                full_response = full_response + f"\n\nFunction: {tool_dict.get('function_name', '')} does not exist! I must use existing functions. I need to try again."
-            if self.print_log and invalid_tools:
-                print("invalid_tools", invalid_tools)
-                print("function_parameter", function_parameter)
-                print("full_response", full_response)
+        if self.use_plugins == True:
+            function_parameter = parse_function_xml(full_response)
             if function_parameter:
-                need_function_call = True
-            else:
-                need_function_call = False
-                if self.print_log:
-                    print("Failed to parse function_parameter full_response", full_response)
-                full_response = ""
+                invalid_tools = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") not in self.plugins.keys()]
+                function_parameter = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") in self.plugins.keys()]
+                for tool_dict in invalid_tools:
+                    full_response = full_response + f"\n\nFunction: {tool_dict.get('function_name', '')} does not exist! I must use existing functions. I need to try again."
+                if self.print_log and invalid_tools:
+                    print("invalid_tools", invalid_tools)
+                    print("function_parameter", function_parameter)
+                    print("full_response", full_response)
+                if function_parameter:
+                    need_function_call = True
+                else:
+                    need_function_call = False
+                    if self.print_log:
+                        print("Failed to parse function_parameter full_response", full_response)
+                    full_response = ""
 
         # 处理函数调用
-        if need_function_call and self.use_plugins != False:
+        if need_function_call and self.use_plugins == True:
             if self.print_log:
                 print("function_parameter", function_parameter)
                 print("function_full_response", function_full_response)

{beswarm-0.1.31.dist-info → beswarm-0.1.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beswarm
-Version: 0.1.31
+Version: 0.1.32
 Summary: MAS
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{beswarm-0.1.31.dist-info → beswarm-0.1.32.dist-info}/RECORD

@@ -1,7 +1,7 @@
 beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/utils.py,sha256=AdDCcqAIIKQEMl7PfryVgeT9G5sHe7QNsZnrvmTGA8E,283
 beswarm/aient/main.py,sha256=SiYAIgQlLJqYusnTVEJOx1WNkSJKMImhgn5aWjfroxg,3814
-beswarm/aient/setup.py,sha256=7VXWS5c7_Rs1e_M-Vb0lVPvFOmvZ4ePzklbj1fMMVX0,487
+beswarm/aient/setup.py,sha256=Yu2nicPHxIzQJARPGUjzlqzfZZW9pGkJguVGBfKn1fk,487
 beswarm/aient/src/aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
 beswarm/aient/src/aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 beswarm/aient/src/aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
@@ -15,7 +15,7 @@ beswarm/aient/src/aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6U
 beswarm/aient/src/aient/models/__init__.py,sha256=ouNDNvoBBpIFrLsk09Q_sq23HR0GbLAKfGLIFmfEuXE,219
 beswarm/aient/src/aient/models/audio.py,sha256=kRd-8-WXzv4vwvsTGwnstK-WR8--vr9CdfCZzu8y9LA,1934
 beswarm/aient/src/aient/models/base.py,sha256=z-Z0pJfTN2x0cuwfvu0BdMRY9O-RmLwHEnBIJN1x4Fg,6719
-beswarm/aient/src/aient/models/chatgpt.py,sha256=Y99EIUE9m7QIo3G-6MQWQ_HShCv5tDQHYM-nQyV32DM,45002
+beswarm/aient/src/aient/models/chatgpt.py,sha256=-NWkkKxTCyraPYT0YN37NA2rUfOaDNXtvFSQmIE5tS8,45066
 beswarm/aient/src/aient/models/claude.py,sha256=thK9P8qkaaoUN3OOJ9Shw4KDs-pAGKPoX4FOPGFXva8,28597
 beswarm/aient/src/aient/models/duckduckgo.py,sha256=1l7vYCs9SG5SWPCbcl7q6pCcB5AUF_r-a4l9frz3Ogo,8115
 beswarm/aient/src/aient/models/gemini.py,sha256=chGLc-8G_DAOxr10HPoOhvVFW1RvMgHd6mt--VyAW98,14730
@@ -125,7 +125,7 @@ beswarm/tools/repomap.py,sha256=CwvwoN5Swr42EzrORTTeV8MMb7mPviy4a4b0fxBu50k,4082
 beswarm/tools/search_arxiv.py,sha256=9slwBemXjEqrd7-YgVmyMijPXlkhZCybEDRVhWVQ9B0,7937
 beswarm/tools/think.py,sha256=WLw-7jNIsnS6n8MMSYUin_f-BGLENFmnKM2LISEp0co,1760
 beswarm/tools/worker.py,sha256=JZkMT4JAkrV_0-CBATLAPVZzVGEMMEM2XUTTMGmED0E,5245
-beswarm-0.1.31.dist-info/METADATA,sha256=F1YBCYr4Ub_jaD3xvQhfsn4Z0lbJr2_H774Jbl3-KN8,2870
-beswarm-0.1.31.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-beswarm-0.1.31.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.1.31.dist-info/RECORD,,
+beswarm-0.1.32.dist-info/METADATA,sha256=kCil9ROq7bb7PmPRvj5N3K0K0XZqmBpxHpbv6IU6SrA,2870
+beswarm-0.1.32.dist-info/WHEEL,sha256=ooBFpIzZCPdw3uqIQsOo4qqbA4ZRPxHnOH7peeONza0,91
+beswarm-0.1.32.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.1.32.dist-info/RECORD,,

{beswarm-0.1.31.dist-info → beswarm-0.1.32.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.0.0)
+Generator: setuptools (80.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any