Skip to content

fix: Align dependency checks with cascade delete behavior #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spuentesp merged 2 commits into from
Dec 28, 2025
Merged

fix: Align dependency checks with cascade delete behavior #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adcc619
Initial plan
Copilot Dec 28, 2025
d8c1cf7
fix: Address review feedback - add Stories to dependency check, fix q…
Copilot Dec 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions packages/data-layer/src/monitor_data/tools/neo4j_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,11 +405,11 @@ def neo4j_update_universe(
return result

set_clause = ", ".join(set_clauses)
update_query = f"""
MATCH (u:Universe {{id: $id}})
SET {set_clause}
RETURN u
"""
update_query = (
"MATCH (u:Universe {id: $id})\n"
"SET " + set_clause + "\n"
"RETURN u"
)

result = client.execute_write(update_query, update_params)
u = result[0]["u"]
Expand Down Expand Up @@ -463,19 +463,27 @@ def neo4j_delete_universe(universe_id: UUID, force: bool = False) -> Dict[str, A
MATCH (u:Universe {id: $id})
OPTIONAL MATCH (u)-[:HAS_SOURCE]->(s:Source)
OPTIONAL MATCH (u)-[:HAS_AXIOM]->(a:Axiom)
OPTIONAL MATCH (u)-[:HAS_STORY]->(st:Story)
OPTIONAL MATCH (u)<-[:IN_UNIVERSE]-(e)
WHERE e:EntityArchetype OR e:EntityInstance
RETURN count(DISTINCT s) AS sources,
count(DISTINCT a) AS axioms,
count(DISTINCT st) AS stories,
count(DISTINCT e) AS entities
"""
dep_result = client.execute_read(dependency_query, {"id": str(universe_id)})
deps = dep_result[0]

if deps["sources"] > 0 or deps["axioms"] > 0 or deps["entities"] > 0:
if (
deps["sources"] > 0
or deps["axioms"] > 0
or deps["stories"] > 0
or deps["entities"] > 0
):
raise ValueError(
f"Universe {universe_id} has dependent data: "
f"{deps['sources']} sources, {deps['axioms']} axioms, {deps['entities']} entities. "
f"{deps['sources']} sources, {deps['axioms']} axioms, "
f"{deps['stories']} stories, {deps['entities']} entities. "
f"Use force=True to cascade delete."
)

Expand All @@ -487,9 +495,9 @@ def neo4j_delete_universe(universe_id: UUID, force: bool = False) -> Dict[str, A
OPTIONAL MATCH (u)-[:HAS_SOURCE]->(source:Source)
OPTIONAL MATCH (u)-[:HAS_AXIOM]->(axiom:Axiom)
OPTIONAL MATCH (u)-[:HAS_STORY]->(story:Story)
// Collect story dependencies (1 level deep from Story)
OPTIONAL MATCH (story)-[:HAS_SCENE]->(scene:Scene)
OPTIONAL MATCH (story)-[:HAS_THREAD]->(thread:PlotThread)
// Collect story dependencies (1 level deep from Story), matched from universe
OPTIONAL MATCH (u)-[:HAS_STORY]->(:Story)-[:HAS_SCENE]->(scene:Scene)
OPTIONAL MATCH (u)-[:HAS_STORY]->(:Story)-[:HAS_THREAD]->(thread:PlotThread)
// Collect entities with IN_UNIVERSE relationship
OPTIONAL MATCH (u)<-[:IN_UNIVERSE]-(entity)
WHERE entity:EntityArchetype OR entity:EntityInstance
Expand Down
4 changes: 2 additions & 2 deletions packages/data-layer/tests/test_tools/test_universe_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ def test_delete_universe_success(
# Mock universe exists
mock_neo4j_client.execute_read.side_effect = [
[{"u": universe_data}], # verify exists
[{"sources": 0, "axioms": 0, "entities": 0}], # no dependencies
[{"sources": 0, "axioms": 0, "stories": 0, "entities": 0}], # no dependencies
]

# Mock deletion
Expand All @@ -332,7 +332,7 @@ def test_delete_universe_with_dependencies_no_force(
# Mock universe exists with dependencies
mock_neo4j_client.execute_read.side_effect = [
[{"u": universe_data}], # verify exists
[{"sources": 2, "axioms": 3, "entities": 5}], # has dependencies
[{"sources": 2, "axioms": 3, "stories": 1, "entities": 5}], # has dependencies
]

universe_id = UUID(universe_data["id"])
Expand Down