beswarm 0.1.64__py3-none-any.whl → 0.1.66__py3-none-any.whl

beswarm/aient/setup.py

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

@@ -12,6 +12,7 @@ from .utils import (
     c35s,
     gemini1,
     gemini2,
+    gemini2_5_pro_exp,
     BaseAPI,
     safe_get,
     get_engine,
@@ -112,7 +113,7 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
     if system_prompt.strip():
         systemInstruction = {"parts": [{"text": system_prompt}]}
 
-    if any(off_model in original_model for off_model in gemini_max_token_65k_models) or original_model == "gemini-2.0-flash-preview-image-generation":
+    if any(off_model in original_model for off_model in gemini_max_token_65k_models) or original_model.endswith("-image-generation"):
         safety_settings = "OFF"
     else:
         safety_settings = "BLOCK_NONE"
@@ -167,6 +168,7 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
         'response_format',
         'stream_options',
         'prompt',
+        'size',
     ]
     generation_config = {}
 
@@ -221,7 +223,7 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
         else:
             payload["generationConfig"]["maxOutputTokens"] = 8192
 
-        if original_model == "gemini-2.0-flash-preview-image-generation":
+        if original_model.endswith("-image-generation"):
             payload["generationConfig"]["response_modalities"] = [
                 "Text",
                 "Image",
@@ -336,10 +338,11 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
     pro_models = ["gemini-2.5", "gemini-2.0"]
     if any(pro_model in original_model for pro_model in pro_models):
         location = gemini2
-        # search_tool = {"googleSearch": {}}
     else:
         location = gemini1
-        # search_tool = {"googleSearchRetrieval": {}}
+
+    if "gemini-2.5-pro-exp-03-25" == original_model:
+        location = gemini2_5_pro_exp
 
     if "google-vertex-ai" in provider.get("base_url", ""):
         url = provider.get("base_url").rstrip('/') + "/v1/projects/{PROJECT_ID}/locations/{LOCATION}/publishers/google/models/{MODEL_ID}:{stream}".format(
@@ -351,6 +354,13 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
     elif api_key is not None and api_key[2] == ".":
         url = f"https://aiplatform.googleapis.com/v1/publishers/google/models/{original_model}:{gemini_stream}?key={api_key}"
         headers.pop("Authorization", None)
+    elif "gemini-2.5-pro-exp-03-25" == original_model:
+        url = "https://aiplatform.googleapis.com/v1/projects/{PROJECT_ID}/locations/{LOCATION}/publishers/google/models/{MODEL_ID}:{stream}".format(
+            LOCATION=await location.next(),
+            PROJECT_ID=project_id,
+            MODEL_ID=original_model,
+            stream=gemini_stream
+        )
     else:
         url = "https://{LOCATION}-aiplatform.googleapis.com/v1/projects/{PROJECT_ID}/locations/{LOCATION}/publishers/google/models/{MODEL_ID}:{stream}".format(
             LOCATION=await location.next(),
@@ -464,6 +474,8 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
         'logprobs',
         'top_logprobs',
         'stream_options',
+        'prompt',
+        'size',
     ]
     generation_config = {}
 

beswarm/aient/src/aient/core/utils.py

@@ -437,6 +437,7 @@ c3o = ThreadSafeCircularList(["us-east5"])
 c3h = ThreadSafeCircularList(["us-east5", "us-central1", "europe-west1", "europe-west4"])
 gemini1 = ThreadSafeCircularList(["us-central1", "us-east4", "us-west1", "us-west4", "europe-west1", "europe-west2"])
 gemini2 = ThreadSafeCircularList(["us-central1"])
+gemini2_5_pro_exp = ThreadSafeCircularList(["global"])
 
 
 

beswarm/aient/src/aient/plugins/excute_command.py

@@ -185,6 +185,9 @@ def excute_command(command):
                 # print(f"is_same: {is_same}", flush=True)
                 # print(f"\n\n\n", flush=True)
                 new_output_lines.append(line)
+        # 限制输出行数
+        if len(new_output_lines) > 500:
+            new_output_lines = new_output_lines[:250] + new_output_lines[-250:]
         final_output_log = "\n".join(new_output_lines)
         # print(f"output_lines: {len(new_output_lines)}")
 

beswarm/tools/__init__.py

@@ -1,6 +1,7 @@
 from .think import think
 from .edit_file import edit_file
 from .worker import worker, worker_gen
+from .screenshot import save_screenshot_to_file
 
 from .search_arxiv import search_arxiv
 from .repomap import get_code_repo_map
@@ -45,4 +46,5 @@ __all__ = [
     "scroll_screen",
     "register_tool",
     "search_web",
+    "save_screenshot_to_file",
 ]

beswarm/tools/screenshot.py

@@ -0,0 +1,34 @@
+from ..aient.src.aient.plugins import register_tool
+
+@register_tool()
+def save_screenshot_to_file(save_path):
+    """
+    截取当前屏幕并保存到指定路径
+
+    参数:
+        save_path: 截图保存的完整路径，包括文件名和扩展名
+
+    返回:
+        成功返回True，失败返回False
+    """
+    try:
+        import os
+        import pyautogui
+
+        # 确保目标目录存在
+        save_dir = os.path.dirname(save_path)
+        if save_dir and not os.path.exists(save_dir):
+            os.makedirs(save_dir)
+
+        # 截取屏幕
+        screenshot = pyautogui.screenshot()
+        img_width, img_height = pyautogui.size()
+
+        # 保存截图到指定路径
+        screenshot.save(save_path)
+        return f"截图成功保存，尺寸: {img_width}x{img_height}，保存路径: {save_path}"
+
+    except ImportError:
+        return "请安装所需库: pip install Pillow pyautogui"
+    except Exception as e:
+        return f"截取屏幕或保存图像时出错: {e}"

{beswarm-0.1.64.dist-info → beswarm-0.1.66.dist-info}/METADATA

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

{beswarm-0.1.64.dist-info → beswarm-0.1.66.dist-info}/RECORD

@@ -1,14 +1,14 @@
 beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/utils.py,sha256=Z2Kuus2BLp9EHUC2ZNL9iUsb6NWnPj-MTA7SYzGyg24,1755
 beswarm/aient/main.py,sha256=SiYAIgQlLJqYusnTVEJOx1WNkSJKMImhgn5aWjfroxg,3814
-beswarm/aient/setup.py,sha256=JlsLhJIFkt5a7CI_6K2Uu4M6-UXf84s3w3Qi1fr7UJ4,487
+beswarm/aient/setup.py,sha256=I9hZR__BG1kFGAzLuA1xI53W0hbWOB-iRslbHO9wZuU,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=kF-HLi1I2k_G5r153ZHuiGH8_NmpTlFMfK0_myB28YQ,7366
-beswarm/aient/src/aient/core/request.py,sha256=nvF_V71svezQ0-UbnC9RB_pXo_wV6QC7WE_SANwQzxE,66195
+beswarm/aient/src/aient/core/request.py,sha256=qKj_w9UpXZePCGhhMuE-rX7rCPUdCx8GJ-HUXiurBho,66589
 beswarm/aient/src/aient/core/response.py,sha256=YphzhA9jtQKzWb3L4XGTp9xJZ2FOzHr1aAMTsi896FQ,33201
-beswarm/aient/src/aient/core/utils.py,sha256=VQ9uutGRR_JOvECOrjeoRBO2aA6w-pGwoXnnS2UvfPU,27263
+beswarm/aient/src/aient/core/utils.py,sha256=zidsBUBd3KskzcxQcPB1y5x1RhtWcbZeWvmgb4LAadA,27318
 beswarm/aient/src/aient/core/test/test_base_api.py,sha256=pWnycRJbuPSXKKU9AQjWrMAX1wiLC_014Qc9hh5C2Pw,524
 beswarm/aient/src/aient/core/test/test_geminimask.py,sha256=HFX8jDbNg_FjjgPNxfYaR-0-roUrOO-ND-FVsuxSoiw,13254
 beswarm/aient/src/aient/core/test/test_image.py,sha256=_T4peNGdXKBHHxyQNx12u-NTyFE8TlYI6NvvagsG2LE,319
@@ -25,7 +25,7 @@ beswarm/aient/src/aient/models/vertex.py,sha256=qVD5l1Q538xXUPulxG4nmDjXE1VoV4yu
 beswarm/aient/src/aient/plugins/__init__.py,sha256=p3KO6Aa3Lupos4i2SjzLQw1hzQTigOAfEHngsldrsyk,986
 beswarm/aient/src/aient/plugins/arXiv.py,sha256=yHjb6PS3GUWazpOYRMKMzghKJlxnZ5TX8z9F6UtUVow,1461
 beswarm/aient/src/aient/plugins/config.py,sha256=Vp6CG9ocdC_FAlCMEGtKj45xamir76DFxdJVvURNtog,6539
-beswarm/aient/src/aient/plugins/excute_command.py,sha256=huQSbNbeImV8BUIsQKE13BIhCAMr7aYRyXO4saE1dTI,10534
+beswarm/aient/src/aient/plugins/excute_command.py,sha256=9t7RB8ikltZZRv8NcjoxfaD8FkPuWbJTZ2Vwk7hEwTA,10683
 beswarm/aient/src/aient/plugins/get_time.py,sha256=Ih5XIW5SDAIhrZ9W4Qe5Hs1k4ieKPUc_LAd6ySNyqZk,654
 beswarm/aient/src/aient/plugins/image.py,sha256=ZElCIaZznE06TN9xW3DrSukS7U3A5_cjk1Jge4NzPxw,2072
 beswarm/aient/src/aient/plugins/list_directory.py,sha256=JZVuImecMSfEv6jLqii-0uQJ1UCsrpMNmYlwW3PEDg4,1374
@@ -119,16 +119,17 @@ beswarm/queries/tree-sitter-languages/ruby-tags.scm,sha256=vIidsCeE2A0vdFN18yXKq
 beswarm/queries/tree-sitter-languages/rust-tags.scm,sha256=9ljM1nzhfPs_ZTRw7cr2P9ToOyhGcKkCoN4_HPXSWi4,1451
 beswarm/queries/tree-sitter-languages/scala-tags.scm,sha256=UxQjz80JIrrJ7Pm56uUnQyThfmQNvwk7aQzPNypB-Ao,1761
 beswarm/queries/tree-sitter-languages/typescript-tags.scm,sha256=OMdCeedPiA24ky82DpgTMKXK_l2ySTuF2zrQ2fJAi9E,1253
-beswarm/tools/__init__.py,sha256=1th0OE6oC_bC1_30XSegaIQ12clFXUqVre4vojfluZ4,1071
+beswarm/tools/__init__.py,sha256=IJExt6D58d2yxBOjHVC6wYGhV7Pb7okmX61RvyqSCSY,1150
 beswarm/tools/click.py,sha256=TygaekCXTmU3fIu6Uom7ZcyzEgYMlCC_GX-5SmWHuLI,20762
 beswarm/tools/edit_file.py,sha256=xlAD0HB_xM0yZYc0eJwLE-9mAkywXa2UQPNHzG1OaW4,7664
 beswarm/tools/planner.py,sha256=lguBCS6kpwNPoXQvqH-WySabVubT82iyWOkJnjt6dXw,1265
 beswarm/tools/repomap.py,sha256=N09K0UgwjCN7Zjg_5TYlVsulp3n2fztYlS8twalChU8,45003
+beswarm/tools/screenshot.py,sha256=u6t8FCgW5YHJ_Oc4coo8e0F3wTusWE_-H8dFh1rBq9Q,1011
 beswarm/tools/search_arxiv.py,sha256=9slwBemXjEqrd7-YgVmyMijPXlkhZCybEDRVhWVQ9B0,7937
 beswarm/tools/search_web.py,sha256=B24amOnGHnmdV_6S8bw8O2PdhZRRIDtJjg-wXcfP7dQ,11859
 beswarm/tools/think.py,sha256=WLw-7jNIsnS6n8MMSYUin_f-BGLENFmnKM2LISEp0co,1760
 beswarm/tools/worker.py,sha256=bZwMGUS4wt4yOleb2kKu0rCLHIJgPcokbCmh9bGMzXA,12679
-beswarm-0.1.64.dist-info/METADATA,sha256=KnWiUh0orLTMVypQqxxo-enfguZLdIWhVvJWCRj0tfE,3553
-beswarm-0.1.64.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.1.64.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.1.64.dist-info/RECORD,,
+beswarm-0.1.66.dist-info/METADATA,sha256=u1H0kHybNKYYajE6OJxivCH1-E1i-Izep8iz5Kt7M9A,3553
+beswarm-0.1.66.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.1.66.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.1.66.dist-info/RECORD,,