Change import statements with try except to enable explicit import of submodules from import to avoid conflicts with parent project.

src/git_ops.py

@@ -1,7 +1,12 @@
 import subprocess
 import os
-import utils.g5505_utils as utils
-from pipelines.metadata_revision import update_hdf5_file_with_review
+
+try: 
+    from dima.utils import g5505_utils as utils
+    from dima.pipelines.metadata_revision import update_hdf5_file_with_review
+except ModuleNotFoundError:
+    import utils.g5505_utils as utils
+    from pipelines.metadata_revision import update_hdf5_file_with_review
 
 def perform_git_operations(hdf5_upload):
     status_command = ['git', 'status']

src/hdf5_ops.py

@@ -17,9 +17,6 @@ if dimaPath not in sys.path:  # Avoid duplicate entries
 import h5py
 import pandas as pd
 import numpy as np
-
-import utils.g5505_utils as utils
-import src.hdf5_writer as hdf5_lib
 import logging
 import datetime
 
@@ -29,6 +26,13 @@ import yaml
 import json
 import copy
 
+try:
+    from dima.utils import g5505_utils as utils
+    from dima.src import hdf5_writer as hdf5_lib
+except ModuleNotFoundError:
+    import utils.g5505_utils as utils
+    import src.hdf5_writer as hdf5_lib
+
 class HDF5DataOpsManager():
 
     """

src/hdf5_writer.py

@@ -1,15 +1,19 @@
 import sys
 import os
-root_dir = os.path.abspath(os.curdir)
-sys.path.append(root_dir)
+#root_dir = os.path.abspath(os.curdir)
+#sys.path.append(root_dir)
 
 import pandas as pd
 import numpy as np
 import h5py
 import logging
 
-import utils.g5505_utils as utils
-import instruments.readers.filereader_registry as filereader_registry
+try:
+    from dima.utils import g5505_utils as utils
+    from dima.instruments.readers import filereader_registry as filereader_registry
+except ModuleNotFoundError:
+    import utils.g5505_utils as utils
+    import instruments.readers.filereader_registry as filereader_registry