AI Agent commited on
Commit ·
6578619
1
Parent(s): 5ed03b8
Fix IndentationError in graph_store.py
Browse files- pipeline/graph_store.py +46 -46
pipeline/graph_store.py
CHANGED
|
@@ -89,62 +89,62 @@ def store_entities(entities: list[dict], source: str, tier: str = "extended", se
|
|
| 89 |
with _db_lock:
|
| 90 |
# Store nodes
|
| 91 |
for ent in entities:
|
| 92 |
-
|
| 93 |
-
continue
|
| 94 |
-
ent_name = ent.get("name") or ent.get("entity") or ent.get("id")
|
| 95 |
-
if not ent_name:
|
| 96 |
-
continue
|
| 97 |
-
|
| 98 |
-
try:
|
| 99 |
-
conn.execute(
|
| 100 |
-
"""
|
| 101 |
-
MERGE (e:Entity {name: $name})
|
| 102 |
-
ON CREATE SET e.type = $type, e.source = $source, e.tier = $tier, e.session_token = $session_token
|
| 103 |
-
ON MATCH SET e.type = $type, e.source = $source, e.tier = $tier, e.session_token = $session_token
|
| 104 |
-
""",
|
| 105 |
-
{"name": str(ent_name), "type": str(ent.get("type", "General")), "source": str(source), "tier": str(tier), "session_token": str(session_token)}
|
| 106 |
-
)
|
| 107 |
-
except Exception as e:
|
| 108 |
-
print(f"[GraphStore] Failed to store node {ent_name}: {e}")
|
| 109 |
-
continue
|
| 110 |
-
|
| 111 |
-
# Store edges
|
| 112 |
-
for rel in ent.get("relations", []):
|
| 113 |
-
if not isinstance(rel, dict):
|
| 114 |
continue
|
| 115 |
-
|
| 116 |
-
if not
|
| 117 |
continue
|
| 118 |
|
| 119 |
try:
|
| 120 |
-
# Ensure target exists
|
| 121 |
conn.execute(
|
| 122 |
"""
|
| 123 |
MERGE (e:Entity {name: $name})
|
| 124 |
-
ON CREATE SET e.type =
|
| 125 |
-
|
| 126 |
-
{"name": str(tgt), "source": str(source), "tier": str(tier), "session_token": str(session_token)}
|
| 127 |
-
)
|
| 128 |
-
|
| 129 |
-
# Merge relationship
|
| 130 |
-
conn.execute(
|
| 131 |
-
"""
|
| 132 |
-
MATCH (a:Entity {name: $src}), (b:Entity {name: $tgt})
|
| 133 |
-
MERGE (a)-[r:RELATES_TO {type: $rel}]->(b)
|
| 134 |
-
ON CREATE SET r.source = $source, r.tier = $tier, r.session_token = $session_token
|
| 135 |
-
ON MATCH SET r.source = $source, r.tier = $tier, r.session_token = $session_token
|
| 136 |
""",
|
| 137 |
-
{
|
| 138 |
-
"src": str(ent_name),
|
| 139 |
-
"tgt": str(tgt),
|
| 140 |
-
"rel": str(rel.get("rel", "related_to")),
|
| 141 |
-
"source": str(source),
|
| 142 |
-
"tier": str(tier),
|
| 143 |
-
"session_token": str(session_token)
|
| 144 |
-
}
|
| 145 |
)
|
| 146 |
except Exception as e:
|
| 147 |
-
print(f"[GraphStore] Failed to store
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 148 |
|
| 149 |
|
| 150 |
def query_related(entity_names: list[str], hops: int = 2, session_token: str = "admin") -> list[str]:
|
|
|
|
| 89 |
with _db_lock:
|
| 90 |
# Store nodes
|
| 91 |
for ent in entities:
|
| 92 |
+
if not isinstance(ent, dict):
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 93 |
continue
|
| 94 |
+
ent_name = ent.get("name") or ent.get("entity") or ent.get("id")
|
| 95 |
+
if not ent_name:
|
| 96 |
continue
|
| 97 |
|
| 98 |
try:
|
|
|
|
| 99 |
conn.execute(
|
| 100 |
"""
|
| 101 |
MERGE (e:Entity {name: $name})
|
| 102 |
+
ON CREATE SET e.type = $type, e.source = $source, e.tier = $tier, e.session_token = $session_token
|
| 103 |
+
ON MATCH SET e.type = $type, e.source = $source, e.tier = $tier, e.session_token = $session_token
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 104 |
""",
|
| 105 |
+
{"name": str(ent_name), "type": str(ent.get("type", "General")), "source": str(source), "tier": str(tier), "session_token": str(session_token)}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 106 |
)
|
| 107 |
except Exception as e:
|
| 108 |
+
print(f"[GraphStore] Failed to store node {ent_name}: {e}")
|
| 109 |
+
continue
|
| 110 |
+
|
| 111 |
+
# Store edges
|
| 112 |
+
for rel in ent.get("relations", []):
|
| 113 |
+
if not isinstance(rel, dict):
|
| 114 |
+
continue
|
| 115 |
+
tgt = rel.get("target") or rel.get("to")
|
| 116 |
+
if not tgt:
|
| 117 |
+
continue
|
| 118 |
+
|
| 119 |
+
try:
|
| 120 |
+
# Ensure target exists
|
| 121 |
+
conn.execute(
|
| 122 |
+
"""
|
| 123 |
+
MERGE (e:Entity {name: $name})
|
| 124 |
+
ON CREATE SET e.type = 'General', e.source = $source, e.tier = $tier, e.session_token = $session_token
|
| 125 |
+
""",
|
| 126 |
+
{"name": str(tgt), "source": str(source), "tier": str(tier), "session_token": str(session_token)}
|
| 127 |
+
)
|
| 128 |
+
|
| 129 |
+
# Merge relationship
|
| 130 |
+
conn.execute(
|
| 131 |
+
"""
|
| 132 |
+
MATCH (a:Entity {name: $src}), (b:Entity {name: $tgt})
|
| 133 |
+
MERGE (a)-[r:RELATES_TO {type: $rel}]->(b)
|
| 134 |
+
ON CREATE SET r.source = $source, r.tier = $tier, r.session_token = $session_token
|
| 135 |
+
ON MATCH SET r.source = $source, r.tier = $tier, r.session_token = $session_token
|
| 136 |
+
""",
|
| 137 |
+
{
|
| 138 |
+
"src": str(ent_name),
|
| 139 |
+
"tgt": str(tgt),
|
| 140 |
+
"rel": str(rel.get("rel", "related_to")),
|
| 141 |
+
"source": str(source),
|
| 142 |
+
"tier": str(tier),
|
| 143 |
+
"session_token": str(session_token)
|
| 144 |
+
}
|
| 145 |
+
)
|
| 146 |
+
except Exception as e:
|
| 147 |
+
print(f"[GraphStore] Failed to store relationship {ent_name} -> {tgt}: {e}")
|
| 148 |
|
| 149 |
|
| 150 |
def query_related(entity_names: list[str], hops: int = 2, session_token: str = "admin") -> list[str]:
|