From a321ee195999bf6b96d0c32b11b3ba5bd45bd1cd Mon Sep 17 00:00:00 2001 From: Callan Gray Date: Wed, 18 May 2022 13:38:43 +0800 Subject: [PATCH] revert arg default behaviour --- daliuge-engine/dlg/apps/pyfunc.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/daliuge-engine/dlg/apps/pyfunc.py b/daliuge-engine/dlg/apps/pyfunc.py index 2c2d8d380..0bd832b77 100644 --- a/daliuge-engine/dlg/apps/pyfunc.py +++ b/daliuge-engine/dlg/apps/pyfunc.py @@ -281,10 +281,6 @@ def initialize(self, **kwargs): """ BarrierAppDROP.initialize(self, **kwargs) - # TODO: for some reason the literal is never cast? - self.input_parser = DropParser(self.input_parser) - self.output_parser = DropParser(self.output_parser) - self._applicationArgs = self._getArg(kwargs, "applicationArgs", {}) self.func_code = self._getArg(kwargs, "func_code", None) @@ -401,7 +397,9 @@ def run(self): elif DropParser(self.input_parser) is DropParser.DATAURL: all_contents = lambda x: x.dataurl else: - raise ValueError(self.input_parser.__repr__()) + all_contents = lambda x: ast.literal_eval( + droputils.allDropContents(x).decode("utf-8") + ) inputs = collections.OrderedDict() for uid, drop in self._inputs.items(): @@ -559,10 +557,8 @@ def write_results(self, result): if DropParser(self.output_parser) is DropParser.PICKLE: logger.debug(f"Writing pickeled result {type(r)} to {o}") o.write(pickle.dumps(r)) - elif DropParser(self.output_parser) is DropParser.AST: - o.write(repr(r).encode('utf-8')) else: - ValueError(self.output_parser.__repr__()) + o.write(repr(r).encode('utf-8')) def generate_recompute_data(self): return self._recompute_data