Fix linting
This commit is contained in:
parent
49baeb7318
commit
2aaa6d5f7d
2 changed files with 57 additions and 31 deletions
|
|
@ -1323,7 +1323,6 @@ def create_document_routes(
|
||||||
dependencies=[Depends(combined_auth)],
|
dependencies=[Depends(combined_auth)],
|
||||||
summary="Delete a document and all its associated data by its ID.",
|
summary="Delete a document and all its associated data by its ID.",
|
||||||
)
|
)
|
||||||
|
|
||||||
async def delete_document(
|
async def delete_document(
|
||||||
delete_request: DeleteDocRequest,
|
delete_request: DeleteDocRequest,
|
||||||
background_tasks: BackgroundTasks,
|
background_tasks: BackgroundTasks,
|
||||||
|
|
@ -1355,10 +1354,7 @@ def create_document_routes(
|
||||||
# Check if doc_id exists first - return error immediately if not found
|
# Check if doc_id exists first - return error immediately if not found
|
||||||
doc_id = delete_request.doc_id
|
doc_id = delete_request.doc_id
|
||||||
if not await check_doc_id_exists(doc_id):
|
if not await check_doc_id_exists(doc_id):
|
||||||
raise HTTPException(
|
raise HTTPException(status_code=404, detail=f"Document {doc_id} not found.")
|
||||||
status_code=404,
|
|
||||||
detail=f"Document {doc_id} not found."
|
|
||||||
)
|
|
||||||
|
|
||||||
# The rag object is initialized from the server startup args,
|
# The rag object is initialized from the server startup args,
|
||||||
# so we can access its properties here.
|
# so we can access its properties here.
|
||||||
|
|
|
||||||
|
|
@ -1731,7 +1731,9 @@ class LightRAG:
|
||||||
if isinstance(chunk_data, dict)
|
if isinstance(chunk_data, dict)
|
||||||
and chunk_data.get("full_doc_id") == doc_id
|
and chunk_data.get("full_doc_id") == doc_id
|
||||||
}
|
}
|
||||||
logger.info(f"Retrieved {len(all_chunks)} total chunks, {len(related_chunks)} related to document {doc_id}")
|
logger.info(
|
||||||
|
f"Retrieved {len(all_chunks)} total chunks, {len(related_chunks)} related to document {doc_id}"
|
||||||
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Failed to retrieve chunks for document {doc_id}: {e}")
|
logger.error(f"Failed to retrieve chunks for document {doc_id}: {e}")
|
||||||
raise Exception(f"Failed to retrieve document chunks: {e}") from e
|
raise Exception(f"Failed to retrieve document chunks: {e}") from e
|
||||||
|
|
@ -1746,7 +1748,9 @@ class LightRAG:
|
||||||
await self.doc_status.delete([doc_id])
|
await self.doc_status.delete([doc_id])
|
||||||
logger.info(f"Deleted document {doc_id} with no associated chunks")
|
logger.info(f"Deleted document {doc_id} with no associated chunks")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Failed to delete document {doc_id} with no chunks: {e}")
|
logger.error(
|
||||||
|
f"Failed to delete document {doc_id} with no chunks: {e}"
|
||||||
|
)
|
||||||
raise Exception(f"Failed to delete document entry: {e}") from e
|
raise Exception(f"Failed to delete document entry: {e}") from e
|
||||||
|
|
||||||
return DeletionResult(
|
return DeletionResult(
|
||||||
|
|
@ -1773,7 +1777,9 @@ class LightRAG:
|
||||||
async with graph_db_lock:
|
async with graph_db_lock:
|
||||||
try:
|
try:
|
||||||
# Get all affected nodes and edges in batch
|
# Get all affected nodes and edges in batch
|
||||||
logger.info(f"Analyzing affected entities and relationships for {len(chunk_ids)} chunks")
|
logger.info(
|
||||||
|
f"Analyzing affected entities and relationships for {len(chunk_ids)} chunks"
|
||||||
|
)
|
||||||
affected_nodes = (
|
affected_nodes = (
|
||||||
await self.chunk_entity_relation_graph.get_nodes_by_chunk_ids(
|
await self.chunk_entity_relation_graph.get_nodes_by_chunk_ids(
|
||||||
list(chunk_ids)
|
list(chunk_ids)
|
||||||
|
|
@ -1784,7 +1790,9 @@ class LightRAG:
|
||||||
list(chunk_ids)
|
list(chunk_ids)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
logger.info(f"Found {len(affected_nodes)} affected nodes and {len(affected_edges)} affected edges")
|
logger.info(
|
||||||
|
f"Found {len(affected_nodes)} affected nodes and {len(affected_edges)} affected edges"
|
||||||
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Failed to analyze affected graph elements: {e}")
|
logger.error(f"Failed to analyze affected graph elements: {e}")
|
||||||
raise Exception(f"Failed to analyze graph dependencies: {e}") from e
|
raise Exception(f"Failed to analyze graph dependencies: {e}") from e
|
||||||
|
|
@ -1823,10 +1831,12 @@ class LightRAG:
|
||||||
elif remaining_sources != sources:
|
elif remaining_sources != sources:
|
||||||
relationships_to_rebuild[edge_tuple] = remaining_sources
|
relationships_to_rebuild[edge_tuple] = remaining_sources
|
||||||
|
|
||||||
logger.info(f"Analysis complete: {len(entities_to_delete)} entities to delete, "
|
logger.info(
|
||||||
f"{len(entities_to_rebuild)} entities to rebuild, "
|
f"Analysis complete: {len(entities_to_delete)} entities to delete, "
|
||||||
f"{len(relationships_to_delete)} relationships to delete, "
|
f"{len(entities_to_rebuild)} entities to rebuild, "
|
||||||
f"{len(relationships_to_rebuild)} relationships to rebuild")
|
f"{len(relationships_to_delete)} relationships to delete, "
|
||||||
|
f"{len(relationships_to_rebuild)} relationships to rebuild"
|
||||||
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Failed to process graph analysis results: {e}")
|
logger.error(f"Failed to process graph analysis results: {e}")
|
||||||
raise Exception(f"Failed to process graph dependencies: {e}") from e
|
raise Exception(f"Failed to process graph dependencies: {e}") from e
|
||||||
|
|
@ -1837,7 +1847,9 @@ class LightRAG:
|
||||||
logger.info(f"Deleting {len(chunk_ids)} chunks from storage")
|
logger.info(f"Deleting {len(chunk_ids)} chunks from storage")
|
||||||
await self.chunks_vdb.delete(chunk_ids)
|
await self.chunks_vdb.delete(chunk_ids)
|
||||||
await self.text_chunks.delete(chunk_ids)
|
await self.text_chunks.delete(chunk_ids)
|
||||||
logger.info(f"Successfully deleted {len(chunk_ids)} chunks from storage")
|
logger.info(
|
||||||
|
f"Successfully deleted {len(chunk_ids)} chunks from storage"
|
||||||
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Failed to delete chunks: {e}")
|
logger.error(f"Failed to delete chunks: {e}")
|
||||||
raise Exception(f"Failed to delete document chunks: {e}") from e
|
raise Exception(f"Failed to delete document chunks: {e}") from e
|
||||||
|
|
@ -1857,7 +1869,9 @@ class LightRAG:
|
||||||
await self.chunk_entity_relation_graph.remove_nodes(
|
await self.chunk_entity_relation_graph.remove_nodes(
|
||||||
list(entities_to_delete)
|
list(entities_to_delete)
|
||||||
)
|
)
|
||||||
logger.info(f"Successfully deleted {len(entities_to_delete)} entities")
|
logger.info(
|
||||||
|
f"Successfully deleted {len(entities_to_delete)} entities"
|
||||||
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Failed to delete entities: {e}")
|
logger.error(f"Failed to delete entities: {e}")
|
||||||
raise Exception(f"Failed to delete entities: {e}") from e
|
raise Exception(f"Failed to delete entities: {e}") from e
|
||||||
|
|
@ -1865,7 +1879,9 @@ class LightRAG:
|
||||||
# 7. Delete relationships that have no remaining sources
|
# 7. Delete relationships that have no remaining sources
|
||||||
if relationships_to_delete:
|
if relationships_to_delete:
|
||||||
try:
|
try:
|
||||||
logger.info(f"Deleting {len(relationships_to_delete)} relationships")
|
logger.info(
|
||||||
|
f"Deleting {len(relationships_to_delete)} relationships"
|
||||||
|
)
|
||||||
# Delete from vector database
|
# Delete from vector database
|
||||||
rel_ids_to_delete = []
|
rel_ids_to_delete = []
|
||||||
for src, tgt in relationships_to_delete:
|
for src, tgt in relationships_to_delete:
|
||||||
|
|
@ -1881,7 +1897,9 @@ class LightRAG:
|
||||||
await self.chunk_entity_relation_graph.remove_edges(
|
await self.chunk_entity_relation_graph.remove_edges(
|
||||||
list(relationships_to_delete)
|
list(relationships_to_delete)
|
||||||
)
|
)
|
||||||
logger.info(f"Successfully deleted {len(relationships_to_delete)} relationships")
|
logger.info(
|
||||||
|
f"Successfully deleted {len(relationships_to_delete)} relationships"
|
||||||
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Failed to delete relationships: {e}")
|
logger.error(f"Failed to delete relationships: {e}")
|
||||||
raise Exception(f"Failed to delete relationships: {e}") from e
|
raise Exception(f"Failed to delete relationships: {e}") from e
|
||||||
|
|
@ -1889,7 +1907,9 @@ class LightRAG:
|
||||||
# 8. Rebuild entities and relationships from remaining chunks
|
# 8. Rebuild entities and relationships from remaining chunks
|
||||||
if entities_to_rebuild or relationships_to_rebuild:
|
if entities_to_rebuild or relationships_to_rebuild:
|
||||||
try:
|
try:
|
||||||
logger.info(f"Rebuilding {len(entities_to_rebuild)} entities and {len(relationships_to_rebuild)} relationships")
|
logger.info(
|
||||||
|
f"Rebuilding {len(entities_to_rebuild)} entities and {len(relationships_to_rebuild)} relationships"
|
||||||
|
)
|
||||||
await _rebuild_knowledge_from_chunks(
|
await _rebuild_knowledge_from_chunks(
|
||||||
entities_to_rebuild=entities_to_rebuild,
|
entities_to_rebuild=entities_to_rebuild,
|
||||||
relationships_to_rebuild=relationships_to_rebuild,
|
relationships_to_rebuild=relationships_to_rebuild,
|
||||||
|
|
@ -1900,10 +1920,14 @@ class LightRAG:
|
||||||
llm_response_cache=self.llm_response_cache,
|
llm_response_cache=self.llm_response_cache,
|
||||||
global_config=asdict(self),
|
global_config=asdict(self),
|
||||||
)
|
)
|
||||||
logger.info(f"Successfully rebuilt {len(entities_to_rebuild)} entities and {len(relationships_to_rebuild)} relationships")
|
logger.info(
|
||||||
|
f"Successfully rebuilt {len(entities_to_rebuild)} entities and {len(relationships_to_rebuild)} relationships"
|
||||||
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Failed to rebuild knowledge from chunks: {e}")
|
logger.error(f"Failed to rebuild knowledge from chunks: {e}")
|
||||||
raise Exception(f"Failed to rebuild knowledge graph: {e}") from e
|
raise Exception(
|
||||||
|
f"Failed to rebuild knowledge graph: {e}"
|
||||||
|
) from e
|
||||||
|
|
||||||
# 9. Delete original document and status
|
# 9. Delete original document and status
|
||||||
try:
|
try:
|
||||||
|
|
@ -1940,9 +1964,13 @@ class LightRAG:
|
||||||
# ALWAYS ensure persistence if any deletion operations were started
|
# ALWAYS ensure persistence if any deletion operations were started
|
||||||
if deletion_operations_started:
|
if deletion_operations_started:
|
||||||
try:
|
try:
|
||||||
logger.info(f"Ensuring data persistence for document {doc_id} deletion")
|
logger.info(
|
||||||
|
f"Ensuring data persistence for document {doc_id} deletion"
|
||||||
|
)
|
||||||
await self._insert_done()
|
await self._insert_done()
|
||||||
logger.info(f"Data persistence completed successfully for document {doc_id} deletion")
|
logger.info(
|
||||||
|
f"Data persistence completed successfully for document {doc_id} deletion"
|
||||||
|
)
|
||||||
except Exception as persistence_error:
|
except Exception as persistence_error:
|
||||||
persistence_error_msg = f"Failed to persist data after deletion attempt for {doc_id}: {persistence_error}"
|
persistence_error_msg = f"Failed to persist data after deletion attempt for {doc_id}: {persistence_error}"
|
||||||
logger.error(persistence_error_msg)
|
logger.error(persistence_error_msg)
|
||||||
|
|
@ -1959,7 +1987,9 @@ class LightRAG:
|
||||||
# If there was an original exception, log the persistence error but don't override the original error
|
# If there was an original exception, log the persistence error but don't override the original error
|
||||||
# The original error result was already returned in the except block
|
# The original error result was already returned in the except block
|
||||||
else:
|
else:
|
||||||
logger.debug(f"No deletion operations were started for document {doc_id}, skipping persistence")
|
logger.debug(
|
||||||
|
f"No deletion operations were started for document {doc_id}, skipping persistence"
|
||||||
|
)
|
||||||
|
|
||||||
async def adelete_by_entity(self, entity_name: str) -> DeletionResult:
|
async def adelete_by_entity(self, entity_name: str) -> DeletionResult:
|
||||||
"""Asynchronously delete an entity and all its relationships.
|
"""Asynchronously delete an entity and all its relationships.
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue