modal 1.5.6.dev3__tar.gz → 1.5.6.dev5__tar.gz

{modal-1.5.6.dev3 → modal-1.5.6.dev5}/PKG-INFO

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

{modal-1.5.6.dev3 → modal-1.5.6.dev5}/modal/_utils/grpc_utils.py

@@ -199,16 +199,23 @@ class ConnectionManager:
         self._client = client
         # This metadata is injected into all requests on all channels created by this manager.
         self._metadata = metadata
-        self._channels: dict[str, grpclib.client.Channel] = {}
+        self._channels: dict[str, asyncio.Future[grpclib.client.Channel]] = {}
 
     async def get_or_create_channel(self, server_url: str) -> grpclib.client.Channel:
-        if server_url not in self._channels:
-            self._channels[server_url] = await create_channel_with_fallbacks(server_url, self._metadata)
-        return self._channels[server_url]
+        fut = self._channels.get(server_url)
+        if fut is None or (fut.done() and (fut.cancelled() or fut.exception() is not None)):
+            # Cache the attempt rather than the channel, so callers racing to connect share one.
+            fut = asyncio.ensure_future(create_channel_with_fallbacks(server_url, self._metadata))
+            self._channels[server_url] = fut
+        # Shielded so one caller giving up doesn't cancel the connection for the others.
+        return await asyncio.shield(fut)
 
     def close(self):
-        for channel in self._channels.values():
-            channel.close()
+        for fut in self._channels.values():
+            if fut.done() and not fut.cancelled() and fut.exception() is None:
+                fut.result().close()
+            else:
+                fut.cancel()
         self._channels.clear()
 
 

{modal-1.5.6.dev3 → modal-1.5.6.dev5}/modal/client.pyi

@@ -77,7 +77,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.6.dev3",
+        version: str = "1.5.6.dev5",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):
@@ -277,7 +277,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.6.dev3",
+        version: str = "1.5.6.dev5",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):

{modal-1.5.6.dev3 → modal-1.5.6.dev5}/modal/mount.py

