ob-metaflow 2.15.11.2__tar.gz → 2.15.13.1__tar.gz

{ob_metaflow-2.15.11.2/ob_metaflow.egg-info → ob_metaflow-2.15.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ob-metaflow
-Version: 2.15.11.2
+Version: 2.15.13.1
 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.15.11.2; extra == "stubs"
+Requires-Dist: metaflow-stubs==2.15.13.1; extra == "stubs"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{ob_metaflow-2.15.11.2 → ob_metaflow-2.15.13.1}/metaflow/cmd/develop/stub_generator.py

@@ -1191,22 +1191,21 @@ class StubGenerator:
                         + "}"
                     )
                 elif isinstance(default_value, str):
-                    return "'" + default_value + "'"
+                    return repr(default_value)  # Use repr() for proper escaping
+                elif isinstance(default_value, (int, float, bool)):
+                    return str(default_value)
+                elif default_value is None:
+                    return "None"
                 else:
-                    return self._get_element_name_with_module(default_value)
-
-            elif str(default_value).startswith("<"):
+                    return "..."  # For other built-in types not explicitly handled
+            elif inspect.isclass(default_value) or inspect.isfunction(default_value):
                 if default_value.__module__ == "builtins":
                     return default_value.__name__
                 else:
                     self._typing_imports.add(default_value.__module__)
                     return ".".join([default_value.__module__, default_value.__name__])
             else:
-                return (
-                    str(default_value)
-                    if not isinstance(default_value, str)
-                    else '"' + default_value + '"'
-                )
+                return "..."  # For complex objects like class instances
 
         buff = StringIO()
         if sign is None and func is None:

{ob_metaflow-2.15.11.2 → ob_metaflow-2.15.13.1}/metaflow/metaflow_config.py

@@ -453,15 +453,7 @@ ESCAPE_HATCH_WARNING = from_conf("ESCAPE_HATCH_WARNING", True)
 ###
 # Debug configuration
 ###
-DEBUG_OPTIONS = [
-    "subcommand",
-    "sidecar",
-    "s3client",
-    "tracing",
-    "stubgen",
-    "userconf",
-    "conda",
-]
+DEBUG_OPTIONS = ["subcommand", "sidecar", "s3client", "tracing", "stubgen", "userconf"]
 
 for typ in DEBUG_OPTIONS:
     vars()["DEBUG_%s" % typ.upper()] = from_conf("DEBUG_%s" % typ.upper(), False)
@@ -549,10 +541,12 @@ def get_pinned_conda_libs(python_version, datastore_type):
         pins["azure-identity"] = ">=1.10.0"
         pins["azure-storage-blob"] = ">=12.12.0"
         pins["azure-keyvault-secrets"] = ">=4.7.0"
+        pins["simple-azure-blob-downloader"] = ">=0.1.0"
     elif datastore_type == "gs":
         pins["google-cloud-storage"] = ">=2.5.0"
         pins["google-auth"] = ">=2.11.0"
         pins["google-cloud-secret-manager"] = ">=2.10.0"
+        pins["simple-gcp-object-downloader"] = ">=0.1.0"
     elif datastore_type == "local":
         pass
     else:

{ob_metaflow-2.15.11.2 → ob_metaflow-2.15.13.1}/metaflow/plugins/argo/argo_workflows_deployer_objects.py

@@ -277,7 +277,7 @@ class ArgoWorkflowsDeployedFlow(DeployedFlow):
 
         flow_name = metadata_annotations.get("metaflow/flow_name", "")
         username = metadata_annotations.get("metaflow/owner", "")
-        parameters = json.loads(metadata_annotations.get("metaflow/parameters", {}))
+        parameters = json.loads(metadata_annotations.get("metaflow/parameters", "{}"))
 
         # these two only exist if @project decorator is used..
         branch_name = metadata_annotations.get("metaflow/branch_name", None)

{ob_metaflow-2.15.11.2 → ob_metaflow-2.15.13.1}/metaflow/plugins/datastores/azure_storage.py

@@ -353,7 +353,9 @@ class AzureStorage(DataStoreStorage):
                     byte_stream, metadata = byte_stream
                 tmp_filename = os.path.join(tmpdir, str(uuid.uuid4()))
                 with open(tmp_filename, "wb") as f:
-                    f.write(byte_stream.read())
+                    # make sure to close the file handle after reading.
+                    with byte_stream as bytes:
+                        f.write(bytes.read())
                 # Fully finish writing the file, before submitting work. Careful with indentation.
 
                 futures.append(

{ob_metaflow-2.15.11.2 → ob_metaflow-2.15.13.1}/metaflow/plugins/datastores/gs_storage.py

@@ -227,7 +227,9 @@ class GSStorage(DataStoreStorage):
                     byte_stream, metadata = byte_stream
                 tmp_filename = os.path.join(tmpdir, str(uuid.uuid4()))
                 with open(tmp_filename, "wb") as f:
-                    f.write(byte_stream.read())
+                    # make sure to close the file handle after reading.
+                    with byte_stream as bytes:
+                        f.write(bytes.read())
                 # Fully finish writing the file, before submitting work. Careful with indentation.
 
                 futures.append(

{ob_metaflow-2.15.11.2 → ob_metaflow-2.15.13.1}/metaflow/plugins/datatools/s3/s3op.py

@@ -18,7 +18,6 @@ from itertools import starmap, chain, islice
 
 from boto3.exceptions import RetriesExceededError, S3UploadFailedError
 from boto3.s3.transfer import TransferConfig
-from botocore.config import Config
 from botocore.exceptions import ClientError, SSLError
 
 try:
@@ -50,13 +49,11 @@ from metaflow.plugins.datatools.s3.s3util import (
 import metaflow.tracing as tracing
 from metaflow.metaflow_config import (
     S3_WORKER_COUNT,
-    S3_CLIENT_RETRY_CONFIG,
 )
 
 DOWNLOAD_FILE_THRESHOLD = 2 * TransferConfig().multipart_threshold
 DOWNLOAD_MAX_CHUNK = 2 * 1024 * 1024 * 1024 - 1
 
-DEFAULT_S3_CLIENT_PARAMS = {"config": Config(retries=S3_CLIENT_RETRY_CONFIG)}
 RANGE_MATCH = re.compile(r"bytes (?P<start>[0-9]+)-(?P<end>[0-9]+)/(?P<total>[0-9]+)")
 
 # from botocore ClientError MSG_TEMPLATE:
@@ -132,7 +129,7 @@ def normalize_client_error(err):
     try:
         return int(error_code)
     except ValueError:
-        if error_code in ("AccessDenied", "AllAccessDisabled"):
+        if error_code in ("AccessDenied", "AllAccessDisabled", "InvalidAccessKeyId"):
             return 403
         if error_code == "NoSuchKey":
             return 404
@@ -830,7 +827,7 @@ def lst(
     s3config = S3Config(
         s3role,
         json.loads(s3sessionvars) if s3sessionvars else None,
-        json.loads(s3clientparams) if s3clientparams else DEFAULT_S3_CLIENT_PARAMS,
+        json.loads(s3clientparams) if s3clientparams else None,
     )
 
     urllist = []
@@ -963,7 +960,7 @@ def put(
     s3config = S3Config(
         s3role,
         json.loads(s3sessionvars) if s3sessionvars else None,
-        json.loads(s3clientparams) if s3clientparams else DEFAULT_S3_CLIENT_PARAMS,
+        json.loads(s3clientparams) if s3clientparams else None,
     )
 
     urls = list(starmap(_make_url, _files()))
@@ -1110,7 +1107,7 @@ def get(
     s3config = S3Config(
         s3role,
         json.loads(s3sessionvars) if s3sessionvars else None,
-        json.loads(s3clientparams) if s3clientparams else DEFAULT_S3_CLIENT_PARAMS,
+        json.loads(s3clientparams) if s3clientparams else None,
     )
 
     # Construct a list of URL (prefix) objects
@@ -1259,7 +1256,7 @@ def info(
     s3config = S3Config(
         s3role,
         json.loads(s3sessionvars) if s3sessionvars else None,
-        json.loads(s3clientparams) if s3clientparams else DEFAULT_S3_CLIENT_PARAMS,
+        json.loads(s3clientparams) if s3clientparams else None,
     )
 
     # Construct a list of URL (prefix) objects

ob_metaflow-2.15.13.1/metaflow/version.py

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

{ob_metaflow-2.15.11.2 → ob_metaflow-2.15.13.1/ob_metaflow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ob-metaflow
-Version: 2.15.11.2
+Version: 2.15.13.1
 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.15.11.2; extra == "stubs"
+Requires-Dist: metaflow-stubs==2.15.13.1; extra == "stubs"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{ob_metaflow-2.15.11.2 → ob_metaflow-2.15.13.1}/ob_metaflow.egg-info/requires.txt

@@ -4,4 +4,4 @@ pylint
 kubernetes
 
 [stubs]
-metaflow-stubs==2.15.11.2
+metaflow-stubs==2.15.13.1

ob_metaflow-2.15.11.2/metaflow/version.py

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