beswarm 0.1.40__tar.gz → 0.1.42__tar.gz

{beswarm-0.1.40 → beswarm-0.1.42}/PKG-INFO

@@ -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 → beswarm-0.1.42}/README.md

@@ -42,6 +42,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
 ```
 
 服务器安装
@@ -52,6 +53,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 → beswarm-0.1.42}/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-0.1.40 → beswarm-0.1.42}/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-0.1.40 → beswarm-0.1.42}/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 → beswarm-0.1.42}/beswarm.egg-info/PKG-INFO

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

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