modal 1.1.5.dev28__tar.gz → 1.1.5.dev30__tar.gz

{modal-1.1.5.dev28 → modal-1.1.5.dev30}/PKG-INFO

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

{modal-1.1.5.dev28 → modal-1.1.5.dev30}/modal/client.pyi

@@ -33,7 +33,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.1.5.dev28",
+        version: str = "1.1.5.dev30",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -164,7 +164,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.1.5.dev28",
+        version: str = "1.1.5.dev30",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.1.5.dev28 → modal-1.1.5.dev30}/modal/functions.pyi

@@ -449,7 +449,7 @@ class Function(
 
     _call_generator: ___call_generator_spec[typing_extensions.Self]
 
-    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         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."""
             ...
@@ -458,7 +458,7 @@ class Function(
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
 
-    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
+    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
 
     class __remote_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -485,7 +485,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         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.
 
@@ -509,7 +509,7 @@ class Function(
             ...
 
     _experimental_spawn: ___experimental_spawn_spec[
-        modal._functions.P, modal._functions.ReturnType, typing_extensions.Self
+        modal._functions.ReturnType, modal._functions.P, typing_extensions.Self
     ]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER, SUPERSELF]):
@@ -518,7 +518,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P, typing_extensions.Self]
 
-    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         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.
 
@@ -539,7 +539,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function."""

{modal-1.1.5.dev28 → modal-1.1.5.dev30}/modal/sandbox.py

@@ -562,7 +562,17 @@ class _Sandbox(_Object, type_prefix="sb"):
 
         return obj
 
-    async def set_tags(self, tags: dict[str, str], *, client: Optional[_Client] = None):
+    async def get_tags(self) -> dict[str, str]:
+        """Fetches any tags (key-value pairs) currently attached to this Sandbox from the server."""
+        req = api_pb2.SandboxTagsGetRequest(sandbox_id=self.object_id)
+        try:
+            resp = await retry_transient_errors(self._client.stub.SandboxTagsGet, req)
+        except GRPCError as exc:
+            raise InvalidError(exc.message) if exc.status == Status.INVALID_ARGUMENT else exc
+
+        return {tag.tag_name: tag.tag_value for tag in resp.tags}
+
+    async def set_tags(self, tags: dict[str, str], *, client: Optional[_Client] = None) -> None:
         """Set tags (key-value pairs) on the Sandbox. Tags can be used to filter results in `Sandbox.list`."""
         environment_name = _get_environment_name()
         if client is None:

{modal-1.1.5.dev28 → modal-1.1.5.dev30}/modal/sandbox.pyi

@@ -241,7 +241,11 @@ class _Sandbox(modal._object._Object):
         """
         ...
 
-    async def set_tags(self, tags: dict[str, str], *, client: typing.Optional[modal.client._Client] = None):
+    async def get_tags(self) -> dict[str, str]:
+        """Fetches any tags (key-value pairs) currently attached to this Sandbox from the server."""
+        ...
+
+    async def set_tags(self, tags: dict[str, str], *, client: typing.Optional[modal.client._Client] = None) -> None:
         """Set tags (key-value pairs) on the Sandbox. Tags can be used to filter results in `Sandbox.list`."""
         ...
 
@@ -744,12 +748,23 @@ class Sandbox(modal.object.Object):
 
     from_id: __from_id_spec
 
+    class __get_tags_spec(typing_extensions.Protocol[SUPERSELF]):
+        def __call__(self, /) -> dict[str, str]:
+            """Fetches any tags (key-value pairs) currently attached to this Sandbox from the server."""
+            ...
+
+        async def aio(self, /) -> dict[str, str]:
+            """Fetches any tags (key-value pairs) currently attached to this Sandbox from the server."""
+            ...
+
+    get_tags: __get_tags_spec[typing_extensions.Self]
+
     class __set_tags_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, /, tags: dict[str, str], *, client: typing.Optional[modal.client.Client] = None):
+        def __call__(self, /, tags: dict[str, str], *, client: typing.Optional[modal.client.Client] = None) -> None:
             """Set tags (key-value pairs) on the Sandbox. Tags can be used to filter results in `Sandbox.list`."""
             ...
 
-        async def aio(self, /, tags: dict[str, str], *, client: typing.Optional[modal.client.Client] = None):
+        async def aio(self, /, tags: dict[str, str], *, client: typing.Optional[modal.client.Client] = None) -> None:
             """Set tags (key-value pairs) on the Sandbox. Tags can be used to filter results in `Sandbox.list`."""
             ...
 

{modal-1.1.5.dev28 → modal-1.1.5.dev30}/modal.egg-info/PKG-INFO

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

{modal-1.1.5.dev28 → modal-1.1.5.dev30}/modal_proto/api.proto

@@ -2881,6 +2881,14 @@ message SandboxTag {
   string tag_value = 2;
 }
 
+message SandboxTagsGetRequest {
+  string sandbox_id = 1;
+}
+
+message SandboxTagsGetResponse {
+  repeated SandboxTag tags = 1;
+}
+
 message SandboxTagsSetRequest {
   string environment_name = 1;
   string sandbox_id = 2;
@@ -3680,6 +3688,7 @@ service ModalClient {
   rpc SandboxSnapshotGet(SandboxSnapshotGetRequest) returns (SandboxSnapshotGetResponse);
   rpc SandboxSnapshotWait(SandboxSnapshotWaitRequest) returns (SandboxSnapshotWaitResponse);
   rpc SandboxStdinWrite(SandboxStdinWriteRequest) returns (SandboxStdinWriteResponse);
+  rpc SandboxTagsGet(SandboxTagsGetRequest) returns (SandboxTagsGetResponse);
   rpc SandboxTagsSet(SandboxTagsSetRequest) returns (google.protobuf.Empty);
   rpc SandboxTerminate(SandboxTerminateRequest) returns (SandboxTerminateResponse);
   rpc SandboxWait(SandboxWaitRequest) returns (SandboxWaitResponse);

{modal-1.1.5.dev28 → modal-1.1.5.dev30}/modal_proto/api_grpc.py

@@ -526,6 +526,10 @@ class ModalClientBase(abc.ABC):
     async def SandboxStdinWrite(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxStdinWriteRequest, modal_proto.api_pb2.SandboxStdinWriteResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def SandboxTagsGet(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxTagsGetRequest, modal_proto.api_pb2.SandboxTagsGetResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def SandboxTagsSet(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxTagsSetRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
@@ -1458,6 +1462,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.SandboxStdinWriteRequest,
                 modal_proto.api_pb2.SandboxStdinWriteResponse,
             ),
+            '/modal.client.ModalClient/SandboxTagsGet': grpclib.const.Handler(
+                self.SandboxTagsGet,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.SandboxTagsGetRequest,
+                modal_proto.api_pb2.SandboxTagsGetResponse,
+            ),
             '/modal.client.ModalClient/SandboxTagsSet': grpclib.const.Handler(
                 self.SandboxTagsSet,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -2478,6 +2488,12 @@ class ModalClientStub:
             modal_proto.api_pb2.SandboxStdinWriteRequest,
             modal_proto.api_pb2.SandboxStdinWriteResponse,
         )
+        self.SandboxTagsGet = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/SandboxTagsGet',
+            modal_proto.api_pb2.SandboxTagsGetRequest,
+            modal_proto.api_pb2.SandboxTagsGetResponse,
+        )
         self.SandboxTagsSet = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/SandboxTagsSet',