modal 1.1.5.dev34__tar.gz → 1.1.5.dev36__tar.gz

{modal-1.1.5.dev34 → modal-1.1.5.dev36}/PKG-INFO

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

{modal-1.1.5.dev34 → modal-1.1.5.dev36}/modal/cli/cluster.py

@@ -2,6 +2,7 @@
 from typing import Optional, Union
 
 import typer
+from rich.table import Column
 from rich.text import Text
 
 from modal._object import _get_environment_name
@@ -33,7 +34,12 @@ async def list_(env: Optional[str] = ENV_OPTION, json: bool = False):
         api_pb2.ClusterListRequest(environment_name=environment_name)
     )
 
-    column_names = ["Cluster ID", "App ID", "Start Time", "Nodes"]
+    column_names: list[Union[Column, str]] = [
+        Column("Cluster ID", min_width=25),
+        Column("App ID", min_width=25),
+        "Start Time",
+        "Nodes",
+    ]
     rows: list[list[Union[Text, str]]] = []
     res.clusters.sort(key=lambda c: c.started_at, reverse=True)
 

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

{modal-1.1.5.dev34 → modal-1.1.5.dev36}/modal/functions.pyi

@@ -449,7 +449,7 @@ class Function(
 
     _call_generator: ___call_generator_spec[typing_extensions.Self]
 
-    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_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.ReturnType, modal._functions.P, typing_extensions.Self]
+    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType, 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[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_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.ReturnType, modal._functions.P, typing_extensions.Self
+        modal._functions.P, modal._functions.ReturnType, 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[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_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.ReturnType, modal._functions.P, typing_extensions.Self]
+    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType, 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.dev34 → modal-1.1.5.dev36}/modal/sandbox.py

@@ -667,19 +667,19 @@ class _Sandbox(_Object, type_prefix="sb"):
         return self._tunnels
 
     async def create_connect_token(
-        self, metadata: Optional[Union[str, dict[str, Any]]] = None
+        self, user_metadata: Optional[Union[str, dict[str, Any]]] = None
     ) -> SandboxConnectCredentials:
         """Create a token for making HTTP connections to the sandbox.
 
-        Also accepts an optional metadata string or dict to associate with the token. This metadata
+        Also accepts an optional user_metadata string or dict to associate with the token. This metadata
         will be added to the headers by the proxy when forwarding requests to the sandbox."""
-        if metadata is not None and isinstance(metadata, dict):
+        if user_metadata is not None and isinstance(user_metadata, dict):
             try:
-                metadata = json.dumps(metadata)
+                user_metadata = json.dumps(user_metadata)
             except Exception as e:
-                raise InvalidError(f"Failed to serialize metadata: {e}")
+                raise InvalidError(f"Failed to serialize user_metadata: {e}")
 
-        req = api_pb2.SandboxCreateConnectTokenRequest(sandbox_id=self.object_id, metadata=metadata)
+        req = api_pb2.SandboxCreateConnectTokenRequest(sandbox_id=self.object_id, user_metadata=user_metadata)
         resp = await retry_transient_errors(self._client.stub.SandboxCreateConnectToken, req)
         return SandboxConnectCredentials(resp.url, resp.token)
 

{modal-1.1.5.dev34 → modal-1.1.5.dev36}/modal/sandbox.pyi

@@ -274,11 +274,11 @@ class _Sandbox(modal._object._Object):
         ...
 
     async def create_connect_token(
-        self, metadata: typing.Union[str, dict[str, typing.Any], None] = None
+        self, user_metadata: typing.Union[str, dict[str, typing.Any], None] = None
     ) -> SandboxConnectCredentials:
         """Create a token for making HTTP connections to the sandbox.
 
-        Also accepts an optional metadata string or dict to associate with the token. This metadata
+        Also accepts an optional user_metadata string or dict to associate with the token. This metadata
         will be added to the headers by the proxy when forwarding requests to the sandbox.
         """
         ...
@@ -829,21 +829,21 @@ class Sandbox(modal.object.Object):
 
     class __create_connect_token_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
-            self, /, metadata: typing.Union[str, dict[str, typing.Any], None] = None
+            self, /, user_metadata: typing.Union[str, dict[str, typing.Any], None] = None
         ) -> SandboxConnectCredentials:
             """Create a token for making HTTP connections to the sandbox.
 
-            Also accepts an optional metadata string or dict to associate with the token. This metadata
+            Also accepts an optional user_metadata string or dict to associate with the token. This metadata
             will be added to the headers by the proxy when forwarding requests to the sandbox.
             """
             ...
 
         async def aio(
-            self, /, metadata: typing.Union[str, dict[str, typing.Any], None] = None
+            self, /, user_metadata: typing.Union[str, dict[str, typing.Any], None] = None
         ) -> SandboxConnectCredentials:
             """Create a token for making HTTP connections to the sandbox.
 
-            Also accepts an optional metadata string or dict to associate with the token. This metadata
+            Also accepts an optional user_metadata string or dict to associate with the token. This metadata
             will be added to the headers by the proxy when forwarding requests to the sandbox.
             """
             ...

{modal-1.1.5.dev34 → modal-1.1.5.dev36}/modal.egg-info/PKG-INFO

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

{modal-1.1.5.dev34 → modal-1.1.5.dev36}/modal_proto/api.proto

@@ -2708,7 +2708,7 @@ message Sandbox {
 
 message SandboxCreateConnectTokenRequest {
   string sandbox_id = 1;
-  string metadata = 2;
+  string user_metadata = 2;
 }
 
 message SandboxCreateConnectTokenResponse {