modal 1.5.4.dev4__tar.gz → 1.5.4.dev6__tar.gz

{modal-1.5.4.dev4 → modal-1.5.4.dev6}/PKG-INFO

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

{modal-1.5.4.dev4 → modal-1.5.4.dev6}/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.4.dev4",
+        version: str = "1.5.4.dev6",
     ):
         """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.4.dev4",
+        version: str = "1.5.4.dev6",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.5.4.dev4 → modal-1.5.4.dev6}/modal/functions.pyi

@@ -546,7 +546,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.
 
@@ -571,7 +571,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]:
@@ -621,7 +621,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.
 
@@ -654,7 +654,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: ...
@@ -662,7 +662,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.
 
@@ -695,7 +695,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.4.dev4 → modal-1.5.4.dev6}/modal/sandbox.py

@@ -80,7 +80,6 @@ from .stream_type import StreamType
 from .types import FileWatchEvent, FileWatchEventType, SandboxConnectCredentials
 
 _default_image: _Image = _Image.debian_slim()
-_EXIT_SNAPSHOT_POLL_INTERVAL_SECONDS = 1.0
 _EXIT_SNAPSHOT_NOT_FOUND_ERROR_CODES = frozenset((api_pb2.SandboxGetExitSnapshotResponse.ERROR_CODE_TIMEOUT,))
 
 
@@ -1415,13 +1414,12 @@ class _Sandbox(_Object, type_prefix="sb"):
         req = sr_pb2.TaskSetNetworkAccessRequest(task_id=task_id, network_access=network_access)
         await command_router_client.set_network_access(req)
 
-    async def _experimental_get_exit_snapshot(self, timeout: float | None = 60) -> _Image:
+    async def _experimental_get_exit_snapshot(self, timeout: float | None = None) -> _Image:
         """Get the exit filesystem snapshot image.
 
         Args:
-            timeout: Client-side deadline in seconds (default 60). Use `None` to
-                poll until the snapshot reaches a terminal state. Use `0` to
-                perform an immediate check.
+            timeout: Deadline in seconds. `None` polls until the snapshot reaches
+                a terminal state. `0` performs an immediate check.
 
         Returns:
             The exit snapshot Image.
@@ -1443,17 +1441,20 @@ class _Sandbox(_Object, type_prefix="sb"):
 
         deadline = None if timeout is None else time.monotonic() + timeout
         timeout_message = f"timed out waiting for exit snapshot for Sandbox {self.object_id}"
+        # Use the private __client so the lookup works with a detached sandbox
+        client = self.__client
 
         while True:
-            resp: api_pb2.SandboxGetExitSnapshotResponse = await self._client.stub.SandboxGetExitSnapshot(
-                api_pb2.SandboxGetExitSnapshotRequest(sandbox_id=self.object_id)
+            request_timeout = 10.0 if deadline is None else min(10.0, max(0.0, deadline - time.monotonic()))
+            resp: api_pb2.SandboxGetExitSnapshotResponse = await client.stub.SandboxGetExitSnapshot(
+                api_pb2.SandboxGetExitSnapshotRequest(sandbox_id=self.object_id, timeout=request_timeout)
             )
             outcome = resp.WhichOneof("outcome")
 
             if outcome == "success":
                 if not resp.success.image_id:
                     raise InternalError("Exit snapshot result is missing image ID")
-                return _Image._new_hydrated(resp.success.image_id, self._client, None)
+                return _Image._new_hydrated(resp.success.image_id, client, None)
 
             if outcome == "error":
                 if resp.error.error_code in _EXIT_SNAPSHOT_NOT_FOUND_ERROR_CODES:
@@ -1465,15 +1466,6 @@ class _Sandbox(_Object, type_prefix="sb"):
             if outcome != "pending":
                 raise InternalError("Exit snapshot response is missing an outcome")
 
-            sleep_for = _EXIT_SNAPSHOT_POLL_INTERVAL_SECONDS
-            if deadline is not None:
-                remaining = deadline - time.monotonic()
-                if remaining <= 0:
-                    raise TimeoutError(timeout_message)
-                sleep_for = min(sleep_for, remaining)
-
-            await asyncio.sleep(sleep_for)
-
             if deadline is not None and time.monotonic() >= deadline:
                 raise TimeoutError(timeout_message)
 
@@ -1793,7 +1785,6 @@ class _Sandbox(_Object, type_prefix="sb"):
         Returns:
             URL and token credentials for connecting to the sandbox over HTTP.
         """
-        self._ensure_v1("create_connect_token")
         if user_metadata is not None and isinstance(user_metadata, dict):
             try:
                 user_metadata = json.dumps(user_metadata)
@@ -1806,7 +1797,14 @@ class _Sandbox(_Object, type_prefix="sb"):
         req = api_pb2.SandboxCreateConnectTokenRequest(
             sandbox_id=self.object_id, user_metadata=user_metadata, port=port
         )
-        resp = await self._client.stub.SandboxCreateConnectToken(req)
+        if self._is_v2:
+            assert self._client._auth_token_manager
+            auth_token = await self._client._auth_token_manager.get_token()
+            resp = await self._client.stub.SandboxCreateConnectTokenV2(
+                req, metadata=[("x-modal-auth-token", auth_token)]
+            )
+        else:
+            resp = await self._client.stub.SandboxCreateConnectToken(req)
         return SandboxConnectCredentials(resp.url, resp.token)
 
     async def reload_volumes(self, *, timeout: int = 55) -> None:

{modal-1.5.4.dev4 → modal-1.5.4.dev6}/modal/sandbox.pyi

@@ -573,13 +573,12 @@ class _Sandbox(modal._object._Object):
         """
         ...
 
-    async def _experimental_get_exit_snapshot(self, timeout: typing.Optional[float] = 60) -> modal._image._Image:
+    async def _experimental_get_exit_snapshot(self, timeout: typing.Optional[float] = None) -> modal._image._Image:
         """Get the exit filesystem snapshot image.
 
         Args:
-            timeout: Client-side deadline in seconds (default 60). Use `None` to
-                poll until the snapshot reaches a terminal state. Use `0` to
-                perform an immediate check.
+            timeout: Deadline in seconds. `None` polls until the snapshot reaches
+                a terminal state. `0` performs an immediate check.
 
         Returns:
             The exit snapshot Image.
@@ -2257,13 +2256,12 @@ class Sandbox(modal.object.Object):
     _experimental_set_outbound_network_policy: ___experimental_set_outbound_network_policy_spec
 
     class ___experimental_get_exit_snapshot_spec(typing_extensions.Protocol):
-        def __call__(self, /, timeout: typing.Optional[float] = 60) -> modal.image.Image:
+        def __call__(self, /, timeout: typing.Optional[float] = None) -> modal.image.Image:
             """Get the exit filesystem snapshot image.
 
             Args:
-                timeout: Client-side deadline in seconds (default 60). Use `None` to
-                    poll until the snapshot reaches a terminal state. Use `0` to
-                    perform an immediate check.
+                timeout: Deadline in seconds. `None` polls until the snapshot reaches
+                    a terminal state. `0` performs an immediate check.
 
             Returns:
                 The exit snapshot Image.
@@ -2282,13 +2280,12 @@ class Sandbox(modal.object.Object):
             """
             ...
 
-        async def aio(self, /, timeout: typing.Optional[float] = 60) -> modal.image.Image:
+        async def aio(self, /, timeout: typing.Optional[float] = None) -> modal.image.Image:
             """Get the exit filesystem snapshot image.
 
             Args:
-                timeout: Client-side deadline in seconds (default 60). Use `None` to
-                    poll until the snapshot reaches a terminal state. Use `0` to
-                    perform an immediate check.
+                timeout: Deadline in seconds. `None` polls until the snapshot reaches
+                    a terminal state. `0` performs an immediate check.
 
             Returns:
                 The exit snapshot Image.

{modal-1.5.4.dev4 → modal-1.5.4.dev6}/modal.egg-info/PKG-INFO

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

{modal-1.5.4.dev4 → modal-1.5.4.dev6}/modal_proto/api_grpc.py

@@ -587,6 +587,10 @@ class ModalClientBase(abc.ABC):
     async def SandboxCreateConnectToken(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxCreateConnectTokenRequest, modal_proto.api_pb2.SandboxCreateConnectTokenResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def SandboxCreateConnectTokenV2(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxCreateConnectTokenRequest, modal_proto.api_pb2.SandboxCreateConnectTokenResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def SandboxCreateV2(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxCreateV2Request, modal_proto.api_pb2.SandboxCreateV2Response]') -> None:
         pass
@@ -1805,6 +1809,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.SandboxCreateConnectTokenRequest,
                 modal_proto.api_pb2.SandboxCreateConnectTokenResponse,
             ),
+            '/modal.client.ModalClient/SandboxCreateConnectTokenV2': grpclib.const.Handler(
+                self.SandboxCreateConnectTokenV2,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.SandboxCreateConnectTokenRequest,
+                modal_proto.api_pb2.SandboxCreateConnectTokenResponse,
+            ),
             '/modal.client.ModalClient/SandboxCreateV2': grpclib.const.Handler(
                 self.SandboxCreateV2,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -3209,6 +3219,12 @@ class ModalClientStub:
             modal_proto.api_pb2.SandboxCreateConnectTokenRequest,
             modal_proto.api_pb2.SandboxCreateConnectTokenResponse,
         )
+        self.SandboxCreateConnectTokenV2 = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/SandboxCreateConnectTokenV2',
+            modal_proto.api_pb2.SandboxCreateConnectTokenRequest,
+            modal_proto.api_pb2.SandboxCreateConnectTokenResponse,
+        )
         self.SandboxCreateV2 = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/SandboxCreateV2',