modal 1.5.3.dev4__tar.gz → 1.5.3.dev6__tar.gz

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

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

{modal-1.5.3.dev4 → modal-1.5.3.dev6}/modal/_environments.py

@@ -103,26 +103,6 @@ class _EnvironmentManager:
         await client.stub.EnvironmentDelete(api_pb2.EnvironmentDeleteRequest(name=name))
 
 
-def _role_to_proto(role: str) -> "api_pb2.EnvironmentRole.ValueType":
-    match role:
-        case "viewer":
-            return api_pb2.ENVIRONMENT_ROLE_VIEWER
-        case "contributor":
-            return api_pb2.ENVIRONMENT_ROLE_CONTRIBUTOR
-        case _:
-            raise InvalidError(f"Invalid Environment role: {role!r} (expected 'viewer' or 'contributor')")
-
-
-def _role_from_proto(proto_value: int) -> str:
-    match proto_value:
-        case api_pb2.ENVIRONMENT_ROLE_VIEWER:
-            return "viewer"
-        case api_pb2.ENVIRONMENT_ROLE_CONTRIBUTOR:
-            return "contributor"
-        case _:
-            raise ValueError(f"Unknown environment role: {proto_value}")
-
-
 class _EnvironmentMembersManager:
     """mdmd:namespace
     Namespace with methods for managing the membership of a restricted Environment.
@@ -135,31 +115,30 @@ class _EnvironmentMembersManager:
         self._environment = environment
 
     async def list(self) -> dict[Literal["users", "service_users"], dict[str, str]]:
-        """Return the members of a restricted Environment with their roles.
+        """Enumerate the environment roles for each user and service user in the workspace.
 
         **Examples:**
 
         ```python notest
-        members = modal.Environment.from_name("my-restricted-env").members.list()
+        members = modal.Environment.from_name("my-env").members.list()
         print(members)
         # {
-        #     "users": {"alice": "contributor", "bob": "viewer"},
-        #     "service_users": {"alice-bot": "contributor"},
+        #     "users": {"alice": "contributor", "bob": "viewer", "carol": "contributor"},
+        #     "service_users": {"alice-bot": "contributor", "ops-bot": "viewer", "ci-bot": "no-access"},
         # }
         ```
         """
         await self._environment.hydrate()
-        req = api_pb2.EnvironmentGetManagedRequest(environment_id=self._environment.object_id)
-        resp = await self._environment.client.stub.EnvironmentGetManaged(req)
+        req = api_pb2.EnvironmentGetRolesRequest(environment_id=self._environment.object_id)
+        resp = await self._environment.client.stub.EnvironmentGetRoles(req)
 
         users: dict[str, str] = {}
         service_users: dict[str, str] = {}
         for principal in resp.principal_roles:
-            role = _role_from_proto(principal.role)
             if principal.user_id:
-                users[principal.user_name] = role
+                users[principal.user_name] = principal.role_str
             elif principal.service_user_id:
-                service_users[principal.service_user_name] = role
+                service_users[principal.service_user_name] = principal.role_str
 
         return {"users": users, "service_users": service_users}
 
@@ -188,13 +167,13 @@ class _EnvironmentMembersManager:
         users = users or {}
         service_users = service_users or {}
 
-        req = api_pb2.EnvironmentGetManagedRequest(environment_id=self._environment.object_id)
-        resp = await self._environment.client.stub.EnvironmentGetManaged(req)
+        req = api_pb2.EnvironmentGetRolesRequest(environment_id=self._environment.object_id)
+        resp = await self._environment.client.stub.EnvironmentGetRoles(req)
 
-        # Both current members and additional eligible workspace principals can be assigned a role
+        # EnvironmentGetRoles returns every workspace principal
         user_name_to_id: dict[str, str] = {}
         service_user_name_to_id: dict[str, str] = {}
