modal 1.0.0.dev17__py3-none-any.whl → 1.0.0.dev19__py3-none-any.whl

modal/__init__.py

@@ -20,7 +20,6 @@ try:
     from .file_pattern_matcher import FilePatternMatcher
     from .functions import Function, FunctionCall
     from .image import Image
-    from .mount import Mount
     from .network_file_system import NetworkFileSystem
     from .output import enable_output
     from .partial_function import (
@@ -67,7 +66,6 @@ __all__ = [
     "Function",
     "FunctionCall",
     "Image",
-    "Mount",
     "NetworkFileSystem",
     "Period",
     "Proxy",

modal/_functions.py

@@ -6,7 +6,7 @@ import textwrap
 import time
 import typing
 import warnings
-from collections.abc import AsyncGenerator, Collection, Sequence, Sized
+from collections.abc import AsyncGenerator, Sequence, Sized
 from dataclasses import dataclass
 from pathlib import PurePosixPath
 from typing import TYPE_CHECKING, Any, Callable, Optional, Union
@@ -99,7 +99,6 @@ if TYPE_CHECKING:
     import modal.cls
     import modal.partial_function
 
-MAX_INTERNAL_FAILURE_COUNT = 100
 
 @dataclasses.dataclass
 class _RetryContext:
@@ -349,14 +348,10 @@ class _InputPlaneInvocation:
         stub: ModalClientModal,
         attempt_token: str,
         client: _Client,
-        input_item: api_pb2.FunctionPutInputsItem,
-        function_id: str
     ):
         self.stub = stub
         self.client = client  # Used by the deserializer.
         self.attempt_token = attempt_token
-        self.input_item = input_item
-        self.function_id = function_id
 
     @staticmethod
     async def create(
@@ -370,53 +365,36 @@ class _InputPlaneInvocation:
         stub = await client.get_stub(input_plane_url)
 
         function_id = function.object_id
-        input_item = await _create_input(args, kwargs, stub, method_name=function._use_method_name)
+        item = await _create_input(args, kwargs, stub, method_name=function._use_method_name)
 
         request = api_pb2.AttemptStartRequest(
             function_id=function_id,
             parent_input_id=current_input_id() or "",
-            input=input_item,
+            input=item,
         )
         response = await retry_transient_errors(stub.AttemptStart, request)
         attempt_token = response.attempt_token
 
-        return _InputPlaneInvocation(stub, attempt_token, client, input_item, function_id)
+        return _InputPlaneInvocation(stub, attempt_token, client)
 
     async def run_function(self) -> Any:
-        # This will retry when the server returns GENERIC_STATUS_INTERNAL_FAILURE, i.e. lost inputs or worker preemption
-        # TODO(ryan): add logic to retry for user defined
-        internal_failure_count = 0
+        # TODO(nathan): add retry logic
         while True:
-            await_request = api_pb2.AttemptAwaitRequest(
+            request = api_pb2.AttemptAwaitRequest(
                 attempt_token=self.attempt_token,
                 timeout_secs=OUTPUTS_TIMEOUT,
                 requested_at=time.time(),
             )
-            await_response: api_pb2.AttemptAwaitResponse = await retry_transient_errors(
+            response: api_pb2.AttemptAwaitResponse = await retry_transient_errors(
                 self.stub.AttemptAwait,
-                await_request,
+                request,
                 attempt_timeout=OUTPUTS_TIMEOUT + ATTEMPT_TIMEOUT_GRACE_PERIOD,
             )
 
-            try:
+            if response.HasField("output"):
                 return await _process_result(
-                    await_response.output.result, await_response.output.data_format, self.stub, self.client
-                )
-            except InternalFailure as e:
-                internal_failure_count += 1
-                # Limit the number of times we retry
-                if internal_failure_count >= MAX_INTERNAL_FAILURE_COUNT:
-                    raise e
-                # For system failures on the server, we retry immediately,
-                # and the failure does not count towards the retry policy.
-                retry_request = api_pb2.AttemptRetryRequest(
-                    function_id=self.function_id,
-                    parent_input_id=current_input_id() or "",
-                    input=self.input_item,
-                    attempt_token=self.attempt_token
+                    response.output.result, response.output.data_format, self.stub, self.client
                 )
-                retry_response = await retry_transient_errors(self.stub.AttemptRetry, retry_request)
-                self.attempt_token = retry_response.attempt_token
 
 
 # Wrapper type for api_pb2.FunctionStats
@@ -527,7 +505,6 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         is_generator: bool = False,
         gpu: Union[GPU_T, list[GPU_T]] = None,
         # TODO: maybe break this out into a separate decorator for notebooks.
-        mounts: Collection[_Mount] = (),
         network_file_systems: dict[Union[str, PurePosixPath], _NetworkFileSystem] = {},
         volumes: dict[Union[str, PurePosixPath], Union[_Volume, _CloudBucketMount]] = {},
         webhook_config: Optional[api_pb2.WebhookConfig] = None,
@@ -583,8 +560,6 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             assert not webhook_config
             assert not schedule
 
-        explicit_mounts = mounts
-
         include_source_mode = get_include_source_mode(include_source)
         if include_source_mode != IncludeSourceMode.INCLUDE_NOTHING:
             entrypoint_mounts = info.get_entrypoint_mount()
@@ -593,7 +568,6 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
 
         all_mounts = [
             _get_client_mount(),
-            *explicit_mounts,
             *entrypoint_mounts.values(),
         ]
 
@@ -633,7 +607,6 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                     image=image,
                     secrets=secrets,
                     gpu=gpu,
-                    mounts=mounts,
                     network_file_systems=network_file_systems,
                     volumes=volumes,
                     memory=memory,
@@ -741,16 +714,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
 
         def _deps(only_explicit_mounts=False) -> list[_Object]:
             deps: list[_Object] = list(secrets)
-            if only_explicit_mounts:
-                # TODO: this is a bit hacky, but all_mounts may differ in the container vs locally
-                # We don't want the function dependencies to change, so we have this way to force it to
-                # only include its declared dependencies.
-                # Only objects that need interaction within a user's container actually need to be
-                # included when only_explicit_mounts=True, so omitting auto mounts here
-                # wouldn't be a problem as long as Mounts are "passive" and only loaded by the
-                # worker runtime
-                deps += list(explicit_mounts)
-            else:
+            if not only_explicit_mounts:
                 deps += list(all_mounts)
             if proxy:
                 deps.append(proxy)
@@ -1018,7 +982,6 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         obj._build_args = dict(  # See get_build_def
             secrets=repr(secrets),
             gpu_config=repr([parse_gpu_config(_gpu) for _gpu in gpus]),
-            mounts=repr(mounts),
             network_file_systems=repr(network_file_systems),
         )
         # these key are excluded if empty to avoid rebuilds on client upgrade

modal/_utils/function_utils.py

@@ -466,10 +466,7 @@ async def _process_result(result: api_pb2.GenericResult, data_format: int, stub,
 
     if result.status == api_pb2.GenericResult.GENERIC_STATUS_TIMEOUT:
         raise FunctionTimeoutError(result.exception)
-    elif result.status in [
-        api_pb2.GenericResult.GENERIC_STATUS_INTERNAL_FAILURE,
-        api_pb2.GenericResult.GENERIC_STATUS_TERMINATED,
-    ]:
+    elif result.status == api_pb2.GenericResult.GENERIC_STATUS_INTERNAL_FAILURE:
         raise InternalFailure(result.exception)
     elif result.status != api_pb2.GenericResult.GENERIC_STATUS_SUCCESS:
         if data:

modal/app.py

@@ -44,7 +44,6 @@ from .exception import ExecutionError, InvalidError
 from .functions import Function
 from .gpu import GPU_T
 from .image import _Image
-from .mount import _Mount
 from .network_file_system import _NetworkFileSystem
 from .partial_function import PartialFunction
 from .proxy import _Proxy
@@ -156,7 +155,6 @@ class _App:
     _classes: dict[str, _Cls]
 
     _image: Optional[_Image]
-    _mounts: Sequence[_Mount]
     _secrets: Sequence[_Secret]
     _volumes: dict[Union[str, PurePosixPath], _Volume]
     _web_endpoints: list[str]  # Used by the CLI
@@ -174,7 +172,6 @@ class _App:
         name: Optional[str] = None,
         *,
         image: Optional[_Image] = None,  # default image for all functions (default is `modal.Image.debian_slim()`)
-        mounts: Sequence[_Mount] = [],  # default mounts for all functions
         secrets: Sequence[_Secret] = [],  # default secrets for all functions
         volumes: dict[Union[str, PurePosixPath], _Volume] = {},  # default volumes for all functions
         include_source: Optional[bool] = None,
@@ -195,7 +192,6 @@ class _App:
         self._description = name
         self._include_source_default = include_source
 
-        check_sequence(mounts, _Mount, "`mounts=` has to be a list or tuple of `modal.Mount` objects")
         check_sequence(secrets, _Secret, "`secrets=` has to be a list or tuple of `modal.Secret` objects")
         validate_volumes(volumes)
 
@@ -205,7 +201,6 @@ class _App:
         self._functions = {}
         self._classes = {}
         self._image = image
-        self._mounts = mounts
         self._secrets = secrets
         self._volumes = volumes
         self._local_entrypoints = {}
@@ -446,9 +441,7 @@ class _App:
         if not self._running_app:
             raise ExecutionError("`_get_watch_mounts` requires a running app.")
 
-        all_mounts = [
-            *self._mounts,
-        ]
+        all_mounts = []
         for function in self.registered_functions.values():
             all_mounts.extend(function._serve_mounts)
 
@@ -612,7 +605,6 @@ class _App:
             GPU_T, list[GPU_T]
         ] = None,  # GPU request as string ("any", "T4", ...), object (`modal.GPU.A100()`, ...), or a list of either
         serialized: bool = False,  # Whether to send the function over using cloudpickle.
-        mounts: Sequence[_Mount] = (),  # Modal Mounts added to the container
         network_file_systems: dict[
             Union[str, PurePosixPath], _NetworkFileSystem
         ] = {},  # Mountpoints for Modal NetworkFileSystems
@@ -792,7 +784,6 @@ class _App:
                 schedule=schedule,
                 is_generator=is_generator,
                 gpu=gpu,
-                mounts=[*self._mounts, *mounts],
                 network_file_systems=network_file_systems,
                 volumes={**self._volumes, **volumes},
                 cpu=cpu,
@@ -843,7 +834,6 @@ class _App:
             GPU_T, list[GPU_T]
         ] = None,  # GPU request as string ("any", "T4", ...), object (`modal.GPU.A100()`, ...), or a list of either
         serialized: bool = False,  # Whether to send the function over using cloudpickle.
-        mounts: Sequence[_Mount] = (),
         network_file_systems: dict[
             Union[str, PurePosixPath], _NetworkFileSystem
         ] = {},  # Mountpoints for Modal NetworkFileSystems
@@ -965,7 +955,6 @@ class _App:
                 image=image or self._get_default_image(),
                 secrets=[*self._secrets, *secrets],
                 gpu=gpu,
-                mounts=[*self._mounts, *mounts],
                 network_file_systems=network_file_systems,
                 volumes={**self._volumes, **volumes},
                 cpu=cpu,

modal/app.pyi

@@ -8,7 +8,6 @@ import modal.cls
 import modal.functions
 import modal.gpu
 import modal.image
-import modal.mount
 import modal.network_file_system
 import modal.partial_function
 import modal.proxy
@@ -77,7 +76,6 @@ class _App:
     _functions: dict[str, modal._functions._Function]
     _classes: dict[str, modal.cls._Cls]
     _image: typing.Optional[modal.image._Image]
-    _mounts: collections.abc.Sequence[modal.mount._Mount]
     _secrets: collections.abc.Sequence[modal.secret._Secret]
     _volumes: dict[typing.Union[str, pathlib.PurePosixPath], modal.volume._Volume]
     _web_endpoints: list[str]
@@ -92,7 +90,6 @@ class _App:
         name: typing.Optional[str] = None,
         *,
         image: typing.Optional[modal.image._Image] = None,
-        mounts: collections.abc.Sequence[modal.mount._Mount] = [],
         secrets: collections.abc.Sequence[modal.secret._Secret] = [],
         volumes: dict[typing.Union[str, pathlib.PurePosixPath], modal.volume._Volume] = {},
         include_source: typing.Optional[bool] = None,
@@ -164,7 +161,6 @@ class _App:
         secrets: collections.abc.Sequence[modal.secret._Secret] = (),
         gpu: typing.Union[None, str, modal.gpu._GPUConfig, list[typing.Union[None, str, modal.gpu._GPUConfig]]] = None,
         serialized: bool = False,
-        mounts: collections.abc.Sequence[modal.mount._Mount] = (),
         network_file_systems: dict[
             typing.Union[str, pathlib.PurePosixPath], modal.network_file_system._NetworkFileSystem
         ] = {},
@@ -216,7 +212,6 @@ class _App:
         secrets: collections.abc.Sequence[modal.secret._Secret] = (),
         gpu: typing.Union[None, str, modal.gpu._GPUConfig, list[typing.Union[None, str, modal.gpu._GPUConfig]]] = None,
         serialized: bool = False,
-        mounts: collections.abc.Sequence[modal.mount._Mount] = (),
         network_file_systems: dict[
             typing.Union[str, pathlib.PurePosixPath], modal.network_file_system._NetworkFileSystem
         ] = {},
@@ -272,7 +267,6 @@ class App:
     _functions: dict[str, modal.functions.Function]
     _classes: dict[str, modal.cls.Cls]
     _image: typing.Optional[modal.image.Image]
-    _mounts: collections.abc.Sequence[modal.mount.Mount]
     _secrets: collections.abc.Sequence[modal.secret.Secret]
     _volumes: dict[typing.Union[str, pathlib.PurePosixPath], modal.volume.Volume]
     _web_endpoints: list[str]
@@ -287,7 +281,6 @@ class App:
         name: typing.Optional[str] = None,
         *,
         image: typing.Optional[modal.image.Image] = None,
-        mounts: collections.abc.Sequence[modal.mount.Mount] = [],
         secrets: collections.abc.Sequence[modal.secret.Secret] = [],
         volumes: dict[typing.Union[str, pathlib.PurePosixPath], modal.volume.Volume] = {},
         include_source: typing.Optional[bool] = None,
@@ -410,7 +403,6 @@ class App:
         secrets: collections.abc.Sequence[modal.secret.Secret] = (),
         gpu: typing.Union[None, str, modal.gpu._GPUConfig, list[typing.Union[None, str, modal.gpu._GPUConfig]]] = None,
         serialized: bool = False,
-        mounts: collections.abc.Sequence[modal.mount.Mount] = (),
         network_file_systems: dict[
             typing.Union[str, pathlib.PurePosixPath], modal.network_file_system.NetworkFileSystem
         ] = {},
@@ -462,7 +454,6 @@ class App:
         secrets: collections.abc.Sequence[modal.secret.Secret] = (),
         gpu: typing.Union[None, str, modal.gpu._GPUConfig, list[typing.Union[None, str, modal.gpu._GPUConfig]]] = None,
         serialized: bool = False,
-        mounts: collections.abc.Sequence[modal.mount.Mount] = (),
         network_file_systems: dict[
             typing.Union[str, pathlib.PurePosixPath], modal.network_file_system.NetworkFileSystem
         ] = {},

modal/client.pyi

@@ -31,7 +31,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.0.dev17",
+        version: str = "1.0.0.dev19",
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -94,7 +94,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.0.dev17",
+        version: str = "1.0.0.dev19",
     ): ...
     def is_closed(self) -> bool: ...
     @property

modal/functions.pyi

@@ -63,7 +63,6 @@ class Function(
         schedule: typing.Optional[modal.schedule.Schedule] = None,
         is_generator: bool = False,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig, list[typing.Union[None, str, modal.gpu._GPUConfig]]] = None,
-        mounts: collections.abc.Collection[modal.mount.Mount] = (),
         network_file_systems: dict[
             typing.Union[str, pathlib.PurePosixPath], modal.network_file_system.NetworkFileSystem
         ] = {},
@@ -228,11 +227,11 @@ class Function(
 
     _call_generator: ___call_generator_spec[typing_extensions.Self]
 
-    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER: ...
         async def aio(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER: ...
 
-    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
+    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
 
     class __remote_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]: ...
@@ -247,12 +246,12 @@ class Function(
         self, *args: modal._functions.P.args, **kwargs: modal._functions.P.kwargs
     ) -> modal._functions.OriginalReturnType: ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
         async def aio(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
 
     _experimental_spawn: ___experimental_spawn_spec[
-        modal._functions.ReturnType, modal._functions.P, typing_extensions.Self
+        modal._functions.P, modal._functions.ReturnType, typing_extensions.Self
     ]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER, SUPERSELF]):
@@ -261,11 +260,11 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P, typing_extensions.Self]
 
-    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
         async def aio(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
 
-    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
+    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]: ...
 

modal/image.py

@@ -437,7 +437,7 @@ class _Image(_Object, type_prefix="im"):
 
     def _add_mount_layer_or_copy(self, mount: _Mount, copy: bool = False):
         if copy:
-            return self.copy_mount(mount, remote_path="/")
+            return self._copy_mount(mount, remote_path="/")
 
         base_image = self
 
@@ -672,23 +672,9 @@ class _Image(_Object, type_prefix="im"):
         )
         return obj
 
