modal 1.5.3.dev9__tar.gz → 1.5.3.dev10__tar.gz

{modal-1.5.3.dev9 → modal-1.5.3.dev10}/PKG-INFO

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

{modal-1.5.3.dev9 → modal-1.5.3.dev10}/modal/_function_variants.py

@@ -171,7 +171,7 @@ class _FunctionOptions:
             replace_secret_ids=bool(self.secrets),
             replace_volume_mounts=len(volume_mounts) > 0,
             volume_mounts=volume_mounts,
-            cloud_bucket_mounts=cloud_bucket_mounts_to_proto(self.cloud_bucket_mounts),
+            cloud_bucket_mounts=cloud_bucket_mounts_to_proto(self.cloud_bucket_mounts)[0],
             replace_cloud_bucket_mounts=bool(self.cloud_bucket_mounts),
             resources=self.resources,
             retry_policy=self.retry_policy,

{modal-1.5.3.dev9 → modal-1.5.3.dev10}/modal/_functions.py

@@ -1000,7 +1000,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                     untrusted=restrict_modal_access,
                     single_use_containers=single_use_containers,
                     max_inputs=int(single_use_containers),  # TODO(michael) remove after worker rollover
-                    cloud_bucket_mounts=cloud_bucket_mounts_to_proto(cloud_bucket_mounts),
+                    cloud_bucket_mounts=cloud_bucket_mounts_to_proto(cloud_bucket_mounts)[0],
                     scheduler_placement=scheduler_placement,
                     is_class=info.is_service_class(),
                     class_parameter_info=info.class_parameter_info(),

{modal-1.5.3.dev9 → modal-1.5.3.dev10}/modal/_utils/task_command_router_client.py

@@ -974,3 +974,8 @@ class TaskCommandRouterClient:
         return await self._unary_call_with_deadline(
             self._stub.TaskSnapshotFilesystem, request, timeout=timeout, **kwargs
         )
+
+    async def snapshot_memory(
+        self, request: sr_pb2.TaskSnapshotMemoryRequest, *, timeout: float, **kwargs
+    ) -> sr_pb2.TaskSnapshotMemoryResponse:
+        return await self._unary_call_with_deadline(self._stub.TaskSnapshotMemory, request, timeout=timeout, **kwargs)

{modal-1.5.3.dev9 → modal-1.5.3.dev10}/modal/client.pyi

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

{modal-1.5.3.dev9 → modal-1.5.3.dev10}/modal/cloud_bucket_mount.py

@@ -121,11 +121,14 @@ class _CloudBucketMount:
     force_path_style: bool = False
 
 
-def cloud_bucket_mounts_to_proto(mounts: Sequence[tuple[str, _CloudBucketMount]]) -> list[api_pb2.CloudBucketMount]:
+def cloud_bucket_mounts_to_proto(
+    mounts: Sequence[tuple[str, _CloudBucketMount]], split_ephemeral_credentials: bool = False
+) -> tuple[list[api_pb2.CloudBucketMount], dict[str, api_pb2.StringMap]]:
     """mdmd:hidden
     Helper function to convert `CloudBucketMount` to a list of protobufs that can be passed to the server.
     """
     cloud_bucket_mounts: list[api_pb2.CloudBucketMount] = []
+    cloud_bucket_credentials: dict[str, api_pb2.StringMap] = {}
 
     for path, mount in mounts:
         # crude mapping from mount arguments to type.
