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

beswarm/knowledge_graph.py

@@ -1,6 +1,7 @@
 import uuid
 import networkx as nx
 from pathlib import Path
+from .aient.src.aient.utils.scripts import unescape_html
 
 class KnowledgeGraphManager:
     """
@@ -48,7 +49,7 @@ class KnowledgeGraphManager:
     def _create_new_graph(self):
         """创建一个带有根节点的新图谱并保存。"""
         self.graph = nx.DiGraph()
-        self.graph.add_node("root", name=".", description="知识图谱根节点")
+        self.graph.add_node("root", name=".", description="知识图谱根节点", tags="")
         self._save_graph()
 
     def set_publish_topic(self, publish_topic):
@@ -68,6 +69,7 @@ class KnowledgeGraphManager:
         if path is None or not path.strip() or path.strip() in ['.', '/']:
             return "root"
 
+        path = unescape_html(path)
         segments = [s for s in path.strip('/').split('/') if s and s != '.']
         current_node_id = "root"
 
@@ -102,8 +104,11 @@ class KnowledgeGraphManager:
 
         return current_node_id
 
-    def add_node(self, parent_path: str, node_name: str, description: str = "") -> str:
+    def add_node(self, parent_path: str, node_name: str, description: str = "", tags: list[str] = None) -> str:
         """在指定父节点下添加一个新节点。"""
+        parent_path = unescape_html(parent_path)
+        node_name = unescape_html(node_name)
+        description = unescape_html(description)
         if not node_name.strip():
             return "❌ 错误：节点名称不能为空。"
         if '/' in node_name:
@@ -118,13 +123,60 @@ class KnowledgeGraphManager:
                 return f"❌ 错误：在 '{parent_path}' 下已存在名为 '{node_name}' 的节点。"
 
         new_node_id = str(uuid.uuid4())
-        self.graph.add_node(new_node_id, name=node_name, description=description)
+        # 将标签列表转换为内部存储的字符串格式
+        tags_str = ",".join(sorted(list(set(filter(None, tags or [])))))
+        self.graph.add_node(new_node_id, name=node_name, description=description, tags=tags_str)
         self.graph.add_edge(parent_id, new_node_id)
         self._save_graph()
         return f"✅ 成功在 '{parent_path}' 下添加节点 '{node_name}'。"
 
+    def _get_tags(self, node_id: str) -> list[str]:
+        """获取节点的标签列表。"""
+        tags_str = self.graph.nodes[node_id].get('tags', '')
+        return tags_str.split(',') if tags_str else []
+
+    def _set_tags(self, node_id: str, tags: list[str]):
+        """设置节点的标签列表。"""
+        # 移除重复项并排序
+        unique_tags = sorted(list(set(filter(None, tags))))
+        self.graph.nodes[node_id]['tags'] = ",".join(unique_tags)
+
+    def add_tags_to_node(self, node_path: str, tags_to_add: list[str]) -> str:
+        """向指定节点添加一个或多个标签。"""
+        node_path = unescape_html(node_path)
+        node_id = self._get_node_id_by_path(node_path)
+        if node_id is None:
+            return f"❌ 错误：路径 '{node_path}' 不存在。"
+
+        current_tags = self._get_tags(node_id)
+        current_tags.extend(tags_to_add)
+        self._set_tags(node_id, current_tags)
+        self._save_graph()
+        return f"✅ 成功向节点 '{node_path}' 添加标签:  {' '.join([f'#{t}' for t in tags_to_add])}"
+
+    def remove_tags_from_node(self, node_path: str, tags_to_remove: list[str]) -> str:
+        """从指定节点移除一个或多个标签。"""
+        node_path = unescape_html(node_path)
+        node_id = self._get_node_id_by_path(node_path)
+        if node_id is None:
+            return f"❌ 错误：路径 '{node_path}' 不存在。"
+
+        current_tags = self._get_tags(node_id)
+        if not current_tags:
+            return f"ℹ️ 节点 '{node_path}' 没有任何标签可供移除。"
+
+        new_tags = [tag for tag in current_tags if tag not in tags_to_remove]
+
+        if len(new_tags) == len(current_tags):
+            return f"ℹ️ 在节点 '{node_path}' 上未找到指定的标签:  {' '.join([f'#{t}' for t in tags_to_remove])}"
+
+        self._set_tags(node_id, new_tags)
+        self._save_graph()
+        return f"✅ 成功从节点 '{node_path}' 移除标签。"
+
     def delete_node(self, node_path: str) -> str:
         """删除一个节点及其所有子孙节点。"""
+        node_path = unescape_html(node_path)
         if node_path is None or node_path.strip() in ['.', '/']:
             return "❌ 错误：不能删除根节点。"
 
@@ -141,6 +193,8 @@ class KnowledgeGraphManager:
 
     def rename_node(self, node_path: str, new_name: str) -> str:
         """重命名一个节点。"""
+        node_path = unescape_html(node_path)
+        new_name = unescape_html(new_name)
         if not new_name.strip():
             return "❌ 错误：新名称不能为空。"
         if '/' in new_name:
@@ -163,6 +217,8 @@ class KnowledgeGraphManager:
 
     def move_node(self, source_path: str, target_parent_path: str) -> str:
         """将一个节点移动到另一个父节点下。"""
+        source_path = unescape_html(source_path)
+        target_parent_path = unescape_html(target_parent_path)
         source_id = self._get_node_id_by_path(source_path)
         if source_id is None:
             return f"❌ 错误：源路径 '{source_path}' 不存在。"
@@ -187,6 +243,30 @@ class KnowledgeGraphManager:
         self._save_graph()
         return f"✅ 成功将节点 '{source_path}' 移动到 '{target_parent_path}' 下。"
 
+    def get_node_details(self, node_path: str) -> str:
+        """获取指定路径节点的所有详细信息。"""
+        node_path = unescape_html(node_path)
+        node_id = self._get_node_id_by_path(node_path)
+        if node_id is None:
+            return f"❌ 错误：路径 '{node_path}' 不存在。"
+
+        node_data = self.graph.nodes[node_id]
+        description = node_data.get('description', '无描述。')
+        tags = self._get_tags(node_id)
+
+        # 路径就用用户输入的，因为这才是用户识别它的方式
+        details = [f"节点: {node_path}"]
+        details.append(f"描述: {description}")
+
+        if tags:
+            # 格式化标签为 '#技术细节, #激活函数'
+            formatted_tags = " ".join([f"#{t}" for t in tags])
+            details.append(f"标签: {formatted_tags}")
+        else:
+            details.append("标签: 无")
+
+        return "\n".join(details)
+
     def render_tree(self) -> str:
         """渲染整个知识图谱为树状结构的文本。"""
         if not self.graph or "root" not in self.graph:
@@ -204,6 +284,13 @@ class KnowledgeGraphManager:
             is_last = (i == len(children) - 1)
             connector = "└── " if is_last else "├── "
             node_name = self.graph.nodes[child_id].get('name', '[Unnamed Node]')
+
+            # 显示标签，过滤掉以'source'开头的标签
+            tags = self._get_tags(child_id)
+            display_tags = [t for t in tags if not t.startswith('source')]
+            if display_tags:
+                node_name += f" {' '.join([f'#{t}' for t in display_tags])}"
+
             tree_lines.append(f"{prefix}{connector}{node_name}")
             new_prefix = prefix + "    " if is_last else prefix + "│   "
-            self._build_tree_string_recursive(child_id, new_prefix, tree_lines)
+            self._build_tree_string_recursive(child_id, new_prefix, tree_lines)

beswarm/tools/__init__.py

@@ -4,7 +4,16 @@ from .completion import task_complete
 from .search_arxiv import search_arxiv
 from .repomap import get_code_repo_map
 from .write_csv import append_row_to_csv
-from .graph import add_knowledge_node, delete_knowledge_node, rename_knowledge_node, move_knowledge_node, get_knowledge_graph_tree
+from .graph import (
+    get_node_details,
+    add_knowledge_node,
+    delete_knowledge_node,
+    rename_knowledge_node,
+    move_knowledge_node,
+    get_knowledge_graph_tree,
+    add_tags_to_knowledge_node,
+    remove_tags_from_knowledge_node,
+)
 from .request_input import request_admin_input
 from .screenshot import save_screenshot_to_file
 from .worker import worker, worker_gen, chatgroup
@@ -49,11 +58,14 @@ __all__ = [
     "list_directory",
     "get_task_result",
     "get_url_content",
+    "get_node_details",
     "add_knowledge_node",
     "move_knowledge_node",
     "delete_knowledge_node",
     "rename_knowledge_node",
     "get_knowledge_graph_tree",
+    "add_tags_to_knowledge_node",
+    "remove_tags_from_knowledge_node",
     "append_row_to_csv",
     "set_readonly_path",
     "get_code_repo_map",

beswarm/tools/graph.py

@@ -1,8 +1,11 @@
-from ..aient.src.aient.plugins import register_tool
+import ast
+from typing import List
+
 from ..core import kgm
+from ..aient.src.aient.plugins import register_tool
 
 @register_tool()
-def add_knowledge_node(parent_path: str, node_name: str, description: str = "") -> str:
+def add_knowledge_node(parent_path: str, node_name: str, description: str = "", tags: List[str] = None) -> str:
     """
     在知识图谱的指定父路径下添加一个新节点。
 
