modal 0.67.6__py3-none-any.whl → 0.67.11__py3-none-any.whl

modal/functions.pyi

@@ -1,3 +1,4 @@
+import collections.abc
 import google.protobuf.message
 import modal._utils.async_utils
 import modal._utils.function_utils
@@ -25,11 +26,35 @@ import pathlib
 import typing
 import typing_extensions
 
+class _RetryContext:
+    function_call_invocation_type: int
+    retry_policy: modal_proto.api_pb2.FunctionRetryPolicy
+    function_call_jwt: str
+    input_jwt: str
+    input_id: str
+    item: modal_proto.api_pb2.FunctionPutInputsItem
+
+    def __init__(
+        self,
+        function_call_invocation_type: int,
+        retry_policy: modal_proto.api_pb2.FunctionRetryPolicy,
+        function_call_jwt: str,
+        input_jwt: str,
+        input_id: str,
+        item: modal_proto.api_pb2.FunctionPutInputsItem,
+    ) -> None: ...
+    def __repr__(self): ...
+    def __eq__(self, other): ...
+
 class _Invocation:
     stub: modal_proto.modal_api_grpc.ModalClientModal
 
     def __init__(
-        self, stub: modal_proto.modal_api_grpc.ModalClientModal, function_call_id: str, client: modal.client._Client
+        self,
+        stub: modal_proto.modal_api_grpc.ModalClientModal,
+        function_call_id: str,
+        client: modal.client._Client,
+        retry_context: typing.Optional[_RetryContext] = None,
     ): ...
     @staticmethod
     async def create(
@@ -38,6 +63,8 @@ class _Invocation:
     async def pop_function_call_outputs(
         self, timeout: typing.Optional[float], clear_on_success: bool
     ) -> modal_proto.api_pb2.FunctionGetOutputsResponse: ...
+    async def _retry_input(self) -> None: ...
+    async def _get_single_output(self) -> typing.Any: ...
     async def run_function(self) -> typing.Any: ...
     async def poll_function(self, timeout: typing.Optional[float] = None): ...
     def run_generator(self): ...
@@ -60,42 +87,38 @@ def _parse_retries(
 
 class _FunctionSpec:
     image: typing.Optional[modal.image._Image]
-    mounts: typing.Sequence[modal.mount._Mount]
-    secrets: typing.Sequence[modal.secret._Secret]
-    network_file_systems: typing.Dict[
-        typing.Union[str, pathlib.PurePosixPath], modal.network_file_system._NetworkFileSystem
-    ]
-    volumes: typing.Dict[
+    mounts: collections.abc.Sequence[modal.mount._Mount]
+    secrets: collections.abc.Sequence[modal.secret._Secret]
+    network_file_systems: dict[typing.Union[str, pathlib.PurePosixPath], modal.network_file_system._NetworkFileSystem]
+    volumes: dict[
         typing.Union[str, pathlib.PurePosixPath],
         typing.Union[modal.volume._Volume, modal.cloud_bucket_mount._CloudBucketMount],
     ]
-    gpus: typing.Union[
-        None, bool, str, modal.gpu._GPUConfig, typing.List[typing.Union[None, bool, str, modal.gpu._GPUConfig]]
-    ]
+    gpus: typing.Union[None, bool, str, modal.gpu._GPUConfig, list[typing.Union[None, bool, str, modal.gpu._GPUConfig]]]
     cloud: typing.Optional[str]
     cpu: typing.Optional[float]
-    memory: typing.Union[int, typing.Tuple[int, int], None]
+    memory: typing.Union[int, tuple[int, int], None]
     ephemeral_disk: typing.Optional[int]
     scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement]
 
     def __init__(
         self,
         image: typing.Optional[modal.image._Image],
-        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, pathlib.PurePosixPath], modal.network_file_system._NetworkFileSystem
         ],
-        volumes: typing.Dict[
+        volumes: dict[
             typing.Union[str, pathlib.PurePosixPath],
             typing.Union[modal.volume._Volume, modal.cloud_bucket_mount._CloudBucketMount],
         ],
         gpus: typing.Union[
-            None, bool, str, modal.gpu._GPUConfig, typing.List[typing.Union[None, bool, str, modal.gpu._GPUConfig]]
+            None, bool, str, modal.gpu._GPUConfig, list[typing.Union[None, bool, str, modal.gpu._GPUConfig]]
         ],
         cloud: typing.Optional[str],
         cpu: typing.Optional[float],
-        memory: typing.Union[int, typing.Tuple[int, int], None],
+        memory: typing.Union[int, tuple[int, int], None],
         ephemeral_disk: typing.Optional[int],
         scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement],
     ) -> None: ...
