modal 1.4.3.dev24__tar.gz → 1.4.3.dev25__tar.gz

{modal-1.4.3.dev24 → modal-1.4.3.dev25}/PKG-INFO

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

{modal-1.4.3.dev24 → modal-1.4.3.dev25}/modal/client.pyi

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

{modal-1.4.3.dev24 → modal-1.4.3.dev25}/modal/functions.pyi

@@ -347,7 +347,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."""
             ...
@@ -356,7 +356,7 @@ class Function(
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
 
-    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]:
@@ -383,7 +383,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.
 
@@ -406,7 +406,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: ...
@@ -414,7 +414,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.
 
@@ -435,7 +435,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.4.3.dev24 → modal-1.4.3.dev25}/modal/sandbox.py

@@ -37,9 +37,11 @@ from .client import _Client
 from .container_process import _ContainerProcess
 from .exception import (
     ClientClosed,
+    ConflictError,
     Error,
     ExecutionError,
     InvalidError,
+    NotFoundError,
     SandboxTerminatedError,
     SandboxTimeoutError,
     TimeoutError,
@@ -1261,12 +1263,15 @@ class _Sandbox(_Object, type_prefix="sb"):
 
     async def _get_command_router_client(self, task_id: str) -> TaskCommandRouterClient:
         if self._command_router_client is None:
-            if self._is_v2:
-                self._command_router_client = await TaskCommandRouterClient.init_v2(
-                    self._client, self.object_id, task_id
-                )
-            else:
-                self._command_router_client = await TaskCommandRouterClient.init(self._client, task_id)
+            try:
+                if self._is_v2:
+                    self._command_router_client = await TaskCommandRouterClient.init_v2(
+                        self._client, self.object_id, task_id
+                    )
+                else:
+                    self._command_router_client = await TaskCommandRouterClient.init(self._client, task_id)
+            except (ConflictError, NotFoundError):
+                raise NotFoundError("Sandbox already finished")
         return self._command_router_client
 
     @property

{modal-1.4.3.dev24 → modal-1.4.3.dev25}/modal/sandbox_fs.py

@@ -112,7 +112,7 @@ class _SandboxFilesystem:
 
         **Usage**
 
-        ```python fixture:sandbox
+        ```python fixture:sandbox fixture:tmpdir
         import tempfile
         from pathlib import Path
 
@@ -173,7 +173,7 @@ class _SandboxFilesystem:
 
         **Usage**
 
-        ```python fixture:sandbox
+        ```python fixture:sandbox fixture:tmpdir
         sandbox.filesystem.write_text("Hello, world!\\n", "/tmp/hello.txt")
         sandbox.filesystem.copy_to_local("/tmp/hello.txt", "/tmp/local-hello.txt")
         ```

{modal-1.4.3.dev24 → modal-1.4.3.dev25}/modal/sandbox_fs.pyi

@@ -101,7 +101,7 @@ class _SandboxFilesystem:
 
         **Usage**
 
-        ```python fixture:sandbox
+        ```python fixture:sandbox fixture:tmpdir
         import tempfile
         from pathlib import Path
 
@@ -131,7 +131,7 @@ class _SandboxFilesystem:
 
         **Usage**
 
-        ```python fixture:sandbox
+        ```python fixture:sandbox fixture:tmpdir
         sandbox.filesystem.write_text("Hello, world!\n", "/tmp/hello.txt")
         sandbox.filesystem.copy_to_local("/tmp/hello.txt", "/tmp/local-hello.txt")
         ```
@@ -365,7 +365,7 @@ class SandboxFilesystem:
 
             **Usage**
 
-            ```python fixture:sandbox
+            ```python fixture:sandbox fixture:tmpdir
             import tempfile
             from pathlib import Path
 
@@ -395,7 +395,7 @@ class SandboxFilesystem:
 
             **Usage**
 
-            ```python fixture:sandbox
+            ```python fixture:sandbox fixture:tmpdir
             import tempfile
             from pathlib import Path
 
@@ -428,7 +428,7 @@ class SandboxFilesystem:
 
             **Usage**
 
-            ```python fixture:sandbox
+            ```python fixture:sandbox fixture:tmpdir
             sandbox.filesystem.write_text("Hello, world!\n", "/tmp/hello.txt")
             sandbox.filesystem.copy_to_local("/tmp/hello.txt", "/tmp/local-hello.txt")
             ```
@@ -454,7 +454,7 @@ class SandboxFilesystem:
 
             **Usage**
 
-            ```python fixture:sandbox
+            ```python fixture:sandbox fixture:tmpdir
             sandbox.filesystem.write_text("Hello, world!\n", "/tmp/hello.txt")
             sandbox.filesystem.copy_to_local("/tmp/hello.txt", "/tmp/local-hello.txt")
             ```

{modal-1.4.3.dev24 → modal-1.4.3.dev25}/modal.egg-info/PKG-INFO

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

{modal-1.4.3.dev24 → modal-1.4.3.dev25}/modal_proto/api_grpc.py

@@ -259,6 +259,10 @@ class ModalClientBase(abc.ABC):
     async def DomainList(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.DomainListRequest, modal_proto.api_pb2.DomainListResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def EndpointCreate(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EndpointCreateRequest, modal_proto.api_pb2.EndpointCreateResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def EnvironmentCreate(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EnvironmentCreateRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
@@ -1173,6 +1177,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.DomainListRequest,
                 modal_proto.api_pb2.DomainListResponse,
             ),
+            '/modal.client.ModalClient/EndpointCreate': grpclib.const.Handler(
+                self.EndpointCreate,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.EndpointCreateRequest,
+                modal_proto.api_pb2.EndpointCreateResponse,
+            ),
             '/modal.client.ModalClient/EnvironmentCreate': grpclib.const.Handler(
                 self.EnvironmentCreate,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -2367,6 +2377,12 @@ class ModalClientStub:
             modal_proto.api_pb2.DomainListRequest,
             modal_proto.api_pb2.DomainListResponse,
         )
+        self.EndpointCreate = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/EndpointCreate',
+            modal_proto.api_pb2.EndpointCreateRequest,
+            modal_proto.api_pb2.EndpointCreateResponse,
+        )
         self.EnvironmentCreate = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/EnvironmentCreate',