-    def copy_mount(self, mount: _Mount, remote_path: Union[str, Path] = ".") -> "_Image":
+    def _copy_mount(self, mount: _Mount, remote_path: Union[str, Path] = ".") -> "_Image":
         """mdmd:hidden
-        **Deprecated**: Use image.add_local_dir(..., copy=True) or similar instead.
-
-        Copy the entire contents of a `modal.Mount` into an image.
-        Useful when files only available locally are required during the image
-        build process.
-
-        **Example**
-
-        ```python notest
-        static_images_dir = "./static"
-        # place all static images in root of mount
-        mount = modal.Mount.from_local_dir(static_images_dir, remote_path="/")
-        # place mount's contents into /static directory of image.
-        image = modal.Image.debian_slim().copy_mount(mount, remote_path="/static")
-        ```
+        Internal
         """
         if not isinstance(mount, _Mount):
             raise InvalidError("The mount argument to copy has to be a Modal Mount object")
@@ -1892,7 +1878,6 @@ class _Image(_Object, type_prefix="im"):
         *,
         secrets: Sequence[_Secret] = (),  # Optional Modal Secret objects with environment variables for the container
         gpu: Union[GPU_T, list[GPU_T]] = None,  # Requested GPU or or list of acceptable GPUs( e.g. ["A10", "A100"])