@@ -851,7 +851,7 @@ async def _create_single_client_dependency_mount(
         print(f"📦 Building {mount_name}.")  # noqa: T201
         requirements = os.path.join(os.path.dirname(__file__), f"builder/{builder_version}.txt")
         cmd = [
-            "uv",
+            os.environ.get("MODAL_UV_PATH", "uv"),
             "pip",
             "install",
             "--strict",
@@ -867,6 +867,11 @@ async def _create_single_client_dependency_mount(
             "--python",
             python_version,
         ]
+        # A directory holding wheels for every pin in the requirements file, for
+        # building mounts where no package index is reachable.
+        find_links = os.environ.get("MODAL_BUILDER_WHEEL_DIR")
+        if find_links:
+            cmd += ["--no-index", "--find-links", find_links]
         # Retry uv pip install on transient failures (e.g. network blips,
         # resource contention).  uv exits with non-zero on recoverable errors
         # like rate limits or connection resets.

{modal-1.5.6.dev3 → modal-1.5.6.dev5}/modal/sandbox.py

@@ -1577,6 +1577,15 @@ class _Sandbox(_Object, type_prefix="sb"):
                 raise InvalidError("ttl is not supported with MODAL_USE_LEGACY_FILESYSTEM_SNAPSHOT")
             return await self._legacy_snapshot_filesystem(timeout)
 
+        return await self._snapshot_filesystem(timeout, ttl=ttl)
+
+    async def _snapshot_filesystem(
+        self,
+        timeout: int,
+        *,
+        ttl: int | None,
+        container_id: str = "",
+    ) -> _Image:
         wire_ttl_seconds = _ttl_to_wire_ttl(ttl)
 
         task_id = await self._get_task_id()
@@ -1586,6 +1595,7 @@ class _Sandbox(_Object, type_prefix="sb"):
             task_id=task_id,
             snapshot_id=str(uuid.uuid4()),
             ttl_seconds=wire_ttl_seconds,
+            container_id=container_id,
         )
         res = await command_router_client.snapshot_filesystem(req, timeout=float(timeout))
         return _Image._new_hydrated(res.image_id, self._client, None)
@@ -2755,6 +2765,31 @@ class _SidecarContainer:
         command_router_client = await self._sandbox._get_command_router_client(task_id)
         return task_id, command_router_client
 
+    async def snapshot_filesystem(
+        self,
+        timeout: int = 55,
+        *,
+        ttl: int | None = 30 * 24 * 3600,
+    ) -> _Image:
+        """Snapshot this Sidecar container's filesystem.
+
+        Args:
+            timeout:
+                Maximum time in seconds to wait for the snapshot operation.
+            ttl:
+                The resulting Image is retained for `ttl` seconds (default: 30 days). Pass `ttl=None` to retain
+                the image indefinitely.
+
+        Returns:
+            An [`Image`](https://modal.com/docs/sdk/py/latest/Image) containing a snapshot of this Sidecar's
+            filesystem.
+        """
+        return await self._sandbox._snapshot_filesystem(
+            timeout,
+            ttl=ttl,
+            container_id=self._container_id,
+        )
+
     @typing.overload
     async def exec(
         self,

{modal-1.5.6.dev3 → modal-1.5.6.dev5}/modal/sandbox.pyi

@@ -637,6 +637,9 @@ class _Sandbox(modal._object._Object):
         """
         ...
 
+    async def _snapshot_filesystem(
+        self, timeout: int, *, ttl: typing.Optional[int], container_id: str = ""
+    ) -> modal._image._Image: ...
     async def _legacy_snapshot_filesystem(self, timeout: int = 55) -> modal._image._Image: ...
     async def mount_image(
         self,
@@ -1111,6 +1114,24 @@ class _SidecarContainer:
         """Get task ID and command router client."""
         ...
 
+    async def snapshot_filesystem(
+        self, timeout: int = 55, *, ttl: typing.Optional[int] = 2592000
+    ) -> modal._image._Image:
+        """Snapshot this Sidecar container's filesystem.
+
+        Args:
+            timeout:
+                Maximum time in seconds to wait for the snapshot operation.
+            ttl:
+                The resulting Image is retained for `ttl` seconds (default: 30 days). Pass `ttl=None` to retain
+                the image indefinitely.
+
+        Returns:
+            An [`Image`](https://modal.com/docs/sdk/py/latest/Image) containing a snapshot of this Sidecar's
+            filesystem.
+        """
+        ...
+
     @typing.overload
     async def exec(
         self,
@@ -1289,6 +1310,41 @@ class SidecarContainer:
 
     _get_command_router: ___get_command_router_spec
 
+    class __snapshot_filesystem_spec(typing_extensions.Protocol):
+        def __call__(self, /, timeout: int = 55, *, ttl: typing.Optional[int] = 2592000) -> modal.image.Image:
+            """Snapshot this Sidecar container's filesystem.
+
+            Args:
+                timeout:
+                    Maximum time in seconds to wait for the snapshot operation.
+                ttl:
+                    The resulting Image is retained for `ttl` seconds (default: 30 days). Pass `ttl=None` to retain
+                    the image indefinitely.
+
+            Returns:
+                An [`Image`](https://modal.com/docs/sdk/py/latest/Image) containing a snapshot of this Sidecar's
+                filesystem.
+            """
+            ...
+
+        async def aio(self, /, timeout: int = 55, *, ttl: typing.Optional[int] = 2592000) -> modal.image.Image:
+            """Snapshot this Sidecar container's filesystem.
+
+            Args:
+                timeout:
+                    Maximum time in seconds to wait for the snapshot operation.
+                ttl:
+                    The resulting Image is retained for `ttl` seconds (default: 30 days). Pass `ttl=None` to retain
+                    the image indefinitely.
+
+            Returns:
+                An [`Image`](https://modal.com/docs/sdk/py/latest/Image) containing a snapshot of this Sidecar's
+                filesystem.
+            """
+            ...
+
+    snapshot_filesystem: __snapshot_filesystem_spec
+
     class __exec_spec(typing_extensions.Protocol):
         @typing.overload
         def __call__(
@@ -2485,6 +2541,16 @@ class Sandbox(modal.object.Object):
 
     snapshot_filesystem: __snapshot_filesystem_spec
 
+    class ___snapshot_filesystem_spec(typing_extensions.Protocol):
+        def __call__(
+            self, /, timeout: int, *, ttl: typing.Optional[int], container_id: str = ""
+        ) -> modal.image.Image: ...
+        async def aio(
+            self, /, timeout: int, *, ttl: typing.Optional[int], container_id: str = ""
+        ) -> modal.image.Image: ...
+
+    _snapshot_filesystem: ___snapshot_filesystem_spec
+
     class ___legacy_snapshot_filesystem_spec(typing_extensions.Protocol):
         def __call__(self, /, timeout: int = 55) -> modal.image.Image: ...
         async def aio(self, /, timeout: int = 55) -> modal.image.Image: ...

{modal-1.5.6.dev3 → modal-1.5.6.dev5}/modal.egg-info/PKG-INFO

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

{modal-1.5.6.dev3 → modal-1.5.6.dev5}/modal_proto/api_grpc.py

@@ -411,6 +411,10 @@ class ModalClientBase(abc.ABC):
     async def FunctionGet(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.FunctionGetRequest, modal_proto.api_pb2.FunctionGetResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def FunctionGetById(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.FunctionGetByIdRequest, modal_proto.api_pb2.FunctionGetByIdResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def FunctionGetCallGraph(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.FunctionGetCallGraphRequest, modal_proto.api_pb2.FunctionGetCallGraphResponse]') -> None:
         pass
@@ -599,6 +603,10 @@ class ModalClientBase(abc.ABC):
     async def QueuePut(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.QueuePutRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def SandboxContainerCreateV2(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxContainerCreateV2Request, modal_proto.api_pb2.SandboxContainerCreateV2Response]') -> None:
+        pass
+
     @abc.abstractmethod
     async def SandboxCreate(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxCreateRequest, modal_proto.api_pb2.SandboxCreateResponse]') -> None:
         pass
@@ -1577,6 +1585,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.FunctionGetRequest,
                 modal_proto.api_pb2.FunctionGetResponse,
             ),
+            '/modal.client.ModalClient/FunctionGetById': grpclib.const.Handler(
+                self.FunctionGetById,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.FunctionGetByIdRequest,
+                modal_proto.api_pb2.FunctionGetByIdResponse,
+            ),
             '/modal.client.ModalClient/FunctionGetCallGraph': grpclib.const.Handler(
                 self.FunctionGetCallGraph,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -1859,6 +1873,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.QueuePutRequest,
                 google.protobuf.empty_pb2.Empty,
             ),
+            '/modal.client.ModalClient/SandboxContainerCreateV2': grpclib.const.Handler(
+                self.SandboxContainerCreateV2,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.SandboxContainerCreateV2Request,
+                modal_proto.api_pb2.SandboxContainerCreateV2Response,
+            ),
             '/modal.client.ModalClient/SandboxCreate': grpclib.const.Handler(
                 self.SandboxCreate,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -3035,6 +3055,12 @@ class ModalClientStub:
             modal_proto.api_pb2.FunctionGetRequest,
             modal_proto.api_pb2.FunctionGetResponse,
         )
+        self.FunctionGetById = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/FunctionGetById',
+            modal_proto.api_pb2.FunctionGetByIdRequest,
+            modal_proto.api_pb2.FunctionGetByIdResponse,
+        )
         self.FunctionGetCallGraph = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/FunctionGetCallGraph',
@@ -3317,6 +3343,12 @@ class ModalClientStub:
             modal_proto.api_pb2.QueuePutRequest,
             google.protobuf.empty_pb2.Empty,
         )
+        self.SandboxContainerCreateV2 = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/SandboxContainerCreateV2',
+            modal_proto.api_pb2.SandboxContainerCreateV2Request,
+            modal_proto.api_pb2.SandboxContainerCreateV2Response,
+        )
         self.SandboxCreate = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/SandboxCreate',