modal 0.73.31__py3-none-any.whl → 0.73.33__py3-none-any.whl

modal/_functions.py

@@ -19,7 +19,6 @@ from synchronicity.exceptions import UserCodeException
 from modal_proto import api_pb2
 from modal_proto.modal_api_grpc import ModalClientModal
 
-from ._location import parse_cloud_provider
 from ._object import _get_environment_name, _Object, live_method, live_method_gen
 from ._pty import get_pty_info
 from ._resolver import Resolver
@@ -627,10 +626,6 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
 
         if not cloud and not is_builder_function:
             cloud = config.get("default_cloud")
-        if cloud:
-            cloud_provider = parse_cloud_provider(cloud)
-        else:
-            cloud_provider = None
 
         if is_generator and webhook_config:
             if webhook_config.type == api_pb2.WEBHOOK_TYPE_FUNCTION:
@@ -819,8 +814,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                     task_idle_timeout_secs=container_idle_timeout or 0,
                     concurrency_limit=concurrency_limit or 0,
                     pty_info=pty_info,
-                    cloud_provider=cloud_provider,  # Deprecated at some point
-                    cloud_provider_str=cloud.upper() if cloud else "",  # Supersedes cloud_provider
+                    cloud_provider_str=cloud if cloud else "",
                     warm_pool_size=keep_warm or 0,
                     runtime=config.get("function_runtime"),
                     runtime_debug=config.get("function_runtime_debug"),

modal/_location.py

@@ -1,35 +1,6 @@
 # Copyright Modal Labs 2022
-from enum import Enum
-
 import modal_proto.api_pb2
 
-from .exception import InvalidError
-
-
-class CloudProvider(Enum):
-    AWS = modal_proto.api_pb2.CLOUD_PROVIDER_AWS
-    GCP = modal_proto.api_pb2.CLOUD_PROVIDER_GCP
-    AUTO = modal_proto.api_pb2.CLOUD_PROVIDER_AUTO
-    OCI = modal_proto.api_pb2.CLOUD_PROVIDER_OCI
-
-
-def parse_cloud_provider(value: str) -> "modal_proto.api_pb2.CloudProvider.V":
-    try:
-        cloud_provider = CloudProvider[value.upper()]
-    except KeyError:
-        # provider's int identifier may be directly specified
-        try:
-            return int(value)  # type: ignore
-        except ValueError:
-            pass
-
-        raise InvalidError(
-            f"Invalid cloud provider: {value}. "
-            f"Value must be one of {[x.name.lower() for x in CloudProvider]} (case-insensitive)."
-        )
-
-    return cloud_provider.value
-
 
 def display_location(cloud_provider: "modal_proto.api_pb2.CloudProvider.V") -> str:
     if cloud_provider == modal_proto.api_pb2.CLOUD_PROVIDER_GCP:

modal/client.pyi

@@ -27,7 +27,7 @@ class _Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.31"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.33"
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -85,7 +85,7 @@ class Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.31"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.33"
     ): ...
     def is_closed(self) -> bool: ...
     @property

modal/sandbox.py

@@ -15,7 +15,6 @@ from modal.cloud_bucket_mount import _CloudBucketMount, cloud_bucket_mounts_to_p
 from modal.volume import _Volume
 from modal_proto import api_pb2
 
-from ._location import parse_cloud_provider
 from ._object import _get_environment_name, _Object
 from ._resolver import Resolver
 from ._resources import convert_fn_config_to_resources_config
@@ -42,10 +41,28 @@ from .stream_type import StreamType
 _default_image: _Image = _Image.debian_slim()
 
 
+# The maximum number of bytes that can be passed to an exec on Linux.
+# Though this is technically a 'server side' limit, it is unlikely to change.
+# getconf ARG_MAX will show this value on a host.
+ARG_MAX_BYTES = 2_097_152  # 2MiB
+
 if TYPE_CHECKING:
     import modal.app
 
 