@@ -110,7 +133,7 @@ OriginalReturnType = typing.TypeVar("OriginalReturnType", covariant=True)
 
 class _Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object._Object):
     _info: typing.Optional[modal._utils.function_utils.FunctionInfo]
-    _serve_mounts: typing.FrozenSet[modal.mount._Mount]
+    _serve_mounts: frozenset[modal.mount._Mount]
     _app: typing.Optional[modal.app._App]
     _obj: typing.Optional[modal.cls._Obj]
     _web_url: typing.Optional[str]
@@ -124,7 +147,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.
     _cluster_size: typing.Optional[int]
     _use_method_name: str
     _class_parameter_info: typing.Optional[modal_proto.api_pb2.ClassParameterInfo]
-    _method_handle_metadata: typing.Optional[typing.Dict[str, modal_proto.api_pb2.FunctionHandleMetadata]]
+    _method_handle_metadata: typing.Optional[dict[str, modal_proto.api_pb2.FunctionHandleMetadata]]
 
     def _bind_method(self, user_cls, method_name: str, partial_function: modal.partial_function._PartialFunction): ...
     def _bind_instance_method(self, class_bound_method: _Function): ...
@@ -133,23 +156,23 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.
         info: modal._utils.function_utils.FunctionInfo,
         app,
         image: modal.image._Image,
-        secrets: typing.Sequence[modal.secret._Secret] = (),
+        secrets: collections.abc.Sequence[modal.secret._Secret] = (),
         schedule: typing.Optional[modal.schedule.Schedule] = None,
         is_generator=False,
         gpu: typing.Union[
-            None, bool, str, modal.gpu._GPUConfig, typing.List[typing.Union[None, bool, str, modal.gpu._GPUConfig]]
+            None, bool, str, modal.gpu._GPUConfig, list[typing.Union[None, bool, str, modal.gpu._GPUConfig]]
         ] = None,
-        mounts: typing.Collection[modal.mount._Mount] = (),
-        network_file_systems: typing.Dict[
+        mounts: collections.abc.Collection[modal.mount._Mount] = (),
+        network_file_systems: dict[
             typing.Union[str, pathlib.PurePosixPath], modal.network_file_system._NetworkFileSystem
         ] = {},
         allow_cross_region_volumes: bool = False,
-        volumes: typing.Dict[
+        volumes: dict[
             typing.Union[str, pathlib.PurePosixPath],
             typing.Union[modal.volume._Volume, modal.cloud_bucket_mount._CloudBucketMount],
         ] = {},
         webhook_config: typing.Optional[modal_proto.api_pb2.WebhookConfig] = None,
-        memory: typing.Union[int, typing.Tuple[int, int], None] = None,
+        memory: typing.Union[int, tuple[int, int], None] = None,
         proxy: typing.Optional[modal.proxy._Proxy] = None,
         retries: typing.Union[int, modal.retries.Retries, None] = None,
         timeout: typing.Optional[int] = None,
@@ -179,13 +202,13 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.
         obj: modal.cls._Obj,
         from_other_workspace: bool,
         options: typing.Optional[modal_proto.api_pb2.FunctionOptions],
-        args: typing.Sized,
-        kwargs: typing.Dict[str, typing.Any],
+        args: collections.abc.Sized,
+        kwargs: dict[str, typing.Any],
     ) -> _Function: ...
     async def keep_warm(self, warm_pool_size: int) -> None: ...
     @classmethod
     def from_name(
-        cls: typing.Type[_Function], app_name: str, tag: str, namespace=1, environment_name: typing.Optional[str] = None
+        cls: type[_Function], app_name: str, tag: str, namespace=1, environment_name: typing.Optional[str] = None
     ) -> _Function: ...
     @staticmethod
     async def lookup(
@@ -218,13 +241,13 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.
     def cluster_size(self) -> int: ...
     def _map(
         self, input_queue: modal.parallel_map._SynchronizedQueue, order_outputs: bool, return_exceptions: bool
-    ) -> typing.AsyncGenerator[typing.Any, None]: ...
+    ) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
     async def _call_function(self, args, kwargs) -> ReturnType: ...
     async def _call_function_nowait(self, args, kwargs, function_call_invocation_type: int) -> _Invocation: ...
     def _call_generator(self, args, kwargs): ...
     async def _call_generator_nowait(self, args, kwargs): ...
     async def remote(self, *args: P.args, **kwargs: P.kwargs) -> ReturnType: ...
-    def remote_gen(self, *args, **kwargs) -> typing.AsyncGenerator[typing.Any, None]: ...
+    def remote_gen(self, *args, **kwargs) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
     def _get_info(self) -> modal._utils.function_utils.FunctionInfo: ...
     def _get_obj(self) -> typing.Optional[modal.cls._Obj]: ...
     def local(self, *args: P.args, **kwargs: P.kwargs) -> OriginalReturnType: ...
@@ -279,7 +302,7 @@ P_INNER = typing_extensions.ParamSpec("P_INNER")
 
 class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.Object):
     _info: typing.Optional[modal._utils.function_utils.FunctionInfo]
