beswarm 0.2.15__tar.gz → 0.2.17__tar.gz

{beswarm-0.2.15 → beswarm-0.2.17}/PKG-INFO

@@ -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 → beswarm-0.2.17}/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-0.2.15 → beswarm-0.2.17}/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-0.2.15 → beswarm-0.2.17}/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-0.2.15 → beswarm-0.2.17}/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 → beswarm-0.2.17}/beswarm.egg-info/PKG-INFO

@@ -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 → beswarm-0.2.17}/pyproject.toml

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