modal 1.5.2.dev10__tar.gz → 1.5.2.dev11__tar.gz

{modal-1.5.2.dev10 → modal-1.5.2.dev11}/PKG-INFO

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

{modal-1.5.2.dev10 → modal-1.5.2.dev11}/modal/_image.py

@@ -1022,7 +1022,7 @@ class _Image(_Object, type_prefix="im"):
             ```
         """
         if app.app_id is None:
-            raise InvalidError("App has not been initialized yet. Use the content manager `app.run()` or `App.lookup`")
+            raise InvalidError("App has not been initialized yet. Use the context manager `app.run()` or `App.lookup`")
 
         resolver = Resolver()
         async with TaskContext() as tc:

{modal-1.5.2.dev10 → modal-1.5.2.dev11}/modal/_utils/task_command_router_client.py

@@ -811,6 +811,14 @@ class TaskCommandRouterClient:
                 lambda: self._call_with_auth_retry(self._stub.TaskSetNetworkAccess, request)
             )
 
+    async def reload_volumes(self, task_id: str) -> sr_pb2.TaskReloadVolumesResponse:
+        """Reload all Volumes mounted in the task to reflect their latest committed state."""
+        request = sr_pb2.TaskReloadVolumesRequest(task_id=task_id)
+        with grpc_error_converter():
+            return await call_with_retries_on_transient_errors(
+                lambda: self._call_with_auth_retry(self._stub.TaskReloadVolumes, request)
+            )
+
     async def _snapshot_with_deadline(self, rpc, request, *, timeout: float, **kwargs):
         # helper method for snapshot_directory and snapshot_filesystem to handle grpc
         # deadlines in a consistent way, converting any error to TimeoutError after passing

{modal-1.5.2.dev10 → modal-1.5.2.dev11}/modal/client.pyi

@@ -35,7 +35,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.2.dev10",
+        version: str = "1.5.2.dev11",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -205,7 +205,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.2.dev10",
+        version: str = "1.5.2.dev11",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.5.2.dev10 → modal-1.5.2.dev11}/modal/functions.pyi

@@ -491,7 +491,7 @@ class Function(
 
     _call_generator: ___call_generator_spec
 
-    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER:
             """Calls the function remotely, executing it with the given arguments and returning the execution's result.
 
@@ -516,7 +516,7 @@ class Function(
             """
             ...
 
-    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P]
+    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType]
 
     class __remote_gen_spec(typing_extensions.Protocol):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -566,7 +566,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """[Experimental] Calls the function with the given arguments, without waiting for the results.
 
@@ -599,7 +599,7 @@ class Function(
             """
             ...
 
-    _experimental_spawn: ___experimental_spawn_spec[modal._functions.ReturnType, modal._functions.P]
+    _experimental_spawn: ___experimental_spawn_spec[modal._functions.P, modal._functions.ReturnType]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> None: ...
@@ -607,7 +607,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P]
 
-    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """Calls the function with the given arguments, without waiting for the results.
 
@@ -640,7 +640,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P]
+    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function.

{modal-1.5.2.dev10 → modal-1.5.2.dev11}/modal/sandbox.py

@@ -39,7 +39,12 @@ from ._resolver import Resolver
 from ._resources import convert_fn_config_to_resources_config
 from ._utils.async_utils import TaskContext, synchronize_api
 from ._utils.deprecation import deprecation_warning
-from ._utils.mount_utils import validate_network_file_systems, validate_volumes, validate_volumes_by_object_id
+from ._utils.mount_utils import (
+    validate_network_file_systems,
+    validate_only_modal_volumes,
+    validate_volumes,
+    validate_volumes_by_object_id,
+)
 from ._utils.name_utils import check_object_name
 from ._utils.task_command_router_client import TaskCommandRouterClient
 from .client import _Client
@@ -1638,13 +1643,16 @@ class _Sandbox(_Object, type_prefix="sb"):
         Added in v1.1.0.
 
         """
-        self._ensure_v1("reload_volumes")
         task_id = await self._get_task_id()
-        await self._client.stub.ContainerReloadVolumes(
-            api_pb2.ContainerReloadVolumesRequest(
-                task_id=task_id,
-            ),
-        )
+        if self._is_v2:
+            command_router_client = await self._get_command_router_client(task_id)
+            await command_router_client.reload_volumes(task_id)
+        else:
+            await self._client.stub.ContainerReloadVolumes(
+                api_pb2.ContainerReloadVolumesRequest(
+                    task_id=task_id,
+                ),
+            )
 
     @overload
     async def terminate(
@@ -2538,13 +2546,34 @@ class _SidecarManager:
         env: dict[str, str] | None = None,
         secrets: Collection[_Secret] | None = None,
         workdir: str | None = None,
+        volumes: dict[str | os.PathLike, _Volume] | None = None,
     ) -> _SidecarContainer:
+        """Create a sidecar container running alongside the Sandbox's main container.
+
+        Sidecar containers share the Sandbox's lifecycle but run their own Image and command. They
+        can be used to run auxiliary processes, such as a database or a service the main container
+        depends on.
+
+        Args:
+            *args: Command and arguments to run inside the sidecar container.
+            name: Unique name for the sidecar container. The name ``"main"`` is reserved.
+            image: Image to run the sidecar container with. Must be a pre-built or referenced Image.
+            env: Environment variables to set in the sidecar container.
+            secrets: Secrets to inject as environment variables in the sidecar container.
+            workdir: Working directory for the command; must be absolute if set.
+            volumes: Mapping of mount paths to `Volume` objects to mount in the sidecar container.
+
+        Returns:
+            A `SidecarContainer` handle for the running container.
+        """
         if name == _MAIN_CONTAINER_NAME:
             raise InvalidError(f"The name {_MAIN_CONTAINER_NAME!r} is reserved for the sandbox's main container.")
         if workdir is not None and not workdir.startswith("/"):
             raise InvalidError(f"workdir must be an absolute path, got: {workdir}")
         _validate_exec_args(args)
 
+        validated_volumes = validate_only_modal_volumes(volumes, "Sandbox._experimental_sidecars.create(volumes=...)")
+
         if image._mount_layers:
             raise InvalidError(
                 "Sandbox._experimental_sidecars.create(image=...) only supports pre-built images. "
@@ -2564,8 +2593,17 @@ class _SidecarManager:
             )
 
         secrets = secrets or []
-        secret_coros = [secret.hydrate(client=self._sandbox._client) for secret in secrets]
-        await TaskContext.gather(*secret_coros)
+        hydrate_coros = [secret.hydrate(client=self._sandbox._client) for secret in secrets] + [
+            volume.hydrate(client=self._sandbox._client) for _, volume in validated_volumes
+        ]
+        await TaskContext.gather(*hydrate_coros)
+
+        # Validate that the same volume (by object_id) isn't mounted at multiple paths. This relies on
+        # the volumes being hydrated above, since it compares object_ids.
+        validate_volumes_by_object_id(validated_volumes)
+
+        # Relies on dicts being ordered (true as of Python 3.6).
+        volume_mounts = [_volume_to_mount_proto(path, volume) for path, volume in validated_volumes]
 
         task_id, command_router_client = await self._get_command_router()
 
@@ -2577,6 +2615,7 @@ class _SidecarManager:
             env=env or {},
             workdir=workdir or "",
             secret_ids=[secret.object_id for secret in secrets],
+            volume_mounts=volume_mounts,
         )
         create_resp = await command_router_client.container_create(create_req)
         container_id = create_resp.container_id

{modal-1.5.2.dev10 → modal-1.5.2.dev11}/modal/sandbox.pyi

@@ -1046,7 +1046,28 @@ class _SidecarManager:
         env: typing.Optional[dict[str, str]] = None,
         secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
         workdir: typing.Optional[str] = None,
-    ) -> _SidecarContainer: ...
+        volumes: typing.Optional[dict[typing.Union[str, os.PathLike], modal.volume._Volume]] = None,
+    ) -> _SidecarContainer:
+        """Create a sidecar container running alongside the Sandbox's main container.
+
+        Sidecar containers share the Sandbox's lifecycle but run their own Image and command. They
+        can be used to run auxiliary processes, such as a database or a service the main container
+        depends on.
+
+        Args:
+            *args: Command and arguments to run inside the sidecar container.
+            name: Unique name for the sidecar container. The name ``"main"`` is reserved.
+            image: Image to run the sidecar container with. Must be a pre-built or referenced Image.
+            env: Environment variables to set in the sidecar container.
+            secrets: Secrets to inject as environment variables in the sidecar container.
+            workdir: Working directory for the command; must be absolute if set.
+            volumes: Mapping of mount paths to `Volume` objects to mount in the sidecar container.
+
+        Returns:
+            A `SidecarContainer` handle for the running container.
+        """
+        ...
+
     async def get(self, *, name: str, include_terminated: bool = False) -> _SidecarContainer: ...
     async def list(self, include_terminated: bool = False) -> list[_SidecarContainer]: ...
 
@@ -1201,7 +1222,28 @@ class SidecarManager:
             env: typing.Optional[dict[str, str]] = None,
             secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
             workdir: typing.Optional[str] = None,
-        ) -> SidecarContainer: ...
+            volumes: typing.Optional[dict[typing.Union[str, os.PathLike], modal.volume.Volume]] = None,
+        ) -> SidecarContainer:
+            """Create a sidecar container running alongside the Sandbox's main container.
+
+            Sidecar containers share the Sandbox's lifecycle but run their own Image and command. They
+            can be used to run auxiliary processes, such as a database or a service the main container
+            depends on.
+
+            Args:
+                *args: Command and arguments to run inside the sidecar container.
+                name: Unique name for the sidecar container. The name ``"main"`` is reserved.
+                image: Image to run the sidecar container with. Must be a pre-built or referenced Image.
+                env: Environment variables to set in the sidecar container.
+                secrets: Secrets to inject as environment variables in the sidecar container.
+                workdir: Working directory for the command; must be absolute if set.
+                volumes: Mapping of mount paths to `Volume` objects to mount in the sidecar container.
+
+            Returns:
+                A `SidecarContainer` handle for the running container.
+            """
+            ...
+
         async def aio(
             self,
             /,
@@ -1211,7 +1253,27 @@ class SidecarManager:
             env: typing.Optional[dict[str, str]] = None,
             secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
             workdir: typing.Optional[str] = None,
-        ) -> SidecarContainer: ...
+            volumes: typing.Optional[dict[typing.Union[str, os.PathLike], modal.volume.Volume]] = None,
+        ) -> SidecarContainer:
+            """Create a sidecar container running alongside the Sandbox's main container.
+
+            Sidecar containers share the Sandbox's lifecycle but run their own Image and command. They
+            can be used to run auxiliary processes, such as a database or a service the main container
+            depends on.
+
+            Args:
+                *args: Command and arguments to run inside the sidecar container.
+                name: Unique name for the sidecar container. The name ``"main"`` is reserved.
+                image: Image to run the sidecar container with. Must be a pre-built or referenced Image.
+                env: Environment variables to set in the sidecar container.
+                secrets: Secrets to inject as environment variables in the sidecar container.
+                workdir: Working directory for the command; must be absolute if set.
+                volumes: Mapping of mount paths to `Volume` objects to mount in the sidecar container.
+
+            Returns:
+                A `SidecarContainer` handle for the running container.
+            """
+            ...
 
     create: __create_spec
 

{modal-1.5.2.dev10 → modal-1.5.2.dev11}/modal.egg-info/PKG-INFO

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

{modal-1.5.2.dev10 → modal-1.5.2.dev11}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2026
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.5.2.dev10"
+__version__ = "1.5.2.dev11"