beswarm 0.2.35__tar.gz → 0.2.37__tar.gz

{beswarm-0.2.35 → beswarm-0.2.37}/PKG-INFO

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

beswarm-0.2.37/beswarm/agents/planact.py

@@ -0,0 +1,339 @@
+import os
+import re
+import sys
+import copy
+import json
+import difflib
+import asyncio
+import platform
+from pathlib import Path
+from datetime import datetime
+from typing import List, Dict, Union
+
+from ..broker import MessageBroker
+from ..aient.src.aient.models import chatgpt
+from ..aient.src.aient.plugins import get_function_call_list, registry
+from ..prompt import worker_system_prompt, instruction_system_prompt
+from ..utils import extract_xml_content, get_current_screen_image_message, replace_xml_content, register_mcp_tools
+
+class BaseAgent:
+    """Base class for agents, handling common initialization and disposal."""
+    def __init__(self, goal: str, tools_json: List, agent_config: Dict, work_dir: str, cache_messages: Union[bool, List[Dict]], broker: MessageBroker, listen_topic: str, publish_topic: str, status_topic: str):
+        self.goal = goal
+        self.tools_json = tools_json
+        self.work_dir = work_dir
+        self.cache_file = Path(work_dir) / ".beswarm" / "work_agent_conversation_history.json"
+        self.config = agent_config
+        self.cache_messages = cache_messages
+        if cache_messages and isinstance(cache_messages, bool) and cache_messages == True:
+            self.cache_messages = json.loads(self.cache_file.read_text(encoding="utf-8"))
+        self.broker = broker
+        self.listen_topic = listen_topic
+        self.error_topic = listen_topic + ".error"
+        self.publish_topic = publish_topic
+        self.status_topic = status_topic
+        self._subscription = self.broker.subscribe(self.handle_message, [self.listen_topic, self.error_topic])
+
+    async def handle_message(self, message: Dict):
+        """Process incoming messages. Must be implemented by subclasses."""
+        raise NotImplementedError
+
+    def dispose(self):
+        """Cancels the subscription and cleans up resources."""
+        if self._subscription:
+            self._subscription.dispose()
+
+
+class InstructionAgent(BaseAgent):
+    """Generates instructions and publishes them to a message broker."""
+    def __init__(self, goal: str, tools_json: List, agent_config: Dict, work_dir: str, cache_messages: Union[bool, List[Dict]], broker: MessageBroker, listen_topic: str, publish_topic: str, status_topic: str):
+        super().__init__(goal, tools_json, agent_config, work_dir, cache_messages, broker, listen_topic, publish_topic, status_topic)
+
+        self.last_instruction = None
+        self.agent = chatgpt(**self.config)
+
+        self.goal_diff = None
+
+        if self.cache_messages and isinstance(self.cache_messages, list) and len(self.cache_messages) > 1:
+            old_goal = extract_xml_content(self.cache_messages[1]["content"], "goal")
+            if old_goal.strip() != goal.strip():
+                diff_generator = difflib.ndiff(old_goal.splitlines(), goal.splitlines())
+                changed_lines = []
+                for line in diff_generator:
+                    if (line.startswith('+ ') or line.startswith('- ')) and line[2:].strip():
+                        changed_lines.append(line)
+                self.goal_diff = '\n'.join(changed_lines).strip()
+
+    def get_conversation_history(self, conversation_history: List[Dict]):
+        conversation_history = copy.deepcopy(conversation_history)
+
+        self.cache_file.write_text(json.dumps(conversation_history, ensure_ascii=False, indent=4), encoding="utf-8")
+
+        work_agent_system_prompt = conversation_history.pop(0)
+        if conversation_history:
+            original_content = work_agent_system_prompt["content"]
+            regex = r"<latest_file_content>(.*?)</latest_file_content>"
+            match = re.search(regex, original_content, re.DOTALL)
+            if match:
+                extracted_content = f"<latest_file_content>{match.group(1)}</latest_file_content>\n\n"
+            else:
+                extracted_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})
+
+        return conversation_history
+
+    async def handle_message(self, message: Dict):
+        """Receives a worker response, generates the next instruction, and publishes it."""
+
+        if len(message["conversation"]) > 1 and message["conversation"][-2]["role"] == "user" \
+        and "<task_complete_message>" in message["conversation"][-2]["content"]:
+            task_complete_message = extract_xml_content(message["conversation"][-2]["content"], "task_complete_message")
+            self.broker.publish({"status": "finished", "result": task_complete_message}, self.status_topic)
+            return
+
+        instruction_prompt = "".join([
+                "</work_agent_conversation_end>\n\n",
+                f"任务目标: {self.goal}\n\n",
+                f"任务目标新变化：\n{self.goal_diff}\n\n" if self.goal_diff else "",
+                "在 tag <work_agent_conversation_start>...</work_agent_conversation_end> 之前的对话历史都是工作智能体的对话历史。\n\n",
+                "根据以上对话历史和目标，请生成下一步指令。如果任务已完成，指示工作智能体调用task_complete工具。\n\n",
+            ])
+        if self.last_instruction and 'fetch_gpt_response_stream HTTP Error' not in self.last_instruction:
+            instruction_prompt = (
+                f"{instruction_prompt}\n\n"
+                "你生成的指令格式错误，必须把给assistant的指令放在<instructions>...</instructions>标签内。请重新生成格式正确的指令。"
+                f"这是你上次给assistant的错误格式的指令：\n{self.last_instruction}"
+            )
+
+        self.agent.conversation["default"][1:] = self.get_conversation_history(message["conversation"])
+
+        if "find_and_click_element" in json.dumps(self.tools_json):
+            instruction_prompt = await get_current_screen_image_message(instruction_prompt)
+
+        raw_response = await self.agent.ask_async(instruction_prompt)
+
+        if "fetch_gpt_response_stream HTTP Error', 'status_code': 404" in raw_response:
+            raise Exception(f"Model: {self.config['engine']} not found!")
+        if "'status_code': 413" in raw_response or \
+        "'status_code': 400" in raw_response:
+            self.broker.publish({"status": "error", "result": raw_response}, self.status_topic)
+            return
+
+        self.broker.publish({"status": "new_message", "result": "\n🤖 指令智能体:\n" + raw_response}, self.status_topic)
+
+        self.last_instruction = raw_response
+        instruction = extract_xml_content(raw_response, "instructions")
+        if instruction:
+            if len(message["conversation"]) == 1:
+                instruction = (
+                    "任务描述：\n"
+                    f"<goal>{self.goal}</goal>\n\n"
+                    "你作为指令的**执行者**，而非任务的**规划师**，你必须严格遵循以下单步工作流程：\n"
+                    "**执行指令**\n"
+                    "   - **严格遵从：** 只执行我当前下达的明确指令。在我明确给出下一步指令前，绝不擅自行动或推测、执行任何未明确要求的后续步骤。\n"
+                    "   - **严禁越权：** 禁止执行任何我未指定的步骤。`<goal>` 标签中的内容仅为背景信息，不得据此进行任务规划或推测。\n"
+                    "**汇报结果**\n"
+                    "   - **聚焦单步：** 指令完成后，仅汇报该步骤的执行结果与产出。\n"
+                    "**暂停等待**\n"
+                    "   - **原地待命：** 汇报后，任务暂停。在收到我新的指令前，严禁发起任何新的工具调用或操作。\n"
+                    "   - **请求指令：** 回复的最后必须明确请求我提供下一步指令。\n"
+                    "**注意：** 禁止完成超出下面我未规定的步骤，`<goal>` 标签中的内容仅为背景信息。"
+                    "现在开始执行第一步：\n"
+                    f"{instruction}"
+                )
+            self.broker.publish({"instruction": instruction, "conversation": message["conversation"]}, self.publish_topic)
+        else:
+            print("\n❌ 指令智能体生成的指令不符合要求，正在重新生成。")
+            self.broker.publish(message, self.error_topic)
+
+
+class WorkerAgent(BaseAgent):
+    """Executes instructions and publishes results to a message broker."""
+    def __init__(self, goal: str, tools_json: List, agent_config: Dict, work_dir: str, cache_messages: Union[bool, List[Dict]], broker: MessageBroker, listen_topic: str, publish_topic: str, status_topic: str):
+        super().__init__(goal, tools_json, agent_config, work_dir, cache_messages, broker, listen_topic, publish_topic, status_topic)
+
+        if self.cache_messages and isinstance(self.cache_messages, list) and len(self.cache_messages) > 1:
+            first_user_message = replace_xml_content(self.cache_messages[1]["content"], "goal", goal)
+            self.config["cache_messages"] = self.cache_messages[0:1] + [{"role": "user", "content": first_user_message}] + self.cache_messages[2:]
+
+        self.agent = chatgpt(**self.config)
+
+    async def handle_message(self, message: Dict):
+        """Receives an instruction, executes it, and publishes the response."""
+
+        if message.get("instruction") == "Initial kickoff":
+            self.broker.publish({
+                "conversation": self.agent.conversation["default"]
+            }, self.publish_topic)
+            return
+
+        instruction = message["instruction"]
+        if "find_and_click_element" in json.dumps(self.tools_json):
+            instruction = await get_current_screen_image_message(instruction)
+        response = await self.agent.ask_async(instruction)
+
+        if response.strip() == '':
+            print("\n❌ 工作智能体回复为空，请重新生成指令。")
+            self.broker.publish(message, self.error_topic)
+        else:
+            self.broker.publish({"status": "new_message", "result": "\n✅ 工作智能体:\n" + response}, self.status_topic)
+            self.broker.publish({
+                "conversation": self.agent.conversation["default"]
+            }, self.publish_topic)
+
+class Tee:
+    def __init__(self, *files):
+        self.files = files
+
+    def write(self, obj):
+        for f in self.files:
+            f.write(obj)
+            f.flush()
+
+    def flush(self):
+        for f in self.files:
+            f.flush()
+
+class BrokerWorker:
+    """The 'glue' class that orchestrates agents via a MessageBroker."""
+    def __init__(self, goal: str, tools: List[Union[str, Dict]], work_dir: str, cache_messages: Union[bool, List[Dict]] = None, broker = None, mcp_manager = None, task_manager = None):
+        self.goal = goal
+        self.tools = tools
+        self.work_dir = Path(work_dir)
+        self.cache_messages = cache_messages
+
+        self.broker = broker
+        self.mcp_manager = mcp_manager
+        self.task_manager = task_manager
+        self.task_completion_event = asyncio.Event()
+        self.final_result = None
+        self._status_subscription = None
+        self.setup()
+
+        self.channel = self.broker.request_channel()
+        self.INSTRUCTION_TOPIC = self.channel + ".instructions"
+        self.WORKER_RESPONSE_TOPIC = self.channel + ".worker_responses"
+        self.TASK_STATUS_TOPIC =self.channel +  ".task_status"
+
+    def setup(self):
+        cache_dir = self.work_dir / ".beswarm"
+        cache_dir.mkdir(parents=True, exist_ok=True)
+        self.task_manager.set_root_path(self.work_dir)
+        self.cache_file = cache_dir / "work_agent_conversation_history.json"
+        if not self.cache_file.exists():
+            self.cache_file.write_text("[]", encoding="utf-8")
+
+        DEBUG = os.getenv("DEBUG", "false").lower() in ("true", "1", "t", "yes")
+        if DEBUG:
+            log_file = open(cache_dir / "history.log", "a", encoding="utf-8")
+            log_file.write(f"========== {datetime.now().strftime('%Y-%m-%d %H:%M:%S')} ==========\n")
+            original_stdout = sys.stdout
+            original_stderr = sys.stderr
+            sys.stdout = Tee(original_stdout, log_file)
+            sys.stderr = Tee(original_stderr, log_file)
+
+    async def _configure_tools(self):
+        mcp_list = [item for item in self.tools if isinstance(item, dict)]
+        if mcp_list:
+            for mcp_item in mcp_list:
+                mcp_name, mcp_config = list(mcp_item.items())[0]
+                await self.mcp_manager.add_server(mcp_name, mcp_config)
+                client = self.mcp_manager.clients.get(mcp_name)
+                await register_mcp_tools(client, registry)
+            all_mcp_tools = await self.mcp_manager.get_all_tools()
+            self.tools.extend([tool.name for tool in sum(all_mcp_tools.values(), [])])
+        self.tools = [item for item in self.tools if not isinstance(item, dict)]
+        if "task_complete" not in self.tools: self.tools.append("task_complete")
+        self.tools_json = [value for _, value in get_function_call_list(self.tools).items()]
+
+    def _task_status_subscriber(self, message: Dict):
+        """Subscriber for task status changes."""
+        if message.get("status") == "finished":
+            self.final_result = message.get("result")
+            self.task_completion_event.set()
+
+        if message.get("status") == "error":
+            raise Exception(message.get("result"))
+
+        if message.get("status") == "new_message":
+            print(message.get("result"))
+
+    def _setup_agents(self):
+        instruction_agent_config = {
+            "api_key": os.getenv("API_KEY"), "api_url": os.getenv("BASE_URL"),
+            "engine": os.getenv("MODEL"),
+            "system_prompt": instruction_system_prompt.format(
+                os_version=platform.platform(), tools_list=self.tools_json,
+                workspace_path=self.work_dir, current_time=datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+            ),
+            "print_log": os.getenv("DEBUG", "false").lower() in ("true", "1", "t", "yes"),
+            "temperature": 0.7, "use_plugins": False
+        }
+
+        worker_agent_config = {
+            "api_key": os.getenv("API_KEY"), "api_url": os.getenv("BASE_URL"),
+            "engine": os.getenv("FAST_MODEL") or os.getenv("MODEL"),
+            "system_prompt": worker_system_prompt.format(
+                os_version=platform.platform(), workspace_path=self.work_dir,
+                shell=os.getenv('SHELL', 'Unknown'), current_time=datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
+                tools_list=self.tools_json
+            ),
+            "print_log": True, "temperature": 0.5, "function_call_max_loop": 100
+        }
+
+        instruction_agent = InstructionAgent(
+            goal=self.goal, tools_json=self.tools_json, agent_config=instruction_agent_config, work_dir=self.work_dir, cache_messages=self.cache_messages,
+            broker=self.broker, listen_topic=self.WORKER_RESPONSE_TOPIC,
+            publish_topic=self.INSTRUCTION_TOPIC, status_topic=self.TASK_STATUS_TOPIC
+        )
+
+        worker_agent = WorkerAgent(
+            goal=self.goal, tools_json=self.tools_json, agent_config=worker_agent_config, work_dir=self.work_dir, cache_messages=self.cache_messages,
+            broker=self.broker, listen_topic=self.INSTRUCTION_TOPIC,
+            publish_topic=self.WORKER_RESPONSE_TOPIC, status_topic=self.TASK_STATUS_TOPIC
+        )
+        return instruction_agent, worker_agent
+
+    async def run(self):
+        """Sets up subscriptions and starts the workflow."""
+        os.chdir(self.work_dir.absolute())
+        await self._configure_tools()
+
+        instruction_agent, worker_agent = self._setup_agents()
+
+        self.broker.publish({"instruction": "Initial kickoff"}, self.INSTRUCTION_TOPIC)
+
+        self._status_subscription = self.broker.subscribe(self._task_status_subscriber, self.TASK_STATUS_TOPIC)
+        await self.task_completion_event.wait()
+
+        instruction_agent.dispose()
+        worker_agent.dispose()
+        self._status_subscription.dispose()
+        await self.mcp_manager.cleanup()
+        return self.final_result
+
+    async def stream_run(self):
+        """Runs the workflow and yields status messages."""
+        os.chdir(self.work_dir.absolute())
+        await self._configure_tools()
+
+        instruction_agent, worker_agent = self._setup_agents()
+
+        self.broker.publish({"instruction": "Initial kickoff"}, self.INSTRUCTION_TOPIC)
+
+        try:
+            async for message in self.broker.iter_topic(self.TASK_STATUS_TOPIC):
+                if message.get("status") == "new_message":
+                    yield message.get("result")
+                elif message.get("status") == "finished":
+                    yield message.get("result")
+                    break
+                elif message.get("status") == "error":
+                    raise Exception(message.get("result"))
+        finally:
+            instruction_agent.dispose()
+            worker_agent.dispose()
+            await self.mcp_manager.cleanup()