-        mounts: Sequence[_Mount] = (),  # Mounts attached to the function
         volumes: dict[Union[str, PurePosixPath], Union[_Volume, _CloudBucketMount]] = {},  # Volume mount paths
         network_file_systems: dict[Union[str, PurePosixPath], _NetworkFileSystem] = {},  # NFS mount paths
         cpu: Optional[float] = None,  # How many CPU cores to request. This is a soft limit.
@@ -1950,7 +1935,6 @@ class _Image(_Object, type_prefix="im"):
             image=self,  # type: ignore[reportArgumentType]  # TODO: probably conflict with type stub?
             secrets=secrets,
             gpu=gpu,
-            mounts=mounts,
             volumes=volumes,
             network_file_systems=network_file_systems,
             cloud=cloud,

modal/image.pyi

@@ -120,7 +120,7 @@ class _Image(modal._object._Object):
         _namespace: int = 1,
         _do_assert_no_mount_layers: bool = True,
     ): ...
-    def copy_mount(self, mount: modal.mount._Mount, remote_path: typing.Union[str, pathlib.Path] = ".") -> _Image: ...
+    def _copy_mount(self, mount: modal.mount._Mount, remote_path: typing.Union[str, pathlib.Path] = ".") -> _Image: ...
     def add_local_file(
         self, local_path: typing.Union[str, pathlib.Path], remote_path: str, *, copy: bool = False
     ) -> _Image: ...
