ob-metaflow 2.12.17.1__tar.gz → 2.12.18.2__tar.gz

{ob_metaflow-2.12.17.1/ob_metaflow.egg-info → ob_metaflow-2.12.18.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-metaflow
-Version: 2.12.17.1
+Version: 2.12.18.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.12.17.1; extra == "stubs"
+Requires-Dist: metaflow-stubs==2.12.18.2; 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.17.1 → ob_metaflow-2.12.18.2}/metaflow/metaflow_config.py

@@ -256,6 +256,7 @@ DEFAULT_RUNTIME_LIMIT = from_conf("DEFAULT_RUNTIME_LIMIT", 5 * 24 * 60 * 60)
 # Organization customizations
 ###
 UI_URL = from_conf("UI_URL")
+PAGERDUTY_TEMPLATE_URL = from_conf("PAGERDUTY_TEMPLATE_URL")
 
 ###
 # Capture error logs from argo

{ob_metaflow-2.12.17.1 → ob_metaflow-2.12.18.2}/metaflow/metaflow_environment.py

@@ -98,7 +98,7 @@ class MetaflowEnvironment(object):
             # Boto3 does not play well with passing None or an empty string to endpoint_url
             return "{python} -c '{script}'".format(
                 python=self._python(),
-                script='import boto3, os; ep=os.getenv(\\"METAFLOW_S3_ENDPOINT_URL\\"); boto3.client(\\"s3\\", **({endpoint_url:ep} if ep else {})).download_file(\\"%s\\", \\"%s\\", \\"job.tar\\")'
+                script='import boto3, os; ep=os.getenv(\\"METAFLOW_S3_ENDPOINT_URL\\"); boto3.client(\\"s3\\", **({\\"endpoint_url\\":ep} if ep else {})).download_file(\\"%s\\", \\"%s\\", \\"job.tar\\")'
                 % (bucket, s3_object),
             )
         elif datastore_type == "azure":

{ob_metaflow-2.12.17.1 → ob_metaflow-2.12.18.2}/metaflow/plugins/argo/argo_workflows.py

@@ -49,6 +49,7 @@ from metaflow.metaflow_config import (
     SERVICE_HEADERS,
     SERVICE_INTERNAL_URL,
     UI_URL,
+    PAGERDUTY_TEMPLATE_URL,
 )
 from metaflow.metaflow_config_funcs import config_values
 from metaflow.mflog import BASH_SAVE_LOGS, bash_capture_logs, export_mflog_env_vars
@@ -2387,10 +2388,18 @@ class ArgoWorkflows(object):
     def _pager_duty_notification_links(self):
         links = []
         if UI_URL:
+            if PAGERDUTY_TEMPLATE_URL:
+                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)
+            else:
+                href_val = "%s/%s/%s"% (UI_URL.rstrip("/"), self.flow.name, "argo-{{workflow.name}}")
             links.append(
                 {
-                    "href": "%s/%s/%s"
-                    % (UI_URL.rstrip("/"), self.flow.name, "argo-{{workflow.name}}"),
+                    "href": href_val,
                     "text": "Metaflow UI",
                 }
             )

{ob_metaflow-2.12.17.1 → ob_metaflow-2.12.18.2}/metaflow/plugins/pypi/conda_environment.py

@@ -185,7 +185,10 @@ class CondaEnvironment(MetaflowEnvironment):
         self.logger("Virtual environment(s) bootstrapped!")
 
     def executable(self, step_name, default=None):
-        step = next(step for step in self.flow if step.name == step_name)
+        step = next((step for step in self.flow if step.name == step_name), None)
+        if step is None:
+            # requesting internal steps e.g. _parameters
+            return super().executable(step_name, default)
         id_ = self.get_environment(step).get("id_")
         if id_:
             # bootstrap.py is responsible for ensuring the validity of this executable.
@@ -288,10 +291,13 @@ class CondaEnvironment(MetaflowEnvironment):
             # PyPI registries, the usage of environment variable `GOOGLE_APPLICATION_CREDENTIALS`
             # demands that `keyrings.google-artifactregistry-auth` has to be installed
             # and available in the underlying python environment.
-            if os.getenv("GOOGLE_APPLICATION_CREDENTIALS"):
-                environment["conda"]["packages"][
-                    "keyrings.google-artifactregistry-auth"
-                ] = ">=1.1.1"
+            
+            # commenting this out per https://outerboundsco.slack.com/archives/C040K733FND/p1719262399355449
+            # this should be a temporary workaround. Need to find a better fix
+            # if os.getenv("GOOGLE_APPLICATION_CREDENTIALS"):
+            #     environment["conda"]["packages"][
+            #         "keyrings.google-artifactregistry-auth"
+            #     ] = ">=1.1.1"
 
         # Z combinator for a recursive lambda
         deep_sort = (lambda f: f(f))(

ob_metaflow-2.12.18.2/metaflow/version.py

@@ -0,0 +1 @@
+metaflow_version = "2.12.18.2"

{ob_metaflow-2.12.17.1 → ob_metaflow-2.12.18.2/ob_metaflow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-metaflow
-Version: 2.12.17.1
+Version: 2.12.18.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.12.17.1; extra == "stubs"
+Requires-Dist: metaflow-stubs==2.12.18.2; 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.17.1 → ob_metaflow-2.12.18.2}/ob_metaflow.egg-info/requires.txt

@@ -4,4 +4,4 @@ pylint
 kubernetes
 
 [stubs]
-metaflow-stubs==2.12.17.1
+metaflow-stubs==2.12.18.2

ob_metaflow-2.12.17.1/metaflow/version.py

@@ -1 +0,0 @@
-metaflow_version = "2.12.17.1"