Fixed import errors

daliuge-engine/dlg/apps/archiving.py

@@ -20,7 +20,8 @@
 #    MA 02111-1307  USA
 #
 import logging
-from ..drop import BarrierAppDROP, ContainerDROP
+from dlg.apps.app_base import BarrierAppDROP
+from dlg.data.drops.container import ContainerDROP
 from ..droputils import DROPFile
 from dlg.data.io import NgasIO, OpenMode, NgasLiteIO
 from ..meta import (
@@ -60,7 +61,9 @@ def run(self):
 
         # Check that the constrains are correct
         if self.outputs:
-            raise Exception("No outputs should be declared for this application")
+            raise Exception(
+                "No outputs should be declared for this application"
+            )
         if len(self.inputs) != 1:
             raise Exception("Only one input is expected by this application")
 
@@ -150,7 +153,9 @@ def store(self, inDrop):
                 mimeType=self.ngasMime,
             )
         except ImportError:
-            logger.warning("NgasIO library not available, falling back to NgasLiteIO.")
+            logger.warning(
+                "NgasIO library not available, falling back to NgasLiteIO."
+            )
             ngasIO = NgasLiteIO(
                 self.ngasSrv,
                 inDrop.uid,

daliuge-engine/dlg/apps/constructs.py

@@ -1,4 +1,4 @@
-from dlg.drop import BarrierAppDROP
+from dlg.apps.app_base import BarrierAppDROP
 
 ##
 # @brief Scatter

daliuge-engine/dlg/apps/mpi.py

@@ -26,7 +26,7 @@
 import subprocess
 import sys
 
-from ..drop import BarrierAppDROP
+from dlg.apps.app_base import BarrierAppDROP
 from ..exceptions import InvalidDropException
 
 logger = logging.getLogger(__name__)
@@ -103,25 +103,39 @@ def run(self):
         vendor, version = MPI.get_vendor()  # @UndefinedVariable
         info = MPI.Info.Create()  # @UndefinedVariable
         logger.debug(
-            "MPI vendor is %s, version %s", vendor, ".".join([str(x) for x in version])
+            "MPI vendor is %s, version %s",
+            vendor,
+            ".".join([str(x) for x in version]),
         )  # @UndefinedVariable
         comm_children = MPI.COMM_SELF.Spawn(
-            cmd, args=args, maxprocs=self._maxprocs, errcodes=errcodes, info=info
+            cmd,
+            args=args,
+            maxprocs=self._maxprocs,
+            errcodes=errcodes,
+            info=info,
         )  # @UndefinedVariable
 
         n_children = comm_children.Get_remote_size()
-        logger.info("%d MPI children apps spawned, gathering exit data", n_children)
+        logger.info(
+            "%d MPI children apps spawned, gathering exit data", n_children
+        )
 
         if self._use_wrapper:
             children_data = comm_children.gather(
                 ("", "", 0), root=MPI.ROOT
             )  # @UndefinedVariable
             exit_codes = [x[2] for x in children_data]
-            logger.info("Exit codes gathered from children processes: %r", exit_codes)
+            logger.info(
+                "Exit codes gathered from children processes: %r", exit_codes
+            )
 
             any_failed = False
             for rank, (stdout, stderr, code) in enumerate(children_data):
-                self._recompute_data[str(rank)] = [code, str(stdout), str(stderr)]
+                self._recompute_data[str(rank)] = [
+                    code,
+                    str(stdout),
+                    str(stderr),
+                ]
                 if code == 0:
                     continue
                 any_failed = True

daliuge-engine/dlg/apps/scp.py

@@ -20,11 +20,9 @@
 #    MA 02111-1307  USA
 #
 from dlg.remote import copyTo, copyFrom
-from dlg.drop import (
-    BarrierAppDROP,
-    NullDROP,
-    ContainerDROP,
-)
+from dlg.apps.app_base import BarrierAppDROP
+from dlg.data.drops.data_base import NullDROP
+from dlg.data.drops.container import ContainerDROP
 from dlg.data.drops.rdbms import RDBMSDrop
 from dlg.data.drops.memory import InMemoryDROP, SharedMemoryDROP
 from dlg.data.drops.ngas import NgasDROP