@@ -316,7 +316,6 @@ class _Image(modal._object._Object):
         *,
         secrets: collections.abc.Sequence[modal.secret._Secret] = (),
         gpu: typing.Union[None, str, modal.gpu._GPUConfig, list[typing.Union[None, str, modal.gpu._GPUConfig]]] = None,
-        mounts: collections.abc.Sequence[modal.mount._Mount] = (),
         volumes: dict[
             typing.Union[str, pathlib.PurePosixPath],
             typing.Union[modal.volume._Volume, modal.cloud_bucket_mount._CloudBucketMount],
@@ -377,7 +376,7 @@ class Image(modal.object.Object):
         _namespace: int = 1,
         _do_assert_no_mount_layers: bool = True,
     ): ...
-    def copy_mount(self, mount: modal.mount.Mount, remote_path: typing.Union[str, pathlib.Path] = ".") -> Image: ...
+    def _copy_mount(self, mount: modal.mount.Mount, remote_path: typing.Union[str, pathlib.Path] = ".") -> Image: ...
     def add_local_file(
         self, local_path: typing.Union[str, pathlib.Path], remote_path: str, *, copy: bool = False
     ) -> Image: ...
@@ -578,7 +577,6 @@ class Image(modal.object.Object):
         *,
         secrets: collections.abc.Sequence[modal.secret.Secret] = (),
         gpu: typing.Union[None, str, modal.gpu._GPUConfig, list[typing.Union[None, str, modal.gpu._GPUConfig]]] = None,