-    _serve_mounts: typing.FrozenSet[modal.mount.Mount]
+    _serve_mounts: frozenset[modal.mount.Mount]
     _app: typing.Optional[modal.app.App]
     _obj: typing.Optional[modal.cls.Obj]
     _web_url: typing.Optional[str]
@@ -293,7 +316,7 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
     _cluster_size: typing.Optional[int]
     _use_method_name: str
     _class_parameter_info: typing.Optional[modal_proto.api_pb2.ClassParameterInfo]
-    _method_handle_metadata: typing.Optional[typing.Dict[str, modal_proto.api_pb2.FunctionHandleMetadata]]
+    _method_handle_metadata: typing.Optional[dict[str, modal_proto.api_pb2.FunctionHandleMetadata]]
 
     def __init__(self, *args, **kwargs): ...
     def _bind_method(self, user_cls, method_name: str, partial_function: modal.partial_function.PartialFunction): ...
@@ -303,23 +326,23 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
         info: modal._utils.function_utils.FunctionInfo,
         app,
         image: modal.image.Image,
-        secrets: typing.Sequence[modal.secret.Secret] = (),
+        secrets: collections.abc.Sequence[modal.secret.Secret] = (),
         schedule: typing.Optional[modal.schedule.Schedule] = None,
         is_generator=False,
         gpu: typing.Union[
-            None, bool, str, modal.gpu._GPUConfig, typing.List[typing.Union[None, bool, str, modal.gpu._GPUConfig]]
+            None, bool, str, modal.gpu._GPUConfig, list[typing.Union[None, bool, str, modal.gpu._GPUConfig]]
         ] = None,
