metaflow 2.15.19__py2.py3-none-any.whl → 2.15.21__py2.py3-none-any.whl

metaflow/plugins/argo/argo_workflows.py

@@ -2298,11 +2298,11 @@ class ArgoWorkflows(object):
         start_step = [step for step in self.graph if step.name == "start"][0]
         # We want to grab the base image used by the start step, as this is known to be pullable from within the cluster,
         # and it might contain the required libraries, allowing us to start up faster.
-        resources = dict(
-            [deco for deco in start_step.decorators if deco.name == "kubernetes"][
-                0
-            ].attributes
-        )
+        start_kube_deco = [
+            deco for deco in start_step.decorators if deco.name == "kubernetes"
+        ][0]
+        resources = dict(start_kube_deco.attributes)
+        kube_defaults = dict(start_kube_deco.defaults)
 
         run_id_template = "argo-{{workflow.name}}"
         metaflow_version = self.environment.get_environment_info()
@@ -2401,15 +2401,10 @@ class ArgoWorkflows(object):
                         if k
                     ],
                     resources=kubernetes_sdk.V1ResourceRequirements(
-                        # NOTE: base resources for this are kept to a minimum to save on running costs.
                         requests={
-                            "cpu": "200m",
-                            "memory": "100Mi",
-                        },
-                        limits={
-                            "cpu": "200m",
-                            "memory": "500Mi",
-                        },
+                            "cpu": str(kube_defaults["cpu"]),
+                            "memory": "%sM" % str(kube_defaults["memory"]),
+                        }
                     ),
                 ).to_dict()
             )

metaflow/plugins/secrets/__init__.py

@@ -11,4 +11,4 @@ class SecretsProvider(abc.ABC):
         environment variables."""
 
 
-from .secrets_func import get_secrets
+from .secrets_func import get_secret

metaflow/plugins/secrets/secrets_func.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, Optional, Union
 
 from metaflow.metaflow_config import DEFAULT_SECRETS_ROLE
 from metaflow.exception import MetaflowException
@@ -6,55 +6,44 @@ from metaflow.plugins.secrets.secrets_spec import SecretSpec
 from metaflow.plugins.secrets.utils import get_secrets_backend_provider
 
 
-def get_secrets(
-    sources: List[Union[str, Dict[str, Any]]] = [], role: Optional[str] = None
-) -> Dict[SecretSpec, Dict[str, str]]:
+def get_secret(
+    source: Union[str, Dict[str, Any]], role: Optional[str] = None
+) -> Dict[str, str]:
     """
-    Get secrets from sources
+    Get secret from source
 
     Parameters
     ----------
