beswarm 0.2.44__tar.gz → 0.2.46__tar.gz

{beswarm-0.2.44 → beswarm-0.2.46}/PKG-INFO

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

{beswarm-0.2.44 → beswarm-0.2.46}/beswarm/agents/planact.py

@@ -17,7 +17,7 @@ from ..utils import extract_xml_content, get_current_screen_image_message, repla
 
 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):
+    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 = None):
         self.goal = goal
         self.tools_json = tools_json
         self.work_dir = work_dir
@@ -32,12 +32,20 @@ class BaseAgent:
         self.error_topic = listen_topic + ".error"
         self.publish_topic = publish_topic
         self.status_topic = status_topic
+        self.graph_update_topic = graph_update_topic
+        if self.graph_update_topic:
+            self.graph_update_subscription = self.broker.subscribe(self.handle_graph_update, self.graph_update_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 handle_graph_update(self, message: Dict):
+        """Handle graph update messages."""
+        raise NotImplementedError
+
     def dispose(self):
         """Cancels the subscription and cleans up resources."""
         if self._subscription:
@@ -46,12 +54,13 @@ class BaseAgent:
 
 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)
+    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)
 
         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:
@@ -64,8 +73,13 @@ class InstructionAgent(BaseAgent):
                         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)
+    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)
 
         self.cache_file.write_text(json.dumps(conversation_history, ensure_ascii=False, indent=4), encoding="utf-8")
 
@@ -83,6 +97,17 @@ class InstructionAgent(BaseAgent):
             elif isinstance(conversation_history[0]["content"], list) and extracted_content:
                 conversation_history[0]["content"].append({"type": "text", "text": extracted_content})
 
+            for message in conversation_history:
+                if message.get("content") and isinstance(message["content"], str) \
+                and "<knowledge_graph_tree>" in message["content"] and self.graph_tree:
+                    message["content"] = replace_xml_content(message["content"], "knowledge_graph_tree", self.graph_tree)
+
+        for index, message in enumerate(raw_conversation_history):
+            if message.get("content") and isinstance(message["content"], str) \
+            and "<knowledge_graph_tree>" in message["content"] and self.graph_tree:
+                message["content"] = replace_xml_content(message["content"], "knowledge_graph_tree", self.graph_tree)
+                raw_conversation_history[index] = message
+
         return conversation_history
 
     async def handle_message(self, message: Dict):
@@ -201,18 +226,21 @@ class BrokerWorker:
         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"
+        self.GRAPH_UPDATE_TOPIC = self.channel + ".knowledge_graph"
+
+        self.setup()
 
     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.kgm.set_root_path(self.work_dir)
+        self.kgm.set_publish_topic(self.GRAPH_UPDATE_TOPIC)
         self.cache_file = cache_dir / "work_agent_conversation_history.json"
         if not self.cache_file.exists():
             self.cache_file.write_text("[]", encoding="utf-8")
@@ -276,13 +304,14 @@ class BrokerWorker:
         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
+            publish_topic=self.INSTRUCTION_TOPIC, status_topic=self.TASK_STATUS_TOPIC,
+            graph_update_topic=self.GRAPH_UPDATE_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
+            publish_topic=self.WORKER_RESPONSE_TOPIC, status_topic=self.TASK_STATUS_TOPIC,
         )
         return instruction_agent, worker_agent
 

{beswarm-0.2.44 → beswarm-0.2.46}/beswarm/core.py

@@ -10,4 +10,4 @@ from .knowledge_graph import KnowledgeGraphManager
 broker = MessageBroker()
 mcp_manager = MCPManager()
 task_manager = TaskManager()
-kgm = KnowledgeGraphManager()
+kgm = KnowledgeGraphManager(broker=broker)

{beswarm-0.2.44 → beswarm-0.2.46}/beswarm/knowledge_graph.py

