adai/MemoryBear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Write Missing None (#321)

Browse Source 
* Write Missing None

* Write Missing None

* Write Missing None

* Apply suggestion from @sourcery-ai[bot]

Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>

* Write Missing None

---------

Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
This commit is contained in:
lixinyue11
2026-02-05 10:50:10 +08:00
committed by GitHub
parent f125d11b6d
commit 3364374dc6
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
api/app/repositories/neo4j/graph_saver.py
View File

@@ -42,8 +42,8 @@ async def save_entities_and_relationships(
'statement': edge.statement, 'statement': edge.statement,
'valid_at': edge.valid_at.isoformat() if edge.valid_at else None, 'valid_at': edge.valid_at.isoformat() if edge.valid_at else None,
'invalid_at': edge.invalid_at.isoformat() if edge.invalid_at else None, 'invalid_at': edge.invalid_at.isoformat() if edge.invalid_at else None,
'created_at': edge.created_at.isoformat(), 'created_at': edge.created_at.isoformat() if edge.created_at else None,
'expired_at': edge.expired_at.isoformat(), 'expired_at': edge.expired_at.isoformat() if edge.expired_at else None,
'run_id': edge.run_id, 'run_id': edge.run_id,
'end_user_id': edge.end_user_id, 'end_user_id': edge.end_user_id,
} }
@@ -228,8 +228,8 @@ async def save_dialog_and_statements_to_neo4j(
'statement': edge.statement, 'statement': edge.statement,
'valid_at': edge.valid_at.isoformat() if edge.valid_at else None, 'valid_at': edge.valid_at.isoformat() if edge.valid_at else None,
'invalid_at': edge.invalid_at.isoformat() if edge.invalid_at else None, 'invalid_at': edge.invalid_at.isoformat() if edge.invalid_at else None,
'created_at': edge.created_at.isoformat(), 'created_at': edge.created_at.isoformat() if edge.created_at else None,
'expired_at': edge.expired_at.isoformat(), 'expired_at': edge.expired_at.isoformat() if edge.expired_at else None,
'run_id': edge.run_id, 'run_id': edge.run_id,
'end_user_id': edge.end_user_id, 'end_user_id': edge.end_user_id,
}) })
@@ -240,19 +240,19 @@ async def save_dialog_and_statements_to_neo4j(
# 6. Save statement-chunk edges # 6. Save statement-chunk edges
if statement_chunk_edges: if statement_chunk_edges:
from app.repositories.neo4j.cypher_queries import STATEMENT_CHUNK_EDGE_SAVE from app.repositories.neo4j.cypher_queries import CHUNK_STATEMENT_EDGE_SAVE
sc_edge_data = [] sc_edge_data = []
for edge in statement_chunk_edges: for edge in statement_chunk_edges:
sc_edge_data.append({ sc_edge_data.append({
"id": edge.id, "id": edge.id,
"source": edge.source, "source": edge.source,
"target": edge.target, "target": edge.target,
"created_at": edge.created_at.isoformat(), "created_at": edge.created_at.isoformat() if edge.created_at else None,
"expired_at": edge.expired_at.isoformat(), "expired_at": edge.expired_at.isoformat() if edge.expired_at else None,
"run_id": edge.run_id, "run_id": edge.run_id,
"end_user_id": edge.end_user_id, "end_user_id": edge.end_user_id,
}) })
result = await tx.run(STATEMENT_CHUNK_EDGE_SAVE, edges=sc_edge_data) result = await tx.run(CHUNK_STATEMENT_EDGE_SAVE, chunk_statement_edges=sc_edge_data)
sc_uuids = [record["uuid"] async for record in result] sc_uuids = [record["uuid"] async for record in result]
results['statement_chunk_edges'] = sc_uuids results['statement_chunk_edges'] = sc_uuids
logger.info(f"Successfully saved {len(sc_uuids)} statement-chunk edges to Neo4j") logger.info(f"Successfully saved {len(sc_uuids)} statement-chunk edges to Neo4j")
@@ -263,15 +263,15 @@ async def save_dialog_and_statements_to_neo4j(
se_edge_data = [] se_edge_data = []
for edge in statement_entity_edges: for edge in statement_entity_edges:
se_edge_data.append({ se_edge_data.append({
"id": edge.id,
"source": edge.source, "source": edge.source,
"target": edge.target, "target": edge.target,
"created_at": edge.created_at.isoformat(), "created_at": edge.created_at.isoformat() if edge.created_at else None,
"expired_at": edge.expired_at.isoformat(), "expired_at": edge.expired_at.isoformat() if edge.expired_at else None,
"run_id": edge.run_id, "run_id": edge.run_id,
"end_user_id": edge.end_user_id, "end_user_id": edge.end_user_id,
"connect_strength": getattr(edge, "connect_strength", "strong"),
}) })
result = await tx.run(STATEMENT_ENTITY_EDGE_SAVE, edges=se_edge_data) result = await tx.run(STATEMENT_ENTITY_EDGE_SAVE, relationships=se_edge_data)
se_uuids = [record["uuid"] async for record in result] se_uuids = [record["uuid"] async for record in result]
results['statement_entity_edges'] = se_uuids results['statement_entity_edges'] = se_uuids
logger.info(f"Successfully saved {len(se_uuids)} statement-entity edges to Neo4j") logger.info(f"Successfully saved {len(se_uuids)} statement-entity edges to Neo4j")
@@ -281,10 +281,17 @@ async def save_dialog_and_statements_to_neo4j(
try: try:
# 使用显式写事务执行所有操作，避免死锁 # 使用显式写事务执行所有操作，避免死锁
results = await connector.execute_write_transaction(_save_all_in_transaction) results = await connector.execute_write_transaction(_save_all_in_transaction)
print("Successfully saved all data to Neo4j in a single transaction") summary = {
key: len(value)
for key, value in results.items()
if isinstance(value, (list, tuple, set))
}
logger.info("Transaction completed. Summary: %s", summary)
logger.debug("Full transaction results: %r", results)
return True return True
except Exception as e: except Exception as e:
logger.error(f"Neo4j integration error: {e}", exc_info=True)
print(f"Neo4j integration error: {e}") print(f"Neo4j integration error: {e}")
print("Continuing without database storage...") print("Continuing without database storage...")
return False return False