metaflow 2.15.19__tar.gz → 2.15.21__tar.gz

{metaflow-2.15.19/metaflow.egg-info → metaflow-2.15.21}/PKG-INFO

@@ -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 → metaflow-2.15.21}/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-2.15.19 → metaflow-2.15.21}/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-2.15.21/metaflow/plugins/secrets/secrets_func.py

@@ -0,0 +1,49 @@
+from typing import Any, Dict, Optional, Union
+
+from metaflow.metaflow_config import DEFAULT_SECRETS_ROLE
+from metaflow.exception import MetaflowException
+from metaflow.plugins.secrets.secrets_spec import SecretSpec
+from metaflow.plugins.secrets.utils import get_secrets_backend_provider
+
+
+def get_secret(
+    source: Union[str, Dict[str, Any]], role: Optional[str] = None
+) -> Dict[str, str]:
+    """
+    Get secret from source
+
+    Parameters
+    ----------
+    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
+
+    secret_spec = None
+
+    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"
+        )
+
+    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-2.15.21/metaflow/version.py

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

{metaflow-2.15.19 → metaflow-2.15.21/metaflow.egg-info}/PKG-INFO

@@ -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 → metaflow-2.15.21}/metaflow.egg-info/requires.txt

@@ -2,4 +2,4 @@ requests
 boto3
 
 [stubs]
-metaflow-stubs==2.15.19
+metaflow-stubs==2.15.21

metaflow-2.15.19/metaflow/plugins/secrets/secrets_func.py

@@ -1,60 +0,0 @@
-from typing import Any, Dict, List, Optional, Union
-
-from metaflow.metaflow_config import DEFAULT_SECRETS_ROLE
-from metaflow.exception import MetaflowException
-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]]:
-    """
-    Get secrets from sources
-
-    Parameters
-    ----------
-    sources : List[Union[str, Dict[str, Any]]], default: []
-        List of secret specs, defining how the secrets are 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 = []
-
-    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
-        )
-        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

metaflow-2.15.19/metaflow/version.py

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