@@ -10,11 +13,64 @@ def add_knowledge_node(parent_path: str, node_name: str, description: str = "")
         parent_path (str): 父节点的路径。路径由'/'分隔，例如 'a/b'。根节点路径为 '.' 或 '/'。
         node_name (str): 新节点的名称。名称中不能包含'/'字符。
         description (str, optional): 节点的可选描述信息。默认为空字符串。
+        tags (List[str], optional): 节点的标签列表。默认为 None。
 
     Returns:
         str: 操作结果的描述信息，例如成功或失败的原因。
     """
-    return kgm.add_node(parent_path, node_name, description)
+    if tags:
+        if "[" not in tags:
+            if "," not in tags:
+                tags = f"['{tags}']"
+            else:
+                tags = f"{tags.split(',')}"
+        tags = ast.literal_eval(tags) if isinstance(tags, str) else tags
+        tags = [tag.strip().lstrip("#") for tag in tags]
+    return kgm.add_node(parent_path, node_name, description, tags)
+
+@register_tool()
+def add_tags_to_knowledge_node(node_path: str, tags: List[str]) -> str:
+    """
+    向知识图谱中的指定节点添加一个或多个标签。
+
+    Args:
+        node_path (str): 要添加标签的节点的完整路径。
+        tags (List[str]): 要添加的标签列表。
+
+    Returns:
+        str: 操作结果的描述信息。
+    """
+    if "[" not in tags:
+        if "," not in tags:
+            tags = f"['{tags}']"
+        else:
+            tags = f"{tags.split(',')}"
+
+    tags = ast.literal_eval(tags) if isinstance(tags, str) else tags
+    tags = [tag.strip().lstrip("#") for tag in tags]
+    return kgm.add_tags_to_node(node_path, tags)
+
+@register_tool()
+def remove_tags_from_knowledge_node(node_path: str, tags: List[str]) -> str:
+    """
+    从知识图谱中的指定节点移除一个或多个标签。
+
+    Args:
+        node_path (str): 要移除标签的节点的完整路径。
+        tags (List[str]): 要移除的标签列表。
+
+    Returns:
+        str: 操作结果的描述信息。
+    """
+    if "[" not in tags:
+        if "," not in tags:
+            tags = f"['{tags}']"
+        else:
+            tags = f"{tags.split(',')}"
+
+    tags = ast.literal_eval(tags) if isinstance(tags, str) else tags
+    tags = [tag.strip().lstrip("#") for tag in tags]
+    return kgm.remove_tags_from_node(node_path, tags)
 
 @register_tool()
 def delete_knowledge_node(node_path: str) -> str:
@@ -71,3 +127,19 @@ def get_knowledge_graph_tree() -> str:
         str: 表示整个知识图谱的、格式化的树状结构字符串。
     """
     return "<knowledge_graph_tree>" + kgm.render_tree() + "</knowledge_graph_tree>"