@@ -9,7 +9,7 @@ class KnowledgeGraphManager:
     - 数据持久化为 GraphML 文件。
     - 提供添加、删除、重命名、移动节点和渲染树状图的功能。
     """
-    def __init__(self, storage_path="knowledge_graph.graphml"):
+    def __init__(self, storage_path="knowledge_graph.graphml", broker=None, publish_topic=None):
         """
         初始化知识图谱管理器。
 
@@ -20,6 +20,8 @@ class KnowledgeGraphManager:
         self.storage_path = Path(storage_path)
         self.graph = nx.DiGraph()
         self.root_path = None
+        self.broker = broker
+        self.publish_topic = publish_topic
         # self._load_graph()
 
     def set_root_path(self, root_path):
@@ -49,16 +51,24 @@ class KnowledgeGraphManager:
         self.graph.add_node("root", name=".", description="知识图谱根节点")
         self._save_graph()
 
+    def set_publish_topic(self, publish_topic):
+        if not publish_topic:
+            return
+        self.publish_topic = publish_topic
+
     def _save_graph(self):
         """将当前图的状态保存到文件。"""
         nx.write_graphml(self.graph, self.storage_path)
 
+        if self.publish_topic and self.broker:
+            self.broker.publish({"message": "graph_updated", "graph": self.render_tree()}, self.publish_topic)
+
     def _get_node_id_by_path(self, path: str):
         """通过'/'分隔的路径查找节点的唯一ID，支持前缀匹配。"""
         if path is None or not path.strip() or path.strip() in ['.', '/']:
             return "root"
 
-        segments = path.strip('/').split('/')
+        segments = [s for s in path.strip('/').split('/') if s and s != '.']
         current_node_id = "root"
 
         for segment in segments:
@@ -69,17 +79,17 @@ class KnowledgeGraphManager:
                     current_node_id = child_id
                     found_child = True
                     break
-            
+
             if found_child:
                 continue
-                
+
             # 如果完全匹配失败，尝试前缀匹配
             prefix_matches = []
             for child_id in self.graph.successors(current_node_id):
                 child_name = self.graph.nodes[child_id].get('name', '')
                 if child_name.startswith(segment):
                     prefix_matches.append(child_id)
-            
+
             if len(prefix_matches) == 1:
                 # 只有一个前缀匹配，使用这个节点
                 current_node_id = prefix_matches[0]
@@ -89,7 +99,7 @@ class KnowledgeGraphManager:
             else:
                 # 没有前缀匹配，节点不存在
                 return None
-                
+
         return current_node_id
 
     def add_node(self, parent_path: str, node_name: str, description: str = "") -> str:

{beswarm-0.2.44 → beswarm-0.2.46}/beswarm/tools/graph.py

@@ -65,7 +65,9 @@ def get_knowledge_graph_tree() -> str:
     此工具不需要任何参数，它会读取当前的图状态并生成一个易于阅读的、
     表示层级结构的字符串。
 
+    注意：此函数返回的知识图谱状态是实时更新的，永远是最新的。只需要调用一次，不必重复调用。
+
     Returns:
         str: 表示整个知识图谱的、格式化的树状结构字符串。
     """
-    return kgm.render_tree()
+    return "<knowledge_graph_tree>" + kgm.render_tree() + "</knowledge_graph_tree>"

{beswarm-0.2.44 → beswarm-0.2.46}/beswarm.egg-info/PKG-INFO

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

{beswarm-0.2.44 → beswarm-0.2.46}/pyproject.toml

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

{beswarm-0.2.44 → beswarm-0.2.46}/test/test_graph.py

@@ -59,7 +59,7 @@ class KnowledgeGraphManager:
         if path is None or not path.strip() or path.strip() in ['.', '/']:
             return "root"
 
-        segments = path.strip('/').split('/')
+        segments = [s for s in path.strip('/').split('/') if s and s != '.']
         current_node_id = "root"
 
         for i, segment in enumerate(segments):