Fixed output port name reference and added additional test

ICRAR · Jun 23, 2022 · 89ea802 · 89ea802
1 parent 53490ab
commit 89ea802
Show file tree

Hide file tree

Showing 4 changed files with 548 additions and 8 deletions.
diff --git a/daliuge-engine/dlg/apps/pyfunc.py b/daliuge-engine/dlg/apps/pyfunc.py
@@ -416,7 +416,7 @@ def optionalEval(x):
 
         outputs = collections.OrderedDict()
         for uid, drop in self._outputs.items():
-            outputs[uid] = all_contents(drop)
+            outputs[uid] = all_contents(drop) if self.output_parser is DropParser.PATH else None
 
 
         self.funcargs = {}

diff --git a/daliuge-engine/dlg/graph_loader.py b/daliuge-engine/dlg/graph_loader.py
@@ -159,10 +159,10 @@ def removeUnmetRelationships(dropSpecList):
                 # Find missing OIDs in this relationship and keep track of them,
                 # removing them from the current DROP spec
                 ds = dropSpec[rel]
-                # if isinstance(ds[0], dict):
-                #     ds = [next(iter(d)) for d in ds]
-                ds = [normalise_oid(d) for d in ds]
-                missingOids = [oid for oid in normalise_oid(ds) if oid not in oids]
+                if isinstance(ds[0], dict):
+                    ds = [next(iter(d)) for d in ds]
+#                ds = [normalise_oid(d) for d in ds]
+                missingOids = [oid for oid in ds if oid not in oids]
                 for oid in missingOids:
                     unmetRelationships.append(DROPRel(oid, link, this_oid))
                     ds.remove(oid)