beswarm 0.2.15__py3-none-any.whl → 0.2.17__py3-none-any.whl

beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.1.43",
+    version="1.1.44",
     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/core/request.py

@@ -182,9 +182,15 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
                 processed_tools = []
                 for tool in value:
                     function_def = tool["function"]
+                    # gemini不支持parameters里面的additionalProperties字段，需要删除
+                    if safe_get(function_def, "parameters", "additionalProperties", default=None) is not None:
+                        del function_def["parameters"]["additionalProperties"]
+
                     # 处理 parameters.properties 中的 default 字段
                     if safe_get(function_def, "parameters", "properties", default=None):
                         for prop_value in function_def["parameters"]["properties"].values():
+                            if "additionalProperties" in prop_value:
+                                del prop_value["additionalProperties"]
                             if "default" in prop_value:
                                 # 将 default 值添加到 description 中
                                 default_value = prop_value["default"]

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

@@ -570,6 +570,9 @@ class chatgpt(BaseLLM):
                 elif tool_name == "read_image" and "<tool_error>" not in tool_response:
                     tool_info["base64_image"] = tool_response
                     all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\nRead image successfully!")
+                elif tool_response.startswith("data:image/") and ";base64," in tool_response and "<tool_error>" not in tool_response:
+                    tool_info["base64_image"] = tool_response
+                    all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\nRead image successfully!")
                 else:
                     all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\n{tool_response}")
 

beswarm/tools/worker.py

