ob-metaflow 2.13.8.1__py2.py3-none-any.whl → 2.13.9.2__py2.py3-none-any.whl

metaflow/plugins/argo/argo_workflows.py

@@ -1909,9 +1909,7 @@ class ArgoWorkflows(object):
 
             additional_obp_configs = {
                 "OBP_PERIMETER": initial_configs["OBP_PERIMETER"],
-                "OBP_INTEGRATIONS_URL": initial_configs[
-                    "OBP_INTEGRATIONS_URL"
-                ],
+                "OBP_INTEGRATIONS_URL": initial_configs["OBP_INTEGRATIONS_URL"],
             }
 
             # Tmpfs variables
@@ -1999,6 +1997,8 @@ class ArgoWorkflows(object):
                 for k, v in env.items():
                     jobset.environment_variable(k, v)
 
+                for k, v in additional_obp_configs.items():
+                    jobset.environment_variable(k, v)
                 # Set labels. Do not allow user-specified task labels to override internal ones.
                 #
                 # Explicitly add the task-id-hint label. This is important because this label
@@ -2520,14 +2520,24 @@ class ArgoWorkflows(object):
         links = []
         if UI_URL:
             if PAGERDUTY_TEMPLATE_URL:
-                pdproject = ''
-                pdbranch = ''
+                pdproject = ""
+                pdbranch = ""
                 if getattr(current, "project_name", None):
                     pdproject = current.project_name
                     pdbranch = current.branch_name
-                href_val = PAGERDUTY_TEMPLATE_URL.format(pd_flow=self.flow.name, pd_namespace=KUBERNETES_NAMESPACE,pd_template=self.name,pd_project=pdproject, pd_branch=pdbranch)
+                href_val = PAGERDUTY_TEMPLATE_URL.format(
+                    pd_flow=self.flow.name,
+                    pd_namespace=KUBERNETES_NAMESPACE,
+                    pd_template=self.name,
+                    pd_project=pdproject,
+                    pd_branch=pdbranch,
+                )
             else:
