beswarm 0.1.63__tar.gz → 0.1.65__tar.gz

{beswarm-0.1.63 → beswarm-0.1.65}/PKG-INFO

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

{beswarm-0.1.63 → beswarm-0.1.65}/beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.1.17",
+    version="1.1.18",
     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.63 → beswarm-0.1.65}/beswarm/aient/src/aient/core/response.py

@@ -54,8 +54,6 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model):
                 if line and '\"finishReason\": \"' in line:
                     if "stop" not in line.lower():
                         logger.error(f"finishReason: {line}")
-                    sse_string = await generate_sse_response(timestamp, model, stop="stop")
-                    yield sse_string
                     is_finish = True
                 if is_finish and '\"promptTokenCount\": ' in line:
                     json_data = parse_json_safely( "{" + line + "}")
@@ -117,6 +115,9 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model):
             sse_string = await generate_sse_response(timestamp, model, content=None, tools_id="chatcmpl-9inWv0yEtgn873CxMBzHeCeiHctTV", function_call_name=None, function_call_content=function_full_response)
             yield sse_string
 
+        sse_string = await generate_sse_response(timestamp, model, stop="stop")
+        yield sse_string
+
         sse_string = await generate_sse_response(timestamp, model, None, None, None, None, None, totalTokenCount, promptTokenCount, candidatesTokenCount)
         yield sse_string
 

{beswarm-0.1.63 → beswarm-0.1.65}/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-0.1.63 → beswarm-0.1.65}/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-0.1.65/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.63 → beswarm-0.1.65}/beswarm/tools/worker.py

@@ -99,8 +99,10 @@ async def worker(goal, tools, work_dir, cache_messages=None):
                     extracted_content = f"<latest_file_content>{match.group(1)}</latest_file_content>\n\n"
                 else:
                     extracted_content = ""
-
-                conversation_history[0]["content"] = extracted_content + conversation_history[0]["content"]
+                if isinstance(conversation_history[0]["content"], str):
+                    conversation_history[0]["content"] = extracted_content + conversation_history[0]["content"]
+                elif isinstance(conversation_history[0]["content"], list) and extracted_content:
+                    conversation_history[0]["content"].append({"type": "text", "text": extracted_content})
 
             instruction_agent.conversation["default"][1:] = conversation_history
             if "find_and_click_element" in str(tools_json):
@@ -221,7 +223,10 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
                 else:
                     extracted_content = ""
 
-                conversation_history[0]["content"] = extracted_content + conversation_history[0]["content"]
+                if isinstance(conversation_history[0]["content"], str):
+                    conversation_history[0]["content"] = extracted_content + conversation_history[0]["content"]
+                elif isinstance(conversation_history[0]["content"], list) and extracted_content:
+                    conversation_history[0]["content"].append({"type": "text", "text": extracted_content})
 
             instruction_agent.conversation["default"][1:] = conversation_history
             if "find_and_click_element" in str(tools_json):

{beswarm-0.1.63 → beswarm-0.1.65}/beswarm.egg-info/PKG-INFO

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

{beswarm-0.1.63 → beswarm-0.1.65}/beswarm.egg-info/SOURCES.txt

@@ -132,6 +132,7 @@ beswarm/tools/click.py
 beswarm/tools/edit_file.py
 beswarm/tools/planner.py
 beswarm/tools/repomap.py
+beswarm/tools/screenshot.py
 beswarm/tools/search_arxiv.py
 beswarm/tools/search_web.py
 beswarm/tools/think.py

{beswarm-0.1.63 → beswarm-0.1.65}/pyproject.toml

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