@@ -153,11 +156,20 @@ def cloud_bucket_mounts_to_proto(mounts: Sequence[tuple[str, _CloudBucketMount]]
         else:
             key_prefix = mount.key_prefix
 
+        credentials_secret_id = ""
+        if secret := mount.secret:
+            if split_ephemeral_credentials and secret._load_env_dict:
+                env_dict = secret._load_env_dict()
+                credientials = api_pb2.StringMap(contents=env_dict)
+                cloud_bucket_credentials[path] = credientials
+            else:
+                credentials_secret_id = secret.object_id
+
         cloud_bucket_mount = api_pb2.CloudBucketMount(
             bucket_name=mount.bucket_name,
             bucket_endpoint_url=mount.bucket_endpoint_url,
             mount_path=path,
-            credentials_secret_id=mount.secret.object_id if mount.secret else "",
+            credentials_secret_id=credentials_secret_id,
             read_only=mount.read_only,
             bucket_type=bucket_type,
             requester_pays=mount.requester_pays,
@@ -167,7 +179,7 @@ def cloud_bucket_mounts_to_proto(mounts: Sequence[tuple[str, _CloudBucketMount]]
         )
         cloud_bucket_mounts.append(cloud_bucket_mount)
 
-    return cloud_bucket_mounts
+    return cloud_bucket_mounts, cloud_bucket_credentials
 
 
 CloudBucketMount = synchronize_api(_CloudBucketMount)

{modal-1.5.3.dev9 → modal-1.5.3.dev10}/modal/cloud_bucket_mount.pyi

@@ -126,8 +126,8 @@ class _CloudBucketMount:
         ...
 
 def cloud_bucket_mounts_to_proto(
-    mounts: collections.abc.Sequence[tuple[str, _CloudBucketMount]],
-) -> list[modal_proto.api_pb2.CloudBucketMount]:
+    mounts: collections.abc.Sequence[tuple[str, _CloudBucketMount]], split_ephemeral_credentials: bool = False
+) -> tuple[list[modal_proto.api_pb2.CloudBucketMount], dict[str, modal_proto.api_pb2.StringMap]]:
     """mdmd:hidden
     Helper function to convert `CloudBucketMount` to a list of protobufs that can be passed to the server.
     """

{modal-1.5.3.dev9 → modal-1.5.3.dev10}/modal/functions.pyi

@@ -493,7 +493,7 @@ class Function(
 
     _call_generator: ___call_generator_spec
 
-    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_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.
 
@@ -518,7 +518,7 @@ class Function(
             """
             ...
 
-    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType]
+    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P]
 
     class __remote_gen_spec(typing_extensions.Protocol):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -568,7 +568,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_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.
 
@@ -601,7 +601,7 @@ class Function(
             """
             ...
 
-    _experimental_spawn: ___experimental_spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    _experimental_spawn: ___experimental_spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> None: ...
@@ -609,7 +609,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P]
 
-    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_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.
 
@@ -642,7 +642,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function.

{modal-1.5.3.dev9 → modal-1.5.3.dev10}/modal/sandbox.py

@@ -472,7 +472,7 @@ class _Sandbox(_Object, type_prefix="sb"):
                 nfs_mounts=network_file_system_mount_protos(validated_network_file_systems),
                 runtime=config.get("function_runtime"),
                 runtime_debug=config.get("function_runtime_debug"),
-                cloud_bucket_mounts=cloud_bucket_mounts_to_proto(cloud_bucket_mounts),
+                cloud_bucket_mounts=cloud_bucket_mounts_to_proto(cloud_bucket_mounts)[0],
                 volume_mounts=volume_mounts,
                 pty_info=pty_info,
                 scheduler_placement=scheduler_placement,
@@ -845,6 +845,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         verbose: bool = False,
         custom_domain: str | None = None,
         client: _Client | None = None,
+        _experimental_enable_snapshot: bool = False,
     ) -> "_Sandbox":
         """Create a sandbox using the V2 backend.
 
@@ -860,8 +861,9 @@ class _Sandbox(_Object, type_prefix="sb"):
         tuple that additionally sets a hard limit (fractional CPU cores; memory
         in MiB), matching `Sandbox.create()`.
 
-        Features like memory snapshots, network file systems, and GPUs are not
-        supported.
+        Pass `_experimental_enable_snapshot=True` to create a sandbox that can be
+        snapshotted with `._experimental_snapshot()`. Features like network
+        file systems and GPUs are not supported.
 
         Set `i6pn=True` to enable private IPv6 networking so sandboxes in the same
         workspace can address each other directly at their `i6pn.modal.local`
@@ -961,8 +963,9 @@ class _Sandbox(_Object, type_prefix="sb"):
             for _, vol in validated_volumes:
                 dep_tasks.append(resolver.load(vol, load_context))
             for _, cloud_bucket_mount in cloud_bucket_mounts:
-                if cloud_bucket_mount.secret:
-                    dep_tasks.append(resolver.load(cloud_bucket_mount.secret, load_context))
+                if secret := cloud_bucket_mount.secret:
+                    if not secret._is_ephemeral:
+                        dep_tasks.append(resolver.load(cloud_bucket_mount.secret, load_context))
             if proxy:
                 dep_tasks.append(resolver.load(proxy, load_context))
             dep_timings = await _gather_load_with_timings(dep_tasks) if dep_tasks else []
@@ -971,6 +974,10 @@ class _Sandbox(_Object, type_prefix="sb"):
 
             volume_mounts = [_volume_to_mount_proto(path, volume) for path, volume in validated_volumes]
 
+            cloud_bucket_mount_protos, cloud_bucket_credientials = cloud_bucket_mounts_to_proto(
+                cloud_bucket_mounts, split_ephemeral_credentials=True
+            )
+
             definition = api_pb2.Sandbox(
                 entrypoint_args=args,
                 image_id=image.object_id,
@@ -995,12 +1002,13 @@ class _Sandbox(_Object, type_prefix="sb"):
                 inbound_cidr_allowlist=list(inbound_cidr_allowlist) if inbound_cidr_allowlist is not None else [],
                 i6pn_enabled=i6pn,
                 volume_mounts=volume_mounts,
-                cloud_bucket_mounts=cloud_bucket_mounts_to_proto(cloud_bucket_mounts),
+                cloud_bucket_mounts=cloud_bucket_mount_protos,
                 readiness_probe=(readiness_probe._to_proto() if readiness_probe else None),
                 experimental_options_v2=(
                     {k: str(v) for k, v in experimental_options.items()} if experimental_options else None
                 ),
                 custom_domain=custom_domain,
+                enable_snapshot=_experimental_enable_snapshot,
             )
 
             tag_protos = [api_pb2.SandboxTag(tag_name=k, tag_value=v) for k, v in tags.items()] if tags else []
@@ -1009,6 +1017,7 @@ class _Sandbox(_Object, type_prefix="sb"):
                 definition=definition,
                 ephemeral_secrets=api_pb2.StringMap(contents=env_dict) if env_dict else None,
                 tags=tag_protos,
+                cloud_bucket_mount_credentials=cloud_bucket_credientials,
             )
             assert load_context.client._auth_token_manager
             auth_token = await load_context.client._auth_token_manager.get_token()
@@ -2079,19 +2088,27 @@ class _Sandbox(_Object, type_prefix="sb"):
         )
 
     async def _experimental_snapshot(self) -> _SandboxSnapshot:
-        self._ensure_v1("_experimental_snapshot")
-        await self._get_task_id()
-        snap_req = api_pb2.SandboxSnapshotRequest(sandbox_id=self.object_id)
-        snap_resp = await self._client.stub.SandboxSnapshot(snap_req)
+        if self._is_v2:
+            task_id = await self._get_task_id()
+            command_router_client = await self._get_command_router_client(task_id)
+            snap_v2_resp = await command_router_client.snapshot_memory(
+                sr_pb2.TaskSnapshotMemoryRequest(task_id=task_id, idempotency_key=str(uuid.uuid4())),
+                timeout=55.0,
+            )
+            snapshot_id = snap_v2_resp.snapshot_id
+        else:
+            await self._get_task_id()
+            snap_req = api_pb2.SandboxSnapshotRequest(sandbox_id=self.object_id)
+            snap_resp = await self._client.stub.SandboxSnapshot(snap_req)
 
-        snapshot_id = snap_resp.snapshot_id
+            snapshot_id = snap_resp.snapshot_id
 
-        # wait for the snapshot to succeed. this is implemented as a second idempotent rpc
-        # because the snapshot itself may take a while to complete.
-        wait_req = api_pb2.SandboxSnapshotWaitRequest(snapshot_id=snapshot_id, timeout=55.0)
-        wait_resp = await self._client.stub.SandboxSnapshotWait(wait_req)
-        if wait_resp.result.status != api_pb2.GenericResult.GENERIC_STATUS_SUCCESS:
-            raise ExecutionError(wait_resp.result.exception)
+            # wait for the snapshot to succeed. this is implemented as a second idempotent rpc
+            # because the snapshot itself may take a while to complete.
+            wait_req = api_pb2.SandboxSnapshotWaitRequest(snapshot_id=snapshot_id, timeout=55.0)
+            wait_resp = await self._client.stub.SandboxSnapshotWait(wait_req)
+            if wait_resp.result.status != api_pb2.GenericResult.GENERIC_STATUS_SUCCESS:
+                raise ExecutionError(wait_resp.result.exception)
 
         async def _load(
             self: _SandboxSnapshot, resolver: Resolver, load_context: LoadContext, existing_object_id: str | None
@@ -2102,7 +2119,8 @@ class _Sandbox(_Object, type_prefix="sb"):
         rep = "SandboxSnapshot()"
         # TODO: use ._new_hydrated instead
         obj = _SandboxSnapshot._from_loader(_load, rep, hydrate_lazily=True, load_context_overrides=LoadContext.empty())
-        obj._hydrate(snapshot_id, self._client, None)
+        metadata = api_pb2.SandboxSnapshotHandleMetadata(is_v2=self._is_v2)
+        obj._hydrate(snapshot_id, self._client, metadata)
 
         return obj
 
@@ -2113,27 +2131,41 @@ class _Sandbox(_Object, type_prefix="sb"):
         *,
         name: str | None = _DEFAULT_SANDBOX_NAME_OVERRIDE,
     ):
+        """Restore a Sandbox from a memory snapshot.
+
+        The restore targets the same backend the snapshot was taken from. A V1
+        snapshot restores as a V1 sandbox, a V2 snapshot as a V2 sandbox.
+        """
         client = client or await _Client.from_env()
 
+        if snapshot._is_v2 is None:
+            await snapshot.hydrate(client=client)
+        use_v2 = bool(snapshot._is_v2)
+
         if name is not None and name != _DEFAULT_SANDBOX_NAME_OVERRIDE:
             check_object_name(name, "Sandbox")
 
         if name is _DEFAULT_SANDBOX_NAME_OVERRIDE:
-            restore_req = api_pb2.SandboxRestoreRequest(
-                snapshot_id=snapshot.object_id,
-                sandbox_name_override_type=api_pb2.SandboxRestoreRequest.SANDBOX_NAME_OVERRIDE_TYPE_UNSPECIFIED,
-            )
+            override_type = api_pb2.SandboxRestoreRequest.SANDBOX_NAME_OVERRIDE_TYPE_UNSPECIFIED
+            name_override = None
         elif name is None:
-            restore_req = api_pb2.SandboxRestoreRequest(
-                snapshot_id=snapshot.object_id,
-                sandbox_name_override_type=api_pb2.SandboxRestoreRequest.SANDBOX_NAME_OVERRIDE_TYPE_NONE,
-            )
+            override_type = api_pb2.SandboxRestoreRequest.SANDBOX_NAME_OVERRIDE_TYPE_NONE
+            name_override = None
         else:
-            restore_req = api_pb2.SandboxRestoreRequest(
-                snapshot_id=snapshot.object_id,
-                sandbox_name_override=name,
-                sandbox_name_override_type=api_pb2.SandboxRestoreRequest.SANDBOX_NAME_OVERRIDE_TYPE_STRING,
+            override_type = api_pb2.SandboxRestoreRequest.SANDBOX_NAME_OVERRIDE_TYPE_STRING
+            name_override = name
+
+        if use_v2:
+            return await _Sandbox._experimental_from_snapshot_v2(
+                snapshot, client, override_type=override_type, name_override=name_override
             )
+
+        restore_req = api_pb2.SandboxRestoreRequest(
+            snapshot_id=snapshot.object_id,
+            sandbox_name_override_type=override_type,
+        )
+        if name_override is not None:
+            restore_req.sandbox_name_override = name_override
         # Pin the restored Sandbox to a specific worker when MODAL_WORKER_ID is
         # set.
         if worker_id := config.get("worker_id"):
@@ -2153,6 +2185,33 @@ class _Sandbox(_Object, type_prefix="sb"):
             raise ExecutionError(resp.task_result.exception)
         return sandbox
 
+    @staticmethod
+    async def _experimental_from_snapshot_v2(
+        snapshot: _SandboxSnapshot,
+        client: _Client,
+        *,
+        override_type: "api_pb2.SandboxRestoreRequest.SandboxNameOverrideType.ValueType",
+        name_override: str | None,
+    ) -> "_Sandbox":
+        restore_req = api_pb2.SandboxRestoreV2Request(
+            snapshot_id=snapshot.object_id,
+            sandbox_name_override_type=override_type,
+        )
+        if name_override is not None:
+            restore_req.sandbox_name_override = name_override
+        if worker_id := config.get("worker_id"):
+            restore_req.worker_id = worker_id
+
+        assert client._auth_token_manager
+        auth_token = await client._auth_token_manager.get_token()
+        restore_resp: api_pb2.SandboxRestoreV2Response = await client.stub.SandboxRestoreV2(
+            restore_req, metadata=[("x-modal-auth-token", auth_token)]
+        )
+
+        sandbox = await _Sandbox.from_id(restore_resp.sandbox_id, client)
+        sandbox._task_id = restore_resp.task_id
+        return sandbox
+
     @property
     def filesystem(self) -> _SandboxFilesystem:
         """Namespace for Sandbox filesystem APIs."""

{modal-1.5.3.dev9 → modal-1.5.3.dev10}/modal/sandbox.pyi

@@ -393,6 +393,7 @@ class _Sandbox(modal._object._Object):
         verbose: bool = False,
         custom_domain: typing.Optional[str] = None,
         client: typing.Optional[modal.client._Client] = None,
+        _experimental_enable_snapshot: bool = False,
     ) -> _Sandbox:
         """Create a sandbox using the V2 backend.
 
@@ -408,8 +409,9 @@ class _Sandbox(modal._object._Object):
         tuple that additionally sets a hard limit (fractional CPU cores; memory
         in MiB), matching `Sandbox.create()`.
 
-        Features like memory snapshots, network file systems, and GPUs are not
-        supported.
+        Pass `_experimental_enable_snapshot=True` to create a sandbox that can be
+        snapshotted with `._experimental_snapshot()`. Features like network
+        file systems and GPUs are not supported.
 
         Set `i6pn=True` to enable private IPv6 networking so sandboxes in the same
         workspace can address each other directly at their `i6pn.modal.local`
@@ -852,7 +854,22 @@ class _Sandbox(modal._object._Object):
         client: typing.Optional[modal.client._Client] = None,
         *,
         name: typing.Optional[str] = _DEFAULT_SANDBOX_NAME_OVERRIDE,
-    ): ...
+    ):
+        """Restore a Sandbox from a memory snapshot.
+
+        The restore targets the same backend the snapshot was taken from. A V1
+        snapshot restores as a V1 sandbox, a V2 snapshot as a V2 sandbox.
+        """
+        ...
+
+    @staticmethod
+    async def _experimental_from_snapshot_v2(
+        snapshot: modal.snapshot._SandboxSnapshot,
+        client: modal.client._Client,
+        *,
+        override_type: int,
+        name_override: typing.Optional[str],
+    ) -> _Sandbox: ...
     @property
     def filesystem(self) -> modal.sandbox_fs._SandboxFilesystem:
         """Namespace for Sandbox filesystem APIs."""
