[bugfix][when extra is '']

Author: lightislost

muagent/db_handler/graph_db_handler/geabase_handler.py

@@ -396,7 +396,7 @@ def decode_vertex(self, col_data, k) -> Dict:
         vertextVal = col_data.get("vertexVal", {})
         node_val_json = {
             **{"ID": int(vertextVal.get("id", "")), "type": vertextVal.get("type", "")}, 
-            **{k: v.get("strVal", "") or v.get("intVal", "0") for k, v in vertextVal.get("props", {}).items()}
+            **{k: v.get("strVal", "") if "strVal" in v else v.get("intVal", "0") for k, v in vertextVal.get("props", {}).items()}
         }
         node_val_json.pop("biz_node_id", "")
         return node_val_json
@@ -406,7 +406,7 @@ def _decode_edge(data):
             edgeVal= data.get("edgeVal", {})
             edge_val_json = {
                 **{"SRCID": int(edgeVal.get("srcId", "")), "DSTID": int(edgeVal.get("dstId", "")), "type": edgeVal.get("type", "")}, 
-                **{k: v.get("strVal", "") or v.get("intVal", "0") for k, v in edgeVal.get("props", {}).items()}
+                **{k: v.get("strVal", "") if "strVal" in v else v.get("intVal", "0") for k, v in edgeVal.get("props", {}).items()}
             }
             # 存在业务逻辑
             edge_val_json["start_id"] = edge_val_json.pop("original_src_id1__")

muagent/service/ekg_construct/ekg_construct_base.py

@@ -408,7 +408,7 @@ def update_edges(self, edges: List[GEdge], teamid: str):
 
     def get_node_by_id(self, nodeid: str, node_type:str = None) -> GNode:
         node = self.gb.get_current_node({'id': nodeid}, node_type=node_type)
-        extra_attrs = json.loads(node.attributes.pop("extra", "{}"))
+        extra_attrs = json.loads(node.attributes.pop("extra", "{}") or "{}")
         node.attributes.update(extra_attrs)
         return node
 
@@ -418,10 +418,10 @@ def get_graph_by_nodeid(self, nodeid: str, node_type: str, teamid: str=None, hop
         # filter the node which dont match teamid
         result = self.gb.get_hop_infos({'id': nodeid}, node_type=node_type, hop=hop)
         for node in result.nodes:
-            extra_attrs = json.loads(node.attributes.pop("extra", "{}"))
+            extra_attrs = json.loads(node.attributes.pop("extra", "{}") or "{}")
             node.attributes.update(extra_attrs)
         for edge in result.edges:
-            extra_attrs = json.loads(edge.attributes.pop("extra", "{}"))
+            extra_attrs = json.loads(edge.attributes.pop("extra", "{}") or "{}")
             edge.attributes.update(extra_attrs)
         return result
 
@@ -463,18 +463,18 @@ def search_nodes_by_text(self, text: str, node_type: str = None, teamid: str = N
         nodes_by_desc = self.gb.get_current_nodes({"description": text}, node_type=node_type)
         nodes = self.gb.get_nodes_by_ids(nodeids)
         for node in nodes:
-            extra_attrs = json.loads(node.attributes.pop("extra", "{}"))
+            extra_attrs = json.loads(node.attributes.pop("extra", "{}") or "{}")
             node.attributes.update(extra_attrs)
         return nodes_by_name + nodes_by_desc + nodes
 
     def search_rootpath_by_nodeid(self, nodeid: str, node_type: str, rootid: str) -> Graph:
         # rootid = f"{teamid}" # todo check the rootid
         result = self.gb.get_hop_infos({"id": nodeid}, node_type=node_type, hop=15, reverse=True)
         for node in result.nodes:
-            extra_attrs = json.loads(node.attributes.pop("extra", "{}"))
+            extra_attrs = json.loads(node.attributes.pop("extra", "{}") or "{}")
             node.attributes.update(extra_attrs)
         for edge in result.edges:
-            extra_attrs = json.loads(edge.attributes.pop("extra", "{}"))
+            extra_attrs = json.loads(edge.attributes.pop("extra", "{}") or "{}")
             edge.attributes.update(extra_attrs)
 
         # paths must be ordered from start to end

tests/service/ekg_construct_test_2.py

@@ -247,5 +247,5 @@ def generate_edge(node1, node2):
 print(len(nodes))
 
 # search path by node and rootid
-graph = ekg_construct_service.search_rootpath_by_nodeid(nodeid="shanshi_opsgptkg_analysis_3", node_type="opsgptkg_analysis", rootid="shanshi_opsgptkg_intent_0")
+graph = ekg_construct_service.search_rootpath_by_nodeid(nodeid="shanshi_opsgptkg_analysis_2", node_type="opsgptkg_analysis", rootid="shanshi_opsgptkg_intent_0")
 print(len(graph.nodes), len(graph.edges))