[bugfix][graph db search circle bug]

Author: lightislost

.gitignore

@@ -17,4 +17,5 @@ dist
 .ipynb_checkpoints
 zdatafront*
 *antgroup*
-*ipynb
+*ipynb
+*log

docker-compose.yaml

@@ -1,4 +1,4 @@
-version: '3.4'
+version: 'Beta'
 services:
   metad0:
     # image: docker.io/vesoft/nebula-metad:v3.8.0
@@ -129,7 +129,7 @@ services:
       - 11434:11434
     volumes:
       # - //d/models/ollama:/root/.ollama # windows path
-      - /Users/wangyunpeng/Downloads/models:/root/.ollama # linux/mac path
+      # - /Users/wangyunpeng/Downloads/models:/root/.ollama # linux/mac path
     networks:
       - ekg-net
     restart: on-failure
@@ -170,4 +170,4 @@ services:
 networks:
   ekg-net: 
     # driver: bridge
-    # external: true
+    external: true

muagent/db_handler/graph_db_handler/geabase_handler.py

@@ -301,17 +301,20 @@ def deduplicate_paths(self, result, block_attributes: List[dict] = {}, select_at
         # deduplicate the paths
         path_strs = ["&&".join(_p) for _p in p]
         new_p = []
+        add_path_strs = set()
         for path_str, _p in zip(path_strs, p):
+            if path_str in add_path_strs: continue
             if not any(path_str in other for other in path_strs if path_str != other):
                 new_p.append(_p)
+                add_path_strs.add(path_str)
 
         # 根据保留路径进行合并
         nodeid2type = {i["id"]: i["type"] for i in n0+n1}
         unique_node_ids = [j for i in new_p for j in i]
         if reverse:
-            last_node_ids = list(set([i[0] for i in new_p if len(i)>=hop]))
+            last_node_ids = list(set([i[0] for i in new_p if len(i)>=hop and i[0] not in i[1:]]))
         else:
-            last_node_ids = list(set([i[-1] for i in new_p if len(i)>=hop]))
+            last_node_ids = list(set([i[-1] for i in new_p if len(i)>=hop and i[-1] not in i[:-1]]))
 
         last_node_types = [nodeid2type[i] for i in last_node_ids]
         new_n0 = deduplicate_dict([i for i in n0 if i["id"] in unique_node_ids])
@@ -393,12 +396,17 @@ def decode_result(self, geabase_result, gql: str) -> Dict:
     def decode_path(self, col_data, k) -> List:
         steps = col_data.get("pathVal", {}).get("steps", [])
         connections = {}
-        for step in steps:
+        head = None
+        path = []
+        for idx, step in enumerate(steps):
             props = step["props"]
             start = props["original_src_id1__"].get("strVal", "") or props["original_src_id1__"].get("intVal", -1)
             end = props["original_dst_id2__"].get("strVal", "") or props["original_dst_id2__"].get("intVal", -1)
             connections[start] = end
 
+            head = start if idx==0 else head
+            path = [start] if idx==0 else path
+
         # 找到头部（1）
         for k in connections:
             if k not in connections.values():
@@ -409,7 +417,8 @@ def decode_path(self, col_data, k) -> List:
         while head in connections:
             head = connections[head]
             path.append(head)
-    
+            if head == path[0]:
+                break
         return path
 
     def decode_vertex(self, col_data, k) -> Dict:

muagent/db_handler/vector_db_handler/tbase_handler.py

@@ -63,7 +63,7 @@ def insert_data_hash(
             self, 
             data_list: Union[list[dict], dict], 
             key: str = "message_index", 
-            expire_time: int = 86400, 
+            expire_time: int = None, 
             need_etime: bool = True
         ):
         '''

muagent/service/ekg_construct/ekg_construct_base.py

@@ -630,8 +630,8 @@ def get_graph_by_nodeid(
         ) -> 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}")
+        if hop >= 20:
+            raise Exception(f"hop can't be larger than 20, now hop is {hop}")
         # filter the node which dont match teamid
         result = self.gb.get_hop_infos(
             {'id': nodeid}, node_type=node_type,