@@ -1768,6 +1785,7 @@ class Sandbox(modal.object.Object):
             verbose: bool = False,
             custom_domain: typing.Optional[str] = None,
             client: typing.Optional[modal.client.Client] = None,
+            _experimental_enable_snapshot: bool = False,
         ) -> Sandbox:
             """Create a sandbox using the V2 backend.
 
@@ -1783,8 +1801,9 @@ class Sandbox(modal.object.Object):
             tuple that additionally sets a hard limit (fractional CPU cores; memory
             in MiB), matching `Sandbox.create()`.
 
-            Features like memory snapshots, network file systems, and GPUs are not
-            supported.
+            Pass `_experimental_enable_snapshot=True` to create a sandbox that can be
+            snapshotted with `._experimental_snapshot()`. Features like network
+            file systems and GPUs are not supported.
 
             Set `i6pn=True` to enable private IPv6 networking so sandboxes in the same
             workspace can address each other directly at their `i6pn.modal.local`
@@ -1837,6 +1856,7 @@ class Sandbox(modal.object.Object):
             verbose: bool = False,
             custom_domain: typing.Optional[str] = None,
             client: typing.Optional[modal.client.Client] = None,
+            _experimental_enable_snapshot: bool = False,
         ) -> Sandbox:
             """Create a sandbox using the V2 backend.
 
