modal 1.1.5.dev20__py3-none-any.whl → 1.1.5.dev21__py3-none-any.whl

modal/image.pyi

@@ -166,7 +166,7 @@ class _Image(modal._object._Object):
                 [typing.Literal["2023.12", "2024.04", "2024.10", "2025.06", "PREVIEW"]], DockerfileSpec
             ]
         ] = None,
-        secrets: typing.Optional[collections.abc.Sequence[modal.secret._Secret]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
         gpu_config: typing.Optional[modal_proto.api_pb2.GPUConfig] = None,
         build_function: typing.Optional[modal._functions._Function] = None,
         build_function_input: typing.Optional[modal_proto.api_pb2.FunctionInput] = None,
@@ -327,7 +327,8 @@ class _Image(modal._object._Object):
         pre: bool = False,
         extra_options: str = "",
         force_build: bool = False,
-        secrets: collections.abc.Sequence[modal.secret._Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
     ) -> _Image:
         """Install a list of Python packages using pip.
@@ -369,7 +370,8 @@ class _Image(modal._object._Object):
         pre: bool = False,
         extra_options: str = "",
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
-        secrets: collections.abc.Sequence[modal.secret._Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
         force_build: bool = False,
     ) -> _Image:
         """Install a list of Python packages from private git repositories using pip.
@@ -414,7 +416,8 @@ class _Image(modal._object._Object):
         pre: bool = False,
         extra_options: str = "",
         force_build: bool = False,
-        secrets: collections.abc.Sequence[modal.secret._Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
     ) -> _Image:
         """Install a list of Python packages from a local `requirements.txt` file."""
@@ -431,7 +434,8 @@ class _Image(modal._object._Object):
         pre: bool = False,
         extra_options: str = "",
         force_build: bool = False,
-        secrets: collections.abc.Sequence[modal.secret._Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
     ) -> _Image:
         """Install dependencies specified by a local `pyproject.toml` file.
@@ -454,7 +458,8 @@ class _Image(modal._object._Object):
         extra_options: str = "",
         force_build: bool = False,
         uv_version: typing.Optional[str] = None,
-        secrets: collections.abc.Sequence[modal.secret._Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
     ) -> _Image:
         """Install a list of Python packages using uv pip install.
@@ -487,7 +492,8 @@ class _Image(modal._object._Object):
         only: list[str] = [],
         poetry_version: typing.Optional[str] = "latest",
         old_installer: bool = False,
-        secrets: collections.abc.Sequence[modal.secret._Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
     ) -> _Image:
         """Install poetry *dependencies* specified by a local `pyproject.toml` file.
@@ -514,7 +520,8 @@ class _Image(modal._object._Object):
         frozen: bool = True,
         extra_options: str = "",
         uv_version: typing.Optional[str] = None,
-        secrets: collections.abc.Sequence[modal.secret._Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
     ) -> _Image:
         """Creates a virtual environment with the dependencies in a uv managed project with `uv sync`.
@@ -535,7 +542,8 @@ class _Image(modal._object._Object):
         self,
         *dockerfile_commands: typing.Union[str, list[str]],
         context_files: dict[str, str] = {},
-        secrets: collections.abc.Sequence[modal.secret._Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
         context_mount: typing.Optional[modal.mount._Mount] = None,
         context_dir: typing.Union[str, pathlib.Path, None] = None,
@@ -597,7 +605,8 @@ class _Image(modal._object._Object):
     def run_commands(
         self,
         *commands: typing.Union[str, list[str]],
-        secrets: collections.abc.Sequence[modal.secret._Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
         force_build: bool = False,
     ) -> _Image:
@@ -615,7 +624,8 @@ class _Image(modal._object._Object):
         spec_file: typing.Optional[str] = None,
         channels: list[str] = [],
         force_build: bool = False,
-        secrets: collections.abc.Sequence[modal.secret._Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
     ) -> _Image:
         """Install a list of additional packages using micromamba."""
@@ -756,7 +766,8 @@ class _Image(modal._object._Object):
         context_mount: typing.Optional[modal.mount._Mount] = None,
         force_build: bool = False,
         context_dir: typing.Union[str, pathlib.Path, None] = None,
-        secrets: collections.abc.Sequence[modal.secret._Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
         add_python: typing.Optional[str] = None,
         build_args: dict[str, str] = {},
@@ -824,7 +835,8 @@ class _Image(modal._object._Object):
         self,
         *packages: typing.Union[str, list[str]],
         force_build: bool = False,
-        secrets: collections.abc.Sequence[modal.secret._Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
     ) -> _Image:
         """Install a list of Debian packages using `apt`.
@@ -841,7 +853,8 @@ class _Image(modal._object._Object):
         self,
         raw_f: collections.abc.Callable[..., typing.Any],
         *,
-        secrets: collections.abc.Sequence[modal.secret._Secret] = (),
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
         volumes: dict[
             typing.Union[str, pathlib.PurePosixPath],
             typing.Union[modal.volume._Volume, modal.cloud_bucket_mount._CloudBucketMount],
@@ -1008,7 +1021,7 @@ class Image(modal.object.Object):
                 [typing.Literal["2023.12", "2024.04", "2024.10", "2025.06", "PREVIEW"]], DockerfileSpec
             ]
         ] = None,
-        secrets: typing.Optional[collections.abc.Sequence[modal.secret.Secret]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
         gpu_config: typing.Optional[modal_proto.api_pb2.GPUConfig] = None,
         build_function: typing.Optional[modal.functions.Function] = None,
         build_function_input: typing.Optional[modal_proto.api_pb2.FunctionInput] = None,
@@ -1178,7 +1191,8 @@ class Image(modal.object.Object):
         pre: bool = False,
         extra_options: str = "",
         force_build: bool = False,
-        secrets: collections.abc.Sequence[modal.secret.Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
     ) -> Image:
         """Install a list of Python packages using pip.
@@ -1220,7 +1234,8 @@ class Image(modal.object.Object):
         pre: bool = False,
         extra_options: str = "",
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
-        secrets: collections.abc.Sequence[modal.secret.Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
         force_build: bool = False,
     ) -> Image:
         """Install a list of Python packages from private git repositories using pip.
@@ -1265,7 +1280,8 @@ class Image(modal.object.Object):
         pre: bool = False,
         extra_options: str = "",
         force_build: bool = False,
-        secrets: collections.abc.Sequence[modal.secret.Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
     ) -> Image:
         """Install a list of Python packages from a local `requirements.txt` file."""
@@ -1282,7 +1298,8 @@ class Image(modal.object.Object):
         pre: bool = False,
         extra_options: str = "",
         force_build: bool = False,
-        secrets: collections.abc.Sequence[modal.secret.Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
     ) -> Image:
         """Install dependencies specified by a local `pyproject.toml` file.
@@ -1305,7 +1322,8 @@ class Image(modal.object.Object):
         extra_options: str = "",
         force_build: bool = False,
         uv_version: typing.Optional[str] = None,
-        secrets: collections.abc.Sequence[modal.secret.Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
     ) -> Image:
         """Install a list of Python packages using uv pip install.
@@ -1338,7 +1356,8 @@ class Image(modal.object.Object):
         only: list[str] = [],
         poetry_version: typing.Optional[str] = "latest",
         old_installer: bool = False,
-        secrets: collections.abc.Sequence[modal.secret.Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
     ) -> Image:
         """Install poetry *dependencies* specified by a local `pyproject.toml` file.
@@ -1365,7 +1384,8 @@ class Image(modal.object.Object):
         frozen: bool = True,
         extra_options: str = "",
         uv_version: typing.Optional[str] = None,
-        secrets: collections.abc.Sequence[modal.secret.Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
     ) -> Image:
         """Creates a virtual environment with the dependencies in a uv managed project with `uv sync`.
@@ -1386,7 +1406,8 @@ class Image(modal.object.Object):
         self,
         *dockerfile_commands: typing.Union[str, list[str]],
         context_files: dict[str, str] = {},
-        secrets: collections.abc.Sequence[modal.secret.Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
         context_mount: typing.Optional[modal.mount.Mount] = None,
         context_dir: typing.Union[str, pathlib.Path, None] = None,
@@ -1448,7 +1469,8 @@ class Image(modal.object.Object):
     def run_commands(
         self,
         *commands: typing.Union[str, list[str]],
-        secrets: collections.abc.Sequence[modal.secret.Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
         force_build: bool = False,
     ) -> Image:
@@ -1466,7 +1488,8 @@ class Image(modal.object.Object):
         spec_file: typing.Optional[str] = None,
         channels: list[str] = [],
         force_build: bool = False,
-        secrets: collections.abc.Sequence[modal.secret.Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
     ) -> Image:
         """Install a list of additional packages using micromamba."""
@@ -1607,7 +1630,8 @@ class Image(modal.object.Object):
         context_mount: typing.Optional[modal.mount.Mount] = None,
         force_build: bool = False,
         context_dir: typing.Union[str, pathlib.Path, None] = None,
-        secrets: collections.abc.Sequence[modal.secret.Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
         add_python: typing.Optional[str] = None,
         build_args: dict[str, str] = {},
@@ -1675,7 +1699,8 @@ class Image(modal.object.Object):
         self,
         *packages: typing.Union[str, list[str]],
         force_build: bool = False,
-        secrets: collections.abc.Sequence[modal.secret.Secret] = [],
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
     ) -> Image:
         """Install a list of Debian packages using `apt`.
@@ -1692,7 +1717,8 @@ class Image(modal.object.Object):
         self,
         raw_f: collections.abc.Callable[..., typing.Any],
         *,
-        secrets: collections.abc.Sequence[modal.secret.Secret] = (),
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
         volumes: dict[
             typing.Union[str, pathlib.PurePosixPath],
             typing.Union[modal.volume.Volume, modal.cloud_bucket_mount.CloudBucketMount],

modal/sandbox.py

@@ -3,7 +3,7 @@ import asyncio
 import json
 import os
 import time
-from collections.abc import AsyncGenerator, Sequence
+from collections.abc import AsyncGenerator, Collection, Sequence
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, AsyncIterator, Literal, Optional, Union, overload
 
@@ -133,7 +133,7 @@ class _Sandbox(_Object, type_prefix="sb"):
     def _new(
         args: Sequence[str],
         image: _Image,
-        secrets: Sequence[_Secret],
+        secrets: Collection[_Secret],
         name: Optional[str] = None,
         timeout: int = 300,
         idle_timeout: Optional[int] = None,
@@ -288,7 +288,8 @@ class _Sandbox(_Object, type_prefix="sb"):
         app: Optional["modal.app._App"] = None,
         name: Optional[str] = None,  # Optionally give the sandbox a name. Unique within an app.
         image: Optional[_Image] = None,  # The image to run as the container for the sandbox.
-        secrets: Sequence[_Secret] = (),  # Environment variables to inject into the sandbox.
+        env: Optional[dict[str, Optional[str]]] = None,  # Environment variables to set in the Sandbox.
+        secrets: Optional[Collection[_Secret]] = None,  # Secrets to inject into the Sandbox as environment variables.
         network_file_systems: dict[Union[str, os.PathLike], _NetworkFileSystem] = {},
         timeout: int = 300,  # Maximum lifetime of the sandbox in seconds.
         # The amount of time in seconds that a sandbox can be idle before being terminated.
@@ -359,6 +360,10 @@ class _Sandbox(_Object, type_prefix="sb"):
                 "Set the `pty` parameter to `True` instead.",
             )
 
+        secrets = secrets or []
+        if env:
+            secrets = [*secrets, _Secret.from_dict(env)]
+
         return await _Sandbox._create(
             *args,
             app=app,
@@ -396,7 +401,8 @@ class _Sandbox(_Object, type_prefix="sb"):
         app: Optional["modal.app._App"] = None,
         name: Optional[str] = None,
         image: Optional[_Image] = None,
-        secrets: Sequence[_Secret] = (),
+        env: Optional[dict[str, Optional[str]]] = None,
+        secrets: Optional[Collection[_Secret]] = None,
         mounts: Sequence[_Mount] = (),
         network_file_systems: dict[Union[str, os.PathLike], _NetworkFileSystem] = {},
         timeout: int = 300,
@@ -409,9 +415,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         memory: Optional[Union[int, tuple[int, int]]] = None,
         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: bool = False,
         encrypted_ports: Sequence[int] = [],
         h2_ports: Sequence[int] = [],
@@ -419,9 +423,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         proxy: Optional[_Proxy] = None,
         experimental_options: Optional[dict[str, bool]] = None,
         _experimental_enable_snapshot: bool = False,
-        _experimental_scheduler_placement: Optional[
-            SchedulerPlacement
-        ] = None,
+        _experimental_scheduler_placement: Optional[SchedulerPlacement] = None,
         client: Optional[_Client] = None,
         verbose: bool = False,
         pty_info: Optional[api_pb2.PTYInfo] = None,
@@ -441,6 +443,10 @@ class _Sandbox(_Object, type_prefix="sb"):
         if block_network and (encrypted_ports or h2_ports or unencrypted_ports):
             raise InvalidError("Cannot specify open ports when `block_network` is enabled")
 
+        secrets = secrets or []
+        if env:
+            secrets = [*secrets, _Secret.from_dict(env)]
+
         # TODO(erikbern): Get rid of the `_new` method and create an already-hydrated object
         obj = _Sandbox._new(
             args,
@@ -717,7 +723,8 @@ class _Sandbox(_Object, type_prefix="sb"):
         stderr: StreamType = StreamType.PIPE,
         timeout: Optional[int] = None,
         workdir: Optional[str] = None,
-        secrets: Sequence[_Secret] = (),
+        env: Optional[dict[str, Optional[str]]] = None,
+        secrets: Optional[Collection[_Secret]] = None,
         text: Literal[True] = True,
         bufsize: Literal[-1, 1] = -1,
         pty: bool = False,
@@ -733,7 +740,8 @@ class _Sandbox(_Object, type_prefix="sb"):
         stderr: StreamType = StreamType.PIPE,
         timeout: Optional[int] = None,
         workdir: Optional[str] = None,
-        secrets: Sequence[_Secret] = (),
+        env: Optional[dict[str, Optional[str]]] = None,
+        secrets: Optional[Collection[_Secret]] = None,
         text: Literal[False] = False,
         bufsize: Literal[-1, 1] = -1,
         pty: bool = False,
@@ -748,7 +756,10 @@ class _Sandbox(_Object, type_prefix="sb"):
         stderr: StreamType = StreamType.PIPE,
         timeout: Optional[int] = None,
         workdir: Optional[str] = None,
-        secrets: Sequence[_Secret] = (),
+        env: Optional[dict[str, Optional[str]]] = None,  # Environment variables to set during command execution.
+        secrets: Optional[
+            Collection[_Secret]
+        ] = None,  # Secrets to inject as environment variables during command execution.
         # Encode output as text.
         text: bool = True,
         # Control line-buffered output.
@@ -793,6 +804,7 @@ class _Sandbox(_Object, type_prefix="sb"):
             stderr=stderr,
             timeout=timeout,
             workdir=workdir,
+            env=env,
             secrets=secrets,
             text=text,
             bufsize=bufsize,
@@ -806,7 +818,8 @@ class _Sandbox(_Object, type_prefix="sb"):
         stderr: StreamType = StreamType.PIPE,
         timeout: Optional[int] = None,
         workdir: Optional[str] = None,
-        secrets: Sequence[_Secret] = (),
+        env: Optional[dict[str, Optional[str]]] = None,
+        secrets: Optional[Collection[_Secret]] = None,
         text: bool = True,
         bufsize: Literal[-1, 1] = -1,
     ) -> Union[_ContainerProcess[bytes], _ContainerProcess[str]]:
@@ -818,6 +831,10 @@ class _Sandbox(_Object, type_prefix="sb"):
             raise InvalidError(f"workdir must be an absolute path, got: {workdir}")
         _validate_exec_args(args)
 
+        secrets = secrets or []
+        if env:
+            secrets = [*secrets, _Secret.from_dict(env)]
+
         # Force secret resolution so we can pass the secret IDs to the backend.
         secret_coros = [secret.hydrate(client=self._client) for secret in secrets]
         await TaskContext.gather(*secret_coros)

modal/sandbox.pyi

@@ -90,7 +90,7 @@ class _Sandbox(modal._object._Object):
     def _new(
         args: collections.abc.Sequence[str],
         image: modal.image._Image,
-        secrets: collections.abc.Sequence[modal.secret._Secret],
+        secrets: collections.abc.Collection[modal.secret._Secret],
         name: typing.Optional[str] = None,
         timeout: int = 300,
         idle_timeout: typing.Optional[int] = None,
@@ -128,7 +128,8 @@ class _Sandbox(modal._object._Object):
         app: typing.Optional[modal.app._App] = None,
         name: typing.Optional[str] = None,
         image: typing.Optional[modal.image._Image] = None,
-        secrets: collections.abc.Sequence[modal.secret._Secret] = (),
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
         network_file_systems: dict[typing.Union[str, os.PathLike], modal.network_file_system._NetworkFileSystem] = {},
         timeout: int = 300,
         idle_timeout: typing.Optional[int] = None,
@@ -178,7 +179,8 @@ class _Sandbox(modal._object._Object):
         app: typing.Optional[modal.app._App] = None,
         name: typing.Optional[str] = None,
         image: typing.Optional[modal.image._Image] = None,
-        secrets: collections.abc.Sequence[modal.secret._Secret] = (),
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
         mounts: collections.abc.Sequence[modal.mount._Mount] = (),
         network_file_systems: dict[typing.Union[str, os.PathLike], modal.network_file_system._NetworkFileSystem] = {},
         timeout: int = 300,
@@ -307,7 +309,8 @@ 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: collections.abc.Sequence[modal.secret._Secret] = (),
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
         text: typing.Literal[True] = True,
         bufsize: typing.Literal[-1, 1] = -1,
         pty: bool = False,
@@ -322,7 +325,8 @@ 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: collections.abc.Sequence[modal.secret._Secret] = (),
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
         text: typing.Literal[False] = False,
         bufsize: typing.Literal[-1, 1] = -1,
         pty: bool = False,
@@ -337,7 +341,8 @@ 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: collections.abc.Sequence[modal.secret._Secret] = (),
+        env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+        secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
         text: bool = True,
         bufsize: typing.Literal[-1, 1] = -1,
     ) -> typing.Union[modal.container_process._ContainerProcess[bytes], modal.container_process._ContainerProcess[str]]:
@@ -446,7 +451,7 @@ class Sandbox(modal.object.Object):
     def _new(
         args: collections.abc.Sequence[str],
         image: modal.image.Image,
-        secrets: collections.abc.Sequence[modal.secret.Secret],
+        secrets: collections.abc.Collection[modal.secret.Secret],
         name: typing.Optional[str] = None,
         timeout: int = 300,
         idle_timeout: typing.Optional[int] = None,
@@ -485,7 +490,8 @@ class Sandbox(modal.object.Object):
             app: typing.Optional[modal.app.App] = None,
             name: typing.Optional[str] = None,
             image: typing.Optional[modal.image.Image] = None,
-            secrets: collections.abc.Sequence[modal.secret.Secret] = (),
+            env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+            secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
             network_file_systems: dict[
                 typing.Union[str, os.PathLike], modal.network_file_system.NetworkFileSystem
             ] = {},
@@ -538,7 +544,8 @@ class Sandbox(modal.object.Object):
             app: typing.Optional[modal.app.App] = None,
             name: typing.Optional[str] = None,
             image: typing.Optional[modal.image.Image] = None,
-            secrets: collections.abc.Sequence[modal.secret.Secret] = (),
+            env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+            secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
             network_file_systems: dict[
                 typing.Union[str, os.PathLike], modal.network_file_system.NetworkFileSystem
             ] = {},
@@ -594,7 +601,8 @@ class Sandbox(modal.object.Object):
             app: typing.Optional[modal.app.App] = None,
             name: typing.Optional[str] = None,
             image: typing.Optional[modal.image.Image] = None,
-            secrets: collections.abc.Sequence[modal.secret.Secret] = (),
+            env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+            secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
             mounts: collections.abc.Sequence[modal.mount.Mount] = (),
             network_file_systems: dict[
                 typing.Union[str, os.PathLike], modal.network_file_system.NetworkFileSystem
@@ -640,7 +648,8 @@ class Sandbox(modal.object.Object):
             app: typing.Optional[modal.app.App] = None,
             name: typing.Optional[str] = None,
             image: typing.Optional[modal.image.Image] = None,
-            secrets: collections.abc.Sequence[modal.secret.Secret] = (),
+            env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+            secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
             mounts: collections.abc.Sequence[modal.mount.Mount] = (),
             network_file_systems: dict[
                 typing.Union[str, os.PathLike], modal.network_file_system.NetworkFileSystem
@@ -893,7 +902,8 @@ 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: collections.abc.Sequence[modal.secret.Secret] = (),
+            env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+            secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
             text: typing.Literal[True] = True,
             bufsize: typing.Literal[-1, 1] = -1,
             pty: bool = False,
@@ -909,7 +919,8 @@ 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: collections.abc.Sequence[modal.secret.Secret] = (),
+            env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+            secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
             text: typing.Literal[False] = False,
             bufsize: typing.Literal[-1, 1] = -1,
             pty: bool = False,
@@ -925,7 +936,8 @@ 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: collections.abc.Sequence[modal.secret.Secret] = (),
+            env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+            secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
             text: typing.Literal[True] = True,
             bufsize: typing.Literal[-1, 1] = -1,
             pty: bool = False,
@@ -941,7 +953,8 @@ 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: collections.abc.Sequence[modal.secret.Secret] = (),
+            env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+            secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
             text: typing.Literal[False] = False,
             bufsize: typing.Literal[-1, 1] = -1,
             pty: bool = False,
@@ -961,7 +974,8 @@ 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: collections.abc.Sequence[modal.secret.Secret] = (),
+            env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+            secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
             text: bool = True,
             bufsize: typing.Literal[-1, 1] = -1,
         ) -> typing.Union[
@@ -982,7 +996,8 @@ 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: collections.abc.Sequence[modal.secret.Secret] = (),
+            env: typing.Optional[dict[str, typing.Optional[str]]] = None,
+            secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
             text: bool = True,
             bufsize: typing.Literal[-1, 1] = -1,
         ) -> typing.Union[

modal/secret.py

@@ -239,7 +239,7 @@ class _Secret(_Object, type_prefix="st"):
     @staticmethod
     def from_dict(
         env_dict: dict[
-            str, Union[str, None]
+            str, Optional[str]
         ] = {},  # dict of entries to be inserted as environment variables in functions using the secret
     ) -> "_Secret":
         """Create a secret from a str-str dictionary. Values can also be `None`, which is ignored.

{modal-1.1.5.dev20.dist-info → modal-1.1.5.dev21.dist-info}/METADATA

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