cherry-pick b7c77396

lightrag/api/routers/graph_routes.py

@@ -264,27 +264,25 @@ def create_graph_routes(rag, api_key: Optional[str] = None):
             }
         """
         try:
-            # Check if entity already exists
+            # Use the proper acreate_entity method which handles:
-            exists = await rag.chunk_entity_relation_graph.has_node(request.entity_name)
+            # - Graph lock for concurrency
-            if exists:
+            # - Vector embedding creation in entities_vdb
-                raise ValueError(f"Entity '{request.entity_name}' already exists")
+            # - Metadata population and defaults
-
+            # - Index consistency via _edit_entity_done
-            # Prepare entity data
+            result = await rag.acreate_entity(
-            entity_data = request.entity_data.copy()
+                entity_name=request.entity_name,
-            entity_data["entity_id"] = request.entity_name
+                entity_data=request.entity_data,
-
-            # Create the entity
-            await rag.chunk_entity_relation_graph.upsert_node(
-                request.entity_name, entity_data
             )
 
             return {
                 "status": "success",
                 "message": f"Entity '{request.entity_name}' created successfully",
-                "data": entity_data,
+                "data": result,
             }
         except ValueError as ve:
-            logger.error(f"Validation error creating entity '{request.entity_name}': {str(ve)}")
+            logger.error(
+                f"Validation error creating entity '{request.entity_name}': {str(ve)}"
+            )
             raise HTTPException(status_code=400, detail=str(ve))
         except Exception as e:
             logger.error(f"Error creating entity '{request.entity_name}': {str(e)}")
@@ -319,32 +317,22 @@ def create_graph_routes(rag, api_key: Optional[str] = None):
             }
         """
         try:
-            # Check if both entities exist
+            # Use the proper acreate_relation method which handles:
-            source_exists = await rag.chunk_entity_relation_graph.has_node(
+            # - Graph lock for concurrency
-                request.source_entity
+            # - Entity existence validation
-            )
+            # - Duplicate relation checks
-            target_exists = await rag.chunk_entity_relation_graph.has_node(
+            # - Vector embedding creation in relationships_vdb
-                request.target_entity
+            # - Index consistency via _edit_relation_done
-            )
+            result = await rag.acreate_relation(
-
+                source_entity=request.source_entity,
-            if not source_exists:
+                target_entity=request.target_entity,
-                raise ValueError(f"Source entity '{request.source_entity}' does not exist")
+                relation_data=request.relation_data,
-            if not target_exists:
-                raise ValueError(f"Target entity '{request.target_entity}' does not exist")
-
-            # Create the relationship
-            await rag.chunk_entity_relation_graph.upsert_edge(
-                request.source_entity, request.target_entity, request.relation_data
             )
 
             return {
                 "status": "success",
                 "message": f"Relation created successfully between '{request.source_entity}' and '{request.target_entity}'",
-                "data": {
+                "data": result,
-                    "source": request.source_entity,
-                    "target": request.target_entity,
-                    **request.relation_data,
-                },
             }
         except ValueError as ve:
             logger.error(