better error handling in arg and env mappers

tapis-project · Dec 6, 2023 · d2a611f · d2a611f
1 parent 844d853
commit d2a611f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/engine/src/core/mappers/ArgMapper.py b/src/engine/src/core/mappers/ArgMapper.py
@@ -6,5 +6,6 @@ def __init__(self, dao: WorkflowExecutorStateDAO):
         self._dao = dao
 
     def get_value_by_key(self, key):
-        value = self._dao.get_state().ctx.args.get(key).value
-        return value
+        arg = self._dao.get_state().ctx.args.get(key, None)
+        if arg == None: return None
+        return arg.value
diff --git a/src/engine/src/core/mappers/EnvMapper.py b/src/engine/src/core/mappers/EnvMapper.py
@@ -6,5 +6,6 @@ def __init__(self, dao: WorkflowExecutorStateDAO):
         self._dao = dao
 
     def get_value_by_key(self, key):
-        value = self._dao.get_state().ctx.env.get(key).value
-        return value
+        env = self._dao.get_state().ctx.env.get(key).value
+        if env == None: return None
+        return env.value
diff --git a/src/engine/src/core/workflows/ValueFromService.py b/src/engine/src/core/workflows/ValueFromService.py
@@ -25,10 +25,10 @@ def get_task_output_value_by_id(self, task_id, _id):
         return output
 
     def get_env_value_by_key(self, key):
-        output = self._env_repo.get_value_by_key(key)
-        return output
+        value = self._env_repo.get_value_by_key(key)
+        return value
 
     def get_arg_value_by_key(self, key):
-        output = self._arg_repo.get_value_by_key(key)
-        return output
+        value = self._arg_repo.get_value_by_key(key)
+        return value