@@ -46,9 +46,15 @@ async def worker(goal, tools, work_dir, cache_messages=None):
     Returns:
         str: 当任务成功完成时，返回字符串 "任务已完成"。
     """
+    cache_dir = Path(work_dir) / ".beswarm"
+    cache_dir.mkdir(exist_ok=True)
+    cache_file = cache_dir / "work_agent_conversation_history.json"
+    if not cache_file.exists():
+        cache_file.write_text("[]", encoding="utf-8")
+
     DEBUG = os.getenv("DEBUG", "false").lower() in ("true", "1", "t", "yes")
     if DEBUG:
-        log_file = open(Path(work_dir) / ".beswarm" / "history.log", "a", encoding="utf-8")
+        log_file = open(cache_dir / "history.log", "a", encoding="utf-8")
         log_file.write(f"========== {datetime.now().strftime('%Y-%m-%d %H:%M:%S')} ==========\n")
         original_stdout = sys.stdout
         original_stderr = sys.stderr
@@ -94,11 +100,7 @@ async def worker(goal, tools, work_dir, cache_messages=None):
     }
     if cache_messages:
         if isinstance(cache_messages, bool) and cache_messages == True:
-            cache_messages = None
-            cache_file_path = Path(work_dir) / ".beswarm" / "work_agent_conversation_history.json"
-            if cache_file_path.exists():
-                with cache_file_path.open("r", encoding="utf-8") as f:
-                    cache_messages = json.load(f)
+            cache_messages = json.loads(cache_file.read_text(encoding="utf-8"))
         if cache_messages and isinstance(cache_messages, list) and len(cache_messages) > 1:
             old_goal = extract_xml_content(cache_messages[1]["content"], "goal")
             if old_goal.strip() != goal.strip():
@@ -144,11 +146,7 @@ async def worker(goal, tools, work_dir, cache_messages=None):
             instruction_agent = chatgpt(**instruction_agent_config)
             conversation_history = copy.deepcopy(work_agent.conversation["default"])
 
-            cache_dir = os.path.join(work_dir, ".beswarm")
-            os.makedirs(cache_dir, exist_ok=True)
-            cache_file = os.path.join(cache_dir, "work_agent_conversation_history.json")
-            with open(cache_file, "w", encoding="utf-8") as f:
-                f.write(json.dumps(conversation_history, ensure_ascii=False, indent=4))
+            cache_file.write_text(json.dumps(conversation_history, ensure_ascii=False, indent=4), encoding="utf-8")
 
             work_agent_system_prompt = conversation_history.pop(0)
             if conversation_history:
@@ -248,9 +246,15 @@ async def worker(goal, tools, work_dir, cache_messages=None):
     return "任务已完成"
 
 async def worker_gen(goal, tools, work_dir, cache_messages=None):
+    cache_dir = Path(work_dir) / ".beswarm"
+    cache_dir.mkdir(exist_ok=True)
+    cache_file = cache_dir / "work_agent_conversation_history.json"
+    if not cache_file.exists():
+        cache_file.write_text("[]", encoding="utf-8")
+
     DEBUG = os.getenv("DEBUG", "false").lower() in ("true", "1", "t", "yes")
     if DEBUG:
-        log_file = open(Path(work_dir) / ".beswarm" / "history.log", "a", encoding="utf-8")
+        log_file = open(cache_dir / "history.log", "a", encoding="utf-8")
         log_file.write(f"========== {datetime.now().strftime('%Y-%m-%d %H:%M:%S')} ==========\n")
         original_stdout = sys.stdout
         original_stderr = sys.stderr
@@ -296,11 +300,7 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
     }
     if cache_messages:
         if isinstance(cache_messages, bool) and cache_messages == True:
-            cache_messages = None
-            cache_file_path = Path(work_dir) / ".beswarm" / "work_agent_conversation_history.json"
-            if cache_file_path.exists():
-                with cache_file_path.open("r", encoding="utf-8") as f:
-                    cache_messages = json.load(f)
+            cache_messages = json.loads(cache_file.read_text(encoding="utf-8"))
         if cache_messages and isinstance(cache_messages, list) and len(cache_messages) > 1:
             old_goal = extract_xml_content(cache_messages[1]["content"], "goal")
             if old_goal.strip() != goal.strip():
@@ -346,11 +346,7 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
             instruction_agent = chatgpt(**instruction_agent_config)
             conversation_history = copy.deepcopy(work_agent.conversation["default"])
 
-            cache_dir = os.path.join(work_dir, ".beswarm")
-            os.makedirs(cache_dir, exist_ok=True)
-            cache_file = os.path.join(cache_dir, "work_agent_conversation_history.json")
-            with open(cache_file, "w", encoding="utf-8") as f:
-                f.write(json.dumps(conversation_history, ensure_ascii=False, indent=4))
+            cache_file.write_text(json.dumps(conversation_history, ensure_ascii=False, indent=4), encoding="utf-8")
 
             work_agent_system_prompt = conversation_history.pop(0)
             if conversation_history:

{beswarm-0.2.15.dist-info → beswarm-0.2.17.dist-info}/METADATA

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

{beswarm-0.2.15.dist-info → beswarm-0.2.17.dist-info}/RECORD

@@ -2,12 +2,12 @@ beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/prompt.py,sha256=_hYKZ0MUiMRs3C-1PMlFKIVgTKFcp_irla3p3wQNF3c,32015
 beswarm/utils.py,sha256=xxbNifOPlfcVkKmF_qFzuEnZgF3MQg3mnOfz1EF0Qss,6697
 beswarm/aient/main.py,sha256=SiYAIgQlLJqYusnTVEJOx1WNkSJKMImhgn5aWjfroxg,3814
-beswarm/aient/setup.py,sha256=vShB3V7TWjyMHa7t3MhAUa_HjBN66F95l8awqEh8oGE,487
+beswarm/aient/setup.py,sha256=G94zedNLlZ9Ys_8yft6otVsSzDN0k-iQ_x4VGTI-668,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
 beswarm/aient/src/aient/core/models.py,sha256=d4MISNezTSe0ls0-fjuToI2SoT-sk5fWqAJuKVinIlo,7502
-beswarm/aient/src/aient/core/request.py,sha256=E2fujOgR8Jxl9kWVZcs7ylz9vftwIye3cbL6HgC-Gn4,71977
+beswarm/aient/src/aient/core/request.py,sha256=90Mit0vrwoDJYQQVJmBltQdTnMaGKSmZNBMRXsoJ19A,72406
 beswarm/aient/src/aient/core/response.py,sha256=mAVsCnNhWY09DXNe0lyPUJq-1ljtGjC67Az-Uh7ozIw,35166
 beswarm/aient/src/aient/core/utils.py,sha256=NcXdb8zBN0GE01OGaUzg8U34RaraoFf2MaLDDGFvvC4,27492
 beswarm/aient/src/aient/core/test/test_base_api.py,sha256=pWnycRJbuPSXKKU9AQjWrMAX1wiLC_014Qc9hh5C2Pw,524
@@ -17,7 +17,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=MKCdstV_gTkcf_bT2mmQVDLgK5f4PUUfEO3_WHzahpE,46665
+beswarm/aient/src/aient/models/chatgpt.py,sha256=Yum3_-LgHmFUII0AljfNNfSc8gBhJzyPYAWZJyr4yFo,46969
 beswarm/aient/src/aient/models/claude.py,sha256=JezghW7y0brl4Y5qiSHvnYR5prQCFywX4RViHt39pGI,26037
 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
@@ -134,8 +134,8 @@ beswarm/tools/request_input.py,sha256=gXNAJPOJektMqxJVyzNTFOeMQ7xUkO-wWMYH-r2Rdw
 beswarm/tools/screenshot.py,sha256=u6t8FCgW5YHJ_Oc4coo8e0F3wTusWE_-H8dFh1rBq9Q,1011
 beswarm/tools/search_arxiv.py,sha256=caVIUOzMhFu-r_gVgJZrH2EO9xI5iV_qLAg0b3Ie9Xg,8095
 beswarm/tools/search_web.py,sha256=w0T0aCqOVlb6Of5hn_TtpnrGXo6bMtw2aKZdkrYjycI,12069
-beswarm/tools/worker.py,sha256=ZFgSe17Je9NJuITvojZ89uEk2p-pXWJIy9GHNvMDAVo,23491
-beswarm-0.2.15.dist-info/METADATA,sha256=KOHXgX4OetD6T6BzonJhlz0GZJHLX4_7FXi4tK1gyxI,3847
-beswarm-0.2.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.15.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.15.dist-info/RECORD,,
+beswarm/tools/worker.py,sha256=ywjD0TUVLzcrVQbVhQuNwtagca0sAuZwSjnKCVb3R6g,23027
+beswarm-0.2.17.dist-info/METADATA,sha256=PcWMP5H6J2h5o-EjQLL2ENjS4VCldPzrSvdTyghV_Ko,3847
+beswarm-0.2.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.17.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.17.dist-info/RECORD,,