@@ -1852,8 +1872,9 @@ class Sandbox(modal.object.Object):
             tuple that additionally sets a hard limit (fractional CPU cores; memory
             in MiB), matching `Sandbox.create()`.
 
-            Features like memory snapshots, network file systems, and GPUs are not
-            supported.
+            Pass `_experimental_enable_snapshot=True` to create a sandbox that can be
+            snapshotted with `._experimental_snapshot()`. Features like network
+            file systems and GPUs are not supported.
 
             Set `i6pn=True` to enable private IPv6 networking so sandboxes in the same
             workspace can address each other directly at their `i6pn.modal.local`
@@ -2802,7 +2823,14 @@ class Sandbox(modal.object.Object):
             client: typing.Optional[modal.client.Client] = None,
             *,
             name: typing.Optional[str] = _DEFAULT_SANDBOX_NAME_OVERRIDE,
-        ): ...
+        ):
+            """Restore a Sandbox from a memory snapshot.
+
+            The restore targets the same backend the snapshot was taken from. A V1
+            snapshot restores as a V1 sandbox, a V2 snapshot as a V2 sandbox.
+            """
+            ...
+
         async def aio(
             self,
             /,
@@ -2810,10 +2838,38 @@ class Sandbox(modal.object.Object):
             client: typing.Optional[modal.client.Client] = None,
             *,
             name: typing.Optional[str] = _DEFAULT_SANDBOX_NAME_OVERRIDE,
-        ): ...
+        ):
+            """Restore a Sandbox from a memory snapshot.
+
+            The restore targets the same backend the snapshot was taken from. A V1
+            snapshot restores as a V1 sandbox, a V2 snapshot as a V2 sandbox.
+            """
+            ...
 
     _experimental_from_snapshot: typing.ClassVar[___experimental_from_snapshot_spec]
 
