beswarm 0.2.85__py3-none-any.whl → 0.2.87__py3-none-any.whl

beswarm/tools/graph.py

@@ -21,14 +21,18 @@ def add_knowledge_node(parent_path: str, node_name: str, description: str = "",
     if tags:
         if "[" not in tags:
             if "," not in tags:
-                if " " in tags:
-                    tags = f"[{tags.split(' ')}]"
+                if "#" in tags:
+                    tags = f"{tags.split('#')}"
                 else:
-                    tags = f"['{tags}']"
+                    if " " in tags:
+                        tags = f"{tags.split(' ')}"
+                    else:
+                        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]
+        tags = [tag.strip().lstrip("#") for tag in tags if tag.strip()]
     return kgm.add_node(parent_path, node_name, description, tags)
 
 @register_tool()
@@ -45,10 +49,13 @@ def add_tags_to_knowledge_node(node_path: str, tags: List[str]) -> str:
     """
     if "[" not in tags:
         if "," not in tags:
-            if " " in tags:
-                tags = f"[{tags.split(' ')}]"
+            if "#" in tags:
+                tags = f"{tags.split('#')}"
             else:
-                tags = f"['{tags}']"
+                if " " in tags:
+                    tags = f"{tags.split(' ')}"
+                else:
+                    tags = f"['{tags}']"
         else:
             tags = f"{tags.split(',')}"
 
@@ -70,10 +77,13 @@ def remove_tags_from_knowledge_node(node_path: str, tags: List[str]) -> str:
     """
     if "[" not in tags:
         if "," not in tags:
-            if " " in tags:
-                tags = f"[{tags.split(' ')}]"
+            if "#" in tags:
+                tags = f"{tags.split('#')}"
             else:
-                tags = f"['{tags}']"
+                if " " in tags:
+                    tags = f"{tags.split(' ')}"
+                else:
+                    tags = f"['{tags}']"
         else:
             tags = f"{tags.split(',')}"
 
@@ -152,3 +162,7 @@ def get_node_details(node_path: str) -> str:
         str: 包含节点详细信息的、格式化的文本字符串。
     """
     return kgm.get_node_details(node_path)
+
+if __name__ == "__main__":
+    print(add_knowledge_node(".", "1", "2", "#date: 2023-12-01 #source:官方频道"))
+# python -m beswarm.tools.graph

beswarm/tools/subtasks.py

@@ -24,6 +24,14 @@ def create_task(goal, tools, work_dir):
         str: 当任务成功完成时，返回字符串 "任务已完成"。
     """
     task_manager = current_task_manager.get()
+
+    # 检查工作目录是否与现有任务重复
+    for task_id, task_info in task_manager.tasks_cache.items():
+        if task_id == "root_path":
+            continue
+        if task_info.get("args", {}).get("work_dir") == work_dir:
+            return f"<tool_error>工作目录 '{work_dir}' 已被任务 {task_id} 使用。请为子任务选择一个唯一的工作目录。</tool_error>"
+
     # 获取 worker 函数，这是正确的
     worker_fun = registry.tools["worker"]
 

{beswarm-0.2.85.dist-info → beswarm-0.2.87.dist-info}/METADATA

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

{beswarm-0.2.85.dist-info → beswarm-0.2.87.dist-info}/RECORD

@@ -111,17 +111,17 @@ beswarm/tools/__init__.py,sha256=CPFj04Lm6TEol_2BFX-mVrpzvVIsmPcfTWhRg3xex7Q,207
 beswarm/tools/click.py,sha256=wu-Ov5U2ZZLcU0gennDVh_2w_Td7F4dbVJcmu_dfHV4,20872
 beswarm/tools/completion.py,sha256=AIHtEHfSp6fs4Xa_nTcw9fLgXtYHtYGRDTSy7_x_Fak,544
 beswarm/tools/edit_file.py,sha256=ZTJvbpsfRlp2t98kTn9XQ5qZBTdsWJVWv9t0lvK4RfU,9147
-beswarm/tools/graph.py,sha256=kmf4MZPGpfMTTkRuy_6C_V9U-4TLC_J7Az05b-ksqHg,5384
+beswarm/tools/graph.py,sha256=Ni51LCB65bLDDLC3ZyEJj_BeHAzhimhFgH9Ekr56Ll8,5871
 beswarm/tools/planner.py,sha256=vsHd7rE8RQHJrZ7BQ0ZXhbt4Fjh3DeyxU4piA5R-VPM,1253
 beswarm/tools/repomap.py,sha256=w98aHmjNjtvcUVc5maWORqzKqDy2KVGLooOe__uJVCU,45235
 beswarm/tools/request_input.py,sha256=3n2UW8m8Q7dxGhd7L7hzSJ1kk4ekMbtdtNZZT3dJf20,938
 beswarm/tools/screenshot.py,sha256=hyL6F8_k9Y03Nb_X18cY-klCpWWdkqyC-iGXfKX-7jc,1007
 beswarm/tools/search_arxiv.py,sha256=NLiJV1B7Um6EuZXLxnL950d837_he2LGG7qaGACSgwg,10750
 beswarm/tools/search_web.py,sha256=0fTeczXiOX_LJQGaLEGbuJtIPzofeuquGWEt3yDMtVw,17498
-beswarm/tools/subtasks.py,sha256=4wJWNAqRFgvwmDOP12SddYo_OteWBU5cLhLBh6xILk8,10492
+beswarm/tools/subtasks.py,sha256=Wekein1vgI9BA5fKS_x5OToquyesDWhOa6Y4jsCK1SU,10889
 beswarm/tools/worker.py,sha256=mQ1qdrQ8MgL99byAbTvxfEByFFGN9mty3UHqHjARMQ8,2331
 beswarm/tools/write_csv.py,sha256=u0Hq18Ksfheb52MVtyLNCnSDHibITpsYBPs2ub7USYA,1466
-beswarm-0.2.85.dist-info/METADATA,sha256=Kgu_r1BYQXoJwR0QQZ1c_-sTpDvSovAQDRvlx2aISDw,3878
-beswarm-0.2.85.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.85.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.85.dist-info/RECORD,,
+beswarm-0.2.87.dist-info/METADATA,sha256=6LrVVhuYW6X4pFOO_0WPpQdylYCcMUBaZE_911CYLtw,3878
+beswarm-0.2.87.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.87.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.87.dist-info/RECORD,,