-        mounts: typing.Collection[modal.mount.Mount] = (),
-        network_file_systems: typing.Dict[
+        mounts: collections.abc.Collection[modal.mount.Mount] = (),
+        network_file_systems: dict[
             typing.Union[str, pathlib.PurePosixPath], modal.network_file_system.NetworkFileSystem
         ] = {},
         allow_cross_region_volumes: bool = False,
-        volumes: typing.Dict[
+        volumes: dict[
             typing.Union[str, pathlib.PurePosixPath],
             typing.Union[modal.volume.Volume, modal.cloud_bucket_mount.CloudBucketMount],
         ] = {},
         webhook_config: typing.Optional[modal_proto.api_pb2.WebhookConfig] = None,
-        memory: typing.Union[int, typing.Tuple[int, int], None] = None,
+        memory: typing.Union[int, tuple[int, int], None] = None,
         proxy: typing.Optional[modal.proxy.Proxy] = None,
         retries: typing.Union[int, modal.retries.Retries, None] = None,
         timeout: typing.Optional[int] = None,
@@ -349,8 +372,8 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
         obj: modal.cls.Obj,
         from_other_workspace: bool,
         options: typing.Optional[modal_proto.api_pb2.FunctionOptions],
-        args: typing.Sized,
-        kwargs: typing.Dict[str, typing.Any],
+        args: collections.abc.Sized,
+        kwargs: dict[str, typing.Any],
     ) -> Function: ...
 
     class __keep_warm_spec(typing_extensions.Protocol):
@@ -361,7 +384,7 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
 
     @classmethod
     def from_name(
-        cls: typing.Type[Function], app_name: str, tag: str, namespace=1, environment_name: typing.Optional[str] = None
+        cls: type[Function], app_name: str, tag: str, namespace=1, environment_name: typing.Optional[str] = None
     ) -> Function: ...
 
     class __lookup_spec(typing_extensions.Protocol):
@@ -412,7 +435,7 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
         ) -> typing.Generator[typing.Any, None, None]: ...
         def aio(
             self, input_queue: modal.parallel_map.SynchronizedQueue, order_outputs: bool, return_exceptions: bool
-        ) -> typing.AsyncGenerator[typing.Any, None]: ...
+        ) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
 
     _map: ___map_spec
 
@@ -444,7 +467,7 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
 
     class __remote_gen_spec(typing_extensions.Protocol):
         def __call__(self, *args, **kwargs) -> typing.Generator[typing.Any, None, None]: ...
-        def aio(self, *args, **kwargs) -> typing.AsyncGenerator[typing.Any, None]: ...
+        def aio(self, *args, **kwargs) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
 
     remote_gen: __remote_gen_spec
 
@@ -517,8 +540,8 @@ class _FunctionCall(typing.Generic[ReturnType], modal.object._Object):
 
     def _invocation(self): ...
     async def get(self, timeout: typing.Optional[float] = None) -> ReturnType: ...