-                href_val = "%s/%s/%s"% (UI_URL.rstrip("/"), self.flow.name, "argo-{{workflow.name}}")
+                href_val = "%s/%s/%s" % (
+                    UI_URL.rstrip("/"),
+                    self.flow.name,
+                    "argo-{{workflow.name}}",
+                )
             links.append(
                 {
                     "href": href_val,

metaflow/plugins/pypi/micromamba.py

@@ -10,6 +10,7 @@ from metaflow.exception import MetaflowException
 from metaflow.util import which
 
 from .utils import MICROMAMBA_MIRROR_URL, MICROMAMBA_URL, conda_platform
+from threading import Lock
 
 
 class MicromambaException(MetaflowException):
@@ -54,22 +55,33 @@ class Micromamba(object):
             or which(os.path.join(self._path_to_hidden_micromamba, "bin/micromamba"))
         )
 
+        # We keep a mutex as environments are resolved in parallel,
+        # which causes a race condition in case micromamba needs to be installed first.
+        self.install_mutex = Lock()
+
     @property
-    def bin(self):
+    def bin(self) -> str:
         "Defer installing Micromamba until when the binary path is actually requested"
         if self._bin is not None:
             return self._bin
-        # Install Micromamba on the fly.
-        # TODO: Make this optional at some point.
-        _install_micromamba(self._path_to_hidden_micromamba)
-        self._bin = which(
-            os.path.join(self._path_to_hidden_micromamba, "bin/micromamba")
-        )
+        with self.install_mutex:
+            # another check as micromamba might have been installed when the mutex is released.
+            if self._bin is not None:
+                return self._bin
+
+            # Install Micromamba on the fly.
+            # TODO: Make this optional at some point.
+            _install_micromamba(self._path_to_hidden_micromamba)
+            self._bin = which(
+                os.path.join(self._path_to_hidden_micromamba, "bin/micromamba")
+            )
+
+            if self._bin is None:
+                msg = "No installation for *Micromamba* found.\n"
+                msg += "Visit https://mamba.readthedocs.io/en/latest/micromamba-installation.html for installation instructions."
+                raise MetaflowException(msg)
 
-        if self._bin is None:
-            msg = "No installation for *Micromamba* found.\n"
-            msg += "Visit https://mamba.readthedocs.io/en/latest/micromamba-installation.html for installation instructions."
-            raise MetaflowException(msg)
+        return self._bin
 
     def solve(self, id_, packages, python, platform):
         # Performance enhancements

metaflow/version.py

@@ -1 +1 @@
-metaflow_version = "2.13.8.1"
+metaflow_version = "2.13.9.2"

{ob_metaflow-2.13.8.1.dist-info → ob_metaflow-2.13.9.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ob-metaflow
-Version: 2.13.8.1
+Version: 2.13.9.2
 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.13.8.1; extra == "stubs"
+Requires-Dist: metaflow-stubs==2.13.9.2; extra == "stubs"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{ob_metaflow-2.13.8.1.dist-info → ob_metaflow-2.13.9.2.dist-info}/RECORD

@@ -36,7 +36,7 @@ metaflow/tuple_util.py,sha256=_G5YIEhuugwJ_f6rrZoelMFak3DqAR2tt_5CapS1XTY,830
 metaflow/unbounded_foreach.py,sha256=p184WMbrMJ3xKYHwewj27ZhRUsSj_kw1jlye5gA9xJk,387
 metaflow/util.py,sha256=hKjHl6NYJkKBSU2tzdVbddfOX1zWK73T4GCO42A0XB4,14666
 metaflow/vendor.py,sha256=FchtA9tH22JM-eEtJ2c9FpUdMn8sSb1VHuQS56EcdZk,5139
-metaflow/version.py,sha256=0njmGBcLAssfxHtQv7nyMsSuteUlRK9mk1VxHg0oD18,30
+metaflow/version.py,sha256=EM98gjK3sbjdiLWeB5F4irk--q-xczkgBeMfJHSDDxA,30
 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
@@ -181,7 +181,7 @@ 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=PS_cYGnPw9h4X7TP_plObDH3clMw4reOsBLkkGPTd0Y,16282
 metaflow/plugins/argo/argo_events.py,sha256=_C1KWztVqgi3zuH57pInaE9OzABc2NnncC-zdwOMZ-w,5909
-metaflow/plugins/argo/argo_workflows.py,sha256=Qiv30NsIUCYYsU6L9iPm6deHs9zfuIjG77lHOmwNGPY,177976
+metaflow/plugins/argo/argo_workflows.py,sha256=w8OsiHWZI66hClgW17HJySbZw2w4mA4vIdS8qGy35lo,178253
 metaflow/plugins/argo/argo_workflows_cli.py,sha256=11_8l4IrtkwviKsijInTZPt7YK5TZzClREnw_Cf4D5o,36706
 metaflow/plugins/argo/argo_workflows_decorator.py,sha256=ogCSBmwsC2C3eusydrgjuAJd4qK18f1sI4jJwA4Fd-o,7800
 metaflow/plugins/argo/argo_workflows_deployer.py,sha256=6kHxEnYXJwzNCM9swI8-0AckxtPWqwhZLerYkX8fxUM,4444
@@ -303,7 +303,7 @@ metaflow/plugins/pypi/__init__.py,sha256=0YFZpXvX7HCkyBFglatual7XGifdA1RwC3U4kci
 metaflow/plugins/pypi/bootstrap.py,sha256=oRfJkAp99R338nYX2wq4FrV0Ax5h4QqqifNmAXrM3CY,14892
 metaflow/plugins/pypi/conda_decorator.py,sha256=piFcE4uGmWhhbGlxMK0GHd7BGEyqy6r9BFy8Mjoi80Q,15937
 metaflow/plugins/pypi/conda_environment.py,sha256=LYjbPNbV29SnspVtS-mHmpW4mt6I-aP3qDbXZSXaH4I,22322
-metaflow/plugins/pypi/micromamba.py,sha256=Rzjg3e_H4bj2zp3liobZmQwSoeRqh7tSDsbqWKcoEBg,16008
+metaflow/plugins/pypi/micromamba.py,sha256=LLJ2dGGOEyld07W8iI6dtE01h2Y1PQnBhU-dMBssZ3c,16502
 metaflow/plugins/pypi/pip.py,sha256=H0cIy8odpZ-JTn4SwF0b74tuC3uRU7X8TdAQJ2kODG8,13971
 metaflow/plugins/pypi/pypi_decorator.py,sha256=ybNgo-T5Z_0W2KNuED0pdjyI0qygZ4a1MXAzKqdHt_E,7250
 metaflow/plugins/pypi/pypi_environment.py,sha256=FYMg8kF3lXqcLfRYWD83a9zpVjcoo_TARqMGZ763rRk,230
@@ -360,9 +360,9 @@ metaflow/user_configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 metaflow/user_configs/config_decorators.py,sha256=Tj0H88UT8Q6pylXxHXgiA6cqnNlw4d3mR7M8J9g3ZUg,20139
 metaflow/user_configs/config_options.py,sha256=t6c9KNVGz9GNK55YAow74Lof4sDZqCbeeZSzldUBFmA,21072
 metaflow/user_configs/config_parameters.py,sha256=oeJGVKu1ao_YQX6Lg6P2FEv5k5-_F4sARLlVpTW9ezM,15502
-ob_metaflow-2.13.8.1.dist-info/LICENSE,sha256=nl_Lt5v9VvJ-5lWJDT4ddKAG-VZ-2IaLmbzpgYDz2hU,11343
-ob_metaflow-2.13.8.1.dist-info/METADATA,sha256=L-5cOFfZfW1zatln4jNGDI4Yy3w2qQ_CznjMwzSXeCQ,5316
-ob_metaflow-2.13.8.1.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
-ob_metaflow-2.13.8.1.dist-info/entry_points.txt,sha256=IKwTN1T3I5eJL3uo_vnkyxVffcgnRdFbKwlghZfn27k,57
-ob_metaflow-2.13.8.1.dist-info/top_level.txt,sha256=v1pDHoWaSaKeuc5fKTRSfsXCKSdW1zvNVmvA-i0if3o,9
-ob_metaflow-2.13.8.1.dist-info/RECORD,,
+ob_metaflow-2.13.9.2.dist-info/LICENSE,sha256=nl_Lt5v9VvJ-5lWJDT4ddKAG-VZ-2IaLmbzpgYDz2hU,11343
+ob_metaflow-2.13.9.2.dist-info/METADATA,sha256=O1HoaLHkYKq74L2cKEonQsNmwBwlOQj5Ozu52SPh2Ks,5316
+ob_metaflow-2.13.9.2.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
+ob_metaflow-2.13.9.2.dist-info/entry_points.txt,sha256=IKwTN1T3I5eJL3uo_vnkyxVffcgnRdFbKwlghZfn27k,57
+ob_metaflow-2.13.9.2.dist-info/top_level.txt,sha256=v1pDHoWaSaKeuc5fKTRSfsXCKSdW1zvNVmvA-i0if3o,9
+ob_metaflow-2.13.9.2.dist-info/RECORD,,