diff --git a/knowledge_graph/querying_raw.py b/knowledge_graph/querying_raw.py index 61e3bb1..fa58554 100644 --- a/knowledge_graph/querying_raw.py +++ b/knowledge_graph/querying_raw.py @@ -18,12 +18,13 @@ def neighbors_reversed( graph: triplets_index.TripletsWithIndex, node: triplet.Element, ) -> FrozenSet[triplet.Element]: - return gamla.pipe( - triplets_index.retrieve(relation, triplets_index.object_relation_index)( - graph, node - ), - gamla.map(triplet.subject), - frozenset, + return frozenset( + map( + triplet.subject, + triplets_index.retrieve(relation, triplets_index.object_relation_index)( + graph, node + ), + ) ) @@ -33,12 +34,13 @@ def neighbors( graph: triplets_index.TripletsWithIndex, node: triplet.Element, ) -> FrozenSet[triplet.Element]: - return gamla.pipe( - triplets_index.retrieve(relation, triplets_index.subject_relation_index)( - graph, node - ), - gamla.map(triplet.object), - frozenset, + return frozenset( + map( + triplet.object, + triplets_index.retrieve(relation, triplets_index.subject_relation_index)( + graph, node + ), + ) ) diff --git a/knowledge_graph/storage.py b/knowledge_graph/storage.py index b1ba3c8..1bb8a9b 100644 --- a/knowledge_graph/storage.py +++ b/knowledge_graph/storage.py @@ -71,12 +71,11 @@ def inner(node: Node): def run_on_kg_and_node(f): + f_any_output = run_on_kg_and_node_any_output(f) + def inner(node: Node) -> Nodes: - return gamla.pipe( - node, - run_on_kg_and_node_any_output(f), - gamla.map(lambda result_node: Node(node.graph_id, result_node)), - frozenset, + return frozenset( + Node(node.graph_id, result_node) for result_node in f_any_output(node) ) return inner diff --git a/pyproject.toml b/pyproject.toml index a65707f..4fc78fc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "knowledge-graph" -version = "0.0.34" +version = "0.0.35" description = "A library to store data in a knowledge graph" readme = "README.md" requires-python = ">=3.14" @@ -12,6 +12,7 @@ authors = [{ name = "Hyro AI", email = "contact@hyro.ai" }] keywords = ["tag1", "tag2"] dependencies = [ "dataclasses_json==0.5.7", + "gamla==164", "immutables", "phonenumbers", "pytest",