diff --git a/metaflow/plugins/aip/aip.py b/metaflow/plugins/aip/aip.py index 44689c1cd0c..d25743f1442 100644 --- a/metaflow/plugins/aip/aip.py +++ b/metaflow/plugins/aip/aip.py @@ -173,7 +173,7 @@ def __init__( notify_on_success=None, sqs_url_on_error=None, sqs_role_arn_on_error=None, - add_default_cards=False, + add_default_card=False, **kwargs, ): """ @@ -205,7 +205,7 @@ def __init__( self.notify_on_success = notify_on_success self.sqs_url_on_error = sqs_url_on_error self.sqs_role_arn_on_error = sqs_role_arn_on_error - self.add_default_cards = add_default_cards + self.add_default_card = add_default_card self._client = None self._exit_handler_created = False @@ -1451,8 +1451,8 @@ def _create_metaflow_step_op( metaflow_execution_cmd += " --is_split_index" if node.type == "join": metaflow_execution_cmd += " --is-join-step" - if self.add_default_cards: - metaflow_execution_cmd += " --add-default-cards" + if self.add_default_card: + metaflow_execution_cmd += " --add-default-card" metaflow_execution_cmd += ' --preceding_component_outputs_dict "' for key in preceding_component_outputs_dict: diff --git a/metaflow/plugins/aip/aip_cli.py b/metaflow/plugins/aip/aip_cli.py index ac931fc89cf..fbae58ad366 100644 --- a/metaflow/plugins/aip/aip_cli.py +++ b/metaflow/plugins/aip/aip_cli.py @@ -261,9 +261,9 @@ def cli_decorator(func: Callable): show_default=True, ) @click.option( - "--add-default-cards", - "add_default_cards", - default=from_conf("METAFLOW_AIP_ADD_DEFAULT_CARDS", default=True), + "--add-default-card", + "add_default_card", + default=from_conf("METAFLOW_AIP_ADD_DEFAULT_CARD", default=True), help="Whether to add default card to all workflow steps", show_default=True, ) @@ -330,7 +330,7 @@ def run( sqs_role_arn_on_error=None, argo_wait=False, wait_for_completion_timeout=None, - add_default_cards=True, + add_default_card=True, **kwargs, ): """ @@ -361,7 +361,7 @@ def run( notify_on_success=notify_on_success, sqs_url_on_error=sqs_url_on_error, sqs_role_arn_on_error=sqs_role_arn_on_error, - add_default_cards=add_default_cards, + add_default_card=add_default_card, ) if yaml_only: @@ -525,7 +525,7 @@ def create( recurring_run_enable=None, recurring_run_cron=None, recurring_run_concurrency=None, - add_default_cards=True, + add_default_card=True, **kwargs, ): """ @@ -559,7 +559,7 @@ def create( notify_on_success=notify_on_success, sqs_url_on_error=sqs_url_on_error, sqs_role_arn_on_error=sqs_role_arn_on_error, - add_default_cards=add_default_cards, + add_default_card=add_default_card, ) if yaml_only: @@ -680,7 +680,7 @@ def make_flow( notify_on_success, sqs_url_on_error, sqs_role_arn_on_error, - add_default_cards, + add_default_card, ): """ Analogous to step_functions_cli.py @@ -694,7 +694,7 @@ def make_flow( # Attach AIP decorator to the flow decorators._attach_decorators(obj.flow, [AIPInternalDecorator.name]) - if add_default_cards: + if add_default_card: decorators._attach_decorators(obj.flow, ["card:id=default"]) decorators._init_step_decorators( @@ -740,5 +740,5 @@ def make_flow( notify_on_success=notify_on_success, sqs_url_on_error=sqs_url_on_error, sqs_role_arn_on_error=sqs_role_arn_on_error, - add_default_cards=add_default_cards, + add_default_card=add_default_card, ) diff --git a/metaflow/plugins/aip/aip_metaflow_step.py b/metaflow/plugins/aip/aip_metaflow_step.py index 0efdf4b7e12..e3fb30afc60 100644 --- a/metaflow/plugins/aip/aip_metaflow_step.py +++ b/metaflow/plugins/aip/aip_metaflow_step.py @@ -277,7 +277,7 @@ def _command( @click.option("--workflow_name") @click.option("--is-interruptible/--not-interruptible", default=False) @click.option("--is-join-step", is_flag=True, default=False) -@click.option("--add-default-cards", is_flag=True, default=False) +@click.option("--add-default-card", is_flag=True, default=False) def aip_metaflow_step( volume_dir: str, environment: str, @@ -303,7 +303,7 @@ def aip_metaflow_step( workflow_name: str, is_interruptible: bool, is_join_step: bool, - add_default_cards: bool, + add_default_card: bool, ) -> None: """ (1) Renders and runs the Metaflow package_commands and Metaflow step @@ -335,7 +335,7 @@ def aip_metaflow_step( user_code_retries, workflow_name, script_name, - add_default_cards, + add_default_card, ) # expose passed KFP passed in arguments as environment variables to