Skip to content

Commit 2e9fd9c

Browse files
committed
fix(graph): 修正上传节点查询时未过滤Upload标签的问题
确保所有查询操作仅针对Upload类型的节点,避免返回不相关的实体数据
1 parent c5dde79 commit 2e9fd9c

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/knowledge/adapters/upload.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ async def query_nodes(self, keyword: str, **kwargs) -> dict[str, Any]:
4848
num = kwargs.get("max_nodes", 100)
4949
raw_results = self._db._get_sample_nodes_with_connections(
5050
num=num,
51-
label_filter=None, # Upload 类型不需要标签过滤
51+
label_filter="Upload",
5252
)
5353
else:
5454
# 否则执行关键词搜索(使用 service 的查询功能)

src/knowledge/services/upload_graph_service.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ def _query_with_fuzzy_match(self, keyword, kgdb_name="neo4j"):
601601
def query_fuzzy_match(tx, keyword):
602602
result = tx.run(
603603
"""
604-
MATCH (n:Entity)
604+
MATCH (n:Upload)
605605
WHERE toLower(n.name) CONTAINS toLower($keyword)
606606
RETURN DISTINCT n.name AS name
607607
""",
@@ -639,6 +639,7 @@ def query_by_vector(tx, text, threshold):
639639
"""
640640
CALL db.index.vector.queryNodes('entityEmbeddings', 10, $embedding)
641641
YIELD node AS similarEntity, score
642+
WHERE 'Upload' IN labels(similarEntity)
642643
RETURN similarEntity.name AS name, score
643644
""",
644645
embedding=embedding,
@@ -679,7 +680,7 @@ def query(tx, entity_name, hops, limit):
679680
query_str = """
680681
WITH [
681682
// 1跳出边
682-
[(n {name: $entity_name})-[r1]->(m1) |
683+
[(n:Upload {name: $entity_name})-[r1]->(m1) |
683684
{h: {id: elementId(n), name: n.name, properties: properties(n)},
684685
r: {
685686
id: elementId(r1),
@@ -690,7 +691,7 @@ def query(tx, entity_name, hops, limit):
690691
},
691692
t: {id: elementId(m1), name: m1.name, properties: properties(m1)}}],
692693
// 2跳出边
693-
[(n {name: $entity_name})-[r1]->(m1)-[r2]->(m2) |
694+
[(n:Upload {name: $entity_name})-[r1]->(m1)-[r2]->(m2) |
694695
{h: {id: elementId(m1), name: m1.name, properties: properties(m1)},
695696
r: {
696697
id: elementId(r2),
@@ -701,7 +702,7 @@ def query(tx, entity_name, hops, limit):
701702
},
702703
t: {id: elementId(m2), name: m2.name, properties: properties(m2)}}],
703704
// 1跳入边
704-
[(m1)-[r1]->(n {name: $entity_name}) |
705+
[(m1)-[r1]->(n:Upload {name: $entity_name}) |
705706
{h: {id: elementId(m1), name: m1.name, properties: properties(m1)},
706707
r: {
707708
id: elementId(r1),
@@ -712,7 +713,7 @@ def query(tx, entity_name, hops, limit):
712713
},
713714
t: {id: elementId(n), name: n.name, properties: properties(n)}}],
714715
// 2跳入边
715-
[(m2)-[r2]->(m1)-[r1]->(n {name: $entity_name}) |
716+
[(m2)-[r2]->(m1)-[r1]->(n:Upload {name: $entity_name}) |
716717
{h: {id: elementId(m2), name: m2.name, properties: properties(m2)},
717718
r: {
718719
id: elementId(r2),

0 commit comments

Comments
 (0)