{beswarm-0.2.35 → beswarm-0.2.37}/beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.1.53",
+    version="1.1.54",
     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.2.35 → beswarm-0.2.37}/beswarm/aient/src/aient/core/request.py

@@ -1354,7 +1354,8 @@ async def get_openrouter_payload(request, engine, provider, api_key=None):
 
     messages = []
     for msg in request.messages:
-        name = None
+        tool_calls = None
+        tool_call_id = None
         if isinstance(msg.content, list):
             content = []
             for item in msg.content:
@@ -1366,9 +1367,25 @@ async def get_openrouter_payload(request, engine, provider, api_key=None):
                     content.append(image_message)
         else:
             content = msg.content
-            name = msg.name
-        if name:
-            messages.append({"role": msg.role, "name": name, "content": content})
+            tool_calls = msg.tool_calls
+            tool_call_id = msg.tool_call_id
+
+        if tool_calls:
+            tool_calls_list = []
+            for tool_call in tool_calls:
+                tool_calls_list.append({
+                    "id": tool_call.id,
+                    "type": tool_call.type,
+                    "function": {
+                        "name": tool_call.function.name,
+                        "arguments": tool_call.function.arguments
+                    }
+                })
+                if provider.get("tools"):
+                    messages.append({"role": msg.role, "tool_calls": tool_calls_list})
+        elif tool_call_id:
+            if provider.get("tools"):
+                messages.append({"role": msg.role, "tool_call_id": tool_call_id, "content": content})
         else:
             # print("content", content)
             if isinstance(content, list):

