updated default values

tests/test_parsing.py

@@ -20,7 +20,7 @@ def read_test_data():
             info["parameters"],
             info["inputs"],
             info["step"]["name"],
-            info["step"]["image"] if 'image' in info["step"] else DEFAULT_DOCKER_IMAGE,
+            info["step"]["image"] if 'image' in info["step"] else None,
         )
 
 

tests/test_yaml/test2.py

@@ -16,4 +16,4 @@ def prepare(a, b):
     print(f"this is fake method {a} {b}")
 
 
-valohai.prepare(step="foobar1", default_parameters=params, default_inputs=inputs, image="hope/thiswillnotchange:1234")
+valohai.prepare(step="foobar1", default_parameters=params, default_inputs=inputs)

valohai/internals/merge.py

@@ -4,6 +4,7 @@
 from valohai_yaml.objs.base import Item
 from valohai_yaml.utils.merge import merge_dicts, merge_simple
 
+from valohai.consts import DEFAULT_DOCKER_IMAGE
 
 def python_to_yaml_merge_strategy(original: Item, parsed: Item) -> Item:
     """Merging strategy in the valohai-utils AST parser use-case
@@ -74,8 +75,7 @@ def _merge_step(original: Step, parsed: Step) -> Step:
         skip_missing_b=True,
     )
 
-    if(parsed.image is not None) :
+    if(parsed.image is not None and parsed.image != DEFAULT_DOCKER_IMAGE) :
         result.image = parsed.image
 
-
     return result

valohai/internals/parsing.py

@@ -45,7 +45,7 @@ def __init__(self):
         self.parameters = {}
         self.inputs = {}
         self.step = None
-        self.image = DEFAULT_DOCKER_IMAGE
+        self.image = None
 
     def visit_Assign(self, node):
         try:
@@ -100,4 +100,5 @@ def parse(source):
     parser = PrepareParser()
     parser.visit(tree)
     result = namedtuple("result", ["step", "parameters", "inputs", "image"])
+    print(result)
     return result(step=parser.step, parameters=parser.parameters, inputs=parser.inputs, image=parser.image)