modal 0.67.1__py3-none-any.whl → 0.67.22__py3-none-any.whl

modal/retries.py

@@ -1,10 +1,14 @@
 # Copyright Modal Labs 2022
+import asyncio
 from datetime import timedelta
 
 from modal_proto import api_pb2
 
 from .exception import InvalidError
 
+MIN_INPUT_RETRY_DELAY_MS = 1000
+MAX_INPUT_RETRY_DELAY_MS = 24 * 60 * 60 * 1000
+
 
 class Retries:
     """Adds a retry policy to a Modal function.
@@ -103,3 +107,37 @@ class Retries:
             initial_delay_ms=self.initial_delay // timedelta(milliseconds=1),
             max_delay_ms=self.max_delay // timedelta(milliseconds=1),
         )
+
+
+class RetryManager:
+    """
+    Helper class to apply the specified retry policy.
+    """
+
+    def __init__(self, retry_policy: api_pb2.FunctionRetryPolicy):
+        self.retry_policy = retry_policy
+        self.attempt_count = 0
+
+    async def raise_or_sleep(self, exc: Exception):
+        """
+        Raises an exception if the maximum retry count has been reached, otherwise sleeps for calculated delay.
+        """
+        self.attempt_count += 1
+        if self.attempt_count > self.retry_policy.retries:
+            raise exc
+        delay_ms = self._retry_delay_ms(self.attempt_count, self.retry_policy)
+        await asyncio.sleep(delay_ms / 1000)
+
+    @staticmethod
+    def _retry_delay_ms(attempt_count: int, retry_policy: api_pb2.FunctionRetryPolicy) -> float:
+        """
+        Computes the amount of time to sleep before retrying based on the backend_coefficient and initial_delay_ms args.
+        """
+        if attempt_count < 1:
+            raise ValueError(f"Cannot compute retry delay. attempt_count must be at least 1, but was {attempt_count}")
+        delay_ms = retry_policy.initial_delay_ms * (retry_policy.backoff_coefficient ** (attempt_count - 1))
+        if delay_ms < MIN_INPUT_RETRY_DELAY_MS:
+            return MIN_INPUT_RETRY_DELAY_MS
+        if delay_ms > MAX_INPUT_RETRY_DELAY_MS:
+            return MAX_INPUT_RETRY_DELAY_MS
+        return delay_ms

modal/runner.py

@@ -4,8 +4,9 @@ import dataclasses
 import os
 import time
 import typing
+from collections.abc import AsyncGenerator
 from multiprocessing.synchronize import Event
-from typing import TYPE_CHECKING, Any, AsyncGenerator, Callable, Dict, List, Optional, Tuple, TypeVar
+from typing import TYPE_CHECKING, Any, Callable, Optional, TypeVar
 
 from grpclib import GRPCError, Status
 from synchronicity.async_wrap import asynccontextmanager
@@ -123,7 +124,7 @@ async def _init_local_app_from_name(
 async def _create_all_objects(
     client: _Client,
     running_app: RunningApp,
-    indexed_objects: Dict[str, _Object],
+    indexed_objects: dict[str, _Object],
     environment_name: str,
 ) -> None:
     """Create objects that have been defined but not created on the server."""
@@ -171,15 +172,15 @@ async def _publish_app(
     client: _Client,
     running_app: RunningApp,
     app_state: int,  # api_pb2.AppState.value
-    indexed_objects: Dict[str, _Object],
+    indexed_objects: dict[str, _Object],
     name: str = "",  # Only relevant for deployments
     tag: str = "",  # Only relevant for deployments
-) -> Tuple[str, List[str]]:
+) -> tuple[str, list[str]]:
     """Wrapper for AppPublish RPC."""
 
     # Could simplify this function some changing the internal representation to use
     # function_ids / class_ids rather than the current tag_to_object_id (i.e. "indexed_objects")
-    def filter_values(full_dict: Dict[str, V], condition: Callable[[V], bool]) -> Dict[str, V]:
+    def filter_values(full_dict: dict[str, V], condition: Callable[[V], bool]) -> dict[str, V]:
         return {k: v for k, v in full_dict.items() if condition(v)}
 
     function_ids = filter_values(running_app.tag_to_object_id, _Function._is_id_type)
@@ -453,7 +454,7 @@ class DeployResult:
     app_id: str
     app_page_url: str
     app_logs_url: str
-    warnings: List[str]
+    warnings: list[str]
 
 
 async def _deploy_app(
@@ -556,7 +557,7 @@ async def _deploy_app(
     )
 
 
-async def _interactive_shell(_app: _App, cmds: List[str], environment_name: str = "", **kwargs: Any) -> None:
+async def _interactive_shell(_app: _App, cmds: list[str], environment_name: str = "", **kwargs: Any) -> None:
     """Run an interactive shell (like `bash`) within the image for this app.
 
     This is useful for online debugging and interactive exploration of the