-    sources : List[Union[str, Dict[str, Any]]], default: []
-        List of secret specs, defining how the secrets are to be retrieved
+    source : Union[str, Dict[str, Any]]
+        Secret spec, defining how the secret is to be retrieved
     role : str, optional
         Role to use for fetching secrets
     """
     if role is None:
         role = DEFAULT_SECRETS_ROLE
 
-    # List of pairs (secret_spec, dict_of_secrets)
-    all_secrets = []
-    secret_specs = []
+    secret_spec = None
 
-    for secret_spec_str_or_dict in sources:
-        if isinstance(secret_spec_str_or_dict, str):
-            secret_specs.append(
-                SecretSpec.secret_spec_from_str(secret_spec_str_or_dict, role=role)
-            )
-        elif isinstance(secret_spec_str_or_dict, dict):
-            secret_specs.append(
-                SecretSpec.secret_spec_from_dict(secret_spec_str_or_dict, role=role)
-            )
-        else:
-            raise MetaflowException(
-                "get_secrets sources items must be either a string or a dict"
-            )
-
-    for secret_spec in secret_specs:
-        secrets_backend_provider = get_secrets_backend_provider(
-            secret_spec.secrets_backend_type
+    if isinstance(source, str):
+        secret_spec = SecretSpec.secret_spec_from_str(source, role=role)
+    elif isinstance(source, dict):
+        secret_spec = SecretSpec.secret_spec_from_dict(source, role=role)
+    else:
+        raise MetaflowException(
+            "get_secrets sources items must be either a string or a dict"
         )
-        try:
-            dict_for_secret = secrets_backend_provider.get_secret_as_dict(
-                secret_spec.secret_id,
-                options=secret_spec.options,
-                role=secret_spec.role,
-            )
-        except Exception as e:
-            raise MetaflowException(
-                "Failed to retrieve secret '%s': %s" % (secret_spec.secret_id, e)
-            )
-
-        all_secrets.append((secret_spec, dict_for_secret))
 
-    return all_secrets
+    secrets_backend_provider = get_secrets_backend_provider(
+        secret_spec.secrets_backend_type
+    )
+    try:
+        dict_for_secret = secrets_backend_provider.get_secret_as_dict(
+            secret_spec.secret_id,
+            options=secret_spec.options,
+            role=secret_spec.role,
+        )
+        return dict_for_secret
+    except Exception as e:
+        raise MetaflowException(
+            "Failed to retrieve secret '%s': %s" % (secret_spec.secret_id, e)
+        )

metaflow/version.py

@@ -1 +1 @@
-metaflow_version = "2.15.19"
+metaflow_version = "2.15.21"

{metaflow-2.15.19.dist-info → metaflow-2.15.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metaflow
-Version: 2.15.19
+Version: 2.15.21
 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.15.19; extra == "stubs"
+Requires-Dist: metaflow-stubs==2.15.21; extra == "stubs"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{metaflow-2.15.19.dist-info → metaflow-2.15.21.dist-info}/RECORD

@@ -37,7 +37,7 @@ metaflow/tuple_util.py,sha256=_G5YIEhuugwJ_f6rrZoelMFak3DqAR2tt_5CapS1XTY,830
 metaflow/unbounded_foreach.py,sha256=p184WMbrMJ3xKYHwewj27ZhRUsSj_kw1jlye5gA9xJk,387
 metaflow/util.py,sha256=MCXCjcGwpuR7y9euBf1GTNRHPtlh6fCpdPMEtbULefw,14554
 metaflow/vendor.py,sha256=EDZokNMrx1PU07jNMiWFMFtC7TL03pMXZ1kKn13k-2g,5139
-metaflow/version.py,sha256=yr4zdbWsxp_HlhawbNsqBR9olu0MgwnsgzJu6I_pta0,29
+metaflow/version.py,sha256=ekBAOcpZTsH5pUNtjBW9Xeun2sktEs-WXZ2vnar5Fuo,29
 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
@@ -207,7 +207,7 @@ metaflow/plugins/airflow/sensors/s3_sensor.py,sha256=iDReG-7FKnumrtQg-HY6cCUAAqN
 metaflow/plugins/argo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metaflow/plugins/argo/argo_client.py,sha256=A1kI9rjVjCadDsBscZ2Wk8xRBI6GNgWV6SU7TyrdfrI,16530
 metaflow/plugins/argo/argo_events.py,sha256=_C1KWztVqgi3zuH57pInaE9OzABc2NnncC-zdwOMZ-w,5909
-metaflow/plugins/argo/argo_workflows.py,sha256=_IVBYucQcNgX9VKU3LqShUGcvmfFC_GHS3H9eud6cI0,186790
+metaflow/plugins/argo/argo_workflows.py,sha256=g38AT4_-j2UU-b6YJyWWGffF4wxYItp-Wc6oCoxpRbc,186650
 metaflow/plugins/argo/argo_workflows_cli.py,sha256=1bdG8BQgwyfHooBidyY1Aw52uwjCxq2Edt0bO7qezWM,38375
 metaflow/plugins/argo/argo_workflows_decorator.py,sha256=ogCSBmwsC2C3eusydrgjuAJd4qK18f1sI4jJwA4Fd-o,7800
 metaflow/plugins/argo/argo_workflows_deployer.py,sha256=6kHxEnYXJwzNCM9swI8-0AckxtPWqwhZLerYkX8fxUM,4444
@@ -340,10 +340,10 @@ metaflow/plugins/pypi/pip.py,sha256=WhPyA18RoVT40sqbZRJdCEij4euL9PZwLfm1SrAKqmU,
 metaflow/plugins/pypi/pypi_decorator.py,sha256=ybNgo-T5Z_0W2KNuED0pdjyI0qygZ4a1MXAzKqdHt_E,7250
 metaflow/plugins/pypi/pypi_environment.py,sha256=FYMg8kF3lXqcLfRYWD83a9zpVjcoo_TARqMGZ763rRk,230
 metaflow/plugins/pypi/utils.py,sha256=W8OhDrhz7YIE-2MSSN5Rj7AmESwsN5YDmdnro152J4w,3551
-metaflow/plugins/secrets/__init__.py,sha256=fOdvNOk648EjQrAlfTZTwxUxwiWMI2Ju9yA3Bc0VqD0,350
+metaflow/plugins/secrets/__init__.py,sha256=hKwDnaMAG7Rjqv-chN4OjWy6G2dkncRjK_wDewthvL8,349
 metaflow/plugins/secrets/inline_secrets_provider.py,sha256=EChmoBGA1i7qM3jtYwPpLZDBybXLergiDlN63E0u3x8,294
 metaflow/plugins/secrets/secrets_decorator.py,sha256=mZFZgUgDl1k4q5iwO6i8Q9UhqOVYxgMciZrI9siGFJ8,4817
-metaflow/plugins/secrets/secrets_func.py,sha256=seDGkAxaH0XWIi7l-yR1oF0OClmnKGoJ-tyrbG5XdTo,2050
+metaflow/plugins/secrets/secrets_func.py,sha256=zjDJdJLiKJfcvKzzkDbnbQCPUoCmr8q4xgPRha0lWF8,1549
 metaflow/plugins/secrets/secrets_spec.py,sha256=rZCBd7Til5laiXCaYLz4izwvM8aQ3__wgBkB-c8X4fA,4251
 metaflow/plugins/secrets/utils.py,sha256=Pxx1iiYRitKQIwJeCnTtV4-IrACMI5aSaUkefKF9E7Y,2669
 metaflow/plugins/uv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -398,12 +398,12 @@ metaflow/user_configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 metaflow/user_configs/config_decorators.py,sha256=n4OTbfuaXejPVLHnXXgVlNJNcrSvWrVOdXCMcqvQlik,20512
 metaflow/user_configs/config_options.py,sha256=yyaiKLB4QWlR5AaTg9I7GoBv-OlffOFdGPe1BL85Llc,21241
 metaflow/user_configs/config_parameters.py,sha256=Eyiqcz4YV_z4algDHAh2gaejGFgIdHk8Vix9AUdPSh0,20989
-metaflow-2.15.19.data/data/share/metaflow/devtools/Makefile,sha256=5n89OGIC_kE4wxtEI66VCucN-b-1w5bqvGeZYmeRGz8,13737
-metaflow-2.15.19.data/data/share/metaflow/devtools/Tiltfile,sha256=I55XTG4RBnrMfDcYRtREXqqS8T9bF8agkZq0DlvdFLk,21404
-metaflow-2.15.19.data/data/share/metaflow/devtools/pick_services.sh,sha256=DCnrMXwtApfx3B4S-YiZESMyAFHbXa3VuNL0MxPLyiE,2196
-metaflow-2.15.19.dist-info/licenses/LICENSE,sha256=nl_Lt5v9VvJ-5lWJDT4ddKAG-VZ-2IaLmbzpgYDz2hU,11343
-metaflow-2.15.19.dist-info/METADATA,sha256=T1A6rHQ7NzyvHQA3sQUlKmym2AagvltY6wlQB9MuIy4,6742
-metaflow-2.15.19.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-metaflow-2.15.19.dist-info/entry_points.txt,sha256=RvEq8VFlgGe_FfqGOZi0D7ze1hLD0pAtXeNyGfzc_Yc,103
-metaflow-2.15.19.dist-info/top_level.txt,sha256=v1pDHoWaSaKeuc5fKTRSfsXCKSdW1zvNVmvA-i0if3o,9
-metaflow-2.15.19.dist-info/RECORD,,
+metaflow-2.15.21.data/data/share/metaflow/devtools/Makefile,sha256=5n89OGIC_kE4wxtEI66VCucN-b-1w5bqvGeZYmeRGz8,13737
+metaflow-2.15.21.data/data/share/metaflow/devtools/Tiltfile,sha256=I55XTG4RBnrMfDcYRtREXqqS8T9bF8agkZq0DlvdFLk,21404
+metaflow-2.15.21.data/data/share/metaflow/devtools/pick_services.sh,sha256=DCnrMXwtApfx3B4S-YiZESMyAFHbXa3VuNL0MxPLyiE,2196
+metaflow-2.15.21.dist-info/licenses/LICENSE,sha256=nl_Lt5v9VvJ-5lWJDT4ddKAG-VZ-2IaLmbzpgYDz2hU,11343
+metaflow-2.15.21.dist-info/METADATA,sha256=kLkaeAJNDbFORm0Y2rARkY02bVnJvco2qXCiRjzSpno,6742
+metaflow-2.15.21.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+metaflow-2.15.21.dist-info/entry_points.txt,sha256=RvEq8VFlgGe_FfqGOZi0D7ze1hLD0pAtXeNyGfzc_Yc,103
+metaflow-2.15.21.dist-info/top_level.txt,sha256=v1pDHoWaSaKeuc5fKTRSfsXCKSdW1zvNVmvA-i0if3o,9
+metaflow-2.15.21.dist-info/RECORD,,