+
+@register_tool()
+def get_node_details(node_path: str) -> str:
+    """
+    获取知识图谱中指定路径节点的所有详细信息。可以显示 get_knowledge_graph_tree 隐藏的信息。
+
+    这个工具用于深入查看单个节点的具体内容，包括其描述和所有标签。
+    它与 `get_knowledge_graph_tree`（提供全局视图）互补。
+
+    Args:
+        node_path (str): 要查询的节点的完整路径。
+
+    Returns:
+        str: 包含节点详细信息的、格式化的文本字符串。
+    """
+    return kgm.get_node_details(node_path)

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

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

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

@@ -1,7 +1,7 @@
 beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/broker.py,sha256=64Y-djrKYaZfBQ8obwHOmr921QgZeu9BtScZWaYLfDo,9887
 beswarm/core.py,sha256=htssaaeIBZ_yOqvX9VtANoVWaZHt_7oWcxyDI1z0paQ,310
-beswarm/knowledge_graph.py,sha256=Q2hhXL2RXnAM8vvxstYetch5wX7ghTM5S7FnORSxCG0,9205
+beswarm/knowledge_graph.py,sha256=PY3gVHuIT7zEp9qhIw9uDYz6koRUPa0RYd2REOwWjRc,13084
 beswarm/prompt.py,sha256=n0a1a6NThIxAYSkisg1sEKjvz2w0tozpKL4BIplaAkI,32286
 beswarm/taskmanager.py,sha256=xczsnehCaOAI3SRE8wUxhzmt6i6G7ynndSWS_bAZn3k,12192
 beswarm/utils.py,sha256=S9jEtht0hTZbjZ2Hk24p4Ip41R69BogOkYS6fgPKY2Y,8219
