LIU-456: Fix failing unittests

Author: myxie

daliuge-engine/dlg/apps/app_base.py

@@ -146,7 +146,6 @@ def addInput(self, inputDrop, back=True):
         uid = inputDrop.uid
         if uid not in self._inputs:
             self._inputs[uid] = inputDrop
-            self._inputs_names[uid] = inputDrop.name
             if back:
                 inputDrop.addConsumer(self, False)
 
@@ -167,7 +166,6 @@ def addOutput(self, outputDrop: DataDROP, back=True):
         uid = outputDrop.uid
         if uid not in self._outputs:
             self._outputs[uid] = outputDrop
-            self._outputs_names[uid] = outputDrop.name
 
             if back:
                 outputDrop.addProducer(self, False)

daliuge-engine/dlg/apps/bash_shell_app.py

@@ -208,11 +208,7 @@ def _run_bash(self, inputs, outputs, stdin=None, stdout=subprocess.PIPE):
         )
 
         cmd = self.command.strip()
-        ins = {inputs[k].name:v for k,v in inputs.items()}
-        outs = {outputs[k].name:v for k,v in outputs.items()}
-
-        logger.debug("input names: %s, output names: %s", ins.keys(), outs.keys())
-        cmd = droputils.replace_placeholders(cmd, ins, outs)
+        cmd = droputils.replace_placeholders(cmd, inputs, outputs)
 
         reader = get_port_reader_function(self.input_parser)
         keyargs, pargs = replace_named_ports(

daliuge-engine/dlg/apps/dockerapp.py

@@ -518,16 +518,11 @@ def run(self):
                 outport_names,
                 appArgs,
             )
-            # ins = {k:v for item in inport_names for k,v in item.items()}
-            # outs = {k:v for item in outport_names for k,v in item.items()}
-            # ins = {ins[k]:v for k,v in iitems}
-            # outs = {outs[k]:v for k,v in oitems}
-            ins = {self._inputs[k].name:v for k,v in self._inputs.items()}
-            outs = {self._outputs[k].name:v for k,v in self._outputs.items()}
+
             # complete command including all additional parameters and optional redirects
             if self._command:
                 cmd = droputils.replace_placeholders(
-                    self._command, ins, outs
+                    self._command, dockerInputs, dockerOutputs
                 )
                 for key, value in keyargs.items():
                     cmd = cmd.replace(f"{{{key}}}", str(value))

daliuge-engine/dlg/drop.py

@@ -257,10 +257,8 @@ def __init__(self, oid, uid, **kwargs):
         # library we need to expose a list.
         self._consumers_uids = set()
         self._consumers = ListAsDict(self._consumers_uids)
-        self._consumers_names = dict()
         self._producers_uids = set()
         self._producers = ListAsDict(self._producers_uids)
-        self._producers_names = dict()
 
         # Set holding the state of the producers that have finished their
         # execution. Once all producers have finished, this DROP moves
@@ -955,7 +953,6 @@ def addConsumer(self, consumer, back=True):
             return
         # logger.debug("Adding new consumer %r to %r", consumer.oid, self.oid)
         self._consumers.append(consumer)
-        self._consumers_names[consumer.name] = consumer._uid
 
         # Subscribe the consumer to events sent when this DROP moves to
         # COMPLETED. This way the consumer will be notified that its input has
@@ -1001,7 +998,6 @@ def addProducer(self, producer, back=True):
             return
 
         self._producers.append(producer)
-        self._producers_names[producer.name] = producer._uid
 
         # Automatic back-reference
         if back and hasattr(producer, "addOutput"):

daliuge-engine/dlg/droputils.py

@@ -385,14 +385,14 @@ def has_path(x):
 
 def replace_placeholders(cmd, inputs, outputs):
     """
-    Replaces any placeholder found in ``cmd`` with the path of the respective
+    Attemps to replace any placeholder found in ``cmd`` with the path of the respective
     input or output Drop from ``inputs`` or ``outputs``.
-    Placeholders have the different formats:
 
-    * ``%iN``, with N starting from 0, indicates the path of the N-th element
-      from the ``inputs`` argument; likewise for ``%oN``.
-    * ``%i[X]`` indicates the path of the input with UID ``X``; likewise for
-      ``%o[X]``.
+    This will attempt to use the value from the associated input or output DROP,
+    provided it has a `path` attribute.
+
+    Sometimes there will be no matching replacement, in which case the argument is not
+    replaced.
     """
 
     logger.debug(
@@ -413,7 +413,6 @@ def replace_placeholders(cmd, inputs, outputs):
         except AttributeError:
             logger.debug("Input %s does not have 'dataUrl' attr", attr)
 
-
     logger.debug("Command after path placeholder replacement is: %s", cmd)
 
     return cmd
@@ -423,12 +422,12 @@ def replace_dataurl_placeholders(cmd, inputs, outputs):
     """
     Replaces any placeholder found in ``cmd`` with the dataURL property of the
     respective input or output Drop from ``inputs`` or ``outputs``.
-    Placeholders have the different formats:
 
-    * ``%iDataURLN``, with N starting from 0, indicates the path of the N-th
-      element from the ``inputs`` argument; likewise for ``%oDataURLN``.
-    * ``%iDataURL[X]`` indicates the path of the input with UID ``X``; likewise
-      for ``%oDataURL[X]``.
+    This will attempt to use the value from the reciprocal input or output DROP,
+    provided it has a `dataURL` attribute.
+
+    Sometimes there will be no matching replacement, in which case the argument is not
+    replaced.
     """
 
     # Inputs/outputs that are not FileDROPs or DirectoryContainers can't