ob-metaflow 2.17.0.1__tar.gz → 2.17.1.0__tar.gz

{ob_metaflow-2.17.0.1/ob_metaflow.egg-info → ob_metaflow-2.17.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ob-metaflow
-Version: 2.17.0.1
+Version: 2.17.1.0
 Summary: Metaflow: More AI and ML, 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.17.0.1; extra == "stubs"
+Requires-Dist: metaflow-stubs==2.17.1.0; extra == "stubs"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{ob_metaflow-2.17.0.1 → ob_metaflow-2.17.1.0}/devtools/Makefile

@@ -257,10 +257,11 @@ shell: setup-tilt
 		echo "🔎 Using $$user_shell for interactive session."; \
 		echo "🐍 If you installed Metaflow in a virtual environment, activate it now."; \
 		if [ -f "$(DEVTOOLS_DIR)/aws_config" ]; then \
-			env METAFLOW_HOME="$(DEVTOOLS_DIR)" \
+			env -u AWS_PROFILE \
+				-u AWS_SHARED_CREDENTIALS_FILE \
+				METAFLOW_HOME="$(DEVTOOLS_DIR)" \
 				METAFLOW_PROFILE=local \
 				AWS_CONFIG_FILE="$(DEVTOOLS_DIR)/aws_config" \
-				AWS_SHARED_CREDENTIALS_FILE= \
 				"$$user_shell" -i; \
 		else \
 			env METAFLOW_HOME="$(DEVTOOLS_DIR)" \

{ob_metaflow-2.17.0.1 → ob_metaflow-2.17.1.0}/devtools/Tiltfile

@@ -593,7 +593,7 @@ if "ui" in enabled_components:
             'uiBackend.metaflowDatastoreSysRootS3=s3://metaflow-test',
             'uiBackend.metaflowS3EndpointURL=http://minio.default.svc.cluster.local:9000',
             'uiBackend.image.name=public.ecr.aws/outerbounds/metaflow_metadata_service',
-            'uiBackend.image.tag=2.4.13-2-g70af4ed',
+            'uiBackend.image.tag=2.5.0',
             'uiBackend.env[0].name=AWS_ACCESS_KEY_ID',
             'uiBackend.env[0].value=rootuser',
             'uiBackend.env[1].name=AWS_SECRET_ACCESS_KEY',
@@ -603,7 +603,7 @@ if "ui" in enabled_components:
             'uiBackend.resources.requests.memory=256Mi',
             'uiStatic.metaflowUIBackendURL=http://localhost:8083/api',
             'uiStatic.image.name=public.ecr.aws/outerbounds/metaflow_ui',
-            'uiStatic.image.tag=v1.3.13-5-g5dd049e',
+            'uiStatic.image.tag=v1.3.14',
             'uiStatic.resources.requests.cpu=25m',
             'uiStatic.resources.requests.memory=64Mi',
             'uiStatic.resources.limits.cpu=50m',

{ob_metaflow-2.17.0.1 → ob_metaflow-2.17.1.0}/metaflow/cmd/make_wrapper.py

@@ -28,6 +28,36 @@ def find_makefile():
         if makefile_candidate.is_file():
             return makefile_candidate
 
+    # 4) When developing, Metaflow might be installed with --editable, which means the devtools will not be located within site-packages.
+    # We read the actual location from package metadata in this case, but only do this heavier operation if the above lookups fail.
+    try:
+        import json
+        from importlib.metadata import Distribution
+
+        direct_url = Distribution.from_name("metaflow").read_text("direct_url.json")
+        if direct_url:
+            content = json.loads(direct_url)
+            url = content.get("url", "")
+            if not url.startswith("file://"):
+                return None
+
+            makefile_candidate = (
+                Path(url.replace("file://", "")) / "devtools" / "Makefile"
+            )
+            if makefile_candidate.is_file():
+                return makefile_candidate
+        else:
+            # No dist metadata found. This is tied to the version of pip being used
+            # Do not bother with .egg-link installs due to the handling of the file contents being a headache due to lack of a unified spec.
+            print(
+                "Could not locate an installation of Metaflow. No package metadata found."
+            )
+            print(
+                "If Metaflow is installed as editable, try upgrading the version of pip and reinstalling in order to generate proper package metadata.\n"
+            )
+    except Exception:
+        return None
+
     return None
 
 

{ob_metaflow-2.17.0.1 → ob_metaflow-2.17.1.0}/metaflow/metaflow_version.py

@@ -133,6 +133,16 @@ def read_info_version():
     return None
 
 
+def make_public_version(version_string):
+    """
+    Takes a complex version string and returns a public, PEP 440-compliant version.
+    It removes local version identifiers (+...) and development markers (-...).
+    """
+    base_version = version_string.split("+", 1)[0]
+    public_version = base_version.split("-", 1)[0]
+    return public_version
+
+
 def get_version(public=False):
     """Tracks the version number.
 
@@ -170,6 +180,11 @@ def get_version(public=False):
     )  # Version info is cached in INFO file; includes extension info
 
     if version:
+        # If we have a version from the INFO file, use it directly.
+        # However, if we are asked for a public version, we parse it to make sure
+        # that no local information is included.
+        if public:
+            version = make_public_version(version)
         _version_cache[public] = version
         return version
 

{ob_metaflow-2.17.0.1 → ob_metaflow-2.17.1.0}/metaflow/runner/deployer_impl.py

@@ -3,7 +3,7 @@ import json
 import os
 import sys
 
-from typing import Any, ClassVar, Dict, Optional, TYPE_CHECKING, Type
+from typing import Any, ClassVar, Dict, Optional, TYPE_CHECKING, Type, List
 
 from metaflow.metaflow_config import CLICK_API_PROCESS_CONFIG
 
@@ -67,15 +67,10 @@ class DeployerImpl(object):
 
         # Reload the CLI with an "empty" flow -- this will remove any configuration
         # and parameter options. They are re-added in from_cli (called below).
-        to_reload = [
-            "metaflow.cli",
-            "metaflow.cli_components.run_cmds",
-            "metaflow.cli_components.init_cmd",
-        ]
         with flow_context(None):
             [
                 importlib.reload(sys.modules[module])
-                for module in to_reload
+                for module in self.to_reload
                 if module in sys.modules
             ]
 
@@ -102,6 +97,19 @@ class DeployerImpl(object):
         self.top_level_kwargs = kwargs
         self.api = MetaflowAPI.from_cli(self.flow_file, start)
 
+    @property
+    def to_reload(self) -> List[str]:
+        """
+        List of modules to reload when the deployer is initialized.
+        This is used to ensure that the CLI is in a clean state before
+        deploying the flow.
+        """
+        return [
+            "metaflow.cli",
+            "metaflow.cli_components.run_cmds",
+            "metaflow.cli_components.init_cmd",
+        ]
+
     @property
     def deployer_kwargs(self) -> Dict[str, Any]:
         raise NotImplementedError

{ob_metaflow-2.17.0.1 → ob_metaflow-2.17.1.0}/metaflow/user_decorators/mutable_flow.py

@@ -367,11 +367,11 @@ class MutableFlow:
                     "Mutable flow overriding flow decorator '%s' "
                     "(removing existing decorator and adding new one)" % flow_deco.name
                 )
-                self._flow_cls._flow_decorators = [
-                    d
+                self._flow_cls._flow_decorators = {
+                    d: self._flow_cls._flow_decorators[d]
                     for d in self._flow_cls._flow_decorators
-                    if d.name != flow_deco.name
-                ]
+                    if d != flow_deco.name
+                }
                 _do_add()
             elif duplicates == MutableFlow.ERROR:
                 # If we error, we raise an exception
@@ -472,7 +472,7 @@ class MutableFlow:
             % (len(old_deco_list) - len(new_deco_list))
         )
         if new_deco_list:
-            self._flow_cls._flow_decorators[deconame] = new_deco_list
+            self._flow_cls._flow_decorators[deco_name] = new_deco_list
         else:
             del self._flow_cls._flow_decorators[deco_name]
         return did_remove

ob_metaflow-2.17.1.0/metaflow/version.py

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

{ob_metaflow-2.17.0.1 → ob_metaflow-2.17.1.0/ob_metaflow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ob-metaflow
-Version: 2.17.0.1
+Version: 2.17.1.0
 Summary: Metaflow: More AI and ML, 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.17.0.1; extra == "stubs"
+Requires-Dist: metaflow-stubs==2.17.1.0; extra == "stubs"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{ob_metaflow-2.17.0.1 → ob_metaflow-2.17.1.0}/ob_metaflow.egg-info/requires.txt

@@ -4,4 +4,4 @@ pylint
 kubernetes
 
 [stubs]
-metaflow-stubs==2.17.0.1
+metaflow-stubs==2.17.1.0

ob_metaflow-2.17.0.1/metaflow/version.py

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