metaflow 2.17.0__py2.py3-none-any.whl → 2.17.1__py2.py3-none-any.whl

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
 
 

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
 

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

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

metaflow/version.py

@@ -1 +1 @@
-metaflow_version = "2.17.0"
+metaflow_version = "2.17.1"

{metaflow-2.17.0.data → metaflow-2.17.1.data}/data/share/metaflow/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)" \

{metaflow-2.17.0.data → metaflow-2.17.1.data}/data/share/metaflow/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',

{metaflow-2.17.0.dist-info → metaflow-2.17.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metaflow
-Version: 2.17.0
+Version: 2.17.1
 Summary: Metaflow: More AI and ML, Less Engineering
 Author: Metaflow Developers
 Author-email: help@metaflow.org
@@ -26,7 +26,7 @@ License-File: LICENSE
 Requires-Dist: requests
 Requires-Dist: boto3
 Provides-Extra: stubs
-Requires-Dist: metaflow-stubs==2.17.0; extra == "stubs"
+Requires-Dist: metaflow-stubs==2.17.1; extra == "stubs"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{metaflow-2.17.0.dist-info → metaflow-2.17.1.dist-info}/RECORD

@@ -22,7 +22,7 @@ metaflow/metaflow_current.py,sha256=pfkXmkyHeMJhxIs6HBJNBEaBDpcl5kz9Wx5mW6F_3qo,
 metaflow/metaflow_environment.py,sha256=20PIhA5R_rJneNj8f8UaWRmznGRPcEd6hP7goj_rc1s,11477
 metaflow/metaflow_git.py,sha256=Pb_VtvQzcjpuuM7UfC2u5kz85EbPMUfspl2UrPWBQMM,3647
 metaflow/metaflow_profile.py,sha256=jKPEW-hmAQO-htSxb9hXaeloLacAh41A35rMZH6G8pA,418
-metaflow/metaflow_version.py,sha256=KJJAxhOMY28DaavMpvJUzvw-G6MI-29Fi2A6AEcQpok,7495
+metaflow/metaflow_version.py,sha256=iuL9QoWjvUpGKIRp6dM9zxp0ED_iqXNihl__Qu9f1dc,8115
 metaflow/monitor.py,sha256=T0NMaBPvXynlJAO_avKtk8OIIRMyEuMAyF8bIp79aZU,5323
 metaflow/multicore_utils.py,sha256=yEo5T6Gemn4_vl8b6IOz7fsTUYtEyqa3AaKZgJY96Wc,4974
 metaflow/parameters.py,sha256=b3rS6P-TeEj2JgPEKaiy0ys1B_JtOGJ6XM0KkY2layc,18649
@@ -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=g2SOU_CRzJLgDM_UGF9QDMANMAIHAsDRXE6S76_YzsY,14594
 metaflow/vendor.py,sha256=A82CGHfStZGDP5pQ5XzRjFkbN1ZC-vFmghXIrzMDDNg,5868
-metaflow/version.py,sha256=XFgMunwxLtn9LRW_fsHkzorB2mBbwIUjTsgDGX1FNQo,28
+metaflow/version.py,sha256=cOW5Gzl3yHX8RxsVq7TnPv58zlZoFrqwP_PGsg1JfRQ,28
 metaflow/_vendor/__init__.py,sha256=y_CiwUD3l4eAKvTVDZeqgVujMy31cAM1qjAB-HfI-9s,353
 metaflow/_vendor/typing_extensions.py,sha256=q9zxWa6p6CzF1zZvSkygSlklduHf_b3K7MCxGz7MJRc,134519
 metaflow/_vendor/zipp.py,sha256=ajztOH-9I7KA_4wqDYygtHa6xUBVZgFpmZ8FE74HHHI,8425
@@ -162,7 +162,7 @@ metaflow/client/filecache.py,sha256=Wy0yhhCqC1JZgebqi7z52GCwXYnkAqMZHTtxThvwBgM,
 metaflow/cmd/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 metaflow/cmd/configure_cmd.py,sha256=o-DKnUf2FBo_HiMVyoyzQaGBSMtpbEPEdFTQZ0hkU-k,33396
 metaflow/cmd/main_cli.py,sha256=iKptsPcys0OKileZdE8Pp0_y8t7pm94SL3b870Qhk30,2972
-metaflow/cmd/make_wrapper.py,sha256=N8L4u8QZAryH0sAjRsdEqG-gTj2S4LUsfDizOemrTR0,1604
+metaflow/cmd/make_wrapper.py,sha256=5uWZw_2jqYmI7gm1pGwPxXCII56WBKarNKJp9FRMN3c,3029
 metaflow/cmd/tutorials_cmd.py,sha256=8FdlKkicTOhCIDKcBR5b0Oz6giDvS-EMY3o9skIrRqw,5156
 metaflow/cmd/util.py,sha256=jS_0rUjOnGGzPT65fzRLdGjrYAOOLA4jU2S0HJLV0oc,406
 metaflow/cmd/code/__init__.py,sha256=VO4dNM9M9LHYy5nTgEiJvCV1RBl8lpDlYGJm6GIcaBA,7413
@@ -375,7 +375,7 @@ metaflow/plugins/uv/uv_environment.py,sha256=AYZICrBEq3Bv-taXktJwu9DhKFxNooPFwlc
 metaflow/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metaflow/runner/click_api.py,sha256=w0-47ntQD4Dd-LiSJ9vPSjlvW5YBniNSmlf95lcXs5E,24026
 metaflow/runner/deployer.py,sha256=OAAMG_l3Q1ClcY_603VZnhclVkfFe3Rf8bFRodC3poc,17138
-metaflow/runner/deployer_impl.py,sha256=zTING0_fwP44JcGo69DuNrVut5KqdBVzYOM7MYTZgIY,7049
+metaflow/runner/deployer_impl.py,sha256=q-IvwnNKPRUTpOkfzrZNrkIsjp-L-Ju75dtXmfDUqbI,7299
 metaflow/runner/metaflow_runner.py,sha256=uo3BzcAfZ67VT_f-TPe5ZHiWHn6uuojWusOMGksvX14,18178
 metaflow/runner/nbdeploy.py,sha256=Sp5w-6nCZwjHaRBHWxi8udya-RYnJOB76KNLjB4L7Gs,4166
 metaflow/runner/nbrun.py,sha256=LhJu-Teoi7wTkNxg0kpNPVXFxH_9P4lvtp0ysMEIFJ8,7299
@@ -422,16 +422,16 @@ metaflow/user_configs/config_options.py,sha256=d3hKA6WRPe21PdTl7sBnxIp5sE6zBpRtg
 metaflow/user_configs/config_parameters.py,sha256=Loa5wu3vIs0SLyGhbOo8b88nWgCuZ09k24EqC_lI7n4,20890
 metaflow/user_decorators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metaflow/user_decorators/common.py,sha256=0u9NRLQ95TfJCjWVEOGT4MJ9WoQgAMBM9kJ2gJGlVjk,5362
-metaflow/user_decorators/mutable_flow.py,sha256=icF7XFCS5FdlW3OEL68ZbQOtTPhLsUycKcFKVOeK_vU,19435
+metaflow/user_decorators/mutable_flow.py,sha256=EywKTN3cnXPQF_s62wQaC4a4aH14j8oeqzD3yZaiDxw,19467
 metaflow/user_decorators/mutable_step.py,sha256=-BY0UDXf_RCAEnC5JlLzEXGdiw1KD9oSrSxS_SWaB9Y,16791
 metaflow/user_decorators/user_flow_decorator.py,sha256=2yDwZq9QGv9W-7kEuKwa8o4ZkTvuHJ5ESz7VVrGViAI,9890
 metaflow/user_decorators/user_step_decorator.py,sha256=JYNGXONWCpzwn-_bF5WiAkof4Ii9tRS4xdK8ojSxG6M,26007
-metaflow-2.17.0.data/data/share/metaflow/devtools/Makefile,sha256=5n89OGIC_kE4wxtEI66VCucN-b-1w5bqvGeZYmeRGz8,13737
-metaflow-2.17.0.data/data/share/metaflow/devtools/Tiltfile,sha256=I55XTG4RBnrMfDcYRtREXqqS8T9bF8agkZq0DlvdFLk,21404
-metaflow-2.17.0.data/data/share/metaflow/devtools/pick_services.sh,sha256=DCnrMXwtApfx3B4S-YiZESMyAFHbXa3VuNL0MxPLyiE,2196
-metaflow-2.17.0.dist-info/licenses/LICENSE,sha256=nl_Lt5v9VvJ-5lWJDT4ddKAG-VZ-2IaLmbzpgYDz2hU,11343
-metaflow-2.17.0.dist-info/METADATA,sha256=KtUYktrM1mNhRT9fVjx5DLXa9e3Dz6SIsKpMmOfaey0,6740
-metaflow-2.17.0.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-metaflow-2.17.0.dist-info/entry_points.txt,sha256=RvEq8VFlgGe_FfqGOZi0D7ze1hLD0pAtXeNyGfzc_Yc,103
-metaflow-2.17.0.dist-info/top_level.txt,sha256=v1pDHoWaSaKeuc5fKTRSfsXCKSdW1zvNVmvA-i0if3o,9
-metaflow-2.17.0.dist-info/RECORD,,
+metaflow-2.17.1.data/data/share/metaflow/devtools/Makefile,sha256=TT4TCq8ALSfqYyGqDPocN5oPcZe2FqoCZxmGO1LmyCc,13760
+metaflow-2.17.1.data/data/share/metaflow/devtools/Tiltfile,sha256=Ty5p6AD3MwJAcAnOGv4yMz8fExAsnNQ11r8whK6uzzw,21381
+metaflow-2.17.1.data/data/share/metaflow/devtools/pick_services.sh,sha256=DCnrMXwtApfx3B4S-YiZESMyAFHbXa3VuNL0MxPLyiE,2196
+metaflow-2.17.1.dist-info/licenses/LICENSE,sha256=nl_Lt5v9VvJ-5lWJDT4ddKAG-VZ-2IaLmbzpgYDz2hU,11343
+metaflow-2.17.1.dist-info/METADATA,sha256=mvfncSAe9iX2JRZxjAHd8YTHZOk8rbCAJHpU23wEtI0,6740
+metaflow-2.17.1.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+metaflow-2.17.1.dist-info/entry_points.txt,sha256=RvEq8VFlgGe_FfqGOZi0D7ze1hLD0pAtXeNyGfzc_Yc,103
+metaflow-2.17.1.dist-info/top_level.txt,sha256=v1pDHoWaSaKeuc5fKTRSfsXCKSdW1zvNVmvA-i0if3o,9
+metaflow-2.17.1.dist-info/RECORD,,