closurizer 0.7.1__tar.gz → 0.7.3__tar.gz

{closurizer-0.7.1 → closurizer-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: closurizer
-Version: 0.7.1
+Version: 0.7.3
 Summary: Add closure expansion fields to kgx files following the Golr pattern
 Author: Kevin Schaper
 Author-email: kevin@tislab.org

{closurizer-0.7.1 → closurizer-0.7.3}/closurizer/closurizer.py

@@ -156,18 +156,35 @@ def add_closure(kg_archive: str,
     """
     print(nodes_query)
 
+
     if not dry_run:
-        db.query(edges_query)
-        db.query(f"""
+
+        db.sql(edges_query)
+
+        edge_closure_replacements = [
+            f"""
+            list_aggregate({field}_closure, 'string_agg', '|') as {field}_closure,
+            list_aggregate({field}_closure_label, 'string_agg', '|') as {field}_closure_label
+            """
+            for field in edge_fields
+        ]
+
+        edge_closure_replacements = "REPLACE (\n" + ",\n".join(edge_closure_replacements) + ")\n"
+
+        edges_export_query = f"""
         -- write denormalized_edges as tsv
-        copy (select * from denormalized_edges) to '{edges_output_file}' (header, delimiter '\t')
-        """)
-        db.query(nodes_query)
-        db.query(f"""
+        copy (select * {edge_closure_replacements} from denormalized_edges) to '{edges_output_file}' (header, delimiter '\t')
+        """
+        print(edges_export_query)
+        db.sql(edges_export_query)
+
+        db.sql(nodes_query)
+        nodes_export_query = f"""
         -- write denormalized_nodes as tsv
         copy (select * from denormalized_nodes) to '{nodes_output_file}' (header, delimiter '\t')
-        """)
-
+        """
+        print(nodes_export_query)
+        db.sql(nodes_export_query)
 
         # Clean up extracted node & edge files
         if os.path.exists(f"{node_file}"):

{closurizer-0.7.1 → closurizer-0.7.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "closurizer"
-version = "0.7.1"
+version = "0.7.3"
 description = "Add closure expansion fields to kgx files following the Golr pattern"
 authors = ["Kevin Schaper <kevin@tislab.org>"]