ob-metaflow-extensions 1.4.18__py2.py3-none-any.whl → 1.4.19__py2.py3-none-any.whl

metaflow_extensions/outerbounds/plugins/fast_bakery/docker_environment.py

@@ -254,7 +254,8 @@ class DockerEnvironment(MetaflowEnvironment):
                 (d for d in step.decorators if _is_env_deco(d)),
                 None,
             )
-            python = next(
+            python = None
+            conda_set_python = next(
                 (
                     d.attributes["python"]
                     for d in step.decorators
@@ -262,17 +263,25 @@ class DockerEnvironment(MetaflowEnvironment):
                 ),
                 None,
             )
-            pypi_deco = next(
-                (d for d in step.decorators if isinstance(d, PyPIStepDecorator)), None
+            pypi_set_python = next(
+                (
+                    d.attributes["python"]
+                    for d in step.decorators
+                    if isinstance(d, PyPIStepDecorator)
+                ),
+                None,
             )
-            # if pypi decorator is set and user has specified a python version, we must create a new environment.
-            # otherwise rely on the base environment
-            if pypi_deco is not None:
-                python = (
-                    pypi_deco.attributes["python"]
-                    if pypi_deco.is_attribute_user_defined("python")
-                    else None
-                )
+            # Since the introduction of custom decorators and new packaging support in Metaflow
+            # @pypi/@pypi_base etc can be set at runtime and can also be overriden at runtime.
+            # So at time of execution here, we can assume the python version set in the decorator land
+            # is the one that has been finally resolved. So we just coalesce the conda_set_python and pypi_set_python.
+            def coalesce(*args):
+                for arg in args:
+                    if arg is not None:
+                        return arg
+                return None
+
+            python = coalesce(conda_set_python, pypi_set_python)
 
             packages = get_pinned_conda_libs(python, self.datastore_type)
             packages.update(dependencies.attributes["packages"] if dependencies else {})

{ob_metaflow_extensions-1.4.18.dist-info → ob_metaflow_extensions-1.4.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-metaflow-extensions
-Version: 1.4.18
+Version: 1.4.19
 Summary: Outerbounds Platform Extensions for Metaflow
 Author: Outerbounds, Inc.
 License: Commercial

{ob_metaflow_extensions-1.4.18.dist-info → ob_metaflow_extensions-1.4.19.dist-info}/RECORD

@@ -52,7 +52,7 @@ metaflow_extensions/outerbounds/plugins/checkpoint_datastores/external_chckpt.py
 metaflow_extensions/outerbounds/plugins/checkpoint_datastores/nebius.py,sha256=xFGdSxlHcwZwgTSKj8efEv6ydCWYqRGrreGqXhf02ko,2321
 metaflow_extensions/outerbounds/plugins/fast_bakery/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metaflow_extensions/outerbounds/plugins/fast_bakery/baker.py,sha256=ShE5omFBr83wkvEhL_ptRFvDNMs6wefg4BjaafQjTcM,3602
-metaflow_extensions/outerbounds/plugins/fast_bakery/docker_environment.py,sha256=vKN3Waz0SgbOALVTRcf_8MCGhxdRueRFZJ7JmWbRJRM,15487
+metaflow_extensions/outerbounds/plugins/fast_bakery/docker_environment.py,sha256=XG0ipumXposCqKQzGWtL0ZokVhf1bgl2BsbYC1mVi-0,15893
 metaflow_extensions/outerbounds/plugins/fast_bakery/fast_bakery.py,sha256=9iqIBowKk95vUYvnMrFNWmmSuK-whKnqJwcCmEcRjTU,5727
 metaflow_extensions/outerbounds/plugins/fast_bakery/fast_bakery_cli.py,sha256=kqFyu2bJSnc9_9aYfBpz5xK6L6luWFZK_NMuh8f1eVk,1494
 metaflow_extensions/outerbounds/plugins/fast_bakery/fast_bakery_decorator.py,sha256=MXSIp05-jvt8Q2uGaLKjtuM_ToLeRLxhtMbfHc9Kcko,1515
@@ -128,7 +128,7 @@ metaflow_extensions/outerbounds/toplevel/plugins/optuna/__init__.py,sha256=6D1wL
 metaflow_extensions/outerbounds/toplevel/plugins/snowflake/__init__.py,sha256=LptpH-ziXHrednMYUjIaosS1SXD3sOtF_9_eRqd8SJw,50
 metaflow_extensions/outerbounds/toplevel/plugins/torchtune/__init__.py,sha256=uTVkdSk3xZ7hEKYfdlyVteWj5KeDwaM1hU9WT-_YKfI,50
 metaflow_extensions/outerbounds/toplevel/plugins/vllm/__init__.py,sha256=ekcgD3KVydf-a0xMI60P4uy6ePkSEoFHiGnDq1JM940,45
-ob_metaflow_extensions-1.4.18.dist-info/METADATA,sha256=B8raSpsbfBI7AcT8RmPVmuZSaXViuF7VV_qwPuri_Js,519
-ob_metaflow_extensions-1.4.18.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
-ob_metaflow_extensions-1.4.18.dist-info/top_level.txt,sha256=NwG0ukwjygtanDETyp_BUdtYtqIA_lOjzFFh1TsnxvI,20
-ob_metaflow_extensions-1.4.18.dist-info/RECORD,,
+ob_metaflow_extensions-1.4.19.dist-info/METADATA,sha256=9_LQgntatP2T4t_k8i_J0AgPRq11Qmq_Ym4FrkUIThU,519
+ob_metaflow_extensions-1.4.19.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
+ob_metaflow_extensions-1.4.19.dist-info/top_level.txt,sha256=NwG0ukwjygtanDETyp_BUdtYtqIA_lOjzFFh1TsnxvI,20
+ob_metaflow_extensions-1.4.19.dist-info/RECORD,,