{beswarm-0.2.35 → beswarm-0.2.37}/beswarm/aient/src/aient/core/response.py

@@ -42,11 +42,12 @@ def gemini_json_poccess(response_str):
     is_thinking = safe_get(json_data, "parts", 0, "thought", default=False)
 
     function_call_name = safe_get(json_data, "functionCall", "name", default=None)
-    function_full_response = json.dumps(safe_get(json_data, "functionCall", "args", default=""))
+    function_full_response = safe_get(json_data, "functionCall", "args", default="")
+    function_full_response = json.dumps(function_full_response) if function_full_response else None
 
     blockReason = safe_get(json_data, 0, "promptFeedback", "blockReason", default=None)
 
-    return is_thinking, content, image_base64, function_call_name, function_full_response, blockReason, promptTokenCount, candidatesTokenCount, totalTokenCount
+    return is_thinking, content, image_base64, function_call_name, function_full_response, finishReason, blockReason, promptTokenCount, candidatesTokenCount, totalTokenCount
 
 async def fetch_gemini_response_stream(client, url, headers, payload, model):
     timestamp = int(datetime.timestamp(datetime.now()))
@@ -62,7 +63,6 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model):
         parts_json = ""
         async for chunk in response.aiter_text():
             buffer += chunk
-            cache_buffer += chunk
 
             while "\n" in buffer:
                 line, buffer = buffer.split("\n", 1)
