bugfix deduplicate_paths, and update leaf node attributes

Author: lightislost

muagent/db_handler/graph_db_handler/geabase_handler.py

@@ -285,15 +285,22 @@ def deduplicate_paths(self, result, block_attributes: dict = {}, select_attribut
             for i in n0+n1
             if select_attributes and not all(item not in i.items() for item in select_attributes.items())
         ]
-        # 路径去重
+        p = [_p for _p in p if all([_pid not in block_node_ids for _pid in _p])]
+        # deduplicate the paths
         path_strs = ["&&".join(_p) for _p in p]
         new_p = []
-        new_path_strs_set = set()
         for path_str, _p in zip(path_strs, p):
             if not any(path_str in other for other in path_strs if path_str != other):
-                if path_str not in new_path_strs_set and all([_pid not in block_node_ids for _pid in _p]):
-                    new_p.append(_p)
-                    new_path_strs_set.add(path_str)
+                new_p.append(_p)
+        # # 路径去重
+        # path_strs = ["&&".join(_p) for _p in p]
+        # new_p = []
+        # new_path_strs_set = set()
+        # for path_str, _p in zip(path_strs, p):
+        #     if not any(path_str in other for other in path_strs if path_str != other):
+        #         if path_str not in new_path_strs_set and all([_pid not in block_node_ids for _pid in _p]):
+        #             new_p.append(_p)
+        #             new_path_strs_set.add(path_str)
 
         # 根据保留路径进行合并
         nodeid2type = {i["id"]: i["type"] for i in n0+n1}

muagent/service/ekg_construct/ekg_construct_base.py

@@ -412,14 +412,35 @@ def get_node_by_id(self, nodeid: str, node_type:str = None) -> GNode:
         node.attributes.update(extra_attrs)
         return node
 
-    def get_graph_by_nodeid(self, nodeid: str, node_type: str, teamid: str=None, hop: int = 10) -> Graph:
-        if hop > 14:
+    def get_graph_by_nodeid(
+            self, 
+            nodeid: str, 
+            node_type: str, 
+            hop: int = 10, 
+            block_attributes: dict = {}
+        ) -> Graph:
+        if hop<2:
+            raise Exception(f"hop must be smaller than 2, now hop is {hop}")
+        if hop >= 14:
             raise Exception(f"hop can't be larger than 14, now hop is {hop}")
         # filter the node which dont match teamid
-        result = self.gb.get_hop_infos({'id': nodeid}, node_type=node_type, hop=hop)
+        result = self.gb.get_hop_infos(
+            {'id': nodeid}, node_type=node_type, 
+            hop=hop, block_attributes=block_attributes
+        )
+
+        if block_attributes:
+            leaf_nodeids = [node.id for node in result.nodes if node.type=="opsgptkg_schedule"]
+        else:
+            leaf_nodeids = [path[-1] for path in result.paths if len(path)==hop+1]
+
         for node in result.nodes:
             extra_attrs = json.loads(node.attributes.pop("extra", "{}") or "{}")
             node.attributes.update(extra_attrs)
+            if node.id in leaf_nodeids:
+                neighbor_nodes = self.gb.get_neighbor_nodes({"id": node.id}, node_type=node.type)
+                node.attributes["cnode_nums"] = len(neighbor_nodes)
+
         for edge in result.edges:
             extra_attrs = json.loads(edge.attributes.pop("extra", "{}") or "{}")
             edge.attributes.update(extra_attrs)