-        for principal in [*resp.principal_roles, *resp.additional_roles]:
+        for principal in resp.principal_roles:
             if principal.user_id:
                 user_name_to_id[principal.user_name] = principal.user_id
             elif principal.service_user_id:
@@ -207,7 +186,7 @@ class _EnvironmentMembersManager:
             requests[f"User {name!r}"] = api_pb2.EnvironmentRoleSetRequest(
                 environment_id=self._environment.object_id,
                 user_id=user_name_to_id[name],
-                role=_role_to_proto(role),
+                role_str=role,
             )
         for name, role in service_users.items():
             if name not in service_user_name_to_id:
@@ -215,7 +194,7 @@ class _EnvironmentMembersManager:
             requests[f"Service user {name!r}"] = api_pb2.EnvironmentRoleSetRequest(
                 environment_id=self._environment.object_id,
                 service_user_id=service_user_name_to_id[name],
-                role=_role_to_proto(role),
+                role_str=role,
             )
 
         await self._dispatch_role_updates(requests)
@@ -242,8 +221,8 @@ class _EnvironmentMembersManager:
         users = users or []
         service_users = service_users or []
 
-        req = api_pb2.EnvironmentGetManagedRequest(environment_id=self._environment.object_id)
-        resp = await self._environment.client.stub.EnvironmentGetManaged(req)
+        req = api_pb2.EnvironmentGetRolesRequest(environment_id=self._environment.object_id)
+        resp = await self._environment.client.stub.EnvironmentGetRoles(req)
 
         user_name_to_id: dict[str, str] = {}
         service_user_name_to_id: dict[str, str] = {}
@@ -256,7 +235,7 @@ class _EnvironmentMembersManager:
         requests: dict[str, api_pb2.EnvironmentRoleSetRequest] = {}
         for name in users:
             if name not in user_name_to_id:
-                raise InvalidError(f"User {name!r} is not a member of this Environment")
+                raise InvalidError(f"User {name!r} not found in workspace")
             requests[f"User {name!r}"] = api_pb2.EnvironmentRoleSetRequest(
                 environment_id=self._environment.object_id,
                 user_id=user_name_to_id[name],
@@ -264,7 +243,7 @@ class _EnvironmentMembersManager:
             )
         for name in service_users:
             if name not in service_user_name_to_id:
