Skip to content

Derek furst/remove offending fields #787

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 2 commits into from
Jan 16, 2025
Merged

Derek furst/remove offending fields #787

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a852db5
changed /ancestors /children /parents/ descendants queries to omit fi…
DerekFurstPitt Jan 16, 2025
4ae38a8
removed superfluous key removals in ancestor, parent, children, desce…
DerekFurstPitt Jan 16, 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
27 changes: 6 additions & 21 deletions src/schema/schema_neo4j_queries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def get_children(neo4j_driver, uuid, property_key = None):
f"WHERE e.uuid='{uuid}' AND e.entity_type <> 'Lab' "
# COLLECT() returns a list
# apoc.coll.toSet() reruns a set containing unique nodes
f"RETURN apoc.coll.toSet(COLLECT(child)) AS {record_field_name}")
f"RETURN apoc.coll.toSet(COLLECT(apoc.create.vNode(labels(child), apoc.map.removeKeys(properties(child), {fields_to_omit})))) AS {record_field_name}")

logger.info("======get_children() query======")
logger.info(query)
Expand All @@ -193,10 +193,7 @@ def get_children(neo4j_driver, uuid, property_key = None):
else:
# Convert the list of nodes to a list of dicts
results = nodes_to_dicts(record[record_field_name])
if fields_to_omit:
for node_dict in results:
for field in fields_to_omit:
node_dict.pop(field, None)

return results


Expand Down Expand Up @@ -233,7 +230,7 @@ def get_parents(neo4j_driver, uuid, property_key = None):
f"WHERE e.uuid='{uuid}' AND parent.entity_type <> 'Lab' "
# COLLECT() returns a list
# apoc.coll.toSet() reruns a set containing unique nodes
f"RETURN apoc.coll.toSet(COLLECT(parent)) AS {record_field_name}")
f"RETURN apoc.coll.toSet(COLLECT(apoc.create.vNode(labels(parent), apoc.map.removeKeys(properties(parent), {fields_to_omit})))) AS {record_field_name}")

logger.info("======get_parents() query======")
logger.info(query)
Expand All @@ -248,10 +245,6 @@ def get_parents(neo4j_driver, uuid, property_key = None):
else:
# Convert the list of nodes to a list of dicts
results = nodes_to_dicts(record[record_field_name])
if fields_to_omit:
for node_dict in results:
for field in fields_to_omit:
node_dict.pop(field, None)

return results

Expand Down Expand Up @@ -401,7 +394,7 @@ def get_ancestors(neo4j_driver, uuid, property_key = None):
f"WHERE e.uuid='{uuid}' AND ancestor.entity_type <> 'Lab' "
# COLLECT() returns a list
# apoc.coll.toSet() reruns a set containing unique nodes
f"RETURN apoc.coll.toSet(COLLECT(ancestor)) AS {record_field_name}")
f"RETURN apoc.coll.toSet(COLLECT(apoc.create.vNode(labels(ancestor), apoc.map.removeKeys(properties(ancestor), {fields_to_omit})))) AS {record_field_name}")

logger.info("======get_ancestors() query======")
logger.info(query)
Expand All @@ -417,11 +410,6 @@ def get_ancestors(neo4j_driver, uuid, property_key = None):
# Convert the list of nodes to a list of dicts
results = nodes_to_dicts(record[record_field_name])

if fields_to_omit:
for node_dict in results:
for field in fields_to_omit:
node_dict.pop(field, None)

return results

"""
Expand Down Expand Up @@ -457,7 +445,7 @@ def get_descendants(neo4j_driver, uuid, property_key = None):
f"WHERE e.uuid='{uuid}' AND e.entity_type <> 'Lab' "
# COLLECT() returns a list
# apoc.coll.toSet() reruns a set containing unique nodes
f"RETURN apoc.coll.toSet(COLLECT(descendant)) AS {record_field_name}")
f"RETURN apoc.coll.toSet(COLLECT(apoc.create.vNode(labels(descendant), apoc.map.removeKeys(properties(descendant), {fields_to_omit})))) AS {record_field_name}")

logger.info("======get_descendants() query======")
logger.info(query)
Expand All @@ -472,10 +460,7 @@ def get_descendants(neo4j_driver, uuid, property_key = None):
else:
# Convert the list of nodes to a list of dicts
results = nodes_to_dicts(record[record_field_name])
if fields_to_omit:
for node_dict in results:
for field in fields_to_omit:
node_dict.pop(field, None)

return results


Expand Down
Loading