beswarm 0.1.40__py3-none-any.whl → 0.1.42__py3-none-any.whl

beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.0.96",
+    version="1.0.97",
     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/models/chatgpt.py

@@ -150,8 +150,12 @@ class chatgpt(BaseLLM):
                     })
                 self.conversation[convo_id].append({"role": role, "tool_call_id": function_call_id, "content": message})
             else:
-                self.conversation[convo_id].append({"role": "assistant", "content": convert_functions_to_xml(function_arguments)})
-                self.conversation[convo_id].append({"role": "user", "content": message})
+                last_user_message = self.conversation[convo_id][-1]["content"]
+                if last_user_message != message:
+                    self.conversation[convo_id].append({"role": "assistant", "content": convert_functions_to_xml(function_arguments)})
+                    self.conversation[convo_id].append({"role": "user", "content": message})
+                else:
+                    self.conversation[convo_id].append({"role": "assistant", "content": "我已经执行过这个工具了，接下来我需要做什么？"})
 
         else:
             print('\033[31m')
@@ -430,6 +434,7 @@ class chatgpt(BaseLLM):
             response_role = "assistant"
 
         if self.use_plugins == True:
+            full_response = full_response.replace("<tool_code>", "").replace("</tool_code>", "")
             function_parameter = parse_function_xml(full_response)
             if function_parameter:
                 invalid_tools = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") not in self.plugins.keys()]

beswarm/tools/click.py

@@ -4,7 +4,6 @@ import re
 import json
 import time
 import base64
-import pyautogui     # 用于桌面屏幕点击
 import pyperclip # 新增：用于操作剪贴板
 import platform  # 新增：用于检测操作系统
 from PIL import Image, ImageDraw
@@ -228,6 +227,7 @@ Returns:
 
     print("正在截取当前屏幕...")
     try:
+        import pyautogui
         # 使用 pyautogui 截取屏幕，返回 PIL Image 对象
         screenshot = pyautogui.screenshot()
         # img_width, img_height = screenshot.size # 获取截图尺寸
@@ -425,6 +425,7 @@ async def scroll_screen(direction: str = "down"):
         return error_msg
 
     try:
+        import pyautogui
         pyautogui.scroll(actual_scroll_amount)
         success_msg = f"✅ 屏幕向 {direction} 滑动 {scroll_offset} 成功。"
         print(success_msg)

{beswarm-0.1.40.dist-info → beswarm-0.1.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beswarm
-Version: 0.1.40
+Version: 0.1.42
 Summary: MAS
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -70,6 +70,7 @@ cd ~/Downloads/GitHub/beswarm && docker run --rm \
 
 ```
 docker run --gpus all -it --rm --entrypoint nvidia-smi yym68686/beswarm
+docker run -it --rm --entrypoint "cat /app/beswarm/aient/src/aient/models/chatgpt.py" yym68686/beswarm
 ```
 
 服务器安装
@@ -80,6 +81,10 @@ pipx ensurepath
 source ~/.bashrc
 pipx install nvitop
 pip install beswarm -i https://pypi.tuna.tsinghua.edu.cn/simple
+
+# 升级 从海外官方 pypi 升级
+pip install --upgrade beswarm -i https://pypi.org/simple
+pip install --upgrade beswarm -i https://pypi.tuna.tsinghua.edu.cn/simple
 ```
 
 main.py

{beswarm-0.1.40.dist-info → beswarm-0.1.42.dist-info}/RECORD

@@ -1,7 +1,7 @@
 beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/utils.py,sha256=AdDCcqAIIKQEMl7PfryVgeT9G5sHe7QNsZnrvmTGA8E,283
 beswarm/aient/main.py,sha256=SiYAIgQlLJqYusnTVEJOx1WNkSJKMImhgn5aWjfroxg,3814
-beswarm/aient/setup.py,sha256=IcqLy7EXcsJbtM5EymvKIR3F7hTIMy7xaDKTSxm039U,487
+beswarm/aient/setup.py,sha256=mPMhSd_IIo8xa60gzJPl4D3S4bSr5JbDsDnW9OOWSes,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
@@ -16,7 +16,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=-NWkkKxTCyraPYT0YN37NA2rUfOaDNXtvFSQmIE5tS8,45066
+beswarm/aient/src/aient/models/chatgpt.py,sha256=q8dx4PD57m4a3gJHrzJr7v_Pl8X0RKDBCZHZEtIMxkk,45480
 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
@@ -120,14 +120,14 @@ beswarm/queries/tree-sitter-languages/scala-tags.scm,sha256=UxQjz80JIrrJ7Pm56uUn
 beswarm/queries/tree-sitter-languages/typescript-tags.scm,sha256=OMdCeedPiA24ky82DpgTMKXK_l2ySTuF2zrQ2fJAi9E,1253
 beswarm/tools/UIworker.py,sha256=YRrzW5GxWqA-tcmmm2c6mMbkVI0kHIqosIUz-GcoQOQ,6339
 beswarm/tools/__init__.py,sha256=-h_zoMEjnLCg9iVgSoor9BI3yK64LdVOQkVB0DgGFmo,1001
-beswarm/tools/click.py,sha256=vjCN6_00xJw-dcMZEv9sneTBmuKI7lFN4xApZZizd5k,20760
+beswarm/tools/click.py,sha256=TygaekCXTmU3fIu6Uom7ZcyzEgYMlCC_GX-5SmWHuLI,20762
 beswarm/tools/edit_file.py,sha256=qKOVanfh_79eavRrqqyFirRo07sZ897jUL2PD4GRKJk,6965
 beswarm/tools/planner.py,sha256=lguBCS6kpwNPoXQvqH-WySabVubT82iyWOkJnjt6dXw,1265
 beswarm/tools/repomap.py,sha256=CwvwoN5Swr42EzrORTTeV8MMb7mPviy4a4b0fxBu50k,40828
 beswarm/tools/search_arxiv.py,sha256=9slwBemXjEqrd7-YgVmyMijPXlkhZCybEDRVhWVQ9B0,7937
 beswarm/tools/think.py,sha256=WLw-7jNIsnS6n8MMSYUin_f-BGLENFmnKM2LISEp0co,1760
 beswarm/tools/worker.py,sha256=FfKCx7KFNbMRoAXtjU1_nJQjx9WHny7KBq8OXSYICJs,5334
-beswarm-0.1.40.dist-info/METADATA,sha256=X_HTASX4oiHvwNfH7eBT0OwNWTY9DOwX84IfE6t2bOw,3150
-beswarm-0.1.40.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-beswarm-0.1.40.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.1.40.dist-info/RECORD,,
+beswarm-0.1.42.dist-info/METADATA,sha256=Oy803Y6RWyApm2aDx7sU_pQxx548uDRF0zvsuHWXLnw,3422
+beswarm-0.1.42.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+beswarm-0.1.42.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.1.42.dist-info/RECORD,,

{beswarm-0.1.40.dist-info → beswarm-0.1.42.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any