ob-metaflow 2.12.36.2__py2.py3-none-any.whl → 2.12.36.3__py2.py3-none-any.whl

metaflow/package.py

@@ -6,7 +6,6 @@ import time
 import json
 from io import BytesIO
 
-from .user_configs.config_parameters import CONFIG_FILE, dump_config_values
 from .extension_support import EXT_PKG, package_mfext_all
 from .metaflow_config import DEFAULT_PACKAGE_SUFFIXES
 from .exception import MetaflowException
@@ -152,23 +151,11 @@ class MetaflowPackage(object):
             for path_tuple in self._walk(flowdir, suffixes=self.suffixes):
                 yield path_tuple
 
-    def _add_configs(self, tar):
-        buf = BytesIO()
-        buf.write(json.dumps(dump_config_values(self._flow)).encode("utf-8"))
-        self._add_file(tar, os.path.basename(CONFIG_FILE), buf)
-
     def _add_info(self, tar):
+        info = tarfile.TarInfo(os.path.basename(INFO_FILE))
+        env = self.environment.get_environment_info(include_ext_info=True)
         buf = BytesIO()
-        buf.write(
-            json.dumps(
-                self.environment.get_environment_info(include_ext_info=True)
-            ).encode("utf-8")
-        )
-        self._add_file(tar, os.path.basename(INFO_FILE), buf)
-
-    @staticmethod
-    def _add_file(tar, filename, buf):
-        info = tarfile.TarInfo(filename)
+        buf.write(json.dumps(env).encode("utf-8"))
         buf.seek(0)
         info.size = len(buf.getvalue())
         # Setting this default to Dec 3, 2019
@@ -188,7 +175,6 @@ class MetaflowPackage(object):
             fileobj=buf, mode="w:gz", compresslevel=3, dereference=True
         ) as tar:
             self._add_info(tar)
-            self._add_configs(tar)
             for path, arcname in self.path_tuples():
                 tar.add(path, arcname=arcname, recursive=False, filter=no_mtime)
 

metaflow/parameters.py

@@ -3,7 +3,7 @@ import json
 from contextlib import contextmanager
 from threading import local
 
-from typing import Any, Callable, Dict, NamedTuple, Optional, TYPE_CHECKING, Type, Union
+from typing import Any, Callable, Dict, NamedTuple, Optional, Type, Union
 
 from metaflow._vendor import click
 
@@ -14,9 +14,6 @@ from .exception import (
     MetaflowException,
 )
 
-if TYPE_CHECKING:
-    from .user_configs.config_parameters import ConfigValue
-
 try:
     # Python2
     strtype = basestring
@@ -35,7 +32,6 @@ ParameterContext = NamedTuple(
         ("parameter_name", str),
         ("logger", Callable[..., None]),
         ("ds_type", str),
-        ("configs", Optional["ConfigValue"]),
     ],
 )
 
@@ -76,16 +72,6 @@ def flow_context(flow_cls):
 context_proto = None
 
 
-def replace_flow_context(flow_cls):
-    """
-    Replace the current flow context with a new flow class. This is used
-    when we change the current flow class after having run user configuration functions
-    """
-    current_flow.flow_cls_stack = current_flow.flow_cls_stack[1:]
-    current_flow.flow_cls_stack.insert(0, flow_cls)
-    current_flow.flow_cls = current_flow.flow_cls_stack[0]
-
-
 class JSONTypeClass(click.ParamType):
     name = "JSON"
 
@@ -224,18 +210,12 @@ class DeployTimeField(object):
 def deploy_time_eval(value):
     if isinstance(value, DeployTimeField):
         return value(deploy_time=True)
-    elif isinstance(value, DelayedEvaluationParameter):
-        return value(return_str=True)
     else:
         return value
 
 
 # this is called by cli.main
-def set_parameter_context(flow_name, echo, datastore, configs):
-    from .user_configs.config_parameters import (
-        ConfigValue,
-    )  # Prevent circular dependency
-
+def set_parameter_context(flow_name, echo, datastore):
     global context_proto
     context_proto = ParameterContext(
         flow_name=flow_name,
@@ -243,7 +223,6 @@ def set_parameter_context(flow_name, echo, datastore, configs):
         parameter_name=None,
         logger=echo,
         ds_type=datastore.TYPE,
-        configs=ConfigValue(dict(configs)),
     )
 
 
