beswarm 0.2.8__py3-none-any.whl → 0.2.10__py3-none-any.whl

beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.1.41",
+    version="1.1.42",
     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

@@ -239,15 +239,17 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
         if m:
             try:
                 val = int(m.group(1))
-                if val < 0:
-                    val = 0
-                elif val > 32768 and "gemini-2.5-pro" in original_model:
+                if val > 32768 and "gemini-2.5-pro" in original_model:
                     val = 32768
                 elif val < 128 and "gemini-2.5-pro" in original_model:
                     val = 128
+                elif val <= 0:
+                    val = 0
                 elif val > 24576:
                     val = 24576
                 payload["generationConfig"]["thinkingConfig"]["thinkingBudget"] = val
+                if val == 0:
+                    payload["generationConfig"].pop("thinkingConfig", None)
             except ValueError:
                 # 如果转换为整数失败，忽略思考预算设置
                 pass
@@ -535,15 +537,17 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
         if m:
             try:
                 val = int(m.group(1))
-                if val < 0:
-                    val = 0
-                elif val > 32768 and "gemini-2.5-pro" in original_model:
+                if val > 32768 and "gemini-2.5-pro" in original_model:
                     val = 32768
                 elif val < 128 and "gemini-2.5-pro" in original_model:
                     val = 128
+                elif val <= 0:
+                    val = 0
                 elif val > 24576:
                     val = 24576
                 payload["generationConfig"]["thinkingConfig"]["thinkingBudget"] = val
+                if val == 0:
+                    payload["generationConfig"].pop("thinkingConfig", None)
             except ValueError:
                 # 如果转换为整数失败，忽略思考预算设置
                 pass

beswarm/tools/worker.py

@@ -15,6 +15,8 @@ from ..bemcp.bemcp import MCPClient, convert_tool_format, MCPManager
 
 manager = MCPManager()
 
+DEBUG = os.getenv("DEBUG", "false").lower() in ("true", "1", "t", "yes")
+
 @register_tool()
 async def worker(goal, tools, work_dir, cache_messages=None):
     """
@@ -32,6 +34,13 @@ async def worker(goal, tools, work_dir, cache_messages=None):
     Returns:
         str: 当任务成功完成时，返回字符串 "任务已完成"。
     """
+    if DEBUG:
+        import sys
+        log_file = open(Path(work_dir) / ".beswarm" / "history.log", "a")
+        log_file.write(f"========== {datetime.now().strftime('%Y-%m-%d %H:%M:%S')} ==========\n")
+        sys.stdout = log_file
+        sys.stderr = log_file
+
     start_time = datetime.now()
     os.chdir(Path(work_dir).absolute())
     finish_flag = 0
@@ -93,7 +102,7 @@ async def worker(goal, tools, work_dir, cache_messages=None):
         "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, current_time=datetime.now().strftime("%Y-%m-%d %H:%M:%S")),
-        "print_log": False,
+        "print_log": DEBUG,
         # "max_tokens": 4000,
         "temperature": 0.7,
         "use_plugins": False,
@@ -164,8 +173,6 @@ async def worker(goal, tools, work_dir, cache_messages=None):
                 raise Exception(f"The request body is too long, please try again.")
             if "任务已完成" == next_instruction.strip():
                 break
-            if "<instructions>" in next_instruction and "</instructions>" not in next_instruction:
-                next_instruction = next_instruction + "\n</instructions>"
             last_instruction = next_instruction
             next_instruction = extract_xml_content(next_instruction, "instructions")
             if not next_instruction:
@@ -227,6 +234,13 @@ async def worker(goal, tools, work_dir, cache_messages=None):
     return "任务已完成"
 
 async def worker_gen(goal, tools, work_dir, cache_messages=None):
+    if DEBUG:
+        import sys
+        log_file = open(Path(work_dir) / ".beswarm" / "history.log", "a")
+        log_file.write(f"========== {datetime.now().strftime('%Y-%m-%d %H:%M:%S')} ==========\n")
+        sys.stdout = log_file
+        sys.stderr = log_file
+
     start_time = datetime.now()
     os.chdir(Path(work_dir).absolute())
     finish_flag = 0
@@ -288,7 +302,7 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
         "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, current_time=datetime.now().strftime("%Y-%m-%d %H:%M:%S")),
-        "print_log": False,
+        "print_log": DEBUG,
         # "max_tokens": 4000,
         "temperature": 0.7,
         "use_plugins": False,
@@ -359,8 +373,6 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
                 raise Exception(f"The request body is too long, please try again.")
             if "任务已完成" == next_instruction.strip():
                 break
-            if "<instructions>" in next_instruction and "</instructions>" not in next_instruction:
-                next_instruction = next_instruction + "\n</instructions>"
             last_instruction = next_instruction
             next_instruction = extract_xml_content(next_instruction, "instructions")
             if not next_instruction:

{beswarm-0.2.8.dist-info → beswarm-0.2.10.dist-info}/METADATA

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

{beswarm-0.2.8.dist-info → beswarm-0.2.10.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=lttzm-VPC3ghnT8qQ8poVNP7evb0cTY1MnsWEBlmLKw,487
+beswarm/aient/setup.py,sha256=PO_a2y7aRPqyKvXJymiVfsJG0WjVV5HlFvFR3zPPiN8,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=1iY-GUgbGCt0gXpO91QDEERIfkptI_anCHg9ElDvVVc,71765
+beswarm/aient/src/aient/core/request.py,sha256=E2fujOgR8Jxl9kWVZcs7ylz9vftwIye3cbL6HgC-Gn4,71977
 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
@@ -133,8 +133,8 @@ beswarm/tools/repomap.py,sha256=YsTPq5MXfn_Ds5begcvHDnY_Xp2d4jH-xmWqNMHnNHY,4523
 beswarm/tools/screenshot.py,sha256=u6t8FCgW5YHJ_Oc4coo8e0F3wTusWE_-H8dFh1rBq9Q,1011
 beswarm/tools/search_arxiv.py,sha256=GpuIOYX8T0iRC-X-hmuR9AUJVn15WWZq864DaoC7BUc,8004
 beswarm/tools/search_web.py,sha256=w0T0aCqOVlb6Of5hn_TtpnrGXo6bMtw2aKZdkrYjycI,12069
-beswarm/tools/worker.py,sha256=oLsg-WO99sScDE1xZBGiQOPLdK71SDPIdrsSoLot_Ro,22659
-beswarm-0.2.8.dist-info/METADATA,sha256=WCzNnkiSx_cEljs8fKxBd7nvHybrzOyW_IiOggtPLG8,3846
-beswarm-0.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.8.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.8.dist-info/RECORD,,
+beswarm/tools/worker.py,sha256=iWhqema9bmn5dSDYqE1tKZ7HMCSZKYxUEklAQhc_Ow4,22919
+beswarm-0.2.10.dist-info/METADATA,sha256=EjUnjz_W9CzDce_JCxVObIQJdln9MD46XbOFVFECP3c,3847
+beswarm-0.2.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.10.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.10.dist-info/RECORD,,