beswarm 0.2.46__py3-none-any.whl → 0.2.48__py3-none-any.whl

beswarm/agents/planact.py

@@ -38,13 +38,16 @@ class BaseAgent:
 
         self._subscription = self.broker.subscribe(self.handle_message, [self.listen_topic, self.error_topic])
 
+        self.graph_tree = None
+
     async def handle_message(self, message: Dict):
         """Process incoming messages. Must be implemented by subclasses."""
         raise NotImplementedError
 
     def handle_graph_update(self, message: Dict):
         """Handle graph update messages."""
-        raise NotImplementedError
+        if message.get("message") == "graph_updated":
+            self.graph_tree = message.get("graph")
 
     def dispose(self):
         """Cancels the subscription and cleans up resources."""
@@ -60,7 +63,6 @@ class InstructionAgent(BaseAgent):
         self.last_instruction = None
         self.agent = chatgpt(**self.config)
 
-        self.graph_tree = None
         self.goal_diff = None
 
         if self.cache_messages and isinstance(self.cache_messages, list) and len(self.cache_messages) > 1:
@@ -73,11 +75,6 @@ class InstructionAgent(BaseAgent):
                         changed_lines.append(line)
                 self.goal_diff = '\n'.join(changed_lines).strip()
 
-    def handle_graph_update(self, message: Dict):
-        """Handle graph update messages."""
-        if message.get("message") == "graph_updated":
-            self.graph_tree = message.get("graph")
-
     def get_conversation_history(self, raw_conversation_history: List[Dict]):
         conversation_history = copy.deepcopy(raw_conversation_history)
 
@@ -179,8 +176,8 @@ class InstructionAgent(BaseAgent):
 
 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)
+    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, graph_update_topic: str):
+        super().__init__(goal, tools_json, agent_config, work_dir, cache_messages, broker, listen_topic, publish_topic, status_topic, graph_update_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)
@@ -197,6 +194,12 @@ class WorkerAgent(BaseAgent):
             }, self.publish_topic)
             return
 
+        for index, raw_message in enumerate(self.agent.conversation["default"]):
+            if raw_message.get("content") and isinstance(raw_message["content"], str) \
+            and "<knowledge_graph_tree>" in raw_message["content"] and self.graph_tree:
+                raw_message["content"] = replace_xml_content(raw_message["content"], "knowledge_graph_tree", self.graph_tree)
+                self.agent.conversation["default"][index] = raw_message
+
         instruction = message["instruction"]
         if "find_and_click_element" in json.dumps(self.tools_json):
             instruction = await get_current_screen_image_message(instruction)
@@ -312,6 +315,7 @@ class BrokerWorker:
             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,
+            graph_update_topic=self.GRAPH_UPDATE_TOPIC
         )
         return instruction_agent, worker_agent
 

beswarm/broker.py

@@ -152,7 +152,7 @@ class MessageBroker:
 
                     if new_messages:
                         if self.debug:
-                            print(f"    -> 订阅者 '{callback.__name__}' 在 '{current_topic}' 主题上收到 {len(new_messages)} 条新消息。")
+                            print(f"    -> 订阅者 '{callback.__name__}' 在 '{current_topic}' 主题上收到 {len(new_messages)} 条新消息。{new_messages}")
                         for msg in new_messages:
                             try:
                                 if asyncio.iscoroutinefunction(callback):

{beswarm-0.2.46.dist-info → beswarm-0.2.48.dist-info}/METADATA

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

{beswarm-0.2.46.dist-info → beswarm-0.2.48.dist-info}/RECORD

@@ -1,12 +1,12 @@
 beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
-beswarm/broker.py,sha256=RtnQZVbhf25acUHahNBiaS5FGxcrj0rhBhkon9gFY_M,9873
+beswarm/broker.py,sha256=64Y-djrKYaZfBQ8obwHOmr921QgZeu9BtScZWaYLfDo,9887
 beswarm/core.py,sha256=htssaaeIBZ_yOqvX9VtANoVWaZHt_7oWcxyDI1z0paQ,310
 beswarm/knowledge_graph.py,sha256=Q2hhXL2RXnAM8vvxstYetch5wX7ghTM5S7FnORSxCG0,9205
 beswarm/prompt.py,sha256=n0a1a6NThIxAYSkisg1sEKjvz2w0tozpKL4BIplaAkI,32286
 beswarm/taskmanager.py,sha256=xczsnehCaOAI3SRE8wUxhzmt6i6G7ynndSWS_bAZn3k,12192
 beswarm/utils.py,sha256=S9jEtht0hTZbjZ2Hk24p4Ip41R69BogOkYS6fgPKY2Y,8219
 beswarm/agents/chatgroup.py,sha256=YHofra9kE0x7UrhqZjlP7PbWvinEew1BkjJ0XilzudM,12020
-beswarm/agents/planact.py,sha256=PGj69lhy6r3q07R8w16aMoWY1OjXVXothu7lDG-UC4Y,19140
+beswarm/agents/planact.py,sha256=-JPN8L1JgVjy4G36eUHZHyLiBrN5oI8fLTbpweZsUuU,19568
 beswarm/aient/main.py,sha256=SiYAIgQlLJqYusnTVEJOx1WNkSJKMImhgn5aWjfroxg,3814
 beswarm/aient/setup.py,sha256=Mq1M05mT9_UYBK2jk5mP_sLxKQAolcuh8PYXexfj-XU,487
 beswarm/aient/src/aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
@@ -145,7 +145,7 @@ beswarm/tools/search_web.py,sha256=LhgXOSHL9fwxg5T2AAOV4TTJkcJVLogsfRJW2faPvDE,1
 beswarm/tools/subtasks.py,sha256=zZmRCjDocbvrU8MvZvpDWpQCKNntDJ123ByBiS8pRko,9889
 beswarm/tools/worker.py,sha256=-tcLGrdLPZYxc1z66iQIB1VH7RWcR-5CgVWuDIQJBCQ,2013
 beswarm/tools/write_csv.py,sha256=-r5OghcvjCg00hY0YQbp6u31VIJLrgaqDIvczAFoqDE,1470
-beswarm-0.2.46.dist-info/METADATA,sha256=xFDxpNffZqMEucZHFfh63mCH2YBq6UnKBz8gJF5kvtk,3878
-beswarm-0.2.46.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.46.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.46.dist-info/RECORD,,
+beswarm-0.2.48.dist-info/METADATA,sha256=x4Nf2GnW7tPwtMAWDVu3tTMWj1aJkM-6gwFPwG5Ga8Q,3878
+beswarm-0.2.48.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.48.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.48.dist-info/RECORD,,