jianf/TrulyMEM-TrueHumanMEM-local
1
0
Fork 0
Code Issues Pull Requests Actions 10 Packages Projects Releases Wiki Activity

fix: 简化 Neo4j 查询语法避免类型错误

Browse Source
This commit is contained in:
root
2026-04-08 23:28:16 +08:00
parent fce2ad209f
commit 5d90f05ec2
1 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
openclaw_neo4j_demo.py
View File

@ -169,7 +169,7 @@ class Neo4jGraph:
if not keywords and not seed_entities: if not keywords and not seed_entities:
return {"entities": [], "relations": [], "message": "无查询关键词"} return {"entities": [], "relations": [], "message": "无查询关键词"}
params = {"session_id": CURRENT_SESSION_ID} params = {"session_id": CURRENT_SESSION_ID, "keywords": keywords if keywords else []}
cond_parts = ["r.status = 'active'"] cond_parts = ["r.status = 'active'"]
if session_filter: if session_filter:
@ -177,37 +177,27 @@ class Neo4jGraph:
params["target_session"] = session_filter params["target_session"] = session_filter
if keywords: if keywords:
# 修复 Neo4j 5.x ANY() 语法 # 简化查询：直接在 WHERE 中使用列表
cond_parts.append("ANY(k IN $keywords WHERE toLower(e.name) CONTAINS k OR toLower(coalesce(e.type, '')) CONTAINS k)") keyword_conditions = " OR ".join([f"toLower(e.name) CONTAINS '{k}' OR toLower(coalesce(e.type, '')) CONTAINS '{k}'" for k in keywords])
params["keywords"] = keywords cond_parts.append(f"({keyword_conditions})")
if seed_entities: if seed_entities:
cond_parts.append("e.name IN $seed") placeholders = ",".join([f"'{s}'" for s in seed_entities])
params["seed"] = seed_entities cond_parts.append(f"e.name IN [{placeholders}]")
if time_range and "days" in time_range: if time_range and "days" in time_range:
cond_parts.append(f"r.created_at >= datetime() - duration('P{time_range['days']}D')") cond_parts.append(f"r.created_at >= datetime() - duration('P{time_range['days']}D')")
where_clause = " AND ".join(cond_parts) where_clause = " AND ".join(cond_parts)
if depth > 1: # 简化查询：不用复杂路径匹配
cypher = f""" cypher = f"""
MATCH path = (e:Entity)-[r:RELATES*1..{depth}]-(other:Entity) MATCH (e:Entity)-[r:RELATES]->(t:Entity)
WHERE {where_clause} WHERE {where_clause}
UNWIND relationships(path) AS rel RETURN e, r, t
WITH DISTINCT rel, e, other ORDER BY r.created_at DESC
RETURN e, rel, other LIMIT 20
ORDER BY rel.created_at DESC """
LIMIT 30
"""
else:
cypher = f"""
MATCH (e:Entity)-[r:RELATES]-(other:Entity)
WHERE {where_clause}
RETURN e, r, other
ORDER BY r.created_at DESC
LIMIT 20
"""
result = session.run(cypher, params) result = session.run(cypher, params)
entities, relations = {}, [] entities, relations = {}, []