Merge pull request #1050 from danielaskdd/fix-neo4j-duplicate-nodes

.gitattributes

@@ -1,3 +1,4 @@
+lightrag/api/webui/** -diff
 *.png filter=lfs diff=lfs merge=lfs -text
 *.ttf filter=lfs diff=lfs merge=lfs -text
 *.ico filter=lfs diff=lfs merge=lfs -text

.pre-commit-config.yaml

@@ -3,16 +3,21 @@ repos:
     rev: v5.0.0
     hooks:
       - id: trailing-whitespace
+        exclude: ^lightrag/api/webui/
       - id: end-of-file-fixer
+        exclude: ^lightrag/api/webui/
       - id: requirements-txt-fixer
+        exclude: ^lightrag/api/webui/
 
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.6.4
     hooks:
       - id: ruff-format
+        exclude: ^lightrag/api/webui/
       - id: ruff
         args: [--fix, --ignore=E402]
+        exclude: ^lightrag/api/webui/
 
 
   - repo: https://github.com/mgedmin/check-manifest
@@ -20,3 +25,4 @@ repos:
     hooks:
       - id: check-manifest
         stages: [manual]
+        exclude: ^lightrag/api/webui/

lightrag/kg/neo4j_impl.py

@@ -553,18 +553,6 @@ class Neo4JStorage(BaseGraphStorage):
             logger.error(f"Error during upsert: {str(e)}")
             raise
 
-    @retry(
-        stop=stop_after_attempt(3),
-        wait=wait_exponential(multiplier=1, min=4, max=10),
-        retry=retry_if_exception_type(
-            (
-                neo4jExceptions.ServiceUnavailable,
-                neo4jExceptions.TransientError,
-                neo4jExceptions.WriteServiceUnavailable,
-                neo4jExceptions.ClientError,
-            )
-        ),
-    )
     @retry(
         stop=stop_after_attempt(3),
         wait=wait_exponential(multiplier=1, min=4, max=10),
@@ -666,7 +654,7 @@ class Neo4JStorage(BaseGraphStorage):
                     main_query = """
                     MATCH (n)
                     OPTIONAL MATCH (n)-[r]-()
-                    WITH n, count(r) AS degree
+                    WITH n, COALESCE(count(r), 0) AS degree
                     WHERE degree >= $min_degree
                     ORDER BY degree DESC
                     LIMIT $max_nodes
@@ -703,7 +691,7 @@ class Neo4JStorage(BaseGraphStorage):
                     WITH start, nodes, relationships
                     UNWIND nodes AS node
                     OPTIONAL MATCH (node)-[r]-()
-                    WITH node, count(r) AS degree, start, nodes, relationships
+                    WITH node, COALESCE(count(r), 0) AS degree, start, nodes, relationships
                     WHERE node = start OR EXISTS((start)--(node)) OR degree >= $min_degree
                     ORDER BY
                         CASE
@@ -744,11 +732,7 @@ class Neo4JStorage(BaseGraphStorage):
                                 result.nodes.append(
                                     KnowledgeGraphNode(
                                         id=f"{node_id}",
-                                        labels=[
-                                            label
-                                            for label in node.labels
-                                            if label != "base"
-                                        ],
+                                        labels=[node.get("entity_id")],
                                         properties=dict(node),
                                     )
                                 )
@@ -865,9 +849,7 @@ class Neo4JStorage(BaseGraphStorage):
                             # Create KnowledgeGraphNode for target
                             target_node = KnowledgeGraphNode(
                                 id=f"{target_id}",
-                                labels=[
-                                    label for label in b_node.labels if label != "base"
-                                ],
+                                labels=list(f"{target_id}"),
                                 properties=dict(b_node.properties),
                             )
 
@@ -907,9 +889,7 @@ class Neo4JStorage(BaseGraphStorage):
                 # Create initial KnowledgeGraphNode
                 start_node = KnowledgeGraphNode(
                     id=f"{node_record['n'].get('entity_id')}",
-                    labels=[
-                        label for label in node_record["n"].labels if label != "base"
-                    ],
+                    labels=list(f"{node_record['n'].get('entity_id')}"),
                     properties=dict(node_record["n"].properties),
                 )
             finally:

lightrag_webui/src/components/graph/PropertiesView.tsx

@@ -96,9 +96,9 @@ const refineNodeProperties = (node: RawNodeType): NodeType => {
         const neighbour = state.rawGraph.getNode(neighbourId)
         if (neighbour) {
           relationships.push({
-            type: isTarget ? 'Target' : 'Source',
+            type: 'Neighbour',
             id: neighbourId,
-            label: neighbour.labels.join(', ')
+            label: neighbour.properties['entity_id'] ? neighbour.properties['entity_id'] : neighbour.labels.join(', ')
           })
         }
       }