From 6f67635d7a42dcb803e23efd67aa8156da0708ec Mon Sep 17 00:00:00 2001 From: Tyler Rhodes <767526+trhodeos@users.noreply.github.com> Date: Thu, 22 Aug 2024 13:21:42 -0500 Subject: [PATCH] fix --- metaflow/plugins/argo/argo_workflows.py | 14 ++++++-------- metaflow/plugins/argo/argo_workflows_cli.py | 12 +++++------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/metaflow/plugins/argo/argo_workflows.py b/metaflow/plugins/argo/argo_workflows.py index 8566e92388..9843b235e9 100644 --- a/metaflow/plugins/argo/argo_workflows.py +++ b/metaflow/plugins/argo/argo_workflows.py @@ -170,16 +170,16 @@ def __init__( self.kubernetes_labels = self._get_kubernetes_labels() self._workflow_template = self._compile_workflow_template() - self._cronworkflow_template = self._compile_cronworkflow_template() + self._cron_workflow = self._compile_cron_workflow() self._sensor = self._compile_sensor() def __str__(self): return str(self._workflow_template) - def get_cron_workflow_template(self): - return self._cronworkflow_template + def get_cron_workflow(self): + return self._cron_workflow - def get_event_sensor_template(self): + def get_event_sensor(self): return self._sensor def deploy(self): @@ -350,9 +350,7 @@ def _get_schedule(self): def schedule(self): try: argo_client = ArgoClient(namespace=KUBERNETES_NAMESPACE) - argo_client.schedule_workflow_template( - self.name, self._cronworkflow_template - ) + argo_client.schedule_workflow_template(self.name, self._cron_workflow) # Register sensor. # Metaflow will overwrite any existing sensor. sensor_name = ArgoWorkflows._sensor_name(self.name) @@ -2619,7 +2617,7 @@ def _heartbeat_daemon_template(self): ) ) - def _compile_cronworkflow_template(self): + def _compile_cron_workflow(self): return ( CronWorkflow() .metadata(ObjectMeta().name(self.name)) diff --git a/metaflow/plugins/argo/argo_workflows_cli.py b/metaflow/plugins/argo/argo_workflows_cli.py index b93c9e42f0..9979df2d67 100644 --- a/metaflow/plugins/argo/argo_workflows_cli.py +++ b/metaflow/plugins/argo/argo_workflows_cli.py @@ -216,7 +216,7 @@ def create( user_namespace=None, only_workflow_template_json=False, only_event_sensor_json=False, - only_cron_workflow_template_json=False, + only_cron_workflow_json=False, authorize=None, generate_new_token=False, given_token=None, @@ -283,16 +283,14 @@ def create( ) only_json = ( - only_workflow_template_json - or only_event_sensor_json - or only_cron_workflow_template_json + only_workflow_template_json or only_event_sensor_json or only_cron_workflow_json ) if only_workflow_template_json: obj.echo_always(str(flow), err=False, no_bold=True) if only_event_sensor_json: - obj.echo_always(str(flow.get_event_source_template()), err=False, no_bold=True) - if only_cron_workflow_template_json: - obj.echo_always(str(flow.get_cron_workflow_template()), err=False, no_bold=True) + obj.echo_always(str(flow.get_event_source()), err=False, no_bold=True) + if only_cron_workflow_json: + obj.echo_always(str(flow.get_cron_workflow()), err=False, no_bold=True) if not only_json: flow.deploy()