Fixing Neo4j import issue with sources property being a dict

orion/build_manager.py

@@ -15,6 +15,7 @@
 from orion.kgx_file_merger import KGXFileMerger, DONT_MERGE
 from orion.kgx_validation import validate_graph
 from orion.neo4j_tools import create_neo4j_dump
+from orion.memgraph_tools import create_memgraph_dump
 from orion.kgxmodel import GraphSpec, SubGraphSource, DataSource
 from orion.normalization import NORMALIZATION_CODE_VERSION, NormalizationScheme
 from orion.metadata import Metadata, GraphMetadata, SourceMetadata
@@ -185,8 +186,7 @@ def build_graph(self, graph_spec: GraphSpec):
                                              graph_id=graph_id,
                                              graph_version=graph_version,
                                              node_property_ignore_list=node_property_ignore_list,
-                                             edge_property_ignore_list=edge_property_ignore_list,
-                                             logger=self.logger)
+                                             edge_property_ignore_list=edge_property_ignore_list)
             if dump_success:
                 graph_metadata.set_dump(dump_type="neo4j_redundant",
                                         dump_url=f'{graph_output_url}graph_{graph_version}_redundant.db.dump')
@@ -208,8 +208,7 @@ def build_graph(self, graph_spec: GraphSpec):
                                              graph_id=graph_id,
                                              graph_version=graph_version,
                                              node_property_ignore_list=node_property_ignore_list,
-                                             edge_property_ignore_list=edge_property_ignore_list,
-                                             logger=self.logger)
+                                             edge_property_ignore_list=edge_property_ignore_list)
             if dump_success:
                 graph_metadata.set_dump(dump_type="neo4j_collapsed_qualifiers",
                                         dump_url=f'{graph_output_url}graph_{graph_version}'
@@ -223,8 +222,7 @@ def build_graph(self, graph_spec: GraphSpec):
                                              graph_id=graph_id,
                                              graph_version=graph_version,
                                              node_property_ignore_list=node_property_ignore_list,
-                                             edge_property_ignore_list=edge_property_ignore_list,
-                                             logger=self.logger)
+                                             edge_property_ignore_list=edge_property_ignore_list)
             if dump_success:
                 graph_metadata.set_dump(dump_type="neo4j",
                                         dump_url=f'{graph_output_url}graph_{graph_version}.db.dump')
@@ -237,8 +235,7 @@ def build_graph(self, graph_spec: GraphSpec):
                                                 graph_id=graph_id,
                                                 graph_version=graph_version,
                                                 node_property_ignore_list=node_property_ignore_list,
-                                                edge_property_ignore_list=edge_property_ignore_list,
-                                                logger=self.logger)
+                                                edge_property_ignore_list=edge_property_ignore_list)
             if dump_success:
                 graph_metadata.set_dump(dump_type="memgraph",
                                         dump_url=f'{graph_output_url}memgraph_{graph_version}.cypher')

orion/cli/memgraph_dump.py

@@ -1,14 +1,9 @@
 import argparse
-import os
-from orion.utils import LoggingUtil
 from orion.memgraph_tools import create_memgraph_dump
 
 def main():
-    logger = LoggingUtil.init_logging("ORION.cli.memgraph_dump",
-                                      line_format='medium',
-                                      log_file_path=os.environ['ORION_LOGS'])
 
-    ap = argparse.ArgumentParser(description='')
+    ap = argparse.ArgumentParser(description='Create memgraph CSV import files from KGX jsonl files.')
     ap.add_argument('nodes_filepath')
     ap.add_argument('edges_filepath')
     ap.add_argument('output_directory')
@@ -18,7 +13,7 @@ def main():
     e_filepath = args['edges_filepath']
     output_directory = args['output_directory']
 
-    create_memgraph_dump(n_filepath, e_filepath, output_directory, logger=logger)
+    create_memgraph_dump(n_filepath, e_filepath, output_directory)
 
 
 if __name__ == '__main__':

orion/cli/neo4j_dump.py

@@ -1,14 +1,9 @@
 import argparse
-import os
-from orion.utils import LoggingUtil
 from orion.neo4j_tools import create_neo4j_dump
 
 def main():
-    logger = LoggingUtil.init_logging("ORION.cli.neo4j_dump",
-                                      line_format='medium',
-                                      log_file_path=os.environ['ORION_LOGS'])
 
-    ap = argparse.ArgumentParser(description='')
+    ap = argparse.ArgumentParser(description='Create a neo4j dump from KGX jsonl files.')
     ap.add_argument('nodes_filepath')
     ap.add_argument('edges_filepath')
     ap.add_argument('output_directory')
@@ -20,8 +15,7 @@ def main():
 
     create_neo4j_dump(nodes_filepath=n_filepath,
                       edges_filepath=e_filepath,
-                      output_directory=output_directory,
-                      logger=logger)
+                      output_directory=output_directory)
 
 
 if __name__ == '__main__':