-                raise InvalidError(f"Service user {name!r} is not a member of this Environment")
+                raise InvalidError(f"Service user {name!r} not found in workspace")
             requests[f"Service user {name!r}"] = api_pb2.EnvironmentRoleSetRequest(
                 environment_id=self._environment.object_id,
                 service_user_id=service_user_name_to_id[name],

{modal-1.5.3.dev4 → modal-1.5.3.dev6}/modal/_functions.py

@@ -2073,11 +2073,13 @@ class _FunctionCall(typing.Generic[ReturnType], _Object, type_prefix="fc"):
 
     @live_method
     async def get_call_graph(self) -> list[InputInfo]:
-        """Returns a structure representing the call graph from a given root
-        call ID, along with the status of execution for each node.
+        """Fetch information about the graph of Inputs this FunctionCall is part of.
 
-        See [`modal.call_graph`](https://modal.com/docs/sdk/py/latest/modal.call_graph) reference page
-        for documentation on the structure of the returned `InputInfo` items.
+        Note: the call graph data is not populated in real-time, and its capture is best-effort.
+        We do not recommend relying on this method for critical use cases.
+
+        See the [`modal.types`](/docs/sdk/py/latest/modal.types) reference for information
+        on the return values.
 
         Returns:
             A list of `InputInfo` nodes describing the call graph.
@@ -2088,19 +2090,13 @@ class _FunctionCall(typing.Generic[ReturnType], _Object, type_prefix="fc"):
         return _reconstruct_call_graph(response)
 
     @live_method
-    async def cancel(
-        self,
-        # if true, containers running the inputs are forcibly terminated
-        terminate_containers: bool = False,
-    ):
-        """Cancels the function call, which will stop its execution and mark its inputs as
-        [`TERMINATED`](https://modal.com/docs/sdk/py/latest/modal.call_graph#modalcall_graphinputstatus).
-
-        If `terminate_containers=True` - the containers running the cancelled inputs are all terminated
-        causing any non-cancelled inputs on those containers to be rescheduled in new containers.
+    async def cancel(self, terminate_containers: bool = False):
+        """Cancel the FunctionCall and terminate its inputs without retrying.
 
         Args:
-            terminate_containers: If True, forcibly terminate workers running cancelled inputs.
+            terminate_containers: If True, terminate the containers running the cancelled
+                inputs. Any other inputs running concurrently on those containers will be
+                rescheduled.
         """
         request = api_pb2.FunctionCallCancelRequest(
             function_call_id=self.object_id, terminate_containers=terminate_containers

{modal-1.5.3.dev4 → modal-1.5.3.dev6}/modal/_utils/task_command_router_client.py

@@ -1,6 +1,7 @@
 # Copyright Modal Labs 2025
 import asyncio
 import base64
+import io
 import json
 import socket
 import ssl
@@ -8,16 +9,16 @@ import time
 import typing
 import urllib.parse
 import weakref
-from collections.abc import AsyncGenerator, Callable
+from collections.abc import AsyncGenerator, AsyncIterable, Callable
 from contextlib import suppress
-from typing import TypeVar
+from typing import BinaryIO, TypeVar
 
 import grpclib.client
 from grpclib import GRPCError, Status
 from grpclib.exceptions import StreamTerminatedError
 
 from modal.config import logger
-from modal.exception import ExecTimeoutError, TimeoutError as ModalTimeoutError
+from modal.exception import AuthError, ExecTimeoutError, InternalError, ServiceError, TimeoutError as ModalTimeoutError
 from modal_proto import api_pb2, task_command_router_pb2 as sr_pb2
 from modal_proto.task_command_router_grpc import TaskCommandRouterStub
 
@@ -26,6 +27,17 @@ from .._utils.grpc_utils import ModalChannel, create_channel_config
 from .async_utils import aclosing, retry
 from .grpc_utils import RETRYABLE_GRPC_STATUS_CODES
 
+STREAMING_STDIN_CHUNK_SIZE = 256 * 1024
+
+_STREAMING_STDIN_RESUMABLE_EXCEPTIONS = (
+    AuthError,
+    InternalError,
+    ServiceError,
+    StreamTerminatedError,
+    OSError,
+    asyncio.TimeoutError,
+)
+
 
 @retry(n_attempts=34, base_delay=1, max_delay=10, attempt_timeout=10, total_timeout=310)
 async def _connect_channel(channel: grpclib.client.Channel):
@@ -468,6 +480,118 @@ class TaskCommandRouterClient:
                 lambda: self._call_with_auth_retry(self._stub.TaskExecStdinWrite, request)
             )
 
+    async def exec_stdin_write_stream(
+        self,
+        task_id: str,
+        exec_id: str,
+        source: BinaryIO,
+        chunk_size: int = STREAMING_STDIN_CHUNK_SIZE,
+        max_resume_attempts: int = 9,
+    ) -> int:
+        """Stream `source` into the exec's stdin, with bounded resume on transient failures.
+
+        Streams the full contents of `source` in one client-streaming RPC and
+        closes stdin (EOF) on success. On a resumable error, queries
+        `exec_stdin_status` for the server's canonical offset, seeks `source`
+        to that point, and reopens the stream.
+
+        Args:
+            task_id: The task ID of the task running the exec'd command.
+            exec_id: The execution ID of the command to write to.
+            source: A seekable byte source (file, BytesIO, etc.).
+            chunk_size: Bytes per outbound message.
+            max_resume_attempts: Upper bound on resume retries before giving up.
+
+        Returns:
+            The total number of bytes streamed into the exec's stdin.
+        """
+        offset = 0
+        attempt = 0
+        while True:
+
+            async def _chunks():
+                while True:
+                    chunk = source.read(chunk_size)
+                    if not chunk:
+                        return
+                    yield chunk
+
+            try:
+                source.seek(offset)
+                await self._exec_stdin_write_stream(task_id, exec_id, offset, _chunks())
+                return source.tell()
+            except (*_STREAMING_STDIN_RESUMABLE_EXCEPTIONS, AttributeError) as e:
+                # StreamTerminatedError surfaces as AttributeError in grpclib<=0.4.7;
+                # see call_with_retries_on_transient_errors.
+                if isinstance(e, AttributeError) and "_write_appdata" not in str(e):
+                    raise
+                attempt += 1
+                if attempt > max_resume_attempts:
+                    raise
+                status = await self.exec_stdin_status(task_id=task_id, exec_id=exec_id)
+                if status.closed:
+                    pos = source.tell()
+                    if status.num_bytes_written == pos and source.seek(0, io.SEEK_END) == pos:
+                        logger.debug(f"exec_stdin_write_stream completed but response was lost: {e}")
+                        return pos
+                    raise
+                offset = status.num_bytes_written
+                logger.debug(f"exec_stdin_write_stream resuming from offset {offset} after error: {e}")
+
+    async def _exec_stdin_write_stream(
+        self,
+        task_id: str,
+        exec_id: str,
+        start_offset: int,
+        chunks: AsyncIterable[bytes],
+    ) -> sr_pb2.TaskExecStdinWriteStreamResponse | None:
+        """Single client-streaming attempt: Start, Data chunks, then End (EOF).
+
+        Does not retry; `exec_stdin_write_stream` owns resume.
+        """
+        with grpc_error_converter():
+            stream = self._stub.TaskExecStdinWriteStream.open(metadata=self._get_metadata())
+            async with stream as s:
+                start = sr_pb2.TaskExecStdinWriteStreamRequest(
+                    start=sr_pb2.TaskExecStdinWriteStreamStart(
+                        task_id=task_id,
+                        exec_id=exec_id,
+                        offset=start_offset,
+                    ),
+                )
+                await s.send_message(start)
+                async for data in chunks:
+                    if not data:
+                        continue
+                    await s.send_message(sr_pb2.TaskExecStdinWriteStreamRequest(data=data))
+                # The server closes stdin only on this explicit End message. A
+                # stream that breaks before it leaves stdin open for resume.
+                await s.send_message(
+                    sr_pb2.TaskExecStdinWriteStreamRequest(end=sr_pb2.TaskExecStdinWriteStreamEnd()),
+                    end=True,
+                )
+                return await s.recv_message()
+
+    async def exec_stdin_status(self, task_id: str, exec_id: str) -> sr_pb2.TaskExecStdinStatusResponse:
+        """Read the current stdin write status for an exec'd command, to support retries from the right offset.
+
+        Used by streaming clients to find the resume offset after a stream
+        failure. Evicts any in-flight stdin stream for the exec, so it is not
+        safe to call for read-only observability.
+
+        Args:
+            task_id: The task ID of the task running the exec'd command.
+            exec_id: The execution ID of the command to query.
+        Raises:
+            Other errors: If retries are exhausted on transient errors or if there's an error
+              from the RPC itself.
+        """
+        request = sr_pb2.TaskExecStdinStatusRequest(task_id=task_id, exec_id=exec_id)
+        with grpc_error_converter():
+            return await call_with_retries_on_transient_errors(
+                lambda: self._call_with_auth_retry(self._stub.TaskExecStdinStatus, request)
+            )
+
     async def sandbox_stdin_write_v2(
         self, task_id: str, offset: int, data: bytes, eof: bool
     ) -> sr_pb2.SandboxStdinWriteV2Response:

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

{modal-1.5.3.dev4 → modal-1.5.3.dev6}/modal/container_process.py

@@ -1,7 +1,7 @@
 # Copyright Modal Labs 2024
 import asyncio
 import platform
-from typing import Generic, TypeVar
+from typing import BinaryIO, Generic, TypeVar
 
 from modal_proto import api_pb2
 
@@ -117,6 +117,18 @@ class _ContainerProcess(Generic[T]):
             )
         return self._returncode
 
+    async def _stdin_write_stream(self, source: BinaryIO) -> int:
+        """mdmd:hidden
+        Stream `source` into the process's stdin and close it (EOF) on success.
+
+        Returns the total bytes streamed.
+        """
+        return await self._command_router_client.exec_stdin_write_stream(
+            task_id=self._task_id,
+            exec_id=self._process_id,
+            source=source,
+        )
+
     async def poll(self) -> int | None:
         """Check if the container process has finished running.
 

{modal-1.5.3.dev4 → modal-1.5.3.dev6}/modal/container_process.pyi

@@ -53,6 +53,14 @@ class _ContainerProcess(typing.Generic[T]):
 
     @property
     def returncode(self) -> int: ...
+    async def _stdin_write_stream(self, source: typing.BinaryIO) -> int:
+        """mdmd:hidden
+        Stream `source` into the process's stdin and close it (EOF) on success.
+
+        Returns the total bytes streamed.
+        """
+        ...
+
     async def poll(self) -> typing.Optional[int]:
         """Check if the container process has finished running.
 
@@ -105,6 +113,25 @@ class ContainerProcess(typing.Generic[T]):
     @property
     def returncode(self) -> int: ...
 
+    class ___stdin_write_stream_spec(typing_extensions.Protocol):
+        def __call__(self, /, source: typing.BinaryIO) -> int:
+            """mdmd:hidden
+            Stream `source` into the process's stdin and close it (EOF) on success.
+
+            Returns the total bytes streamed.
+            """
+            ...
+
+        async def aio(self, /, source: typing.BinaryIO) -> int:
+            """mdmd:hidden
+            Stream `source` into the process's stdin and close it (EOF) on success.
+
+            Returns the total bytes streamed.
+            """
+            ...
+
+    _stdin_write_stream: ___stdin_write_stream_spec
+
     class __poll_spec(typing_extensions.Protocol):
         def __call__(self, /) -> typing.Optional[int]:
             """Check if the container process has finished running.

{modal-1.5.3.dev4 → modal-1.5.3.dev6}/modal/environments.pyi

@@ -113,32 +113,32 @@ class EnvironmentMembersManager:
 
     class __list_spec(typing_extensions.Protocol):
         def __call__(self, /) -> dict[typing.Literal["users", "service_users"], dict[str, str]]:
-            """Return the members of a restricted Environment with their roles.
+            """Enumerate the environment roles for each user and service user in the workspace.
 
             **Examples:**
 
             ```python notest
-            members = modal.Environment.from_name("my-restricted-env").members.list()
+            members = modal.Environment.from_name("my-env").members.list()
             print(members)
             # {
-            #     "users": {"alice": "contributor", "bob": "viewer"},
-            #     "service_users": {"alice-bot": "contributor"},
+            #     "users": {"alice": "contributor", "bob": "viewer", "carol": "contributor"},
+            #     "service_users": {"alice-bot": "contributor", "ops-bot": "viewer", "ci-bot": "no-access"},
             # }
             ```
             """
             ...
 
         async def aio(self, /) -> dict[typing.Literal["users", "service_users"], dict[str, str]]:
-            """Return the members of a restricted Environment with their roles.
+            """Enumerate the environment roles for each user and service user in the workspace.
 
             **Examples:**
 
             ```python notest
-            members = modal.Environment.from_name("my-restricted-env").members.list()
+            members = modal.Environment.from_name("my-env").members.list()
             print(members)
             # {
-            #     "users": {"alice": "contributor", "bob": "viewer"},
-            #     "service_users": {"alice-bot": "contributor"},
+            #     "users": {"alice": "contributor", "bob": "viewer", "carol": "contributor"},
+            #     "service_users": {"alice-bot": "contributor", "ops-bot": "viewer", "ci-bot": "no-access"},
             # }
             ```
             """

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

@@ -1044,11 +1044,13 @@ class FunctionCall(typing.Generic[modal._functions.ReturnType], modal.object.Obj
 
     class __get_call_graph_spec(typing_extensions.Protocol):
         def __call__(self, /) -> list[modal.types.InputInfo]:
-            """Returns a structure representing the call graph from a given root
-            call ID, along with the status of execution for each node.
+            """Fetch information about the graph of Inputs this FunctionCall is part of.
 
-            See [`modal.call_graph`](https://modal.com/docs/sdk/py/latest/modal.call_graph) reference page
-            for documentation on the structure of the returned `InputInfo` items.
+            Note: the call graph data is not populated in real-time, and its capture is best-effort.
+            We do not recommend relying on this method for critical use cases.
+
+            See the [`modal.types`](/docs/sdk/py/latest/modal.types) reference for information
+            on the return values.
 
             Returns:
                 A list of `InputInfo` nodes describing the call graph.
@@ -1056,11 +1058,13 @@ class FunctionCall(typing.Generic[modal._functions.ReturnType], modal.object.Obj
             ...
 
         async def aio(self, /) -> list[modal.types.InputInfo]:
-            """Returns a structure representing the call graph from a given root
-            call ID, along with the status of execution for each node.
+            """Fetch information about the graph of Inputs this FunctionCall is part of.
+
+            Note: the call graph data is not populated in real-time, and its capture is best-effort.
+            We do not recommend relying on this method for critical use cases.
 
-            See [`modal.call_graph`](https://modal.com/docs/sdk/py/latest/modal.call_graph) reference page
-            for documentation on the structure of the returned `InputInfo` items.
+            See the [`modal.types`](/docs/sdk/py/latest/modal.types) reference for information
+            on the return values.
 
             Returns:
                 A list of `InputInfo` nodes describing the call graph.
@@ -1071,26 +1075,22 @@ class FunctionCall(typing.Generic[modal._functions.ReturnType], modal.object.Obj
 
     class __cancel_spec(typing_extensions.Protocol):
         def __call__(self, /, terminate_containers: bool = False):
-            """Cancels the function call, which will stop its execution and mark its inputs as
-            [`TERMINATED`](https://modal.com/docs/sdk/py/latest/modal.call_graph#modalcall_graphinputstatus).
-
-            If `terminate_containers=True` - the containers running the cancelled inputs are all terminated
-            causing any non-cancelled inputs on those containers to be rescheduled in new containers.
+            """Cancel the FunctionCall and terminate its inputs without retrying.
 
             Args:
-                terminate_containers: If True, forcibly terminate workers running cancelled inputs.
+                terminate_containers: If True, terminate the containers running the cancelled
+                    inputs. Any other inputs running concurrently on those containers will be
+                    rescheduled.
             """
             ...
 
         async def aio(self, /, terminate_containers: bool = False):
-            """Cancels the function call, which will stop its execution and mark its inputs as
-            [`TERMINATED`](https://modal.com/docs/sdk/py/latest/modal.call_graph#modalcall_graphinputstatus).
-
-            If `terminate_containers=True` - the containers running the cancelled inputs are all terminated
-            causing any non-cancelled inputs on those containers to be rescheduled in new containers.
+            """Cancel the FunctionCall and terminate its inputs without retrying.
 
             Args:
-                terminate_containers: If True, forcibly terminate workers running cancelled inputs.
+                terminate_containers: If True, terminate the containers running the cancelled
+                    inputs. Any other inputs running concurrently on those containers will be
+                    rescheduled.
             """
             ...