Skip to content

reworked validator query to not include missing uuids. this involved … #969

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
yuanzhou merged 1 commit into from
Nov 24, 2025
Merged

reworked validator query to not include missing uuids. this involved … #969

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 8 additions & 15 deletions src/schema/schema_neo4j_queries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1801,22 +1801,15 @@ def create_activity_tx(tx, activity_data_dict):
def validate_direct_ancestors(neo4j_driver, entity_uuids, allowed_types, disallowed_property_values=None):
disallowed_rules_list = disallowed_property_values
query = """
UNWIND $uuids AS uid
OPTIONAL MATCH (n) WHERE n.uuid = uid
WITH uid, n,
CASE
WHEN n IS NULL THEN false
ELSE any(l IN labels(n) WHERE l IN $allowed_labels)
END AS label_ok,
$disallowed AS rules
WITH uid, label_ok,
any(rule IN rules WHERE
n IS NOT NULL
AND n[rule.property] IS NOT NULL
AND n[rule.property] = rule.value
) AS has_forbidden_prop
MATCH (n)
WHERE n.uuid IN $uuids
WITH n,
any(l IN labels(n) WHERE l IN $allowed_labels) AS label_ok,
$disallowed AS rules
WITH n, label_ok,
any(rule IN rules WHERE n[rule.property] IS NOT NULL AND n[rule.property] = rule.value) AS has_forbidden_prop
WHERE NOT label_ok OR has_forbidden_prop
RETURN DISTINCT uid AS invalid_uuid
RETURN DISTINCT n.uuid AS invalid_uuid
"""
with neo4j_driver.session() as session:
result = session.run(query,
Expand Down