@@ -300,11 +279,7 @@ class Parameter(object):
     ----------
     name : str
         User-visible parameter name.
-    default : Union[str, float, int, bool, Dict[str, Any],
-                Callable[
-                    [ParameterContext], Union[str, float, int, bool, Dict[str, Any]]
-                ],
-            ], optional, default None
+    default : str or float or int or bool or `JSONType` or a function.
         Default value for the parameter. Use a special `JSONType` class to
         indicate that the value must be a valid JSON object. A function
         implies that the parameter corresponds to a *deploy-time parameter*.
@@ -313,19 +288,15 @@ class Parameter(object):
         If `default` is not specified, define the parameter type. Specify
         one of `str`, `float`, `int`, `bool`, or `JSONType`. If None, defaults
         to the type of `default` or `str` if none specified.
-    help : str, optional, default None
+    help : str, optional
         Help text to show in `run --help`.
-    required : bool, optional, default None
-        Require that the user specified a value for the parameter. Note that if
-        a default is provide, the required flag is ignored.
-        A value of None is equivalent to False.
-    show_default : bool, optional, default None
-        If True, show the default value in the help text. A value of None is equivalent
-        to True.
+    required : bool, default False
+        Require that the user specified a value for the parameter.
+        `required=True` implies that the `default` is not used.
+    show_default : bool, default True
+        If True, show the default value in the help text.
     """
 
-    IS_CONFIG_PARAMETER = False
-
     def __init__(
         self,
         name: str,
@@ -336,53 +307,31 @@ class Parameter(object):
                 int,
                 bool,
                 Dict[str, Any],
-                Callable[
-                    [ParameterContext], Union[str, float, int, bool, Dict[str, Any]]
-                ],
+                Callable[[], Union[str, float, int, bool, Dict[str, Any]]],
             ]
         ] = None,
         type: Optional[
             Union[Type[str], Type[float], Type[int], Type[bool], JSONTypeClass]
         ] = None,
         help: Optional[str] = None,
-        required: Optional[bool] = None,
-        show_default: Optional[bool] = None,
+        required: bool = False,
+        show_default: bool = True,
         **kwargs: Dict[str, Any]
     ):
         self.name = name
         self.kwargs = kwargs
-        self._override_kwargs = {
+        for k, v in {
             "default": default,
             "type": type,
             "help": help,
             "required": required,
             "show_default": show_default,
-        }
-
-    def init(self):
-        # Prevent circular import
-        from .user_configs.config_parameters import (
-            resolve_delayed_evaluator,
-            unpack_delayed_evaluator,
-        )
-
-        # Resolve any value from configurations
-        self.kwargs = unpack_delayed_evaluator(self.kwargs)
-        self.kwargs = resolve_delayed_evaluator(self.kwargs)
-
-        # This was the behavior before configs: values specified in args would override
-        # stuff in kwargs which is what we implement here as well
-        for key, value in self._override_kwargs.items():
-            if value is not None:
-                self.kwargs[key] = value
-        # Set two default values if no-one specified them
-        self.kwargs.setdefault("required", False)
-        self.kwargs.setdefault("show_default", True)
-
-        # Continue processing kwargs free of any configuration values :)
+        }.items():
+            if v is not None:
+                self.kwargs[k] = v
 
         # TODO: check that the type is one of the supported types
-        param_type = self.kwargs["type"] = self._get_type(self.kwargs)
+        param_type = self.kwargs["type"] = self._get_type(kwargs)
 
         reserved_params = [
             "params",
@@ -407,27 +356,23 @@ class Parameter(object):
             raise MetaflowException(
                 "Parameter name '%s' is a reserved "
                 "word. Please use a different "
-                "name for your parameter." % (self.name)
+                "name for your parameter." % (name)
             )
 
         # make sure the user is not trying to pass a function in one of the
         # fields that don't support function-values yet
         for field in ("show_default", "separator", "required"):
-            if callable(self.kwargs.get(field)):
+            if callable(kwargs.get(field)):
                 raise MetaflowException(
                     "Parameter *%s*: Field '%s' cannot "
-                    "have a function as its value" % (self.name, field)
+                    "have a function as its value" % (name, field)
                 )
 
         # default can be defined as a function
         default_field = self.kwargs.get("default")
         if callable(default_field) and not isinstance(default_field, DeployTimeField):
             self.kwargs["default"] = DeployTimeField(
-                self.name,
-                param_type,
-                "default",
-                self.kwargs["default"],
-                return_str=True,
+                name, param_type, "default", self.kwargs["default"], return_str=True
             )
 
         # note that separator doesn't work with DeployTimeFields unless you
@@ -436,7 +381,7 @@ class Parameter(object):
         if self.separator and not self.is_string_type:
             raise MetaflowException(
                 "Parameter *%s*: Separator is only allowed "
-                "for string parameters." % self.name
+                "for string parameters." % name
             )
 
     def __repr__(self):
@@ -492,9 +437,7 @@ def add_custom_parameters(deploy_mode=False):
         flow_cls = getattr(current_flow, "flow_cls", None)
         if flow_cls is None:
             return cmd
-        parameters = [
-            p for _, p in flow_cls._get_parameters() if not p.IS_CONFIG_PARAMETER
-        ]
+        parameters = [p for _, p in flow_cls._get_parameters()]
         for arg in parameters[::-1]:
             kwargs = arg.option_kwargs(deploy_mode)
             cmd.params.insert(0, click.Option(("--" + arg.name,), **kwargs))

metaflow/plugins/__init__.py

@@ -164,10 +164,6 @@ def get_plugin_cli():
     return resolve_plugins("cli")
 
 
-def get_plugin_cli_path():
-    return resolve_plugins("cli", path_only=True)
-
-
 STEP_DECORATORS = resolve_plugins("step_decorator")
 FLOW_DECORATORS = resolve_plugins("flow_decorator")
 ENVIRONMENTS = resolve_plugins("environment")

metaflow/plugins/airflow/airflow_cli.py

@@ -283,7 +283,6 @@ def make_flow(
 ):
     # Attach @kubernetes.
     decorators._attach_decorators(obj.flow, [KubernetesDecorator.name])
-    decorators._init(obj.flow)
 
     decorators._init_step_decorators(
         obj.flow, obj.graph, obj.environment, obj.flow_datastore, obj.logger

metaflow/plugins/argo/argo_workflows.py

@@ -61,7 +61,6 @@ from metaflow.plugins.kubernetes.kubernetes import (
 )
 from metaflow.plugins.kubernetes.kubernetes_jobsets import KubernetesArgoJobSet
 from metaflow.unbounded_foreach import UBF_CONTROL, UBF_TASK
-from metaflow.user_configs.config_options import ConfigInput
 from metaflow.util import (
     compress_list,
     dict_to_cli_options,
@@ -170,7 +169,6 @@ class ArgoWorkflows(object):
         self.enable_heartbeat_daemon = enable_heartbeat_daemon
         self.enable_error_msg_capture = enable_error_msg_capture
         self.parameters = self._process_parameters()
-        self.config_parameters = self._process_config_parameters()
         self.triggers, self.trigger_options = self._process_triggers()
         self._schedule, self._timezone = self._get_schedule()
 
@@ -458,10 +456,6 @@ class ArgoWorkflows(object):
                     "case-insensitive." % param.name
                 )
             seen.add(norm)
-            # NOTE: We skip config parameters as these do not have dynamic values,
-            # and need to be treated differently.
-            if param.IS_CONFIG_PARAMETER:
-                continue
 
             extra_attrs = {}
             if param.kwargs.get("type") == JSONType:
@@ -495,7 +489,6 @@ class ArgoWorkflows(object):
             # execution - which needs to be fixed imminently.
             if not is_required or default_value is not None:
                 default_value = json.dumps(default_value)
-
             parameters[param.name] = dict(
                 name=param.name,
                 value=default_value,
@@ -506,27 +499,6 @@ class ArgoWorkflows(object):
             )
         return parameters
 
-    def _process_config_parameters(self):
-        parameters = []
-        seen = set()
-        for var, param in self.flow._get_parameters():
-            if not param.IS_CONFIG_PARAMETER:
-                continue
-            # Throw an exception if the parameter is specified twice.
-            norm = param.name.lower()
-            if norm in seen:
-                raise MetaflowException(
-                    "Parameter *%s* is specified twice. "
-                    "Note that parameter names are "
-                    "case-insensitive." % param.name
-                )
-            seen.add(norm)
-
-            parameters.append(
-                dict(name=param.name, kv_name=ConfigInput.make_key_name(param.name))
-            )
-        return parameters
-
     def _process_triggers(self):
         # Impute triggers for Argo Workflow Template specified through @trigger and
         # @trigger_on_finish decorators
@@ -549,13 +521,8 @@ class ArgoWorkflows(object):
             # convert them to lower case since Metaflow parameters are case
             # insensitive.
             seen = set()
-            # NOTE: We skip config parameters as their values can not be set through event payloads
             params = set(
-                [
-                    param.name.lower()
-                    for var, param in self.flow._get_parameters()
-                    if not param.IS_CONFIG_PARAMETER
-                ]
+                [param.name.lower() for var, param in self.flow._get_parameters()]
             )
             trigger_deco = self.flow._flow_decorators.get("trigger")[0]
             trigger_deco.format_deploytime_value()
@@ -1754,13 +1721,6 @@ class ArgoWorkflows(object):
             metaflow_version["production_token"] = self.production_token
             env["METAFLOW_VERSION"] = json.dumps(metaflow_version)
 
-            # map config values
-            cfg_env = {
-                param["name"]: param["kv_name"] for param in self.config_parameters
-            }
-            if cfg_env:
-                env["METAFLOW_FLOW_CONFIG_VALUE"] = json.dumps(cfg_env)
-
             # Set the template inputs and outputs for passing state. Very simply,
             # the container template takes in input-paths as input and outputs
             # the task-id (which feeds in as input-paths to the subsequent task).

metaflow/plugins/argo/argo_workflows_cli.py

@@ -470,7 +470,6 @@ def make_flow(
     decorators._attach_decorators(
         obj.flow, [KubernetesDecorator.name, EnvironmentDecorator.name]
     )
-    decorators._init(obj.flow)
 
     decorators._init_step_decorators(
         obj.flow, obj.graph, obj.environment, obj.flow_datastore, obj.logger

metaflow/plugins/argo/argo_workflows_deployer_objects.py

@@ -97,7 +97,6 @@ class ArgoWorkflowsTriggeredRun(TriggeredRun):
         )
 
         command_obj = self.deployer.spm.get(pid)
-        command_obj.sync_wait()
         return command_obj.process.returncode == 0
 
     def unsuspend(self, **kwargs) -> bool:
@@ -132,7 +131,6 @@ class ArgoWorkflowsTriggeredRun(TriggeredRun):
         )
 
         command_obj = self.deployer.spm.get(pid)
-        command_obj.sync_wait()
         return command_obj.process.returncode == 0
 
     def terminate(self, **kwargs) -> bool:
@@ -167,7 +165,6 @@ class ArgoWorkflowsTriggeredRun(TriggeredRun):
         )
 
         command_obj = self.deployer.spm.get(pid)
-        command_obj.sync_wait()
         return command_obj.process.returncode == 0
 
     @property
@@ -322,7 +319,6 @@ class ArgoWorkflowsDeployedFlow(DeployedFlow):
         )
 
         command_obj = self.deployer.spm.get(pid)
-        command_obj.sync_wait()
         return command_obj.process.returncode == 0
 
     def trigger(self, **kwargs) -> ArgoWorkflowsTriggeredRun:
@@ -365,7 +361,7 @@ class ArgoWorkflowsDeployedFlow(DeployedFlow):
             content = handle_timeout(
                 attribute_file_fd, command_obj, self.deployer.file_read_timeout
             )
-            command_obj.sync_wait()
+
             if command_obj.process.returncode == 0:
                 return ArgoWorkflowsTriggeredRun(
                     deployer=self.deployer, content=content

metaflow/plugins/aws/batch/batch_decorator.py

@@ -138,8 +138,8 @@ class BatchDecorator(StepDecorator):
     supports_conda_environment = True
     target_platform = "linux-64"
 
-    def init(self):
-        super(BatchDecorator, self).init()
+    def __init__(self, attributes=None, statically_defined=False):
+        super(BatchDecorator, self).__init__(attributes, statically_defined)
 
         # If no docker image is explicitly specified, impute a default image.
         if not self.attributes["image"]:

metaflow/plugins/aws/step_functions/step_functions.py

@@ -18,7 +18,6 @@ from metaflow.metaflow_config import (
     SFN_S3_DISTRIBUTED_MAP_OUTPUT_PATH,
 )
 from metaflow.parameters import deploy_time_eval
-from metaflow.user_configs.config_options import ConfigInput
 from metaflow.util import dict_to_cli_options, to_pascalcase
 
 from ..batch.batch import Batch
@@ -72,7 +71,6 @@ class StepFunctions(object):
         self.username = username
         self.max_workers = max_workers
         self.workflow_timeout = workflow_timeout
-        self.config_parameters = self._process_config_parameters()
 
         # https://aws.amazon.com/blogs/aws/step-functions-distributed-map-a-serverless-solution-for-large-scale-parallel-data-processing/
         self.use_distributed_map = use_distributed_map
@@ -487,10 +485,6 @@ class StepFunctions(object):
                     "case-insensitive." % param.name
                 )
             seen.add(norm)
-            # NOTE: We skip config parameters as these do not have dynamic values,
-            # and need to be treated differently.
-            if param.IS_CONFIG_PARAMETER:
-                continue
 
             is_required = param.kwargs.get("required", False)
             # Throw an exception if a schedule is set for a flow with required
@@ -507,27 +501,6 @@ class StepFunctions(object):
             parameters.append(dict(name=param.name, value=value))
         return parameters
 
-    def _process_config_parameters(self):
-        parameters = []
-        seen = set()
-        for var, param in self.flow._get_parameters():
-            if not param.IS_CONFIG_PARAMETER:
-                continue
-            # Throw an exception if the parameter is specified twice.
-            norm = param.name.lower()
-            if norm in seen:
-                raise MetaflowException(
-                    "Parameter *%s* is specified twice. "
-                    "Note that parameter names are "
-                    "case-insensitive." % param.name
-                )
-            seen.add(norm)
-
-            parameters.append(
-                dict(name=param.name, kv_name=ConfigInput.make_key_name(param.name))
-            )
-        return parameters
-
     def _batch(self, node):
         attrs = {
             # metaflow.user is only used for setting the AWS Job Name.
@@ -774,11 +747,6 @@ class StepFunctions(object):
         metaflow_version["production_token"] = self.production_token
         env["METAFLOW_VERSION"] = json.dumps(metaflow_version)
 
-        # map config values
-        cfg_env = {param["name"]: param["kv_name"] for param in self.config_parameters}
-        if cfg_env:
-            env["METAFLOW_FLOW_CONFIG_VALUE"] = json.dumps(cfg_env)
-
         # Set AWS DynamoDb Table Name for state tracking for for-eaches.
         # There are three instances when metaflow runtime directly interacts
         # with AWS DynamoDB.

metaflow/plugins/aws/step_functions/step_functions_cli.py

@@ -326,7 +326,6 @@ def make_flow(
 
     # Attach AWS Batch decorator to the flow
     decorators._attach_decorators(obj.flow, [BatchDecorator.name])
-    decorators._init(obj.flow)
     decorators._init_step_decorators(
         obj.flow, obj.graph, obj.environment, obj.flow_datastore, obj.logger
     )

metaflow/plugins/aws/step_functions/step_functions_deployer_objects.py

@@ -46,7 +46,6 @@ class StepFunctionsTriggeredRun(TriggeredRun):
         )
 
         command_obj = self.deployer.spm.get(pid)
-        command_obj.sync_wait()
         return command_obj.process.returncode == 0
 
 
@@ -175,7 +174,6 @@ class StepFunctionsDeployedFlow(DeployedFlow):
         )
 
         command_obj = self.deployer.spm.get(pid)
-        command_obj.sync_wait()
         return command_obj.process.returncode == 0
 
     def trigger(self, **kwargs) -> StepFunctionsTriggeredRun:
@@ -219,7 +217,6 @@ class StepFunctionsDeployedFlow(DeployedFlow):
                 attribute_file_fd, command_obj, self.deployer.file_read_timeout
             )
 
-            command_obj.sync_wait()
             if command_obj.process.returncode == 0:
                 return StepFunctionsTriggeredRun(
                     deployer=self.deployer, content=content

metaflow/plugins/datatools/s3/s3op.py

@@ -722,8 +722,8 @@ def cli():
     pass
 
 
-@cli.command("list", help="List S3 objects")
 @tracing.cli_entrypoint("s3op/list")
+@cli.command("list", help="List S3 objects")
 @click.option(
     "--recursive/--no-recursive",
     default=False,
@@ -782,8 +782,8 @@ def lst(
             print(format_result_line(idx, url.prefix, url.url, str(size)))
 
 
-@cli.command(help="Upload files to S3")
 @tracing.cli_entrypoint("s3op/put")
+@cli.command(help="Upload files to S3")
 @click.option(
     "--file",
     "files",
@@ -977,8 +977,8 @@ def _populate_prefixes(prefixes, inputs):
     return prefixes, is_transient_retry
 
 
-@cli.command(help="Download files from S3")
 @tracing.cli_entrypoint("s3op/get")
+@cli.command(help="Download files from S3")
 @click.option(
     "--recursive/--no-recursive",
     default=False,

metaflow/plugins/kubernetes/kubernetes_cli.py

@@ -33,12 +33,12 @@ def kubernetes():
     pass
 
 
+@tracing.cli_entrypoint("kubernetes/step")
 @kubernetes.command(
     help="Execute a single task on Kubernetes. This command calls the top-level step "
     "command inside a Kubernetes pod with the given options. Typically you do not call "
     "this command directly; it is used internally by Metaflow."
 )
-@tracing.cli_entrypoint("kubernetes/step")
 @click.argument("step-name")
 @click.argument("code-package-sha")
 @click.argument("code-package-url")

metaflow/plugins/kubernetes/kubernetes_decorator.py

@@ -153,8 +153,8 @@ class KubernetesDecorator(StepDecorator):
     supports_conda_environment = True
     target_platform = "linux-64"
 
-    def init(self):
-        super(KubernetesDecorator, self).init()
+    def __init__(self, attributes=None, statically_defined=False):
+        super(KubernetesDecorator, self).__init__(attributes, statically_defined)
 
         if not self.attributes["namespace"]:
             self.attributes["namespace"] = KUBERNETES_NAMESPACE

metaflow/plugins/pypi/conda_decorator.py

@@ -50,26 +50,20 @@ class CondaStepDecorator(StepDecorator):
     # conda channels, users can specify channel::package as the package name.
 
     def __init__(self, attributes=None, statically_defined=False):
-        self._attributes_with_user_values = (
-            set(attributes.keys()) if attributes is not None else set()
+        self._user_defined_attributes = (
+            attributes.copy() if attributes is not None else {}
         )
-
         super(CondaStepDecorator, self).__init__(attributes, statically_defined)
 
-    def init(self):
-        super(CondaStepDecorator, self).init()
-
         # Support legacy 'libraries=' attribute for the decorator.
         self.attributes["packages"] = {
             **self.attributes["libraries"],
             **self.attributes["packages"],
         }
         del self.attributes["libraries"]
-        if self.attributes["packages"]:
-            self._attributes_with_user_values.add("packages")
 
     def is_attribute_user_defined(self, name):
-        return name in self._attributes_with_user_values
+        return name in self._user_defined_attributes
 
     def step_init(self, flow, graph, step, decos, environment, flow_datastore, logger):
         # The init_environment hook for Environment creates the relevant virtual
@@ -89,10 +83,10 @@ class CondaStepDecorator(StepDecorator):
                 **super_attributes["packages"],
                 **self.attributes["packages"],
             }
-            self._attributes_with_user_values.update(
-                conda_base._attributes_with_user_values
-            )
-
+            self._user_defined_attributes = {
+                **self._user_defined_attributes,
+                **conda_base._user_defined_attributes,
+            }
             self.attributes["python"] = (
                 self.attributes["python"] or super_attributes["python"]
             )
@@ -339,15 +333,11 @@ class CondaFlowDecorator(FlowDecorator):
     }
 
     def __init__(self, attributes=None, statically_defined=False):
-        self._attributes_with_user_values = (
-            set(attributes.keys()) if attributes is not None else set()
+        self._user_defined_attributes = (
+            attributes.copy() if attributes is not None else {}
         )
-
         super(CondaFlowDecorator, self).__init__(attributes, statically_defined)
 
-    def init(self):
-        super(CondaFlowDecorator, self).init()
-
         # Support legacy 'libraries=' attribute for the decorator.
         self.attributes["packages"] = {
             **self.attributes["libraries"],
@@ -358,7 +348,7 @@ class CondaFlowDecorator(FlowDecorator):
             self.attributes["python"] = str(self.attributes["python"])
 
     def is_attribute_user_defined(self, name):
-        return name in self._attributes_with_user_values
+        return name in self._user_defined_attributes
 
     def flow_init(
         self, flow, graph, environment, flow_datastore, metadata, logger, echo, options