+    class ___experimental_from_snapshot_v2_spec(typing_extensions.Protocol):
+        def __call__(
+            self,
+            /,
+            snapshot: modal.snapshot.SandboxSnapshot,
+            client: modal.client.Client,
+            *,
+            override_type: int,
+            name_override: typing.Optional[str],
+        ) -> Sandbox: ...
+        async def aio(
+            self,
+            /,
+            snapshot: modal.snapshot.SandboxSnapshot,
+            client: modal.client.Client,
+            *,
+            override_type: int,
+            name_override: typing.Optional[str],
+        ) -> Sandbox: ...
+
+    _experimental_from_snapshot_v2: typing.ClassVar[___experimental_from_snapshot_v2_spec]
+
     @property
     def filesystem(self) -> modal.sandbox_fs.SandboxFilesystem:
         """Namespace for Sandbox filesystem APIs."""

{modal-1.5.3.dev9 → modal-1.5.3.dev10}/modal/secret.py

@@ -263,6 +263,15 @@ class _Secret(_Object, type_prefix="st"):
         assert self._metadata
         return self._metadata
 
+    @property
+    def _is_ephemeral(self) -> bool:
+        """Whether this Secret is backed by a locally-resolvable env dict rather than a named deployment.
+
+        True for Secrets created via `from_dict`, `from_dotenv`, or `from_local_environ`, whose contents
+        can be resolved locally and inlined; False for `from_name` references that must be resolved server-side.
+        """
+        return self._load_env_dict is not None
+
     @staticmethod
     def from_dict(
         env_dict: dict[str, str | None] = {},

{modal-1.5.3.dev9 → modal-1.5.3.dev10}/modal/secret.pyi

@@ -432,6 +432,15 @@ class _Secret(modal._object._Object):
     def name(self) -> typing.Optional[str]: ...
     def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
     def _get_metadata(self) -> modal_proto.api_pb2.SecretMetadata: ...
+    @property
+    def _is_ephemeral(self) -> bool:
+        """Whether this Secret is backed by a locally-resolvable env dict rather than a named deployment.
+
+        True for Secrets created via `from_dict`, `from_dotenv`, or `from_local_environ`, whose contents
+        can be resolved locally and inlined; False for `from_name` references that must be resolved server-side.
+        """
+        ...
+
     @staticmethod
     def from_dict(env_dict: dict[str, typing.Optional[str]] = {}) -> _Secret:
         """Create a Secret from a dictionary of environment variable names to string values.
@@ -588,6 +597,15 @@ class Secret(modal.object.Object):
     def name(self) -> typing.Optional[str]: ...
     def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
     def _get_metadata(self) -> modal_proto.api_pb2.SecretMetadata: ...
+    @property
+    def _is_ephemeral(self) -> bool:
+        """Whether this Secret is backed by a locally-resolvable env dict rather than a named deployment.
+
+        True for Secrets created via `from_dict`, `from_dotenv`, or `from_local_environ`, whose contents
+        can be resolved locally and inlined; False for `from_name` references that must be resolved server-side.
+        """
+        ...
+
     @staticmethod
     def from_dict(env_dict: dict[str, typing.Optional[str]] = {}) -> Secret:
         """Create a Secret from a dictionary of environment variable names to string values.

{modal-1.5.3.dev9 → modal-1.5.3.dev10}/modal/snapshot.py

@@ -2,6 +2,7 @@
 from typing import cast
 
 import typing_extensions
+from google.protobuf.message import Message
 
 import modal.client
 from modal_proto import api_pb2
@@ -22,6 +23,21 @@ class _SandboxSnapshot(_Object, type_prefix="sn"):
     the original Sandbox at the time the snapshot was taken.
     """
 
+    _metadata: "api_pb2.SandboxSnapshotHandleMetadata | None" = None
+
+    def _hydrate_metadata(self, metadata: Message | None):
+        if metadata:
+            assert isinstance(metadata, api_pb2.SandboxSnapshotHandleMetadata)
+            self._metadata = metadata
+
+    def _get_metadata(self) -> "api_pb2.SandboxSnapshotHandleMetadata | None":
+        return self._metadata
+
+    @property
+    def _is_v2(self) -> bool | None:
+        """Whether the snapshot came from a V2 sandbox."""
+        return self._metadata.is_v2 if self._metadata is not None else None
+
     @deprecate_aio_usage((2025, 12, 5), "SandboxSnapshot.from_id")
     @classmethod
     def from_id(cls, sandbox_snapshot_id: str, client: "modal.client.Client | None" = None) -> typing_extensions.Self:
@@ -45,7 +61,7 @@ class _SandboxSnapshot(_Object, type_prefix="sn"):
             resp: api_pb2.SandboxSnapshotGetResponse = await load_context.client.stub.SandboxSnapshotGet(
                 api_pb2.SandboxSnapshotGetRequest(snapshot_id=sandbox_snapshot_id)
             )
-            self._hydrate(resp.snapshot_id, load_context.client, None)
+            self._hydrate(resp.snapshot_id, load_context.client, resp.handle_metadata)
 
         rep = "SandboxSnapshot()"
         obj = _SandboxSnapshot._from_loader(

{modal-1.5.3.dev9 → modal-1.5.3.dev10}/modal/snapshot.pyi

@@ -1,6 +1,8 @@
+import google.protobuf.message
 import modal._object
 import modal.client
 import modal.object
+import modal_proto.api_pb2
 import typing
 import typing_extensions
 
@@ -13,6 +15,16 @@ class _SandboxSnapshot(modal._object._Object):
     `._experimental_snapshot()` on a Sandbox instance. This includes both the filesystem and memory state of
     the original Sandbox at the time the snapshot was taken.
     """
+
+    _metadata: typing.Optional[modal_proto.api_pb2.SandboxSnapshotHandleMetadata]
+
+    def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
+    def _get_metadata(self) -> typing.Optional[modal_proto.api_pb2.SandboxSnapshotHandleMetadata]: ...
+    @property
+    def _is_v2(self) -> typing.Optional[bool]:
+        """Whether the snapshot came from a V2 sandbox."""
+        ...
+
     class __from_id_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
             self, /, sandbox_snapshot_id: str, client: typing.Optional[modal.client.Client] = None
@@ -39,10 +51,20 @@ class SandboxSnapshot(modal.object.Object):
     `._experimental_snapshot()` on a Sandbox instance. This includes both the filesystem and memory state of
     the original Sandbox at the time the snapshot was taken.
     """
+
+    _metadata: typing.Optional[modal_proto.api_pb2.SandboxSnapshotHandleMetadata]
+
     def __init__(self, *args, **kwargs):
         """mdmd:hidden"""
         ...
 
+    def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
+    def _get_metadata(self) -> typing.Optional[modal_proto.api_pb2.SandboxSnapshotHandleMetadata]: ...
+    @property
+    def _is_v2(self) -> typing.Optional[bool]:
+        """Whether the snapshot came from a V2 sandbox."""
+        ...
+
     class __from_id_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
             self, /, sandbox_snapshot_id: str, client: typing.Optional[modal.client.Client] = None

{modal-1.5.3.dev9 → modal-1.5.3.dev10}/modal.egg-info/PKG-INFO

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