-    def get_gen(self) -> typing.AsyncGenerator[typing.Any, None]: ...
-    async def get_call_graph(self) -> typing.List[modal.call_graph.InputInfo]: ...
+    def get_gen(self) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
+    async def get_call_graph(self) -> list[modal.call_graph.InputInfo]: ...
     async def cancel(self, terminate_containers: bool = False): ...
     @staticmethod
     async def from_id(
@@ -539,13 +562,13 @@ class FunctionCall(typing.Generic[ReturnType], modal.object.Object):
 
     class __get_gen_spec(typing_extensions.Protocol):
         def __call__(self) -> typing.Generator[typing.Any, None, None]: ...
-        def aio(self) -> typing.AsyncGenerator[typing.Any, None]: ...
+        def aio(self) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
 
     get_gen: __get_gen_spec
 
     class __get_call_graph_spec(typing_extensions.Protocol):
-        def __call__(self) -> typing.List[modal.call_graph.InputInfo]: ...
-        async def aio(self) -> typing.List[modal.call_graph.InputInfo]: ...
+        def __call__(self) -> list[modal.call_graph.InputInfo]: ...
+        async def aio(self) -> list[modal.call_graph.InputInfo]: ...
 
     get_call_graph: __get_call_graph_spec
 

modal/image.py

@@ -7,18 +7,15 @@ import shlex
 import sys
 import typing
 import warnings
+from collections.abc import Sequence
 from dataclasses import dataclass
 from inspect import isfunction
 from pathlib import Path, PurePosixPath
 from typing import (
     Any,
     Callable,
-    Dict,
-    List,
     Literal,
     Optional,
-    Sequence,
-    Set,
     Union,
     cast,
     get_args,
@@ -59,7 +56,7 @@ ImageBuilderVersion = Literal["2023.12", "2024.04", "2024.10"]
 # so that we fail fast / clearly in unsupported containers. Additionally, we enumerate the supported
 # Python versions in mount.py where we specify the "standalone Python versions" we create mounts for.
 # Consider consolidating these multiple sources of truth?
-SUPPORTED_PYTHON_SERIES: Dict[ImageBuilderVersion, List[str]] = {
+SUPPORTED_PYTHON_SERIES: dict[ImageBuilderVersion, list[str]] = {
     "2024.10": ["3.9", "3.10", "3.11", "3.12", "3.13"],
     "2024.04": ["3.9", "3.10", "3.11", "3.12"],
     "2023.12": ["3.9", "3.10", "3.11", "3.12"],
@@ -74,7 +71,7 @@ def _validate_python_version(
 ) -> str:
     if python_version is None:
         # If Python version is unspecified, match the local version, up to the minor component
-        python_version = series_version = "{0}.{1}".format(*sys.version_info)
+        python_version = series_version = "{}.{}".format(*sys.version_info)
     elif not isinstance(python_version, str):
         raise InvalidError(f"Python version must be specified as a string, not {type(python_version).__name__}")
     elif not re.match(r"^3(?:\.\d{1,2}){1,2}(rc\d*)?$", python_version):
@@ -86,7 +83,7 @@ def _validate_python_version(
                 "Python version must be specified as 'major.minor' for this interface;"
                 f" micro-level specification ({python_version!r}) is not valid."
             )
-        series_version = "{0}.{1}".format(*components)
+        series_version = "{}.{}".format(*components)
 
     supported_series = SUPPORTED_PYTHON_SERIES[builder_version]
     if series_version not in supported_series:
@@ -111,13 +108,13 @@ def _dockerhub_python_version(builder_version: ImageBuilderVersion, python_versi
     # This allows us to publish one pre-built debian-slim image per Python series.
     python_versions = _base_image_config("python", builder_version)
     series_to_micro_version = dict(tuple(v.rsplit(".", 1)) for v in python_versions)
-    python_series_requested = "{0}.{1}".format(*version_components)
+    python_series_requested = "{}.{}".format(*version_components)
     micro_version = series_to_micro_version[python_series_requested]
     return f"{python_series_requested}.{micro_version}"
 
 
 def _base_image_config(group: str, builder_version: ImageBuilderVersion) -> Any:
-    with open(LOCAL_REQUIREMENTS_DIR / "base-images.json", "r") as f:
+    with open(LOCAL_REQUIREMENTS_DIR / "base-images.json") as f:
         data = json.load(f)
     return data[group][builder_version]
 
@@ -146,7 +143,7 @@ def _get_modal_requirements_command(version: ImageBuilderVersion) -> str:
     return f"{prefix} -r {CONTAINER_REQUIREMENTS_PATH}"
 
 
-def _flatten_str_args(function_name: str, arg_name: str, args: Sequence[Union[str, List[str]]]) -> List[str]:
+def _flatten_str_args(function_name: str, arg_name: str, args: Sequence[Union[str, list[str]]]) -> list[str]:
     """Takes a sequence of strings, or string lists, and flattens it.
 
     Raises an error if any of the elements are not strings or string lists.
@@ -155,7 +152,7 @@ def _flatten_str_args(function_name: str, arg_name: str, args: Sequence[Union[st
     def is_str_list(x):
         return isinstance(x, list) and all(isinstance(y, str) for y in x)
 
-    ret: List[str] = []
+    ret: list[str] = []
     for x in args:
         if isinstance(x, str):
             ret.append(x)
@@ -166,7 +163,7 @@ def _flatten_str_args(function_name: str, arg_name: str, args: Sequence[Union[st
     return ret
 
 
-def _validate_packages(packages: List[str]) -> bool:
+def _validate_packages(packages: list[str]) -> bool:
     """Validates that a list of packages does not contain any command-line options."""
     return not any(pkg.startswith("-") for pkg in packages)
 
@@ -219,7 +216,7 @@ def _get_image_builder_version(server_version: ImageBuilderVersion) -> ImageBuil
         version_source = ""
         version = server_version
 
-    supported_versions: Set[ImageBuilderVersion] = set(get_args(ImageBuilderVersion))
+    supported_versions: set[ImageBuilderVersion] = set(get_args(ImageBuilderVersion))
     if version not in supported_versions:
         if local_config_version is not None:
             update_suggestion = "or remove your local configuration"
@@ -259,8 +256,8 @@ class _ImageRegistryConfig:
 @dataclass
 class DockerfileSpec:
     # Ideally we would use field() with default_factory=, but doesn't work with synchronicity type-stub gen
-    commands: List[str]
-    context_files: Dict[str, str]
+    commands: list[str]
+    context_files: dict[str, str]
 
 
 async def _image_await_build_result(image_id: str, client: _Client) -> api_pb2.ImageJoinStreamingResponse:
@@ -310,8 +307,8 @@ class _Image(_Object, type_prefix="im"):
     """
 
     force_build: bool
-    inside_exceptions: List[Exception]
-    _serve_mounts: typing.FrozenSet[_Mount]  # used for mounts watching in `modal serve`
+    inside_exceptions: list[Exception]
+    _serve_mounts: frozenset[_Mount]  # used for mounts watching in `modal serve`
     _deferred_mounts: Sequence[
         _Mount
     ]  # added as mounts on any container referencing the Image, see `def _mount_layers`
@@ -390,7 +387,7 @@ class _Image(_Object, type_prefix="im"):
     @staticmethod
     def _from_args(
         *,
-        base_images: Optional[Dict[str, "_Image"]] = None,
+        base_images: Optional[dict[str, "_Image"]] = None,
         dockerfile_function: Optional[Callable[[ImageBuilderVersion], DockerfileSpec]] = None,
         secrets: Optional[Sequence[_Secret]] = None,
         gpu_config: Optional[api_pb2.GPUConfig] = None,
@@ -720,7 +717,7 @@ class _Image(_Object, type_prefix="im"):
 
     def pip_install(
         self,
-        *packages: Union[str, List[str]],  # A list of Python packages, eg. ["numpy", "matplotlib>=3.5.0"]
+        *packages: Union[str, list[str]],  # A list of Python packages, eg. ["numpy", "matplotlib>=3.5.0"]
         find_links: Optional[str] = None,  # Passes -f (--find-links) pip install
         index_url: Optional[str] = None,  # Passes -i (--index-url) to pip install
         extra_index_url: Optional[str] = None,  # Passes --extra-index-url to pip install
@@ -762,7 +759,7 @@ class _Image(_Object, type_prefix="im"):
             return self
 
         def build_dockerfile(version: ImageBuilderVersion) -> DockerfileSpec:
-            package_args = " ".join(shlex.quote(pkg) for pkg in sorted(pkgs))
+            package_args = shlex.join(sorted(pkgs))
             extra_args = _make_pip_install_args(find_links, index_url, extra_index_url, pre, extra_options)
             commands = ["FROM base", f"RUN python -m pip install {package_args} {extra_args}"]
             if not _validate_packages(pkgs):
@@ -924,7 +921,7 @@ class _Image(_Object, type_prefix="im"):
     def pip_install_from_pyproject(
         self,
         pyproject_toml: str,
-        optional_dependencies: List[str] = [],
+        optional_dependencies: list[str] = [],
         *,
         find_links: Optional[str] = None,  # Passes -f (--find-links) pip install
         index_url: Optional[str] = None,  # Passes -i (--index-url) to pip install
@@ -968,7 +965,7 @@ class _Image(_Object, type_prefix="im"):
                         dependencies.extend(optionals[dep_group_name])
 
             extra_args = _make_pip_install_args(find_links, index_url, extra_index_url, pre, extra_options)
-            package_args = " ".join(shlex.quote(pkg) for pkg in sorted(dependencies))
+            package_args = shlex.join(sorted(dependencies))
             commands = ["FROM base", f"RUN python -m pip install {package_args} {extra_args}"]
             if version > "2023.12":  # Back-compat for legacy trailing space
                 commands = [cmd.strip() for cmd in commands]
@@ -994,11 +991,11 @@ class _Image(_Object, type_prefix="im"):
         old_installer: bool = False,
         force_build: bool = False,  # Ignore cached builds, similar to 'docker build --no-cache'
         # Selected optional dependency groups to install (See https://python-poetry.org/docs/cli/#install)
-        with_: List[str] = [],
+        with_: list[str] = [],
         # Selected optional dependency groups to exclude (See https://python-poetry.org/docs/cli/#install)
-        without: List[str] = [],
+        without: list[str] = [],
         # Only install dependency groups specifed in this list.
-        only: List[str] = [],
+        only: list[str] = [],
         *,
         secrets: Sequence[_Secret] = [],
         gpu: GPU_T = None,
@@ -1066,8 +1063,8 @@ class _Image(_Object, type_prefix="im"):
 
     def dockerfile_commands(
         self,
-        *dockerfile_commands: Union[str, List[str]],
-        context_files: Dict[str, str] = {},
+        *dockerfile_commands: Union[str, list[str]],
+        context_files: dict[str, str] = {},
         secrets: Sequence[_Secret] = [],
         gpu: GPU_T = None,
         # modal.Mount with local files to supply as build context for COPY commands
@@ -1093,7 +1090,7 @@ class _Image(_Object, type_prefix="im"):
 
     def entrypoint(
         self,
-        entrypoint_commands: List[str],
+        entrypoint_commands: list[str],
     ) -> "_Image":
         """Set the entrypoint for the image."""
         args_str = _flatten_str_args("entrypoint", "entrypoint_files", entrypoint_commands)
@@ -1104,7 +1101,7 @@ class _Image(_Object, type_prefix="im"):
 
     def shell(
         self,
-        shell_commands: List[str],
+        shell_commands: list[str],
     ) -> "_Image":
         """Overwrite default shell for the image."""
         args_str = _flatten_str_args("shell", "shell_commands", shell_commands)
@@ -1115,7 +1112,7 @@ class _Image(_Object, type_prefix="im"):
 
     def run_commands(
         self,
-        *commands: Union[str, List[str]],
+        *commands: Union[str, list[str]],
         secrets: Sequence[_Secret] = [],
         gpu: GPU_T = None,
         force_build: bool = False,  # Ignore cached builds, similar to 'docker build --no-cache'
@@ -1147,8 +1144,8 @@ class _Image(_Object, type_prefix="im"):
 
     def conda_install(
         self,
-        *packages: Union[str, List[str]],  # A list of Python packages, eg. ["numpy", "matplotlib>=3.5.0"]
-        channels: List[str] = [],  # A list of Conda channels, eg. ["conda-forge", "nvidia"]
+        *packages: Union[str, list[str]],  # A list of Python packages, eg. ["numpy", "matplotlib>=3.5.0"]
+        channels: list[str] = [],  # A list of Conda channels, eg. ["conda-forge", "nvidia"]
         force_build: bool = False,  # Ignore cached builds, similar to 'docker build --no-cache'
         secrets: Sequence[_Secret] = [],
         gpu: GPU_T = None,
@@ -1208,11 +1205,11 @@ class _Image(_Object, type_prefix="im"):
     def micromamba_install(
         self,
         # A list of Python packages, eg. ["numpy", "matplotlib>=3.5.0"]
-        *packages: Union[str, List[str]],
+        *packages: Union[str, list[str]],
         # A local path to a file containing package specifications
         spec_file: Optional[str] = None,
         # A list of Conda channels, eg. ["conda-forge", "nvidia"].
-        channels: List[str] = [],
+        channels: list[str] = [],
         force_build: bool = False,  # Ignore cached builds, similar to 'docker build --no-cache'
         secrets: Sequence[_Secret] = [],
         gpu: GPU_T = None,
@@ -1223,7 +1220,7 @@ class _Image(_Object, type_prefix="im"):
             return self
 
         def build_dockerfile(version: ImageBuilderVersion) -> DockerfileSpec:
-            package_args = " ".join(shlex.quote(pkg) for pkg in pkgs)
+            package_args = shlex.join(pkgs)
             channel_args = "".join(f" -c {channel}" for channel in channels)
 
             space = " " if package_args else ""
@@ -1251,10 +1248,10 @@ class _Image(_Object, type_prefix="im"):
     def _registry_setup_commands(
         tag: str,
         builder_version: ImageBuilderVersion,
-        setup_commands: List[str],
+        setup_commands: list[str],
         add_python: Optional[str] = None,
-    ) -> List[str]:
-        add_python_commands: List[str] = []
+    ) -> list[str]:
+        add_python_commands: list[str] = []
         if add_python:
             _validate_python_version(add_python, builder_version, allow_micro_granularity=False)
             add_python_commands = [
@@ -1285,7 +1282,7 @@ class _Image(_Object, type_prefix="im"):
         tag: str,
         *,
         secret: Optional[_Secret] = None,
-        setup_dockerfile_commands: List[str] = [],
+        setup_dockerfile_commands: list[str] = [],
         force_build: bool = False,  # Ignore cached builds, similar to 'docker build --no-cache'
         add_python: Optional[str] = None,
         **kwargs,
@@ -1344,7 +1341,7 @@ class _Image(_Object, type_prefix="im"):
         tag: str,
         secret: Optional[_Secret] = None,
         *,
-        setup_dockerfile_commands: List[str] = [],
+        setup_dockerfile_commands: list[str] = [],
         force_build: bool = False,  # Ignore cached builds, similar to 'docker build --no-cache'
         add_python: Optional[str] = None,
         **kwargs,
@@ -1395,7 +1392,7 @@ class _Image(_Object, type_prefix="im"):
         tag: str,
         secret: Optional[_Secret] = None,
         *,
-        setup_dockerfile_commands: List[str] = [],
+        setup_dockerfile_commands: list[str] = [],
         force_build: bool = False,  # Ignore cached builds, similar to 'docker build --no-cache'
         add_python: Optional[str] = None,
         **kwargs,
@@ -1550,7 +1547,7 @@ class _Image(_Object, type_prefix="im"):
 
     def apt_install(
         self,
-        *packages: Union[str, List[str]],  # A list of packages, e.g. ["ssh", "libpq-dev"]
+        *packages: Union[str, list[str]],  # A list of packages, e.g. ["ssh", "libpq-dev"]
         force_build: bool = False,  # Ignore cached builds, similar to 'docker build --no-cache'
         secrets: Sequence[_Secret] = [],
         gpu: GPU_T = None,
@@ -1567,7 +1564,7 @@ class _Image(_Object, type_prefix="im"):
         if not pkgs:
             return self
 
-        package_args = " ".join(shlex.quote(pkg) for pkg in pkgs)
+        package_args = shlex.join(pkgs)
 
         def build_dockerfile(version: ImageBuilderVersion) -> DockerfileSpec:
             commands = [
@@ -1590,11 +1587,11 @@ class _Image(_Object, type_prefix="im"):
         raw_f: Callable[..., Any],
         secrets: Sequence[_Secret] = (),  # Optional Modal Secret objects with environment variables for the container
         gpu: Union[
-            GPU_T, List[GPU_T]
+            GPU_T, list[GPU_T]
         ] = None,  # GPU request as string ("any", "T4", ...), object (`modal.GPU.A100()`, ...), or a list of either
         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
+        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.
         memory: Optional[int] = None,  # How much memory to request, in MiB. This is a soft limit.
         timeout: Optional[int] = 60 * 60,  # Maximum execution time of the function in seconds.
@@ -1602,7 +1599,7 @@ class _Image(_Object, type_prefix="im"):
         cloud: Optional[str] = None,  # Cloud provider to run the function on. Possible values are aws, gcp, oci, auto.
         region: Optional[Union[str, Sequence[str]]] = None,  # Region or regions to run the function on.
         args: Sequence[Any] = (),  # Positional arguments to the function.
-        kwargs: Dict[str, Any] = {},  # Keyword arguments to the function.
+        kwargs: dict[str, Any] = {},  # Keyword arguments to the function.
     ) -> "_Image":
         """Run user-defined function `raw_f` as an image build step. The function runs just like an ordinary Modal
         function, and any kwargs accepted by `@app.function` (such as `Mount`s, `NetworkFileSystem`s,
@@ -1676,7 +1673,7 @@ class _Image(_Object, type_prefix="im"):
             force_build=self.force_build or force_build,
         )
 
-    def env(self, vars: Dict[str, str]) -> "_Image":
+    def env(self, vars: dict[str, str]) -> "_Image":
         """Sets the environment variables in an Image.
 
         **Example**