modal 1.5.4.dev8__tar.gz → 1.5.4.dev9__tar.gz

{modal-1.5.4.dev8 → modal-1.5.4.dev9}/PKG-INFO

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

{modal-1.5.4.dev8 → modal-1.5.4.dev9}/modal/_output/rich.py

@@ -37,6 +37,7 @@ from rich.progress import (
 )
 from rich.spinner import Spinner
 from rich.status import Status
+from rich.table import Column
 from rich.text import Text
 from rich.tree import Tree
 
@@ -476,7 +477,10 @@ class RichOutputManager(OutputManager):
         and adds it to the current render group."""
         if not self._function_queueing_progress:
             self._function_queueing_progress = Progress(
-                TextColumn("[progress.description]{task.description}"),
+                TextColumn(
+                    "[progress.description]{task.description}",
+                    table_column=Column(no_wrap=False, overflow="fold"),
+                ),
                 FunctionQueuingColumn(),
                 console=self._console,
                 transient=True,
@@ -581,11 +585,17 @@ class RichOutputManager(OutputManager):
         """Handle queueing updates, ignoring completion updates for functions that have no queue progress bar."""
         task_key = (function_id, api_pb2.FUNCTION_QUEUED)
         task_description = description or f"'{function_id}' function waiting on worker"
+        task_description = escape(task_description)
         task_desc = f"[yellow]{task_description}. Time in queue:"
         if task_key in self._task_progress_items:
             progress_task_id = self._task_progress_items[task_key]
             try:
-                self._function_queueing_progress_bar.update(progress_task_id, completed=completed, total=total)
+                self._function_queueing_progress_bar.update(
+                    progress_task_id,
+                    description=task_desc if description else None,
+                    completed=completed,
+                    total=total,
+                )
                 if completed == total:
                     del self._task_progress_items[task_key]
                     self._function_queueing_progress_bar.remove_task(progress_task_id)

{modal-1.5.4.dev8 → modal-1.5.4.dev9}/modal/_utils/task_command_router_client.py

@@ -288,11 +288,21 @@ class TaskCommandRouterClient:
         server_client,
         sandbox_id: str,
         task_id: str,
+        access: api_pb2.CommandRouterAccess | None = None,
     ) -> "TaskCommandRouterClient":
-        """Initialize a TaskCommandRouterClient for a V2 sandbox."""
-        resp = await fetch_command_router_access_v2(server_client, sandbox_id=sandbox_id)
+        """Initialize a TaskCommandRouterClient for a V2 sandbox.
+
+        `access` is the router access returned by SandboxCreateV2, which lets a
+        freshly created sandbox connect without a round-trip. When it is absent —
+        a re-attached sandbox, or the server could not mint a token — we ask for it.
+        """
+        if access is not None:
+            url, jwt = access.url, access.jwt
+        else:
+            resp = await fetch_command_router_access_v2(server_client, sandbox_id=sandbox_id)
+            url, jwt = resp.url, resp.jwt
         logger.debug(f"Using command router access for sandbox {sandbox_id}")
-        return await cls._connect(server_client, task_id, resp.url, resp.jwt, sandbox_id=sandbox_id)
+        return await cls._connect(server_client, task_id, url, jwt, sandbox_id=sandbox_id)
 
     @classmethod
     async def init_v2_by_task_id(

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

{modal-1.5.4.dev8 → modal-1.5.4.dev9}/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.dev8 → modal-1.5.4.dev9}/modal/sandbox.py

@@ -333,6 +333,7 @@ class _Sandbox(_Object, type_prefix="sb"):
     _tunnels: dict[int, Tunnel] | None
     _enable_snapshot: bool
     _command_router_client: TaskCommandRouterClient | None
+    _init_command_router_access: api_pb2.CommandRouterAccess | None
     _attached: bool
     _filesystem: _SandboxFilesystem | None
     _is_v2: bool = False
@@ -1034,6 +1035,10 @@ class _Sandbox(_Object, type_prefix="sb"):
             self._hydrate(sandbox_id, load_context.client, create_resp.metadata)
             self._is_v2 = True
             self._task_id = create_resp.task_id
+            # An unset proto message reads as an empty one rather than None, so the
+            # presence check is what distinguishes "no access" from "empty access".
+            if create_resp.HasField("command_router_access"):
+                self._init_command_router_access = create_resp.command_router_access
             self._hydrate_metadata_v2()
             # Unencrypted tunnel endpoints are not known at create time. Only
             # cache a complete set so tunnels() fetches the rest otherwise.
@@ -1121,6 +1126,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         self._tunnels = None
         self._enable_snapshot = False
         self._command_router_client = None
+        self._init_command_router_access = None
         self._filesystem = None
         self._is_v2 = _is_v2_sandbox_id(self.object_id)
         if self._is_v2:
@@ -1912,8 +1918,12 @@ class _Sandbox(_Object, type_prefix="sb"):
         if self._command_router_client is None:
             try:
                 if self._is_v2:
+                    # Consume the seeded access, so if connecting with it fails the
+                    # retry falls back to the authoritative RPC instead of
+                    # re-trying the same credentials forever.
+                    access, self._init_command_router_access = self._init_command_router_access, None
                     self._command_router_client = await TaskCommandRouterClient.init_v2_by_sandbox_id(
-                        self._client, self.object_id, task_id
+                        self._client, self.object_id, task_id, access
                     )
                 else:
                     self._command_router_client = await TaskCommandRouterClient.init(self._client, task_id)

{modal-1.5.4.dev8 → modal-1.5.4.dev9}/modal/sandbox.pyi

@@ -147,6 +147,7 @@ class _Sandbox(modal._object._Object):
     _tunnels: typing.Optional[dict[int, modal._tunnel.Tunnel]]
     _enable_snapshot: bool
     _command_router_client: typing.Optional[modal._utils.task_command_router_client.TaskCommandRouterClient]
+    _init_command_router_access: typing.Optional[modal_proto.api_pb2.CommandRouterAccess]
     _attached: bool
     _filesystem: typing.Optional[modal.sandbox_fs._SandboxFilesystem]
     _is_v2: bool
@@ -1454,6 +1455,7 @@ class Sandbox(modal.object.Object):
     _tunnels: typing.Optional[dict[int, modal._tunnel.Tunnel]]
     _enable_snapshot: bool
     _command_router_client: typing.Optional[modal._utils.task_command_router_client.TaskCommandRouterClient]
+    _init_command_router_access: typing.Optional[modal_proto.api_pb2.CommandRouterAccess]
     _attached: bool
     _filesystem: typing.Optional[modal.sandbox_fs.SandboxFilesystem]
     _is_v2: bool

{modal-1.5.4.dev8 → modal-1.5.4.dev9}/modal.egg-info/PKG-INFO

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

{modal-1.5.4.dev8 → modal-1.5.4.dev9}/modal_proto/api_grpc.py

@@ -327,6 +327,10 @@ class ModalClientBase(abc.ABC):
     async def EnvironmentSetBudget(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EnvironmentSetBudgetRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def EnvironmentSetDefaultMemberRole(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EnvironmentSetDefaultMemberRoleRequest, google.protobuf.empty_pb2.Empty]') -> None:
+        pass
+
     @abc.abstractmethod
     async def EnvironmentSetManaged(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EnvironmentSetManagedRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
@@ -1419,6 +1423,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.EnvironmentSetBudgetRequest,
                 google.protobuf.empty_pb2.Empty,
             ),
+            '/modal.client.ModalClient/EnvironmentSetDefaultMemberRole': grpclib.const.Handler(
+                self.EnvironmentSetDefaultMemberRole,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.EnvironmentSetDefaultMemberRoleRequest,
+                google.protobuf.empty_pb2.Empty,
+            ),
             '/modal.client.ModalClient/EnvironmentSetManaged': grpclib.const.Handler(
                 self.EnvironmentSetManaged,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -2829,6 +2839,12 @@ class ModalClientStub:
             modal_proto.api_pb2.EnvironmentSetBudgetRequest,
             google.protobuf.empty_pb2.Empty,
         )
+        self.EnvironmentSetDefaultMemberRole = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/EnvironmentSetDefaultMemberRole',
+            modal_proto.api_pb2.EnvironmentSetDefaultMemberRoleRequest,
+            google.protobuf.empty_pb2.Empty,
+        )
         self.EnvironmentSetManaged = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/EnvironmentSetManaged',