@@ -77,7 +77,7 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model):
                         continue
 
                 # https://ai.google.dev/api/generate-content?hl=zh-cn#FinishReason
-                is_thinking, content, image_base64, function_call_name, function_full_response, blockReason, promptTokenCount, candidatesTokenCount, totalTokenCount = gemini_json_poccess(parts_json)
+                is_thinking, content, image_base64, function_call_name, function_full_response, finishReason, blockReason, promptTokenCount, candidatesTokenCount, totalTokenCount = gemini_json_poccess(parts_json)
 
                 if is_thinking:
                     sse_string = await generate_sse_response(timestamp, model, reasoning_content=content)
@@ -99,9 +99,10 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model):
                 if parts_json == "[]" or blockReason == "PROHIBITED_CONTENT":
                     sse_string = await generate_sse_response(timestamp, model, stop="PROHIBITED_CONTENT")
                     yield sse_string
-                else:
+                elif finishReason:
                     sse_string = await generate_sse_response(timestamp, model, stop="stop")
                     yield sse_string
+                    break
 
                 parts_json = ""
 

{beswarm-0.2.35 → beswarm-0.2.37}/beswarm/aient/src/aient/models/chatgpt.py

@@ -187,7 +187,8 @@ class chatgpt(BaseLLM):
         #     print(json.dumps(replaced_text, indent=4, ensure_ascii=False))
         while message_index < conversation_len:
             if self.conversation[convo_id][message_index]["role"] == self.conversation[convo_id][message_index + 1]["role"]:
-                if self.conversation[convo_id][message_index].get("content") and self.conversation[convo_id][message_index + 1].get("content"):
+                if self.conversation[convo_id][message_index].get("content") and self.conversation[convo_id][message_index + 1].get("content") \
+                and self.conversation[convo_id][message_index].get("content") != self.conversation[convo_id][message_index + 1].get("content"):
                     if type(self.conversation[convo_id][message_index + 1]["content"]) == str \
                     and type(self.conversation[convo_id][message_index]["content"]) == list:
                         self.conversation[convo_id][message_index + 1]["content"] = [{"type": "text", "text": self.conversation[convo_id][message_index + 1]["content"]}]
@@ -754,8 +755,8 @@ class chatgpt(BaseLLM):
 
         # 打印日志
         if self.print_log:
-            print("api_url", kwargs.get('api_url', self.api_url.chat_url) == url)
-            print("api_url", kwargs.get('api_url', self.api_url.chat_url))
+            # print("api_url", kwargs.get('api_url', self.api_url.chat_url) == url)
+            # print("api_url", kwargs.get('api_url', self.api_url.chat_url))
             print("api_url", url)
             # print("headers", headers)
             print("api_key", kwargs.get('api_key', self.api_key))