ob-metaflow 2.12.23.1__py2.py3-none-any.whl → 2.12.24.1__py2.py3-none-any.whl

metaflow/plugins/argo/argo_workflows.py

@@ -51,7 +51,7 @@ from metaflow.metaflow_config import (
     UI_URL,
     PAGERDUTY_TEMPLATE_URL,
 )
-from metaflow.metaflow_config_funcs import config_values
+from metaflow.metaflow_config_funcs import config_values, init_config
 from metaflow.mflog import BASH_SAVE_LOGS, bash_capture_logs, export_mflog_env_vars
 from metaflow.parameters import deploy_time_eval
 from metaflow.plugins.kubernetes.kubernetes import (
@@ -1822,6 +1822,21 @@ class ArgoWorkflows(object):
                 and k not in set(ARGO_WORKFLOWS_ENV_VARS_TO_SKIP.split(","))
             }
 
+            # get initial configs
+            initial_configs = init_config()
+            for entry in ["OBP_PERIMETER", "OBP_INTEGRATIONS_SECRETS_METADATA_URL"]:
+                if entry not in initial_configs:
+                    raise ArgoWorkflowsException(
+                        f"{entry} was not found in metaflow config. Please make sure to run `outerbounds configure <...>` command which can be found on the Ourebounds UI or reach out to your Outerbounds support team."
+                    )
+
+            additional_obp_configs = {
+                "OBP_PERIMETER": initial_configs["OBP_PERIMETER"],
+                "OBP_INTEGRATIONS_SECRETS_METADATA_URL": initial_configs[
+                    "OBP_INTEGRATIONS_SECRETS_METADATA_URL"
+                ],
+            }
+
             # Tmpfs variables
             use_tmpfs = resources["use_tmpfs"]
             tmpfs_size = resources["tmpfs_size"]
@@ -2083,6 +2098,13 @@ class ArgoWorkflows(object):
                                         "METAFLOW_KUBERNETES_SERVICE_ACCOUNT_NAME": "spec.serviceAccountName",
                                         "METAFLOW_KUBERNETES_NODE_IP": "status.hostIP",
                                     }.items()
+                                ]
+                                + [
+                                    kubernetes_sdk.V1EnvVar(
+                                        name=k,
+                                        value=v,
+                                    )
+                                    for k, v in additional_obp_configs.items()
                                 ],
                                 image=resources["image"],
                                 image_pull_policy=resources["image_pull_policy"],