-        mounts: collections.abc.Sequence[modal.mount.Mount] = (),
         volumes: dict[
             typing.Union[str, pathlib.PurePosixPath],
             typing.Union[modal.volume.Volume, modal.cloud_bucket_mount.CloudBucketMount],

modal/runner.py

@@ -601,8 +601,9 @@ async def _interactive_shell(
             "MODAL_ENVIRONMENT": _get_environment_name(),
         }
         secrets = kwargs.pop("secrets", []) + [_Secret.from_dict(sandbox_env)]
+
         with enable_output():  # show any image build logs
-            sandbox = await _Sandbox.create(
+            sandbox = await _Sandbox._create(
                 "sleep",
                 "100000",
                 app=_app,

modal/sandbox.py

@@ -12,6 +12,7 @@ from grpclib import GRPCError, Status
 
 from modal._tunnel import Tunnel
 from modal.cloud_bucket_mount import _CloudBucketMount, cloud_bucket_mounts_to_proto
+from modal.mount import _Mount
 from modal.volume import _Volume
 from modal_proto import api_pb2
 
@@ -29,7 +30,6 @@ from .file_io import FileWatchEvent, FileWatchEventType, _FileIO
 from .gpu import GPU_T
 from .image import _Image
 from .io_streams import StreamReader, StreamWriter, _StreamReader, _StreamWriter
-from .mount import _Mount
 from .network_file_system import _NetworkFileSystem, network_file_system_mount_protos
 from .proxy import _Proxy
 from .scheduler_placement import SchedulerPlacement
@@ -85,7 +85,6 @@ class _Sandbox(_Object, type_prefix="sb"):
     def _new(
         entrypoint_args: Sequence[str],
         image: _Image,
-        mounts: Sequence[_Mount],
         secrets: Sequence[_Secret],
         timeout: Optional[int] = None,
         workdir: Optional[str] = None,
@@ -94,6 +93,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         region: Optional[Union[str, Sequence[str]]] = None,
         cpu: Optional[float] = None,
         memory: Optional[Union[int, tuple[int, int]]] = None,
+        mounts: Sequence[_Mount] = (),
         network_file_systems: dict[Union[str, os.PathLike], _NetworkFileSystem] = {},
         block_network: bool = False,
         cidr_allowlist: Optional[Sequence[str]] = None,
@@ -217,7 +217,6 @@ class _Sandbox(_Object, type_prefix="sb"):
         app: Optional["modal.app._App"] = None,  # Optionally associate the sandbox with an app
         environment_name: Optional[str] = None,  # Optionally override the default environment
         image: Optional[_Image] = None,  # The image to run as the container for the sandbox.
-        mounts: Sequence[_Mount] = (),  # Mounts to attach to the sandbox.
         secrets: Sequence[_Secret] = (),  # Environment variables to inject into the sandbox.
         network_file_systems: dict[Union[str, os.PathLike], _NetworkFileSystem] = {},
         timeout: Optional[int] = None,  # Maximum execution time of the sandbox in seconds.
@@ -264,6 +263,76 @@ class _Sandbox(_Object, type_prefix="sb"):
         sandbox.wait()
         ```
         """
+        return await _Sandbox._create(
+            *entrypoint_args,
+            app=app,
+            environment_name=environment_name,
+            image=image,
+            secrets=secrets,
+            network_file_systems=network_file_systems,
+            timeout=timeout,
+            workdir=workdir,
+            gpu=gpu,
+            cloud=cloud,
+            region=region,
+            cpu=cpu,
+            memory=memory,
+            block_network=block_network,
+            cidr_allowlist=cidr_allowlist,
+            volumes=volumes,
+            pty_info=pty_info,
+            encrypted_ports=encrypted_ports,
+            unencrypted_ports=unencrypted_ports,
+            proxy=proxy,
+            _experimental_enable_snapshot=_experimental_enable_snapshot,
+            _experimental_scheduler_placement=_experimental_scheduler_placement,
+            client=client,
+        )
+
+    @staticmethod
+    async def _create(
+        *entrypoint_args: str,
+        app: Optional["modal.app._App"] = None,  # Optionally associate the sandbox with an app
+        environment_name: Optional[str] = None,  # Optionally override the default environment
+        image: Optional[_Image] = None,  # The image to run as the container for the sandbox.
+        secrets: Sequence[_Secret] = (),  # Environment variables to inject into the sandbox.
+        mounts: Sequence[_Mount] = (),
+        network_file_systems: dict[Union[str, os.PathLike], _NetworkFileSystem] = {},
+        timeout: Optional[int] = None,  # Maximum execution time of the sandbox in seconds.
+        workdir: Optional[str] = None,  # Working directory of the sandbox.
+        gpu: GPU_T = None,
+        cloud: Optional[str] = None,
+        region: Optional[Union[str, Sequence[str]]] = None,  # Region or regions to run the sandbox on.
+        # Specify, in fractional CPU cores, how many CPU cores to request.
+        # Or, pass (request, limit) to additionally specify a hard limit in fractional CPU cores.
+        # CPU throttling will prevent a container from exceeding its specified limit.
+        cpu: Optional[Union[float, tuple[float, float]]] = None,
+        # Specify, in MiB, a memory request which is the minimum memory required.
+        # Or, pass (request, limit) to additionally specify a hard limit in MiB.
+        memory: Optional[Union[int, tuple[int, int]]] = None,
+        block_network: bool = False,  # Whether to block network access
+        # List of CIDRs the sandbox is allowed to access. If None, all CIDRs are allowed.
+        cidr_allowlist: Optional[Sequence[str]] = None,
+        volumes: dict[
+            Union[str, os.PathLike], Union[_Volume, _CloudBucketMount]
+        ] = {},  # Mount points for Modal Volumes and CloudBucketMounts
+        pty_info: Optional[api_pb2.PTYInfo] = None,
+        # List of ports to tunnel into the sandbox. Encrypted ports are tunneled with TLS.
+        encrypted_ports: Sequence[int] = [],
+        # List of ports to tunnel into the sandbox without encryption.
+        unencrypted_ports: Sequence[int] = [],
+        # Reference to a Modal Proxy to use in front of this Sandbox.
+        proxy: Optional[_Proxy] = None,
+        # Enable memory snapshots.
+        _experimental_enable_snapshot: bool = False,
+        _experimental_scheduler_placement: Optional[
+            SchedulerPlacement
+        ] = None,  # Experimental controls over fine-grained scheduling (alpha).
+        client: Optional[_Client] = None,
+    ):
+        # This method exposes some internal arguments (currently `mounts`) which are not in the public API
+        # `mounts` is currently only used by modal shell (cli) to provide a function's mounts to the
+        # sandbox that runs the shell session
         from .app import _App
 
         environment_name = _get_environment_name(environment_name)
@@ -274,7 +343,6 @@ class _Sandbox(_Object, type_prefix="sb"):
         obj = _Sandbox._new(
             entrypoint_args,
             image=image or _default_image,
-            mounts=mounts,
             secrets=secrets,
             timeout=timeout,
             workdir=workdir,
@@ -283,6 +351,7 @@ class _Sandbox(_Object, type_prefix="sb"):
             region=region,
             cpu=cpu,
             memory=memory,
+            mounts=mounts,
             network_file_systems=network_file_systems,
             block_network=block_network,
             cidr_allowlist=cidr_allowlist,

modal/sandbox.pyi

@@ -40,7 +40,6 @@ class _Sandbox(modal._object._Object):
     def _new(
         entrypoint_args: collections.abc.Sequence[str],
         image: modal.image._Image,
-        mounts: collections.abc.Sequence[modal.mount._Mount],
         secrets: collections.abc.Sequence[modal.secret._Secret],
         timeout: typing.Optional[int] = None,
         workdir: typing.Optional[str] = None,
@@ -49,6 +48,7 @@ class _Sandbox(modal._object._Object):
         region: typing.Union[str, collections.abc.Sequence[str], None] = None,
         cpu: typing.Optional[float] = None,
         memory: typing.Union[int, tuple[int, int], None] = None,
+        mounts: collections.abc.Sequence[modal.mount._Mount] = (),
         network_file_systems: dict[typing.Union[str, os.PathLike], modal.network_file_system._NetworkFileSystem] = {},
         block_network: bool = False,
         cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
@@ -69,7 +69,6 @@ class _Sandbox(modal._object._Object):
         app: typing.Optional[modal.app._App] = None,
         environment_name: typing.Optional[str] = None,
         image: typing.Optional[modal.image._Image] = None,
-        mounts: collections.abc.Sequence[modal.mount._Mount] = (),
         secrets: collections.abc.Sequence[modal.secret._Secret] = (),
         network_file_systems: dict[typing.Union[str, os.PathLike], modal.network_file_system._NetworkFileSystem] = {},
         timeout: typing.Optional[int] = None,
@@ -93,6 +92,36 @@ class _Sandbox(modal._object._Object):
         _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
         client: typing.Optional[modal.client._Client] = None,
     ) -> _Sandbox: ...
+    @staticmethod
+    async def _create(
+        *entrypoint_args: str,
+        app: typing.Optional[modal.app._App] = None,
+        environment_name: typing.Optional[str] = None,
+        image: typing.Optional[modal.image._Image] = None,
+        secrets: collections.abc.Sequence[modal.secret._Secret] = (),
+        mounts: collections.abc.Sequence[modal.mount._Mount] = (),
+        network_file_systems: dict[typing.Union[str, os.PathLike], modal.network_file_system._NetworkFileSystem] = {},
+        timeout: typing.Optional[int] = None,
+        workdir: typing.Optional[str] = None,
+        gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
+        cloud: typing.Optional[str] = None,
+        region: typing.Union[str, collections.abc.Sequence[str], None] = None,
+        cpu: typing.Union[float, tuple[float, float], None] = None,
+        memory: typing.Union[int, tuple[int, int], None] = None,
+        block_network: bool = False,
+        cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
+        volumes: dict[
+            typing.Union[str, os.PathLike],
+            typing.Union[modal.volume._Volume, modal.cloud_bucket_mount._CloudBucketMount],
+        ] = {},
+        pty_info: typing.Optional[modal_proto.api_pb2.PTYInfo] = None,
+        encrypted_ports: collections.abc.Sequence[int] = [],
+        unencrypted_ports: collections.abc.Sequence[int] = [],
+        proxy: typing.Optional[modal.proxy._Proxy] = None,
+        _experimental_enable_snapshot: bool = False,
+        _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
+        client: typing.Optional[modal.client._Client] = None,
+    ): ...
     def _hydrate_metadata(self, handle_metadata: typing.Optional[google.protobuf.message.Message]): ...
     @staticmethod
     async def from_id(sandbox_id: str, client: typing.Optional[modal.client._Client] = None) -> _Sandbox: ...
@@ -182,7 +211,6 @@ class Sandbox(modal.object.Object):
     def _new(
         entrypoint_args: collections.abc.Sequence[str],
         image: modal.image.Image,
-        mounts: collections.abc.Sequence[modal.mount.Mount],
         secrets: collections.abc.Sequence[modal.secret.Secret],
         timeout: typing.Optional[int] = None,
         workdir: typing.Optional[str] = None,
@@ -191,6 +219,7 @@ class Sandbox(modal.object.Object):
         region: typing.Union[str, collections.abc.Sequence[str], None] = None,
         cpu: typing.Optional[float] = None,
         memory: typing.Union[int, tuple[int, int], None] = None,
+        mounts: collections.abc.Sequence[modal.mount.Mount] = (),
         network_file_systems: dict[typing.Union[str, os.PathLike], modal.network_file_system.NetworkFileSystem] = {},
         block_network: bool = False,
         cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
@@ -213,7 +242,6 @@ class Sandbox(modal.object.Object):
             app: typing.Optional[modal.app.App] = None,
             environment_name: typing.Optional[str] = None,
             image: typing.Optional[modal.image.Image] = None,
-            mounts: collections.abc.Sequence[modal.mount.Mount] = (),
             secrets: collections.abc.Sequence[modal.secret.Secret] = (),
             network_file_systems: dict[
                 typing.Union[str, os.PathLike], modal.network_file_system.NetworkFileSystem
@@ -246,7 +274,6 @@ class Sandbox(modal.object.Object):
             app: typing.Optional[modal.app.App] = None,
             environment_name: typing.Optional[str] = None,
             image: typing.Optional[modal.image.Image] = None,
-            mounts: collections.abc.Sequence[modal.mount.Mount] = (),
             secrets: collections.abc.Sequence[modal.secret.Secret] = (),
             network_file_systems: dict[
                 typing.Union[str, os.PathLike], modal.network_file_system.NetworkFileSystem
@@ -275,6 +302,76 @@ class Sandbox(modal.object.Object):
 
     create: __create_spec
 
+    class ___create_spec(typing_extensions.Protocol):
+        def __call__(
+            self,
+            /,
+            *entrypoint_args: str,
+            app: typing.Optional[modal.app.App] = None,
+            environment_name: typing.Optional[str] = None,
+            image: typing.Optional[modal.image.Image] = None,
+            secrets: collections.abc.Sequence[modal.secret.Secret] = (),
+            mounts: collections.abc.Sequence[modal.mount.Mount] = (),
+            network_file_systems: dict[
+                typing.Union[str, os.PathLike], modal.network_file_system.NetworkFileSystem
+            ] = {},
+            timeout: typing.Optional[int] = None,
+            workdir: typing.Optional[str] = None,
+            gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
+            cloud: typing.Optional[str] = None,
+            region: typing.Union[str, collections.abc.Sequence[str], None] = None,
+            cpu: typing.Union[float, tuple[float, float], None] = None,
+            memory: typing.Union[int, tuple[int, int], None] = None,
+            block_network: bool = False,
+            cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
+            volumes: dict[
+                typing.Union[str, os.PathLike],
+                typing.Union[modal.volume.Volume, modal.cloud_bucket_mount.CloudBucketMount],
+            ] = {},
+            pty_info: typing.Optional[modal_proto.api_pb2.PTYInfo] = None,
+            encrypted_ports: collections.abc.Sequence[int] = [],
+            unencrypted_ports: collections.abc.Sequence[int] = [],
+            proxy: typing.Optional[modal.proxy.Proxy] = None,
+            _experimental_enable_snapshot: bool = False,
+            _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
+            client: typing.Optional[modal.client.Client] = None,
+        ): ...
+        async def aio(
+            self,
+            /,
+            *entrypoint_args: str,
+            app: typing.Optional[modal.app.App] = None,
+            environment_name: typing.Optional[str] = None,
+            image: typing.Optional[modal.image.Image] = None,
+            secrets: collections.abc.Sequence[modal.secret.Secret] = (),
+            mounts: collections.abc.Sequence[modal.mount.Mount] = (),
+            network_file_systems: dict[
+                typing.Union[str, os.PathLike], modal.network_file_system.NetworkFileSystem
+            ] = {},
+            timeout: typing.Optional[int] = None,
+            workdir: typing.Optional[str] = None,
+            gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
+            cloud: typing.Optional[str] = None,
+            region: typing.Union[str, collections.abc.Sequence[str], None] = None,
+            cpu: typing.Union[float, tuple[float, float], None] = None,
+            memory: typing.Union[int, tuple[int, int], None] = None,
+            block_network: bool = False,
+            cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
+            volumes: dict[
+                typing.Union[str, os.PathLike],
+                typing.Union[modal.volume.Volume, modal.cloud_bucket_mount.CloudBucketMount],
+            ] = {},
+            pty_info: typing.Optional[modal_proto.api_pb2.PTYInfo] = None,
+            encrypted_ports: collections.abc.Sequence[int] = [],
+            unencrypted_ports: collections.abc.Sequence[int] = [],
+            proxy: typing.Optional[modal.proxy.Proxy] = None,
+            _experimental_enable_snapshot: bool = False,
+            _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
+            client: typing.Optional[modal.client.Client] = None,
+        ): ...
+
+    _create: ___create_spec
+
     def _hydrate_metadata(self, handle_metadata: typing.Optional[google.protobuf.message.Message]): ...
 
     class __from_id_spec(typing_extensions.Protocol):

{modal-1.0.0.dev17.dist-info → modal-1.0.0.dev19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.0.0.dev17
+Version: 1.0.0.dev19
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License: Apache-2.0

{modal-1.0.0.dev17.dist-info → modal-1.0.0.dev19.dist-info}/RECORD

@@ -1,9 +1,9 @@
-modal/__init__.py,sha256=AaO8fXHO6BYltmFoYOwCB2pSjEECXVvGK5p2Vfo_SpU,2752
+modal/__init__.py,sha256=1131svUxi876UMFC6Z68qe5Z031ZfZ9NrduvGwHphj8,2710
 modal/__main__.py,sha256=sTJcc9EbDuCKSwg3tL6ZckFw9WWdlkXW8mId1IvJCNc,2846
 modal/_clustered_functions.py,sha256=kTf-9YBXY88NutC1akI-gCbvf01RhMPCw-zoOI_YIUE,2700
 modal/_clustered_functions.pyi,sha256=2aWxN2v5WUnj-R-sk6BzJ-3AvggkQGQjwhtvbDH3pds,777
 modal/_container_entrypoint.py,sha256=2Zx9O_EMJg0H77EdnC2vGKs6uFMWwbP1NLFf-qYmWmU,28962
-modal/_functions.py,sha256=kIyUjK1v6C8RWXSkkJI5kTO3mz--gkO-3aA9f40aaog,79212
+modal/_functions.py,sha256=HSQ8BVar2RsMD4ud83iUKvE7NSyEoVsTc-3quW8YObA,77149
 modal/_ipython.py,sha256=TW1fkVOmZL3YYqdS2YlM1hqpf654Yf8ZyybHdBnlhSw,301
 modal/_location.py,sha256=joiX-0ZeutEUDTrrqLF1GHXCdVLF-rHzstocbMcd_-k,366
 modal/_object.py,sha256=KzzzZoM41UQUiY9TKOrft9BtZKgjWG_ukdlyLGjB4UY,10758
@@ -18,11 +18,11 @@ modal/_tunnel.py,sha256=zTBxBiuH1O22tS1OliAJdIsSmaZS8PlnifS_6S5z-mk,6320
 modal/_tunnel.pyi,sha256=a4Ea0RQ5jaJB0A4LH9FANGB44ObqkHHGVDV4RwtokzU,1251
 modal/_type_manager.py,sha256=DWjgmjYJuOagw2erin506UUbG2H5UzZCFEekS-7hmfA,9087
 modal/_watcher.py,sha256=K6LYnlmSGQB4tWWI9JADv-tvSvQ1j522FwT71B51CX8,3584
-modal/app.py,sha256=Wz9DIFzO2ByObuqoh3zk9B76WTWcPqYoQDuPU-yrLTU,47100
-modal/app.pyi,sha256=1dHHI6RgvJ1y5Ouzb1_S-wpjfjCL7QHz0gqE4BxMw10,23192
+modal/app.py,sha256=NZ_rJ9TuMfiNiLg8-gOFgufD5flGtXWPHOZI0gdD3hE,46585
+modal/app.pyi,sha256=4-b_vbe3lNAqQPcMRpQCEDsE1zsVkQRJGUql9B7HvbM,22659
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=o-aQThHpvDHUzg_kUafyhWzACViUBhY2WLZ2EitnSHA,16787
-modal/client.pyi,sha256=Ddk29klkblcqrIS02IgWDkKgrLTgAXIqYTAF2PFmDSM,8459
+modal/client.pyi,sha256=SQcb7cVcVA9JvRHfZe0elbkd32wV3mwWyUl50N6lI-I,8459
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
 modal/cls.py,sha256=dBbeARwOWftlKd1cwtM0cHFtQWSWkwVXwVmOV4w0SyI,37907
@@ -39,10 +39,10 @@ modal/file_io.py,sha256=lcMs_E9Xfm0YX1t9U2wNIBPnqHRxmImqjLW1GHqVmyg,20945
 modal/file_io.pyi,sha256=oB7x-rKq7bmm8cA7Z7W9C9yeko7KK9m9i5GidFnkGK4,9569
 modal/file_pattern_matcher.py,sha256=wov-otB5M1oTdrYDtR2_VgacYin2srdtAP4McA1Cqzw,6516
 modal/functions.py,sha256=kcNHvqeGBxPI7Cgd57NIBBghkfbeFJzXO44WW0jSmao,325
-modal/functions.pyi,sha256=YE2ZjUSY-sToZK0cRtmSrIp9fI3kr39-6EGhMLVy5pQ,16304
+modal/functions.pyi,sha256=iqdp5ixtOOlm8bF-QYbD_G8VKqSRt_AVLT7AWjpn6pQ,16236
 modal/gpu.py,sha256=Kbhs_u49FaC2Zi0TjCdrpstpRtT5eZgecynmQi5IZVE,6752
-modal/image.py,sha256=glnu6LDf3iFq71CGVstHx40CKVN4rw8tukPLAy5JgTQ,92464
-modal/image.pyi,sha256=NbegOjy6QX_SL-eTxtJm1_4gOJHW04Ja449QHZIdKgU,25586
+modal/image.py,sha256=yfOaKHS0YQtaAB1lb9Dv22fV5jqp_7qeIYLtz5vVc6w,91751
+modal/image.pyi,sha256=V0IKbs_fAvkxzFrceJm5W_Dl4s5ATy4LEy8L2tMuemQ,25455
 modal/io_streams.py,sha256=YDZVQSDv05DeXg5TwcucC9Rj5hQBx2GXdluan9rIUpw,15467
 modal/io_streams.pyi,sha256=1UK6kWLREASQfq-wL9wSp5iqjLU0egRZPDn4LXs1PZY,5136
 modal/mount.py,sha256=HbpGQbqqT5pTP4dh8j6USWXb2Fr1ro3V1uHIardkya4,30726
@@ -62,11 +62,11 @@ modal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal/queue.py,sha256=lu-QYW8GTqhZgX0TPTndmltT9uIWgLFV5mKZ_yTfmd4,18829
 modal/queue.pyi,sha256=O0f0S5kM1P0GVgzUzgsN0XsI46B9cJem4kkWluFndjM,10632
 modal/retries.py,sha256=IvNLDM0f_GLUDD5VgEDoN09C88yoxSrCquinAuxT1Sc,5205
-modal/runner.py,sha256=BqqN9rWfr-Bwuv9fVNZqAwZnM8OSC9H-HTJC1KQPRMg,24150
+modal/runner.py,sha256=nvpnU7U2O5d2WqME1QUTTwu-NkSLLwblytlGk7HXPAw,24152
 modal/runner.pyi,sha256=1AnEu48SUPnLWp3raQ2zJCV5lc85EGLkX2nL0bHWaB0,5162
 modal/running_app.py,sha256=v61mapYNV1-O-Uaho5EfJlryMLvIT9We0amUOSvSGx8,1188
-modal/sandbox.py,sha256=RuTA3VjnOTNDRAxIzW9ffxHhUG4PDK5SUyNVWYeqSBw,31941
-modal/sandbox.pyi,sha256=BD1VfQGFY6X6sismOWGd8_UMTPE7-gs3eSfNFw44u2M,22931
+modal/sandbox.py,sha256=VwbbQPK6e03kp11M8SQWbe6SLWSOwMaFwoQLYdP5EV0,35573
+modal/sandbox.pyi,sha256=stxwoLcyQNToPISj6umlU8sDUgqzeooLdMs3BwIr740,28195
 modal/schedule.py,sha256=ewa7hb9NKYnoeSCW2PujZAbGGJL8btX6X3KalCFpc_M,2626
 modal/scheduler_placement.py,sha256=BAREdOY5HzHpzSBqt6jDVR6YC_jYfHMVqOzkyqQfngU,1235
 modal/secret.py,sha256=I2z-rgKWl_Ix107d2_Y2OWGXdFOuJ7zMOyDfIOdFI1A,10374
@@ -96,7 +96,7 @@ modal/_utils/blob_utils.py,sha256=IexC2Jbtqp_Tkmy62ayfgzTYte0UPCNufB_v-DO21g8,18
 modal/_utils/bytes_io_segment_payload.py,sha256=uunxVJS4PE1LojF_UpURMzVK9GuvmYWRqQo_bxEj5TU,3385
 modal/_utils/deprecation.py,sha256=EXP1beU4pmEqEzWMLw6E3kUfNfpmNA_VOp6i0EHi93g,4856
 modal/_utils/docker_utils.py,sha256=h1uETghR40mp_y3fSWuZAfbIASH1HMzuphJHghAL6DU,3722
-modal/_utils/function_utils.py,sha256=qi_ubD5jvOpksKvaxitJDXxfVl1R2Kph6eX8k3y5Hz4,27052
+modal/_utils/function_utils.py,sha256=bhrjyOHPPXm6fAyJx3bzI1Yh56j6xh8eeMSFKdAWrHQ,26978
 modal/_utils/git_utils.py,sha256=qtUU6JAttF55ZxYq51y55OR58B0tDPZsZWK5dJe6W5g,3182
 modal/_utils/grpc_testing.py,sha256=H1zHqthv19eGPJz2HKXDyWXWGSqO4BRsxah3L5Xaa8A,8619
 modal/_utils/grpc_utils.py,sha256=xSFosSJYQ4m6cH9WtChcSXqsnyk6DMeVvOHI4N3914g,10922
@@ -146,7 +146,7 @@ modal/requirements/2024.10.txt,sha256=qD-5cVIVM9wXesJ6JC89Ew-3m2KjEElUz3jaw_MddR
 modal/requirements/PREVIEW.txt,sha256=qD-5cVIVM9wXesJ6JC89Ew-3m2KjEElUz3jaw_MddRo,296
 modal/requirements/README.md,sha256=9tK76KP0Uph7O0M5oUgsSwEZDj5y-dcUPsnpR0Sc-Ik,854
 modal/requirements/base-images.json,sha256=57vMSqzMbLBxw5tFWSaMiIkkVEps4JfX5PAtXGnkS4U,740
-modal-1.0.0.dev17.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.0.0.dev19.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=c1yfBS_x--gL5bs0N4ihMwqwX8l3IBWSkBAKNNIi6bQ,3801
 modal_docs/gen_reference_docs.py,sha256=d_CQUGQ0rfw28u75I2mov9AlS773z9rG40-yq5o7g2U,6359
@@ -169,10 +169,10 @@ modal_proto/options_pb2.pyi,sha256=l7DBrbLO7q3Ir-XDkWsajm0d0TQqqrfuX54i4BMpdQg,1
 modal_proto/options_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHDCNMhZD2VXqocC9l_gk,159
 modal_proto/options_pb2_grpc.pyi,sha256=CImmhxHsYnF09iENPoe8S4J-n93jtgUYD2JPAc0yJSI,247
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-modal_version/__init__.py,sha256=GHKCCzDIY8EaRLgeTTWDfXOXRlxYUKA7fhfqAieG_2M,121
+modal_version/__init__.py,sha256=FR4_HseRm9npOtRt6PAqTMeTh0iZcSgepflnoYAz040,121
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal-1.0.0.dev17.dist-info/METADATA,sha256=FKF7xQQABbtG_5NXNR-eXh7lsACZ0fmK0pAs_sWbWlE,2455
-modal-1.0.0.dev17.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-1.0.0.dev17.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.0.0.dev17.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.0.0.dev17.dist-info/RECORD,,
+modal-1.0.0.dev19.dist-info/METADATA,sha256=onMFcBbloX_n7iUnqwySK_5uAg3gJyoC7JoDWiigpMM,2455
+modal-1.0.0.dev19.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-1.0.0.dev19.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.0.0.dev19.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.0.0.dev19.dist-info/RECORD,,

modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.0.0.dev17"
+__version__ = "1.0.0.dev19"