@@ -131,11 +131,11 @@ beswarm/queries/tree-sitter-languages/ruby-tags.scm,sha256=vIidsCeE2A0vdFN18yXKq
 beswarm/queries/tree-sitter-languages/rust-tags.scm,sha256=9ljM1nzhfPs_ZTRw7cr2P9ToOyhGcKkCoN4_HPXSWi4,1451
 beswarm/queries/tree-sitter-languages/scala-tags.scm,sha256=UxQjz80JIrrJ7Pm56uUnQyThfmQNvwk7aQzPNypB-Ao,1761
 beswarm/queries/tree-sitter-languages/typescript-tags.scm,sha256=OMdCeedPiA24ky82DpgTMKXK_l2ySTuF2zrQ2fJAi9E,1253
-beswarm/tools/__init__.py,sha256=fhJSEaYcfgMTW_nzUqQiyX5RLBhE-gxs8u4PpFquOdg,1868
+beswarm/tools/__init__.py,sha256=5ZJeCEau1OVVOVBMv5E0DTGERsgknSxSLX8o4B1WR8k,2081
 beswarm/tools/click.py,sha256=7g6x1X7ffTInGWp7112KS-MAQ5-8wa1Ze2sIipUIbjc,20884
 beswarm/tools/completion.py,sha256=wHEJrdzjuTKQNQZhelSuPnK2YRsGbeUqZ0P6IgT3c10,605
 beswarm/tools/edit_file.py,sha256=iwWl7a8sTVq4vj0e1ny3H6UGcHfYnxALRGcLuk5hZS8,9155
-beswarm/tools/graph.py,sha256=-Lyhi-AsJNKQ5p9BJk6mzARd1-IDhdLyKmNAVN5PdUE,2703
+beswarm/tools/graph.py,sha256=f0OmaB1UI9rdYU5KNxOUINPBvXhLo5pdznrCKNpQ3nM,5088
 beswarm/tools/planner.py,sha256=lguBCS6kpwNPoXQvqH-WySabVubT82iyWOkJnjt6dXw,1265
 beswarm/tools/repomap.py,sha256=YsTPq5MXfn_Ds5begcvHDnY_Xp2d4jH-xmWqNMHnNHY,45239
 beswarm/tools/request_input.py,sha256=gXNAJPOJektMqxJVyzNTFOeMQ7xUkO-wWMYH-r2Rdwk,942
@@ -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.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,,
+beswarm-0.2.50.dist-info/METADATA,sha256=GjMlSOekWJWwnLPekTnpAoxjnPC9tmkAHou-EIUIG5k,3878
+beswarm-0.2.50.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.50.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.50.dist-info/RECORD,,