beswarm 0.1.27__tar.gz → 0.1.29__tar.gz

{beswarm-0.1.27 → beswarm-0.1.29}/PKG-INFO

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

{beswarm-0.1.27 → beswarm-0.1.29}/beswarm/aient/setup.py

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

{beswarm-0.1.27 → beswarm-0.1.29}/beswarm/aient/src/aient/models/chatgpt.py

@@ -431,10 +431,15 @@ class chatgpt(BaseLLM):
 
         function_parameter = parse_function_xml(full_response)
         if function_parameter:
-            for tool_dict in function_parameter:
-                if tool_dict.get("function_name", "") not in self.plugins.keys():
-                    function_parameter.remove(tool_dict)
-                    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."
+            print("function_parameter1", function_parameter)
+            function_parameter = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") in self.plugins.keys()]
+            invalid_tools = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") not 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."
+            print("function_parameter2", self.print_log, function_parameter)
+            if self.print_log:
+                print("invalid_tools", invalid_tools)
+                print("full_response", full_response)
             if function_parameter:
                 need_function_call = True
             else:
@@ -453,6 +458,11 @@ class chatgpt(BaseLLM):
                 print("function_parameter", function_parameter)
                 print("function_full_response", function_full_response)
 
+            function_parameter = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") in self.plugins.keys()]
+
+            if self.print_log:
+                print("function_parameter3", function_parameter)
+
             function_response = ""
             # 定义处理单个工具调用的辅助函数
             async def process_single_tool_call(tool_name, tool_args, tool_id):
@@ -549,7 +559,7 @@ class chatgpt(BaseLLM):
                     all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\n{tool_response}")
 
             # 合并所有工具响应
-            function_response = "\n\n".join(all_responses)
+            function_response = "\n\n".join(all_responses).strip()
 
             # 使用第一个工具的名称和参数作为历史记录
             function_call_name = tool_calls[0]['function_name']

{beswarm-0.1.27 → beswarm-0.1.29}/beswarm/aient/src/aient/plugins/excute_command.py

@@ -39,8 +39,12 @@ def excute_command(command):
             stdout_log = result.stdout
         return f"执行命令成功:\n{stdout_log}"
     except subprocess.CalledProcessError as e:
+        if "pip install" in command:
+            stdout_log = "\n".join([x for x in e.stdout.split('\n') if '━━' not in x])
+        else:
+            stdout_log = e.stdout
         # 如果命令执行失败，返回错误信息和错误输出
-        return f"执行命令失败 (退出码 {e.returncode}):\n错误: {e.stderr}\n输出: {e.stdout}"
+        return f"执行命令失败 (退出码 {e.returncode}):\n错误: {e.stderr}\n输出: {stdout_log}"
     except Exception as e:
         return f"执行命令时发生异常: {e}"
 

{beswarm-0.1.27 → beswarm-0.1.29}/beswarm.egg-info/PKG-INFO

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

{beswarm-0.1.27 → beswarm-0.1.29}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "beswarm"
-version = "0.1.27"
+version = "0.1.29"
 description = "MAS"
 readme = "README.md"
 requires-python = ">=3.11"