modal/runner.pyi

@@ -27,17 +27,17 @@ async def _init_local_app_from_name(
 async def _create_all_objects(
     client: modal.client._Client,
     running_app: modal.running_app.RunningApp,
-    indexed_objects: typing.Dict[str, modal.object._Object],
+    indexed_objects: dict[str, modal.object._Object],
     environment_name: str,
 ) -> None: ...
 async def _publish_app(
     client: modal.client._Client,
     running_app: modal.running_app.RunningApp,
     app_state: int,
-    indexed_objects: typing.Dict[str, modal.object._Object],
+    indexed_objects: dict[str, modal.object._Object],
     name: str = "",
     tag: str = "",
-) -> typing.Tuple[str, typing.List[str]]: ...
+) -> tuple[str, list[str]]: ...
 async def _disconnect(client: modal.client._Client, app_id: str, reason: int, exc_str: str = "") -> None: ...
 async def _status_based_disconnect(
     client: modal.client._Client, app_id: str, exc_info: typing.Optional[BaseException] = None
@@ -58,9 +58,9 @@ class DeployResult:
     app_id: str
     app_page_url: str
     app_logs_url: str
-    warnings: typing.List[str]
+    warnings: list[str]
 
-    def __init__(self, app_id: str, app_page_url: str, app_logs_url: str, warnings: typing.List[str]) -> None: ...
+    def __init__(self, app_id: str, app_page_url: str, app_logs_url: str, warnings: list[str]) -> None: ...
     def __repr__(self): ...
     def __eq__(self, other): ...
     def __setattr__(self, name, value): ...
@@ -75,9 +75,7 @@ async def _deploy_app(
     environment_name: typing.Optional[str] = None,
     tag: str = "",
 ) -> DeployResult: ...
-async def _interactive_shell(
-    _app: _App, cmds: typing.List[str], environment_name: str = "", **kwargs: typing.Any
-) -> None: ...
+async def _interactive_shell(_app: _App, cmds: list[str], environment_name: str = "", **kwargs: typing.Any) -> None: ...
 def _run_stub(*args: typing.Any, **kwargs: typing.Any): ...
 def _deploy_stub(*args: typing.Any, **kwargs: typing.Any): ...
 
@@ -136,12 +134,8 @@ class __deploy_app_spec(typing_extensions.Protocol):
 deploy_app: __deploy_app_spec
 
 class __interactive_shell_spec(typing_extensions.Protocol):
-    def __call__(
-        self, _app: _App, cmds: typing.List[str], environment_name: str = "", **kwargs: typing.Any
-    ) -> None: ...
-    async def aio(
-        self, _app: _App, cmds: typing.List[str], environment_name: str = "", **kwargs: typing.Any
-    ) -> None: ...
+    def __call__(self, _app: _App, cmds: list[str], environment_name: str = "", **kwargs: typing.Any) -> None: ...
+    async def aio(self, _app: _App, cmds: list[str], environment_name: str = "", **kwargs: typing.Any) -> None: ...
 
 interactive_shell: __interactive_shell_spec
 

modal/running_app.py

@@ -1,6 +1,6 @@
 # Copyright Modal Labs 2024
 from dataclasses import dataclass, field
-from typing import Dict, Optional
+from typing import Optional
 
 from google.protobuf.message import Message
 
@@ -13,7 +13,7 @@ class RunningApp:
     environment_name: Optional[str] = None
     app_page_url: Optional[str] = None
     app_logs_url: Optional[str] = None
-    tag_to_object_id: Dict[str, str] = field(default_factory=dict)
-    object_handle_metadata: Dict[str, Optional[Message]] = field(default_factory=dict)
+    tag_to_object_id: dict[str, str] = field(default_factory=dict)
+    object_handle_metadata: dict[str, Optional[Message]] = field(default_factory=dict)
     interactive: bool = False
     client: Optional[_Client] = None

modal/sandbox.py

@@ -1,7 +1,8 @@
 # Copyright Modal Labs 2022
 import asyncio
 import os
-from typing import TYPE_CHECKING, AsyncGenerator, Dict, List, Literal, Optional, Sequence, Tuple, Union, overload
+from collections.abc import AsyncGenerator, Sequence
+from typing import TYPE_CHECKING, Literal, Optional, Union, overload
 
 from google.protobuf.message import Message
 from grpclib import GRPCError, Status
@@ -27,6 +28,7 @@ from .io_streams import StreamReader, StreamWriter, _StreamReader, _StreamWriter
 from .mount import _Mount
 from .network_file_system import _NetworkFileSystem, network_file_system_mount_protos
 from .object import _get_environment_name, _Object
+from .proxy import _Proxy
 from .scheduler_placement import SchedulerPlacement
 from .secret import _Secret
 from .stream_type import StreamType
@@ -50,7 +52,7 @@ class _Sandbox(_Object, type_prefix="sb"):
     _stderr: _StreamReader[str]
     _stdin: _StreamWriter
     _task_id: Optional[str] = None
-    _tunnels: Optional[Dict[int, Tunnel]] = None
+    _tunnels: Optional[dict[int, Tunnel]] = None
 
     @staticmethod
     def _new(
@@ -64,14 +66,15 @@ class _Sandbox(_Object, type_prefix="sb"):
         cloud: Optional[str] = None,
         region: Optional[Union[str, Sequence[str]]] = None,
         cpu: Optional[float] = None,
-        memory: Optional[Union[int, Tuple[int, int]]] = None,
-        network_file_systems: Dict[Union[str, os.PathLike], _NetworkFileSystem] = {},
+        memory: Optional[Union[int, tuple[int, int]]] = None,
+        network_file_systems: dict[Union[str, os.PathLike], _NetworkFileSystem] = {},
         block_network: bool = False,
         cidr_allowlist: Optional[Sequence[str]] = None,
-        volumes: Dict[Union[str, os.PathLike], Union[_Volume, _CloudBucketMount]] = {},
+        volumes: dict[Union[str, os.PathLike], Union[_Volume, _CloudBucketMount]] = {},
         pty_info: Optional[api_pb2.PTYInfo] = None,
         encrypted_ports: Sequence[int] = [],
         unencrypted_ports: Sequence[int] = [],
+        proxy: Optional[_Proxy] = None,
         _experimental_scheduler_placement: Optional[SchedulerPlacement] = None,
     ) -> "_Sandbox":
         """mdmd:hidden"""
@@ -101,8 +104,8 @@ class _Sandbox(_Object, type_prefix="sb"):
         cloud_bucket_mounts = [(k, v) for k, v in validated_volumes if isinstance(v, _CloudBucketMount)]
         validated_volumes = [(k, v) for k, v in validated_volumes if isinstance(v, _Volume)]
 
-        def _deps() -> List[_Object]:
-            deps: List[_Object] = [image] + list(mounts) + list(secrets)
+        def _deps() -> list[_Object]:
+            deps: list[_Object] = [image] + list(mounts) + list(secrets)
             for _, vol in validated_network_file_systems:
                 deps.append(vol)
             for _, vol in validated_volumes:
@@ -165,6 +168,7 @@ class _Sandbox(_Object, type_prefix="sb"):
                 worker_id=config.get("worker_id"),
                 open_ports=api_pb2.PortSpecs(ports=open_ports),
                 network_access=network_access,
+                proxy_id=(proxy.object_id if proxy else None),
             )
 
             # Note - `resolver.app_id` will be `None` for app-less sandboxes