@@ -2642,6 +2664,9 @@ class ArgoWorkflows(object):
 
         return (
             DaemonTemplate("heartbeat-daemon")
+            # NOTE: Even though a retry strategy does not work for Argo daemon containers,
+            # this has the side-effect of protecting the exit hooks of the workflow from failing in case the daemon container errors out.
+            .retry_strategy(10, 1)
             .service_account_name(resources["service_account"])
             .container(
                 to_camelcase(
@@ -3313,6 +3338,15 @@ class DaemonTemplate(object):
         self.payload["serviceAccountName"] = service_account_name
         return self
 
+    def retry_strategy(self, times, minutes_between_retries):
+        if times > 0:
+            self.payload["retryStrategy"] = {
+                "retryPolicy": "Always",
+                "limit": times,
+                "backoff": {"duration": "%sm" % minutes_between_retries},
+            }
+        return self
+
     def to_json(self):
         return self.payload
 

metaflow/plugins/argo/argo_workflows_cli.py

@@ -179,7 +179,7 @@ def argo_workflows(obj, name=None):
 )
 @click.option(
     "--enable-heartbeat-daemon/--no-enable-heartbeat-daemon",
-    default=True,
+    default=False,
     show_default=True,
     help="Use a daemon container to broadcast heartbeats.",
 )

metaflow/plugins/kubernetes/kubernetes.py

@@ -45,7 +45,7 @@ from metaflow.metaflow_config import (
     SERVICE_INTERNAL_URL,
 )
 from metaflow.unbounded_foreach import UBF_CONTROL, UBF_TASK
-from metaflow.metaflow_config_funcs import config_values
+from metaflow.metaflow_config_funcs import config_values, init_config
 from metaflow.mflog import (
     BASH_SAVE_LOGS,
     bash_capture_logs,
@@ -311,6 +311,22 @@ class Kubernetes(object):
         ) + KUBERNETES_SECRETS.split(","):
             jobset.secret(k)
 
+        initial_configs = init_config()
+        for entry in ["OBP_PERIMETER", "OBP_INTEGRATIONS_SECRETS_METADATA_URL"]:
+            if entry not in initial_configs:
+                raise KubernetesException(
+                    f"{entry} was not found in metaflow config. Please make sure to run `outerbounds configure <...>` command which can be found on the Ourebounds UI or reach out to your Outerbounds support team."
+                )
+
+        additional_obp_configs = {
+            "OBP_PERIMETER": initial_configs["OBP_PERIMETER"],
+            "OBP_INTEGRATIONS_SECRETS_METADATA_URL": initial_configs[
+                "OBP_INTEGRATIONS_SECRETS_METADATA_URL"
+            ],
+        }
+        for k, v in additional_obp_configs.items():
+            jobset.environment_variable(k, v)
+
         jobset.environment_variables_from_selectors(
             {
                 "METAFLOW_KUBERNETES_NAMESPACE": "metadata.namespace",

metaflow/plugins/kubernetes/kubernetes_client.py

@@ -121,10 +121,7 @@ class KubernetesClient(object):
         job_api = self._client.BatchV1Api()
         pods = self._find_active_pods(flow_name, run_id, user)
 
-        active_pods = False
-
         def _kill_pod(pod):
-            active_pods = True
             echo("Killing Kubernetes pod %s\n" % pod.metadata.name)
             try:
                 stream(
@@ -158,10 +155,10 @@ class KubernetesClient(object):
                     echo("failed to kill pod %s - %s" % (pod.metadata.name, str(e)))
 
         with ThreadPoolExecutor() as executor:
-            executor.map(_kill_pod, pods)
+            operated_pods = list(executor.map(_kill_pod, pods))
 
-        if not active_pods:
-            echo("No active Kubernetes pods found for run *%s*" % run_id)
+            if not operated_pods:
+                echo("No active Kubernetes pods found for run *%s*" % run_id)
 
     def jobset(self, **kwargs):
         return KubernetesJobSet(self, **kwargs)

metaflow/plugins/kubernetes/kubernetes_job.py

@@ -9,6 +9,7 @@ from metaflow.exception import MetaflowException
 from metaflow.metaflow_config import KUBERNETES_SECRETS
 from metaflow.tracing import inject_tracing_vars
 from metaflow.unbounded_foreach import UBF_CONTROL, UBF_TASK
+from metaflow.metaflow_config_funcs import init_config
 
 CLIENT_REFRESH_INTERVAL_SECONDS = 300
 from .kubernetes_jobsets import (
@@ -74,6 +75,20 @@ class KubernetesJob(object):
             if self._kwargs["shared_memory"]
             else None
         )
+        initial_configs = init_config()
+        for entry in ["OBP_PERIMETER", "OBP_INTEGRATIONS_SECRETS_METADATA_URL"]:
+            if entry not in initial_configs:
+                raise KubernetesJobException(
+                    f"{entry} was not found in metaflow config. Please make sure to run `outerbounds configure <...>` command which can be found on the Ourebounds UI or reach out to your Outerbounds support team."
+                )
+
+        additional_obp_configs = {
+            "OBP_PERIMETER": initial_configs["OBP_PERIMETER"],
+            "OBP_INTEGRATIONS_SECRETS_METADATA_URL": initial_configs[
+                "OBP_INTEGRATIONS_SECRETS_METADATA_URL"
+            ],
+        }
+
         return client.V1JobSpec(
             # Retries are handled by Metaflow when it is responsible for
             # executing the flow. The responsibility is moved to Kubernetes
@@ -135,6 +150,13 @@ class KubernetesJob(object):
                                     "METAFLOW_KUBERNETES_NODE_IP": "status.hostIP",
                                 }.items()
                             ]
+                            + [
+                                client.V1EnvVar(
+                                    name=k,
+                                    value=v,
+                                )
+                                for k, v in additional_obp_configs.items()
+                            ]
                             + [
                                 client.V1EnvVar(name=k, value=str(v))
                                 for k, v in inject_tracing_vars({}).items()

metaflow/task.py

@@ -180,6 +180,10 @@ class MetaflowTask(object):
         # 2) join - pop the topmost frame from the stack
         # 3) step following a split - push a new frame in the stack
 
+        # We have a non-modifying case (case 4)) where we propagate the
+        # foreach-stack information to all tasks in the foreach. This is
+        # then used later to write the foreach-stack metadata for that task
+
         # case 1) - reset the stack
         if step_name == "start":
             self.flow._foreach_stack = []
@@ -264,6 +268,9 @@ class MetaflowTask(object):
             stack = inputs[0]["_foreach_stack"]
             stack.append(frame)
             self.flow._foreach_stack = stack
+        # case 4) - propagate in the foreach nest
+        elif "_foreach_stack" in inputs[0]:
+            self.flow._foreach_stack = inputs[0]["_foreach_stack"]
 
     def _clone_flow(self, datastore):
         x = self.flow.__class__(use_cli=False)

metaflow/version.py

@@ -1 +1 @@
-metaflow_version = "2.12.23.1"
+metaflow_version = "2.12.24.1"

{ob_metaflow-2.12.23.1.dist-info → ob_metaflow-2.12.24.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-metaflow
-Version: 2.12.23.1
+Version: 2.12.24.1
 Summary: Metaflow: More Data Science, Less Engineering
 Author: Netflix, Outerbounds & the Metaflow Community
 Author-email: help@outerbounds.co
@@ -12,7 +12,7 @@ Requires-Dist: boto3
 Requires-Dist: pylint
 Requires-Dist: kubernetes
 Provides-Extra: stubs
-Requires-Dist: metaflow-stubs==2.12.23.1; extra == "stubs"
+Requires-Dist: metaflow-stubs==2.12.24.1; extra == "stubs"
 
 ![Metaflow_Logo_Horizontal_FullColor_Ribbon_Dark_RGB](https://user-images.githubusercontent.com/763451/89453116-96a57e00-d713-11ea-9fa6-82b29d4d6eff.png)
 

{ob_metaflow-2.12.23.1.dist-info → ob_metaflow-2.12.24.1.dist-info}/RECORD

@@ -31,12 +31,12 @@ metaflow/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metaflow/pylint_wrapper.py,sha256=zzBY9YaSUZOGH-ypDKAv2B_7XcoyMZj-zCoCrmYqNRc,2865
 metaflow/runtime.py,sha256=fbBObJJciagHWPzR3T7x9e_jez_RBnLZIHsXMvYnW_M,68875
 metaflow/tagging_util.py,sha256=ctyf0Q1gBi0RyZX6J0e9DQGNkNHblV_CITfy66axXB4,2346
-metaflow/task.py,sha256=uJHl8K4n3jNllWHSsG1vAZtDza0U2QbQcdg9GS_YPBE,28660
+metaflow/task.py,sha256=5-Qy6wAm7dt7DnhnX1KVhVAKl4DWb3IZWIN5YCdRGIg,29043
 metaflow/tuple_util.py,sha256=_G5YIEhuugwJ_f6rrZoelMFak3DqAR2tt_5CapS1XTY,830
 metaflow/unbounded_foreach.py,sha256=p184WMbrMJ3xKYHwewj27ZhRUsSj_kw1jlye5gA9xJk,387
 metaflow/util.py,sha256=olAvJK3y1it_k99MhLulTaAJo7OFVt5rnrD-ulIFLCU,13616
 metaflow/vendor.py,sha256=FchtA9tH22JM-eEtJ2c9FpUdMn8sSb1VHuQS56EcdZk,5139
-metaflow/version.py,sha256=05uFYfkjTqeZGmqF8PVV-sZGW8rNNdsGp_jJnwXcr4I,31
+metaflow/version.py,sha256=d372RV8qNQ_4WoLsDeosYcVFOzaXBqQDVoqK6m525cM,31
 metaflow/_vendor/__init__.py,sha256=y_CiwUD3l4eAKvTVDZeqgVujMy31cAM1qjAB-HfI-9s,353
 metaflow/_vendor/typing_extensions.py,sha256=0nUs5p1A_UrZigrAVBoOEM6TxU37zzPDUtiij1ZwpNc,110417
 metaflow/_vendor/zipp.py,sha256=ajztOH-9I7KA_4wqDYygtHa6xUBVZgFpmZ8FE74HHHI,8425
@@ -175,8 +175,8 @@ metaflow/plugins/airflow/sensors/s3_sensor.py,sha256=iDReG-7FKnumrtQg-HY6cCUAAqN
 metaflow/plugins/argo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metaflow/plugins/argo/argo_client.py,sha256=KTUpP0DmnmNsMp4tbdNyKX_zOdTFRVpUkrf7Vv79d-o,16011
 metaflow/plugins/argo/argo_events.py,sha256=_C1KWztVqgi3zuH57pInaE9OzABc2NnncC-zdwOMZ-w,5909
-metaflow/plugins/argo/argo_workflows.py,sha256=dbqZsqn6aHO7HCy23vLkN_a2g2TTzjMv8aMTNAkeDtE,173506
-metaflow/plugins/argo/argo_workflows_cli.py,sha256=E_PyhOtxuS2F8DwhBANsRZCMxpeZ5rfID8eksfSOPm8,37231
+metaflow/plugins/argo/argo_workflows.py,sha256=AFP0ZmtsxoAAnReYEgfkGYOIWDdG6Ee-hu37CLMo4gY,175217
+metaflow/plugins/argo/argo_workflows_cli.py,sha256=0qAGo0YlC1Y9-1zqYAzhVCpCcITotfOI421VOIRpseM,37232
 metaflow/plugins/argo/argo_workflows_decorator.py,sha256=yprszMdbE3rBTcEA9VR0IEnPjTprUauZBc4SBb-Q7sA,7878
 metaflow/plugins/argo/argo_workflows_deployer.py,sha256=wSSZtThn_VPvE_Wu6NB1L0Q86LmBJh9g009v_lpvBPM,8125
 metaflow/plugins/argo/capture_error.py,sha256=Ys9dscGrTpW-ZCirLBU0gD9qBM0BjxyxGlUMKcwewQc,1852
@@ -280,11 +280,11 @@ metaflow/plugins/gcp/gs_utils.py,sha256=ZmIGFse1qYyvAVrwga23PQUzF6dXEDLLsZ2F-YRm
 metaflow/plugins/gcp/includefile_support.py,sha256=vIDeR-MiJuUh-2S2pV7Z7FBkhIWwtHXaRrj76MWGRiY,3869
 metaflow/plugins/kubernetes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metaflow/plugins/kubernetes/kube_utils.py,sha256=fYDlvqi8jYPsWijDwT6Z2qhQswyFqv7tiwtic_I80Vg,749
-metaflow/plugins/kubernetes/kubernetes.py,sha256=bKBqgZXnIDkoa4xKtKoV6InPtYQy4CujfvcbQ3Pvsbc,31305
+metaflow/plugins/kubernetes/kubernetes.py,sha256=HYNIicCfzTL-9q-nEhwURe2z7_dNIe8eOSyzJEBnd4o,32108
 metaflow/plugins/kubernetes/kubernetes_cli.py,sha256=sFZ9Zrjef85vCO0MGpUF-em8Pw3dePFb3hbX3PtAH4I,13463
-metaflow/plugins/kubernetes/kubernetes_client.py,sha256=y_CswSO_OdDW8eC56lwKwC69JqIfo9tYVw0njXc_sj8,6519
+metaflow/plugins/kubernetes/kubernetes_client.py,sha256=tuvXP-QKpdeSmzVolB2R_TaacOr5DIb0j642eKcjsiM,6491
 metaflow/plugins/kubernetes/kubernetes_decorator.py,sha256=Pr4nzigafYyHgZK4gPnQaQuyxViHozp_idl-AWY3cgk,26871
-metaflow/plugins/kubernetes/kubernetes_job.py,sha256=Cfkee8LbXC17jSXWoeNdomQRvF_8YSeXNg1gvxm6E_M,31806
+metaflow/plugins/kubernetes/kubernetes_job.py,sha256=E2Aa-IItwYErlwAbPgwdqJI_l6axBQ-IzKY__psW-nE,32865
 metaflow/plugins/kubernetes/kubernetes_jobsets.py,sha256=wb0sK1OxW7pRbKdj6bWB4JsskXDsoKKqjyUWo4N9Y6E,41196
 metaflow/plugins/metadata/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 metaflow/plugins/metadata/local.py,sha256=YhLJC5zjVJrvQFIyQ92ZBByiUmhCC762RUX7ITX12O8,22428
@@ -345,9 +345,9 @@ metaflow/tutorials/07-worldview/README.md,sha256=5vQTrFqulJ7rWN6r20dhot9lI2sVj9W
 metaflow/tutorials/07-worldview/worldview.ipynb,sha256=ztPZPI9BXxvW1QdS2Tfe7LBuVzvFvv0AToDnsDJhLdE,2237
 metaflow/tutorials/08-autopilot/README.md,sha256=GnePFp_q76jPs991lMUqfIIh5zSorIeWznyiUxzeUVE,1039
 metaflow/tutorials/08-autopilot/autopilot.ipynb,sha256=DQoJlILV7Mq9vfPBGW-QV_kNhWPjS5n6SJLqePjFYLY,3191
-ob_metaflow-2.12.23.1.dist-info/LICENSE,sha256=nl_Lt5v9VvJ-5lWJDT4ddKAG-VZ-2IaLmbzpgYDz2hU,11343
-ob_metaflow-2.12.23.1.dist-info/METADATA,sha256=81s4jcZ3L8Ugru9il9sH2Yv-FFvbxBrpA_WUvLP4MG8,5143
-ob_metaflow-2.12.23.1.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
-ob_metaflow-2.12.23.1.dist-info/entry_points.txt,sha256=IKwTN1T3I5eJL3uo_vnkyxVffcgnRdFbKwlghZfn27k,57
-ob_metaflow-2.12.23.1.dist-info/top_level.txt,sha256=v1pDHoWaSaKeuc5fKTRSfsXCKSdW1zvNVmvA-i0if3o,9
-ob_metaflow-2.12.23.1.dist-info/RECORD,,
+ob_metaflow-2.12.24.1.dist-info/LICENSE,sha256=nl_Lt5v9VvJ-5lWJDT4ddKAG-VZ-2IaLmbzpgYDz2hU,11343
+ob_metaflow-2.12.24.1.dist-info/METADATA,sha256=gvYCBrqcVdy7KaQQ1EF7OeXJH0lSKbfZDJc49usMgkk,5143
+ob_metaflow-2.12.24.1.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
+ob_metaflow-2.12.24.1.dist-info/entry_points.txt,sha256=IKwTN1T3I5eJL3uo_vnkyxVffcgnRdFbKwlghZfn27k,57
+ob_metaflow-2.12.24.1.dist-info/top_level.txt,sha256=v1pDHoWaSaKeuc5fKTRSfsXCKSdW1zvNVmvA-i0if3o,9
+ob_metaflow-2.12.24.1.dist-info/RECORD,,