beswarm 0.1.31__tar.gz → 0.1.33__tar.gz

{beswarm-0.1.31 → beswarm-0.1.33}/PKG-INFO

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

{beswarm-0.1.31 → beswarm-0.1.33}/beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.0.90",
+    version="1.0.92",
     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.31 → beswarm-0.1.33}/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 → beswarm-0.1.33}/beswarm/aient/src/aient/prompt/agent.py

@@ -131,6 +131,8 @@ instruction_system_prompt = """
 你的工作目录为：{workspace_path}，请在指令中使用绝对路径。所有操作必须基于工作目录。
 禁止在工作目录之外进行任何操作。你当前运行目录不一定就是工作目录。禁止默认你当前就在工作目录。
 
+当前时间：{current_time}
+
 你的输出必须符合以下步骤：
 
 1. 首先分析当前对话历史。其中user就是你发送给工作智能体的指令。assistant就是工作智能体的回复。

{beswarm-0.1.31 → beswarm-0.1.33}/beswarm/tools/worker.py

@@ -1,6 +1,7 @@
 import os
 import copy
 import platform
+from datetime import datetime
 from ..aient.src.aient.plugins import register_tool
 
 from ..aient.src.aient.models import chatgpt
@@ -52,7 +53,7 @@ async def worker(goal, tools, work_dir, cache_messages=None):
         "api_key": os.getenv("API_KEY"),
         "api_url": os.getenv("BASE_URL"),
         "engine": os.getenv("MODEL"),
-        "system_prompt": instruction_system_prompt.format(os_version=platform.platform(), tools_list=tools_json, workspace_path=work_dir),
+        "system_prompt": instruction_system_prompt.format(os_version=platform.platform(), tools_list=tools_json, workspace_path=work_dir, current_time=datetime.now().strftime("%Y-%m-%d %H:%M:%S")),
         "print_log": False,
         # "max_tokens": 4000,
         "temperature": 0.7,

{beswarm-0.1.31 → beswarm-0.1.33}/beswarm.egg-info/PKG-INFO

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

{beswarm-0.1.31 → beswarm-0.1.33}/pyproject.toml

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