Fixup rebase

Author: romain-intel

metaflow/cli.py

@@ -475,7 +475,7 @@ def start(
         raise ctx.obj.delayed_config_exception
 
     # Init all values in the flow mutators and then process them
-    for decorator in ctx.obj.flow._flow_state[FlowStateItems.FLOW_MUTATORS]:
+    for decorator in ctx.obj.flow._flow_mutators:
         decorator.external_init()
 
     new_cls = ctx.obj.flow._process_config_decorators(config_options)
@@ -596,7 +596,7 @@ def start(
         ctx.obj.echo,
         ctx.obj.flow_datastore,
         {
-            k: v if plain_flag else ConfigValue(v)
+            k: v if plain_flag or v is None else ConfigValue(v)
             for k, (v, plain_flag) in ctx.obj.flow.__class__._flow_state[
                 FlowStateItems.CONFIGS
             ].items()

metaflow/decorators.py

@@ -803,7 +803,7 @@ def _init_step_decorators(
     # and then the step level ones to maintain a consistent order with how
     # other decorators are run.
 
-    for deco in cls._flow_state[FlowStateItems.FLOW_MUTATORS]:
+    for deco in cls._flow_mutators:
         if isinstance(deco, FlowMutator):
             inserted_by_value = [deco.decorator_name] + (deco.inserted_by or [])
             mutable_flow = MutableFlow(

metaflow/flowspec.py

@@ -331,6 +331,10 @@ def _flow_decorators(self):
         # Backward compatible method to access flow decorators
         return self._flow_state[FlowStateItems.FLOW_DECORATORS]
 
+    @property
+    def _flow_mutators(self):
+        return self._flow_state[FlowStateItems.FLOW_MUTATORS]
+
     @classmethod
     def _check_parameters(cls, config_parameters=False):
         seen = set()

metaflow/runner/click_api.py

@@ -532,7 +532,7 @@ def _compute_flow_parameters(self):
         # We ignore any errors if we don't check the configs in the click API.
 
         # Init all values in the flow mutators and then process them
-        for decorator in self._flow_cls._flow_state[FlowStateItems.FLOW_MUTATORS]:
+        for decorator in self._flow_cls._flow_mutators:
             decorator.external_init()
 
         new_cls = self._flow_cls._process_config_decorators(