+def _validate_exec_args(entrypoint_args: Sequence[str]) -> None:
+    # Entrypoint args must be strings.
+    if not all(isinstance(arg, str) for arg in entrypoint_args):
+        raise InvalidError("All entrypoint arguments must be strings")
+    # Avoid "[Errno 7] Argument list too long" errors.
+    total_arg_len = sum(len(arg) for arg in entrypoint_args)
+    if total_arg_len > ARG_MAX_BYTES:
+        raise InvalidError(
+            f"Total length of entrypoint arguments must be less than {ARG_MAX_BYTES} bytes (ARG_MAX). "
+            f"Got {total_arg_len} bytes."
+        )
+
+
 class _Sandbox(_Object, type_prefix="sb"):
     """A `Sandbox` object lets you interact with a running sandbox. This API is similar to Python's
     [asyncio.subprocess.Process](https://docs.python.org/3/library/asyncio-subprocess.html#asyncio.subprocess.Process).
@@ -168,8 +185,7 @@ class _Sandbox(_Object, type_prefix="sb"):
                 resources=convert_fn_config_to_resources_config(
                     cpu=cpu, memory=memory, gpu=gpu, ephemeral_disk=ephemeral_disk
                 ),
-                cloud_provider=parse_cloud_provider(cloud) if cloud else None,  # Deprecated at some point
-                cloud_provider_str=cloud.upper() if cloud else None,  # Supersedes cloud_provider
+                cloud_provider_str=cloud if cloud else None,  # Supersedes cloud_provider
                 nfs_mounts=network_file_system_mount_protos(validated_network_file_systems, False),
                 runtime_debug=config.get("function_runtime_debug"),
                 cloud_bucket_mounts=cloud_bucket_mounts_to_proto(cloud_bucket_mounts),
@@ -245,6 +261,8 @@ class _Sandbox(_Object, type_prefix="sb"):
             max_sleep_time = 60 * 60 * 24 * 2  # 2 days is plenty since workers roll every 24h
             entrypoint_args = ("sleep", str(max_sleep_time))
 
+        _validate_exec_args(entrypoint_args)
+
         # TODO(erikbern): Get rid of the `_new` method and create an already-hydrated object
         obj = _Sandbox._new(
             entrypoint_args,
@@ -521,6 +539,7 @@ class _Sandbox(_Object, type_prefix="sb"):
 
         if workdir is not None and not workdir.startswith("/"):
             raise InvalidError(f"workdir must be an absolute path, got: {workdir}")
+        _validate_exec_args(cmds)
 
         # Force secret resolution so we can pass the secret IDs to the backend.
         secret_coros = [secret.hydrate(client=self._client) for secret in secrets]

modal/sandbox.pyi

@@ -25,6 +25,8 @@ import os
 import typing
 import typing_extensions
 
+def _validate_exec_args(entrypoint_args: collections.abc.Sequence[str]) -> None: ...
+
 class _Sandbox(modal._object._Object):
     _result: typing.Optional[modal_proto.api_pb2.GenericResult]
     _stdout: modal.io_streams._StreamReader[str]

{modal-0.73.31.dist-info → modal-0.73.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: modal
-Version: 0.73.31
+Version: 0.73.33
 Summary: Python client library for Modal
 Author: Modal Labs
 Author-email: support@modal.com

{modal-0.73.31.dist-info → modal-0.73.33.dist-info}/RECORD

@@ -3,9 +3,9 @@ modal/__main__.py,sha256=CgIjP8m1xJjjd4AXc-delmR6LdBCZclw2A_V38CFIio,2870
 modal/_clustered_functions.py,sha256=kTf-9YBXY88NutC1akI-gCbvf01RhMPCw-zoOI_YIUE,2700
 modal/_clustered_functions.pyi,sha256=vllkegc99A0jrUOWa8mdlSbdp6uz36TsHhGxysAOpaQ,771
 modal/_container_entrypoint.py,sha256=YtfJ852XUDtAWBD-yVs99zy933-VBEKQyIngEj36Qcw,29286
-modal/_functions.py,sha256=eXqyhxucn3c_V4Y-zqwqqXCDeF6lW1h7N0hcQJNinR8,71463
+modal/_functions.py,sha256=ls_u9YqRFLgL5_vAWcTpBkpRQZX0Wx50kCxrt6Tlb_k,71180
 modal/_ipython.py,sha256=TW1fkVOmZL3YYqdS2YlM1hqpf654Yf8ZyybHdBnlhSw,301
-modal/_location.py,sha256=S3lSxIU3h9HkWpkJ3Pwo0pqjIOSB1fjeSgUsY3x7eec,1202
+modal/_location.py,sha256=joiX-0ZeutEUDTrrqLF1GHXCdVLF-rHzstocbMcd_-k,366
 modal/_object.py,sha256=ItQcsMNkz9Y3kdTsvfNarbW-paJ2qabDyQ7njaqY0XI,11359
 modal/_output.py,sha256=Z0nngPh2mKHMQc4MQ92YjVPc3ewOLa3I4dFBlL9nvQY,25656
 modal/_partial_function.py,sha256=KGv4hWXBboiWFxC733jfOHKdvShTPjF75lVv866Lgyc,29078
@@ -22,7 +22,7 @@ modal/app.py,sha256=rCOPD51gVyow8muyaqMuV65qfTnAZKf_w1OCZdSF_6o,44636
 modal/app.pyi,sha256=0MMCgskIL4r3eq8oBcfm2lLyeao2gXjS3iXaIfmaJ-o,25959
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=8SQawr7P1PNUCq1UmJMUQXG2jIo4Nmdcs311XqrNLRE,15276
-modal/client.pyi,sha256=TT9wOEgIzzEkyCBPOf4iEWhdNqduK3Bg869sRX-lO3Y,7593
+modal/client.pyi,sha256=81qGUSORM6eHl05tz2Ke3yiFWFZkkj-7wSIMBvSkeAo,7593
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
 modal/cls.py,sha256=5Er9L9tGpLGIrbiHOI7c9266gPG6nhxoJ_BX8op96nU,31096
@@ -67,8 +67,8 @@ modal/retries.py,sha256=HKR2Q9aNPWkMjQ5nwobqYTuZaSuw0a8lI2zrtY5IW98,5230
 modal/runner.py,sha256=fdUyDGN-bWu_aZBvxBO_MIgEuucsA0PgDKDHBn5k8J0,24451
 modal/runner.pyi,sha256=RYEYsnofrvVroYefWLhWAy8I_uwXV9fRNuJaVgcNzrg,5278
 modal/running_app.py,sha256=v61mapYNV1-O-Uaho5EfJlryMLvIT9We0amUOSvSGx8,1188
-modal/sandbox.py,sha256=fPStBypgDjclm388u5v3q26gAub0mP4c1pZYLlrJcUY,31777
-modal/sandbox.pyi,sha256=0E8aEejCcI5ySes0sifpRqIkmI584wiOPNp6J3L6Fs0,22633
+modal/sandbox.py,sha256=39MCW0EQ_CCmZgmhcr_PjT-H-7mo_Dycg9oeeNx3L2Q,32511
+modal/sandbox.pyi,sha256=cLmSwI1ab-2DgEuXNf6S1PiK63wfUR9dHtxlZtSOuX8,22719
 modal/schedule.py,sha256=0ZFpKs1bOxeo5n3HZjoL7OE2ktsb-_oGtq-WJEPO4tY,2615
 modal/scheduler_placement.py,sha256=BAREdOY5HzHpzSBqt6jDVR6YC_jYfHMVqOzkyqQfngU,1235
 modal/secret.py,sha256=U2Jivqdb94eI_BrGCMVbCots8F2gDcbXLMia_gVlej0,10455
@@ -172,10 +172,10 @@ modal_proto/options_pb2_grpc.pyi,sha256=CImmhxHsYnF09iENPoe8S4J-n93jtgUYD2JPAc0y
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal_version/__init__.py,sha256=wiJQ53c-OMs0Xf1UeXOxQ7FwlV1VzIjnX6o-pRYZ_Pk,470
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal_version/_version_generated.py,sha256=J1oAwbWNkSUn5KRSMgTkUcnTmLQuB4j_XhHlcX7WIuE,149
-modal-0.73.31.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-modal-0.73.31.dist-info/METADATA,sha256=40QP2R389PZVjhdg4DKclsWxlXD6G4uA6Xw3jbAV2D0,2330
-modal-0.73.31.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-modal-0.73.31.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.73.31.dist-info/top_level.txt,sha256=1nvYbOSIKcmU50fNrpnQnrrOpj269ei3LzgB6j9xGqg,64
-modal-0.73.31.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=0z9U6hfE3SIVx8R28D2_YwK_cXr1eX0p9LpyvZ7egEg,149
+modal-0.73.33.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.73.33.dist-info/METADATA,sha256=_6rqwvIii_O7uVb1LuIL3002kt72twfiUaopI3PpV3k,2330
+modal-0.73.33.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+modal-0.73.33.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.73.33.dist-info/top_level.txt,sha256=1nvYbOSIKcmU50fNrpnQnrrOpj269ei3LzgB6j9xGqg,64
+modal-0.73.33.dist-info/RECORD,,

modal_version/_version_generated.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 
 # Note: Reset this value to -1 whenever you make a minor `0.X` release of the client.
-build_number = 31  # git: 08cdea1
+build_number = 33  # git: 41d57c2