ob-metaflow 2.12.18.1__tar.gz → 2.12.19.1__tar.gz

{ob_metaflow-2.12.18.1/ob_metaflow.egg-info → ob_metaflow-2.12.19.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-metaflow
-Version: 2.12.18.1
+Version: 2.12.19.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.18.1; extra == "stubs"
+Requires-Dist: metaflow-stubs==2.12.19.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.18.1 → ob_metaflow-2.12.19.1}/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.18.1 → ob_metaflow-2.12.19.1}/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.18.1 → ob_metaflow-2.12.19.1}/metaflow/plugins/kubernetes/kubernetes.py

@@ -698,7 +698,7 @@ class Kubernetes(object):
                     t = time.time()
                 time.sleep(update_delay(time.time() - start_time))
 
-        _make_prefix = lambda: b"[%s] " % util.to_bytes(self._job.id)
+        prefix = lambda: b"[%s] " % util.to_bytes(self._job.id)
 
         stdout_tail = get_log_tailer(stdout_location, self._datastore.TYPE)
         stderr_tail = get_log_tailer(stderr_location, self._datastore.TYPE)
@@ -708,7 +708,7 @@ class Kubernetes(object):
 
         # 2) Tail logs until the job has finished
         tail_logs(
-            prefix=_make_prefix(),
+            prefix=prefix(),
             stdout_tail=stdout_tail,
             stderr_tail=stderr_tail,
             echo=echo,

{ob_metaflow-2.12.18.1 → ob_metaflow-2.12.19.1}/metaflow/plugins/kubernetes/kubernetes_jobsets.py

@@ -571,10 +571,8 @@ class JobSetSpec(object):
                                 namespace=self._kwargs["namespace"],
                             ),
                             spec=client.V1PodSpec(
-                                ##  --- jobset require podspec deets start----
                                 subdomain=self._kwargs["subdomain"],
                                 set_hostname_as_fqdn=True,
-                                ##  --- jobset require podspec deets end ----
                                 # Timeout is set on the pod and not the job (important!)
                                 active_deadline_seconds=self._kwargs[
                                     "timeout_in_seconds"

{ob_metaflow-2.12.18.1 → ob_metaflow-2.12.19.1}/metaflow/plugins/pypi/conda_decorator.py

@@ -50,6 +50,9 @@ class CondaStepDecorator(StepDecorator):
     # conda channels, users can specify channel::package as the package name.
 
     def __init__(self, attributes=None, statically_defined=False):
+        self._user_defined_attributes = (
+            attributes.copy() if attributes is not None else {}
+        )
         super(CondaStepDecorator, self).__init__(attributes, statically_defined)
 
         # Support legacy 'libraries=' attribute for the decorator.
@@ -59,6 +62,9 @@ class CondaStepDecorator(StepDecorator):
         }
         del self.attributes["libraries"]
 
+    def is_attribute_user_defined(self, name):
+        return name in self._user_defined_attributes
+
     def step_init(self, flow, graph, step, decos, environment, flow_datastore, logger):
         # The init_environment hook for Environment creates the relevant virtual
         # environments. The step_init hook sets up the relevant state for that hook to
@@ -71,11 +77,16 @@ class CondaStepDecorator(StepDecorator):
 
         # Support flow-level decorator.
         if "conda_base" in self.flow._flow_decorators:
-            super_attributes = self.flow._flow_decorators["conda_base"][0].attributes
+            conda_base = self.flow._flow_decorators["conda_base"][0]
+            super_attributes = conda_base.attributes
             self.attributes["packages"] = {
                 **super_attributes["packages"],
                 **self.attributes["packages"],
             }
+            self._user_defined_attributes = {
+                **self._user_defined_attributes,
+                **conda_base._user_defined_attributes,
+            }
             self.attributes["python"] = (
                 self.attributes["python"] or super_attributes["python"]
             )
@@ -322,6 +333,9 @@ class CondaFlowDecorator(FlowDecorator):
     }
 
     def __init__(self, attributes=None, statically_defined=False):
+        self._user_defined_attributes = (
+            attributes.copy() if attributes is not None else {}
+        )
         super(CondaFlowDecorator, self).__init__(attributes, statically_defined)
 
         # Support legacy 'libraries=' attribute for the decorator.
@@ -333,6 +347,9 @@ class CondaFlowDecorator(FlowDecorator):
         if self.attributes["python"]:
             self.attributes["python"] = str(self.attributes["python"])
 
+    def is_attribute_user_defined(self, name):
+        return name in self._user_defined_attributes
+
     def flow_init(
         self, flow, graph, environment, flow_datastore, metadata, logger, echo, options
     ):

{ob_metaflow-2.12.18.1 → ob_metaflow-2.12.19.1}/metaflow/plugins/pypi/conda_environment.py

@@ -291,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.1 → ob_metaflow-2.12.19.1}/metaflow/plugins/pypi/pypi_decorator.py

@@ -40,7 +40,12 @@ class PyPIStepDecorator(StepDecorator):
 
         # Support flow-level decorator
         if "pypi_base" in self.flow._flow_decorators:
-            super_attributes = self.flow._flow_decorators["pypi_base"][0].attributes
+            pypi_base = self.flow._flow_decorators["pypi_base"][0]
+            super_attributes = pypi_base.attributes
+            self._user_defined_attributes = {
+                **self._user_defined_attributes,
+                **pypi_base._user_defined_attributes,
+            }
             self.attributes["packages"] = {
                 **super_attributes["packages"],
                 **self.attributes["packages"],
@@ -93,6 +98,12 @@ class PyPIStepDecorator(StepDecorator):
                     ),
                 )
             )
+        # TODO: This code snippet can be done away with by altering the constructor of
+        #       MetaflowEnvironment. A good first-task exercise.
+        # Avoid circular import
+        from metaflow.plugins.datastores.local_storage import LocalStorage
+
+        environment.set_local_root(LocalStorage.get_datastore_root_from_config(logger))
 
     def is_attribute_user_defined(self, name):
         return name in self._user_defined_attributes
@@ -117,6 +128,12 @@ class PyPIFlowDecorator(FlowDecorator):
     name = "pypi_base"
     defaults = {"packages": {}, "python": None, "disabled": None}
 
+    def __init__(self, attributes=None, statically_defined=False):
+        self._user_defined_attributes = (
+            attributes.copy() if attributes is not None else {}
+        )
+        super().__init__(attributes, statically_defined)
+
     def flow_init(
         self, flow, graph, environment, flow_datastore, metadata, logger, echo, options
     ):

ob_metaflow-2.12.19.1/metaflow/version.py

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

{ob_metaflow-2.12.18.1 → ob_metaflow-2.12.19.1/ob_metaflow.egg-info}/PKG-INFO

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

@@ -4,4 +4,4 @@ pylint
 kubernetes
 
 [stubs]
-metaflow-stubs==2.12.18.1
+metaflow-stubs==2.12.19.1

ob_metaflow-2.12.18.1/metaflow/version.py

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