@@ -186,7 +190,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         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] = {},
+        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,
@@ -195,11 +199,11 @@ class _Sandbox(_Object, type_prefix="sb"):
         cpu: Optional[float] = None,  # How many CPU cores to request. This is a soft limit.
         # 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,
+        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[
+        volumes: dict[
             Union[str, os.PathLike], Union[_Volume, _CloudBucketMount]
         ] = {},  # Mount points for Modal Volumes and CloudBucketMounts
         pty_info: Optional[api_pb2.PTYInfo] = None,
@@ -207,6 +211,8 @@ class _Sandbox(_Object, type_prefix="sb"):
         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,
         _experimental_scheduler_placement: Optional[
             SchedulerPlacement
         ] = None,  # Experimental controls over fine-grained scheduling (alpha).
@@ -242,6 +248,7 @@ class _Sandbox(_Object, type_prefix="sb"):
             pty_info=pty_info,
             encrypted_ports=encrypted_ports,
             unencrypted_ports=unencrypted_ports,
+            proxy=proxy,
             _experimental_scheduler_placement=_experimental_scheduler_placement,
         )
 
@@ -306,7 +313,7 @@ class _Sandbox(_Object, type_prefix="sb"):
 
         return obj
 
-    async def set_tags(self, tags: Dict[str, str], *, client: Optional[_Client] = None):
+    async def set_tags(self, tags: dict[str, str], *, client: Optional[_Client] = None):
         """Set tags (key-value pairs) on the Sandbox. Tags can be used to filter results in `Sandbox.list`."""
         environment_name = _get_environment_name()
         if client is None:
@@ -341,7 +348,7 @@ class _Sandbox(_Object, type_prefix="sb"):
                     raise SandboxTerminatedError()
                 break
 
-    async def tunnels(self, timeout: int = 50) -> Dict[int, Tunnel]:
+    async def tunnels(self, timeout: int = 50) -> dict[int, Tunnel]:
         """Get tunnel metadata for the sandbox.
 
         Raises `SandboxTimeoutError` if the tunnels are not available after the timeout.
@@ -531,7 +538,7 @@ class _Sandbox(_Object, type_prefix="sb"):
 
     @staticmethod
     async def list(
-        *, app_id: Optional[str] = None, tags: Optional[Dict[str, str]] = None, client: Optional[_Client] = None
+        *, app_id: Optional[str] = None, tags: Optional[dict[str, str]] = None, client: Optional[_Client] = None
     ) -> AsyncGenerator["_Sandbox", None]:
         """List all sandboxes for the current environment or app ID (if specified). If tags are specified, only
         sandboxes that have at least those tags are returned. Returns an iterator over `Sandbox` objects."""

modal/sandbox.pyi

@@ -1,3 +1,4 @@
+import collections.abc
 import google.protobuf.message
 import modal._tunnel
 import modal.app
@@ -10,6 +11,7 @@ import modal.io_streams
 import modal.mount
 import modal.network_file_system
 import modal.object
+import modal.proxy
 import modal.scheduler_placement
 import modal.secret
 import modal.stream_type
@@ -25,33 +27,32 @@ class _Sandbox(modal.object._Object):
     _stderr: modal.io_streams._StreamReader[str]
     _stdin: modal.io_streams._StreamWriter
     _task_id: typing.Optional[str]
-    _tunnels: typing.Optional[typing.Dict[int, modal._tunnel.Tunnel]]
+    _tunnels: typing.Optional[dict[int, modal._tunnel.Tunnel]]
 
     @staticmethod
     def _new(
-        entrypoint_args: typing.Sequence[str],
+        entrypoint_args: collections.abc.Sequence[str],
         image: modal.image._Image,
-        mounts: typing.Sequence[modal.mount._Mount],
-        secrets: typing.Sequence[modal.secret._Secret],
+        mounts: collections.abc.Sequence[modal.mount._Mount],
+        secrets: collections.abc.Sequence[modal.secret._Secret],
         timeout: typing.Optional[int] = None,
         workdir: typing.Optional[str] = None,
         gpu: typing.Union[None, bool, str, modal.gpu._GPUConfig] = None,
         cloud: typing.Optional[str] = None,
-        region: typing.Union[str, typing.Sequence[str], None] = None,
+        region: typing.Union[str, collections.abc.Sequence[str], None] = None,
         cpu: typing.Optional[float] = None,
-        memory: typing.Union[int, typing.Tuple[int, int], None] = None,
-        network_file_systems: typing.Dict[
-            typing.Union[str, os.PathLike], modal.network_file_system._NetworkFileSystem
-        ] = {},
+        memory: typing.Union[int, tuple[int, int], None] = None,
+        network_file_systems: dict[typing.Union[str, os.PathLike], modal.network_file_system._NetworkFileSystem] = {},
         block_network: bool = False,
-        cidr_allowlist: typing.Optional[typing.Sequence[str]] = None,
-        volumes: typing.Dict[
+        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: typing.Sequence[int] = [],
-        unencrypted_ports: typing.Sequence[int] = [],
+        encrypted_ports: collections.abc.Sequence[int] = [],
+        unencrypted_ports: collections.abc.Sequence[int] = [],
+        proxy: typing.Optional[modal.proxy._Proxy] = None,
         _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
     ) -> _Sandbox: ...
     @staticmethod
@@ -60,36 +61,35 @@ 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: typing.Sequence[modal.mount._Mount] = (),
-        secrets: typing.Sequence[modal.secret._Secret] = (),
-        network_file_systems: typing.Dict[
-            typing.Union[str, os.PathLike], modal.network_file_system._NetworkFileSystem
-        ] = {},
+        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,
         workdir: typing.Optional[str] = None,
         gpu: typing.Union[None, bool, str, modal.gpu._GPUConfig] = None,
         cloud: typing.Optional[str] = None,
-        region: typing.Union[str, typing.Sequence[str], None] = None,
+        region: typing.Union[str, collections.abc.Sequence[str], None] = None,
         cpu: typing.Optional[float] = None,
-        memory: typing.Union[int, typing.Tuple[int, int], None] = None,
+        memory: typing.Union[int, tuple[int, int], None] = None,
         block_network: bool = False,
-        cidr_allowlist: typing.Optional[typing.Sequence[str]] = None,
-        volumes: typing.Dict[
+        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: typing.Sequence[int] = [],
-        unencrypted_ports: typing.Sequence[int] = [],
+        encrypted_ports: collections.abc.Sequence[int] = [],
+        unencrypted_ports: collections.abc.Sequence[int] = [],
+        proxy: typing.Optional[modal.proxy._Proxy] = None,
         _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
         client: typing.Optional[modal.client._Client] = None,
     ) -> _Sandbox: ...
     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: ...
-    async def set_tags(self, tags: typing.Dict[str, str], *, client: typing.Optional[modal.client._Client] = None): ...
+    async def set_tags(self, tags: dict[str, str], *, client: typing.Optional[modal.client._Client] = None): ...
     async def wait(self, raise_on_termination: bool = True): ...
-    async def tunnels(self, timeout: int = 50) -> typing.Dict[int, modal._tunnel.Tunnel]: ...
+    async def tunnels(self, timeout: int = 50) -> dict[int, modal._tunnel.Tunnel]: ...
     async def terminate(self): ...
     async def poll(self) -> typing.Optional[int]: ...
     async def _get_task_id(self): ...
@@ -102,7 +102,7 @@ class _Sandbox(modal.object._Object):
         stderr: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
         timeout: typing.Optional[int] = None,
         workdir: typing.Optional[str] = None,
-        secrets: typing.Sequence[modal.secret._Secret] = (),
+        secrets: collections.abc.Sequence[modal.secret._Secret] = (),
         text: typing.Literal[True] = True,
         bufsize: typing.Literal[-1, 1] = -1,
         _pty_info: typing.Optional[modal_proto.api_pb2.PTYInfo] = None,
@@ -116,7 +116,7 @@ class _Sandbox(modal.object._Object):
         stderr: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
         timeout: typing.Optional[int] = None,
         workdir: typing.Optional[str] = None,
-        secrets: typing.Sequence[modal.secret._Secret] = (),
+        secrets: collections.abc.Sequence[modal.secret._Secret] = (),
         text: typing.Literal[False] = False,
         bufsize: typing.Literal[-1, 1] = -1,
         _pty_info: typing.Optional[modal_proto.api_pb2.PTYInfo] = None,
@@ -133,9 +133,9 @@ class _Sandbox(modal.object._Object):
     def list(
         *,
         app_id: typing.Optional[str] = None,
-        tags: typing.Optional[typing.Dict[str, str]] = None,
+        tags: typing.Optional[dict[str, str]] = None,
         client: typing.Optional[modal.client._Client] = None,
-    ) -> typing.AsyncGenerator[_Sandbox, None]: ...
+    ) -> collections.abc.AsyncGenerator[_Sandbox, None]: ...
 
 class Sandbox(modal.object.Object):
     _result: typing.Optional[modal_proto.api_pb2.GenericResult]
@@ -143,33 +143,32 @@ class Sandbox(modal.object.Object):
     _stderr: modal.io_streams.StreamReader[str]
     _stdin: modal.io_streams.StreamWriter
     _task_id: typing.Optional[str]
-    _tunnels: typing.Optional[typing.Dict[int, modal._tunnel.Tunnel]]
+    _tunnels: typing.Optional[dict[int, modal._tunnel.Tunnel]]
 
     def __init__(self, *args, **kwargs): ...
     @staticmethod
     def _new(
-        entrypoint_args: typing.Sequence[str],
+        entrypoint_args: collections.abc.Sequence[str],
         image: modal.image.Image,
-        mounts: typing.Sequence[modal.mount.Mount],
-        secrets: typing.Sequence[modal.secret.Secret],
+        mounts: collections.abc.Sequence[modal.mount.Mount],
+        secrets: collections.abc.Sequence[modal.secret.Secret],
         timeout: typing.Optional[int] = None,
         workdir: typing.Optional[str] = None,
         gpu: typing.Union[None, bool, str, modal.gpu._GPUConfig] = None,
         cloud: typing.Optional[str] = None,
-        region: typing.Union[str, typing.Sequence[str], None] = None,
+        region: typing.Union[str, collections.abc.Sequence[str], None] = None,
         cpu: typing.Optional[float] = None,
-        memory: typing.Union[int, typing.Tuple[int, int], None] = None,
-        network_file_systems: typing.Dict[
-            typing.Union[str, os.PathLike], modal.network_file_system.NetworkFileSystem
-        ] = {},
+        memory: typing.Union[int, tuple[int, int], None] = None,
+        network_file_systems: dict[typing.Union[str, os.PathLike], modal.network_file_system.NetworkFileSystem] = {},
         block_network: bool = False,
-        cidr_allowlist: typing.Optional[typing.Sequence[str]] = None,
-        volumes: typing.Dict[
+        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: typing.Sequence[int] = [],
-        unencrypted_ports: typing.Sequence[int] = [],
+        encrypted_ports: collections.abc.Sequence[int] = [],
+        unencrypted_ports: collections.abc.Sequence[int] = [],
+        proxy: typing.Optional[modal.proxy.Proxy] = None,
         _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
     ) -> Sandbox: ...
 
@@ -180,27 +179,28 @@ 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: typing.Sequence[modal.mount.Mount] = (),
-            secrets: typing.Sequence[modal.secret.Secret] = (),
-            network_file_systems: typing.Dict[
+            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,
             workdir: typing.Optional[str] = None,
             gpu: typing.Union[None, bool, str, modal.gpu._GPUConfig] = None,
             cloud: typing.Optional[str] = None,
-            region: typing.Union[str, typing.Sequence[str], None] = None,
+            region: typing.Union[str, collections.abc.Sequence[str], None] = None,
             cpu: typing.Optional[float] = None,
-            memory: typing.Union[int, typing.Tuple[int, int], None] = None,
+            memory: typing.Union[int, tuple[int, int], None] = None,
             block_network: bool = False,
-            cidr_allowlist: typing.Optional[typing.Sequence[str]] = None,
-            volumes: typing.Dict[
+            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: typing.Sequence[int] = [],
-            unencrypted_ports: typing.Sequence[int] = [],
+            encrypted_ports: collections.abc.Sequence[int] = [],
+            unencrypted_ports: collections.abc.Sequence[int] = [],
+            proxy: typing.Optional[modal.proxy.Proxy] = None,
             _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
             client: typing.Optional[modal.client.Client] = None,
         ) -> Sandbox: ...
@@ -210,27 +210,28 @@ 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: typing.Sequence[modal.mount.Mount] = (),
-            secrets: typing.Sequence[modal.secret.Secret] = (),
-            network_file_systems: typing.Dict[
+            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,
             workdir: typing.Optional[str] = None,
             gpu: typing.Union[None, bool, str, modal.gpu._GPUConfig] = None,
             cloud: typing.Optional[str] = None,
-            region: typing.Union[str, typing.Sequence[str], None] = None,
+            region: typing.Union[str, collections.abc.Sequence[str], None] = None,
             cpu: typing.Optional[float] = None,
-            memory: typing.Union[int, typing.Tuple[int, int], None] = None,
+            memory: typing.Union[int, tuple[int, int], None] = None,
             block_network: bool = False,
-            cidr_allowlist: typing.Optional[typing.Sequence[str]] = None,
-            volumes: typing.Dict[
+            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: typing.Sequence[int] = [],
-            unencrypted_ports: typing.Sequence[int] = [],
+            encrypted_ports: collections.abc.Sequence[int] = [],
+            unencrypted_ports: collections.abc.Sequence[int] = [],
+            proxy: typing.Optional[modal.proxy.Proxy] = None,
             _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
             client: typing.Optional[modal.client.Client] = None,
         ) -> Sandbox: ...
@@ -246,8 +247,8 @@ class Sandbox(modal.object.Object):
     from_id: __from_id_spec
 
     class __set_tags_spec(typing_extensions.Protocol):
-        def __call__(self, tags: typing.Dict[str, str], *, client: typing.Optional[modal.client.Client] = None): ...
-        async def aio(self, tags: typing.Dict[str, str], *, client: typing.Optional[modal.client.Client] = None): ...
+        def __call__(self, tags: dict[str, str], *, client: typing.Optional[modal.client.Client] = None): ...
+        async def aio(self, tags: dict[str, str], *, client: typing.Optional[modal.client.Client] = None): ...
 
     set_tags: __set_tags_spec
 
@@ -258,8 +259,8 @@ class Sandbox(modal.object.Object):
     wait: __wait_spec
 
     class __tunnels_spec(typing_extensions.Protocol):
-        def __call__(self, timeout: int = 50) -> typing.Dict[int, modal._tunnel.Tunnel]: ...
-        async def aio(self, timeout: int = 50) -> typing.Dict[int, modal._tunnel.Tunnel]: ...
+        def __call__(self, timeout: int = 50) -> dict[int, modal._tunnel.Tunnel]: ...
+        async def aio(self, timeout: int = 50) -> dict[int, modal._tunnel.Tunnel]: ...
 
     tunnels: __tunnels_spec
 
@@ -291,7 +292,7 @@ class Sandbox(modal.object.Object):
             stderr: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
             timeout: typing.Optional[int] = None,
             workdir: typing.Optional[str] = None,
-            secrets: typing.Sequence[modal.secret.Secret] = (),
+            secrets: collections.abc.Sequence[modal.secret.Secret] = (),
             text: typing.Literal[True] = True,
             bufsize: typing.Literal[-1, 1] = -1,
             _pty_info: typing.Optional[modal_proto.api_pb2.PTYInfo] = None,
@@ -305,7 +306,7 @@ class Sandbox(modal.object.Object):
             stderr: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
             timeout: typing.Optional[int] = None,
             workdir: typing.Optional[str] = None,
-            secrets: typing.Sequence[modal.secret.Secret] = (),
+            secrets: collections.abc.Sequence[modal.secret.Secret] = (),
             text: typing.Literal[False] = False,
             bufsize: typing.Literal[-1, 1] = -1,
             _pty_info: typing.Optional[modal_proto.api_pb2.PTYInfo] = None,
@@ -319,7 +320,7 @@ class Sandbox(modal.object.Object):
             stderr: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
             timeout: typing.Optional[int] = None,
             workdir: typing.Optional[str] = None,
-            secrets: typing.Sequence[modal.secret.Secret] = (),
+            secrets: collections.abc.Sequence[modal.secret.Secret] = (),
             text: typing.Literal[True] = True,
             bufsize: typing.Literal[-1, 1] = -1,
             _pty_info: typing.Optional[modal_proto.api_pb2.PTYInfo] = None,
@@ -333,7 +334,7 @@ class Sandbox(modal.object.Object):
             stderr: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
             timeout: typing.Optional[int] = None,
             workdir: typing.Optional[str] = None,
-            secrets: typing.Sequence[modal.secret.Secret] = (),
+            secrets: collections.abc.Sequence[modal.secret.Secret] = (),
             text: typing.Literal[False] = False,
             bufsize: typing.Literal[-1, 1] = -1,
             _pty_info: typing.Optional[modal_proto.api_pb2.PTYInfo] = None,
@@ -355,16 +356,16 @@ class Sandbox(modal.object.Object):
             self,
             *,
             app_id: typing.Optional[str] = None,
-            tags: typing.Optional[typing.Dict[str, str]] = None,
+            tags: typing.Optional[dict[str, str]] = None,
             client: typing.Optional[modal.client.Client] = None,
         ) -> typing.Generator[Sandbox, None, None]: ...
         def aio(
             self,
             *,
             app_id: typing.Optional[str] = None,
-            tags: typing.Optional[typing.Dict[str, str]] = None,
+            tags: typing.Optional[dict[str, str]] = None,
             client: typing.Optional[modal.client.Client] = None,
-        ) -> typing.AsyncGenerator[Sandbox, None]: ...
+        ) -> collections.abc.AsyncGenerator[Sandbox, None]: ...
 
     list: __list_spec
 

modal/scheduler_placement.py

@@ -1,5 +1,6 @@
 # Copyright Modal Labs 2024
-from typing import Optional, Sequence, Union
+from collections.abc import Sequence
+from typing import Optional, Union
 
 from modal_proto import api_pb2