modal 1.1.5.dev87__tar.gz → 1.1.5.dev89__tar.gz

{modal-1.1.5.dev87 → modal-1.1.5.dev89}/PKG-INFO

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

modal-1.1.5.dev89/modal/_billing.py

@@ -0,0 +1,80 @@
+# Copyright Modal Labs 2025
+from datetime import datetime, timezone
+from decimal import Decimal
+from typing import Any, Optional, TypedDict
+
+from modal_proto import api_pb2
+
+from .client import _Client
+from .exception import InvalidError
+
+
+class WorkspaceBillingReportItem(TypedDict):
+    object_id: str
+    description: str
+    environment_name: str
+    interval_start: datetime
+    cost: Decimal
+    tags: dict[str, str]
+
+
+async def _workspace_billing_report(
+    *,
+    start: datetime,  # Start of the report, inclusive
+    end: Optional[datetime] = None,  # End of the report, exclusive
+    resolution: str = "d",  # Resolution, e.g. "d" for daily or "h" for hourly
+    tag_names: Optional[list[str]] = None,  # Optional additional metadata to include
+    client: Optional[_Client] = None,
+) -> list[dict[str, Any]]:
+    """Generate a tabular report of workspace usage by object and time.
+
+    The result will be a list of dictionaries for each interval (determined by `resolution`)
+    between the `start` and `end` limits. The dictionary represents a single Modal object
+    that billing can be attributed to (e.g., an App) along with metadata (including user-defined
+    tags) for identifying that object.
+
+    The `start` and `end` parameters are required to either have a UTC timezone or to be
+    timezone-naive (which will be interpreted as UTC times). The timestamps in the result will
+    be in UTC. Cost will be reported for full intervals, even if the provided `start` or `end`
+    parameters are partial: `start` will be rounded to the beginning of its interval, while
+    partial `end` intervals will be excluded.
+
+    Additional user-provided metadata can be included in the report if the objects have tags
+    and `tag_names` (i.e., keys) are specified in the request. Note that tags will be attributed
+    to the entire interval even if they were added or removed at some point within it.
+
+    """
+    if client is None:
+        client = await _Client.from_env()
+
+    tag_names = tag_names or []
+
+    if end is None:
+        end = datetime.now(timezone.utc)
+
+    for dt in (start, end):
+        if dt.tzinfo is None:
+            dt = dt.replace(tzinfo=timezone.utc)
+        elif dt.tzinfo != timezone.utc:
+            raise InvalidError("Timezone-aware start/end limits must be in UTC.")
+
+    request = api_pb2.WorkspaceBillingReportRequest(
+        resolution=resolution,
+        tag_names=tag_names,
+    )
+    request.start_timestamp.FromDatetime(start)
+    request.end_timestamp.FromDatetime(end)
+
+    rows = []
+    async for pb_item in client.stub.WorkspaceBillingReport.unary_stream(request):
+        item = {
+            "object_id": pb_item.object_id,
+            "description": pb_item.description,
+            "environment_name": pb_item.environment_name,
+            "interval_start": pb_item.interval.ToDatetime().replace(tzinfo=timezone.utc),
+            "cost": Decimal(pb_item.cost),
+            "tags": dict(pb_item.tags),
+        }
+        rows.append(item)
+
+    return rows

modal-1.1.5.dev89/modal/billing.py

@@ -0,0 +1,5 @@
+# Copyright Modal Labs 2025
+from ._billing import _workspace_billing_report
+from ._utils.async_utils import synchronize_api
+
+workspace_billing_report = synchronize_api(_workspace_billing_report)

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

{modal-1.1.5.dev87 → modal-1.1.5.dev89}/modal.egg-info/PKG-INFO

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

{modal-1.1.5.dev87 → modal-1.1.5.dev89}/modal.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ README.md
 pyproject.toml
 modal/__init__.py
 modal/__main__.py
+modal/_billing.py
 modal/_clustered_functions.py
 modal/_clustered_functions.pyi
 modal/_container_entrypoint.py
@@ -23,6 +24,7 @@ modal/_type_manager.py
 modal/_watcher.py
 modal/app.py
 modal/app.pyi
+modal/billing.py
 modal/call_graph.py
 modal/client.py
 modal/client.pyi

{modal-1.1.5.dev87 → modal-1.1.5.dev89}/modal_proto/task_command_router.proto

@@ -130,7 +130,7 @@ message TaskExecWaitResponse {
   // and termination by Modal (due to task timeout, exec exceeded deadline, etc.)
 }
 
-service TaskRouter {
+service TaskCommandRouter {
   // Poll for the exit status of an exec'd command.
   rpc TaskExecPoll(TaskExecPollRequest) returns (TaskExecPollResponse);
   // Execute a command in the task.

{modal-1.1.5.dev87 → modal-1.1.5.dev89}/modal_proto/task_command_router_grpc.py

@@ -13,7 +13,7 @@ import modal_proto.api_pb2
 import modal_proto.task_command_router_pb2
 
 
-class TaskRouterBase(abc.ABC):
+class TaskCommandRouterBase(abc.ABC):
 
     @abc.abstractmethod
     async def TaskExecPoll(self, stream: 'grpclib.server.Stream[modal_proto.task_command_router_pb2.TaskExecPollRequest, modal_proto.task_command_router_pb2.TaskExecPollResponse]') -> None:
@@ -37,31 +37,31 @@ class TaskRouterBase(abc.ABC):
 
     def __mapping__(self) -> typing.Dict[str, grpclib.const.Handler]:
         return {
-            '/modal.task_command_router.TaskRouter/TaskExecPoll': grpclib.const.Handler(
+            '/modal.task_command_router.TaskCommandRouter/TaskExecPoll': grpclib.const.Handler(
                 self.TaskExecPoll,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 modal_proto.task_command_router_pb2.TaskExecPollRequest,
                 modal_proto.task_command_router_pb2.TaskExecPollResponse,
             ),
-            '/modal.task_command_router.TaskRouter/TaskExecStart': grpclib.const.Handler(
+            '/modal.task_command_router.TaskCommandRouter/TaskExecStart': grpclib.const.Handler(
                 self.TaskExecStart,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 modal_proto.task_command_router_pb2.TaskExecStartRequest,
                 modal_proto.task_command_router_pb2.TaskExecStartResponse,
             ),
-            '/modal.task_command_router.TaskRouter/TaskExecStdinWrite': grpclib.const.Handler(
+            '/modal.task_command_router.TaskCommandRouter/TaskExecStdinWrite': grpclib.const.Handler(
                 self.TaskExecStdinWrite,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 modal_proto.task_command_router_pb2.TaskExecStdinWriteRequest,
                 modal_proto.task_command_router_pb2.TaskExecStdinWriteResponse,
             ),
-            '/modal.task_command_router.TaskRouter/TaskExecStdioRead': grpclib.const.Handler(
+            '/modal.task_command_router.TaskCommandRouter/TaskExecStdioRead': grpclib.const.Handler(
                 self.TaskExecStdioRead,
                 grpclib.const.Cardinality.UNARY_STREAM,
                 modal_proto.task_command_router_pb2.TaskExecStdioReadRequest,
                 modal_proto.task_command_router_pb2.TaskExecStdioReadResponse,
             ),
-            '/modal.task_command_router.TaskRouter/TaskExecWait': grpclib.const.Handler(
+            '/modal.task_command_router.TaskCommandRouter/TaskExecWait': grpclib.const.Handler(
                 self.TaskExecWait,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 modal_proto.task_command_router_pb2.TaskExecWaitRequest,
@@ -70,36 +70,36 @@ class TaskRouterBase(abc.ABC):
         }
 
 
-class TaskRouterStub:
+class TaskCommandRouterStub:
 
     def __init__(self, channel: grpclib.client.Channel) -> None:
         self.TaskExecPoll = grpclib.client.UnaryUnaryMethod(
             channel,
-            '/modal.task_command_router.TaskRouter/TaskExecPoll',
+            '/modal.task_command_router.TaskCommandRouter/TaskExecPoll',
             modal_proto.task_command_router_pb2.TaskExecPollRequest,
             modal_proto.task_command_router_pb2.TaskExecPollResponse,
         )
         self.TaskExecStart = grpclib.client.UnaryUnaryMethod(
             channel,
-            '/modal.task_command_router.TaskRouter/TaskExecStart',
+            '/modal.task_command_router.TaskCommandRouter/TaskExecStart',
             modal_proto.task_command_router_pb2.TaskExecStartRequest,
             modal_proto.task_command_router_pb2.TaskExecStartResponse,
         )
         self.TaskExecStdinWrite = grpclib.client.UnaryUnaryMethod(
             channel,
-            '/modal.task_command_router.TaskRouter/TaskExecStdinWrite',
+            '/modal.task_command_router.TaskCommandRouter/TaskExecStdinWrite',
             modal_proto.task_command_router_pb2.TaskExecStdinWriteRequest,
             modal_proto.task_command_router_pb2.TaskExecStdinWriteResponse,
         )
         self.TaskExecStdioRead = grpclib.client.UnaryStreamMethod(
             channel,
-            '/modal.task_command_router.TaskRouter/TaskExecStdioRead',
+            '/modal.task_command_router.TaskCommandRouter/TaskExecStdioRead',
             modal_proto.task_command_router_pb2.TaskExecStdioReadRequest,
             modal_proto.task_command_router_pb2.TaskExecStdioReadResponse,
         )
         self.TaskExecWait = grpclib.client.UnaryUnaryMethod(
             channel,
-            '/modal.task_command_router.TaskRouter/TaskExecWait',
+            '/modal.task_command_router.TaskCommandRouter/TaskExecWait',
             modal_proto.task_command_router_pb2.TaskExecWaitRequest,
             modal_proto.task_command_router_pb2.TaskExecWaitResponse,
         )

{modal-1.1.5.dev87 → modal-1.1.5.dev89}/modal_proto/task_command_router_pb2.py

@@ -16,7 +16,7 @@ _sym_db = _symbol_database.Default()
 from modal_proto import api_pb2 as modal__proto_dot_api__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n%modal_proto/task_command_router.proto\x12\x19modal.task_command_router\x1a\x15modal_proto/api.proto\"7\n\x13TaskExecPollRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\"G\n\x14TaskExecPollResponse\x12\x0e\n\x04\x63ode\x18\x01 \x01(\x05H\x00\x12\x10\n\x06signal\x18\x02 \x01(\x05H\x00\x42\r\n\x0b\x65xit_status\"\x92\x03\n\x14TaskExecStartRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\x12\x14\n\x0c\x63ommand_args\x18\x03 \x03(\t\x12\x46\n\rstdout_config\x18\x04 \x01(\x0e\x32/.modal.task_command_router.TaskExecStdoutConfig\x12\x46\n\rstderr_config\x18\x05 \x01(\x0e\x32/.modal.task_command_router.TaskExecStderrConfig\x12\x19\n\x0ctimeout_secs\x18\x06 \x01(\rH\x00\x88\x01\x01\x12\x14\n\x07workdir\x18\x07 \x01(\tH\x01\x88\x01\x01\x12\x12\n\nsecret_ids\x18\x08 \x03(\t\x12,\n\x08pty_info\x18\t \x01(\x0b\x32\x15.modal.client.PTYInfoH\x02\x88\x01\x01\x12\x15\n\rruntime_debug\x18\n \x01(\x08\x42\x0f\n\r_timeout_secsB\n\n\x08_workdirB\x0b\n\t_pty_info\"\x17\n\x15TaskExecStartResponse\"h\n\x19TaskExecStdinWriteRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\x12\x0e\n\x06offset\x18\x03 \x01(\x04\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\x0c\x12\x0b\n\x03\x65of\x18\x05 \x01(\x08\"\x1c\n\x1aTaskExecStdinWriteResponse\"\x9d\x01\n\x18TaskExecStdioReadRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\x12\x0e\n\x06offset\x18\x03 \x01(\x04\x12O\n\x0f\x66ile_descriptor\x18\x04 \x01(\x0e\x32\x36.modal.task_command_router.TaskExecStdioFileDescriptor\")\n\x19TaskExecStdioReadResponse\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c\"7\n\x13TaskExecWaitRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\"G\n\x14TaskExecWaitResponse\x12\x0e\n\x04\x63ode\x18\x01 \x01(\x05H\x00\x12\x10\n\x06signal\x18\x02 \x01(\x05H\x00\x42\r\n\x0b\x65xit_status*\x81\x01\n\x14TaskExecStderrConfig\x12#\n\x1fTASK_EXEC_STDERR_CONFIG_DEVNULL\x10\x00\x12 \n\x1cTASK_EXEC_STDERR_CONFIG_PIPE\x10\x01\x12\"\n\x1eTASK_EXEC_STDERR_CONFIG_STDOUT\x10\x02*u\n\x1bTaskExecStdioFileDescriptor\x12*\n&TASK_EXEC_STDIO_FILE_DESCRIPTOR_STDOUT\x10\x00\x12*\n&TASK_EXEC_STDIO_FILE_DESCRIPTOR_STDERR\x10\x01*]\n\x14TaskExecStdoutConfig\x12#\n\x1fTASK_EXEC_STDOUT_CONFIG_DEVNULL\x10\x00\x12 \n\x1cTASK_EXEC_STDOUT_CONFIG_PIPE\x10\x01\x32\xe9\x04\n\nTaskRouter\x12o\n\x0cTaskExecPoll\x12..modal.task_command_router.TaskExecPollRequest\x1a/.modal.task_command_router.TaskExecPollResponse\x12r\n\rTaskExecStart\x12/.modal.task_command_router.TaskExecStartRequest\x1a\x30.modal.task_command_router.TaskExecStartResponse\x12\x81\x01\n\x12TaskExecStdinWrite\x12\x34.modal.task_command_router.TaskExecStdinWriteRequest\x1a\x35.modal.task_command_router.TaskExecStdinWriteResponse\x12\x80\x01\n\x11TaskExecStdioRead\x12\x33.modal.task_command_router.TaskExecStdioReadRequest\x1a\x34.modal.task_command_router.TaskExecStdioReadResponse0\x01\x12o\n\x0cTaskExecWait\x12..modal.task_command_router.TaskExecWaitRequest\x1a/.modal.task_command_router.TaskExecWaitResponseB:Z8github.com/modal-labs/modal/go/proto/task_command_routerb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n%modal_proto/task_command_router.proto\x12\x19modal.task_command_router\x1a\x15modal_proto/api.proto\"7\n\x13TaskExecPollRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\"G\n\x14TaskExecPollResponse\x12\x0e\n\x04\x63ode\x18\x01 \x01(\x05H\x00\x12\x10\n\x06signal\x18\x02 \x01(\x05H\x00\x42\r\n\x0b\x65xit_status\"\x92\x03\n\x14TaskExecStartRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\x12\x14\n\x0c\x63ommand_args\x18\x03 \x03(\t\x12\x46\n\rstdout_config\x18\x04 \x01(\x0e\x32/.modal.task_command_router.TaskExecStdoutConfig\x12\x46\n\rstderr_config\x18\x05 \x01(\x0e\x32/.modal.task_command_router.TaskExecStderrConfig\x12\x19\n\x0ctimeout_secs\x18\x06 \x01(\rH\x00\x88\x01\x01\x12\x14\n\x07workdir\x18\x07 \x01(\tH\x01\x88\x01\x01\x12\x12\n\nsecret_ids\x18\x08 \x03(\t\x12,\n\x08pty_info\x18\t \x01(\x0b\x32\x15.modal.client.PTYInfoH\x02\x88\x01\x01\x12\x15\n\rruntime_debug\x18\n \x01(\x08\x42\x0f\n\r_timeout_secsB\n\n\x08_workdirB\x0b\n\t_pty_info\"\x17\n\x15TaskExecStartResponse\"h\n\x19TaskExecStdinWriteRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\x12\x0e\n\x06offset\x18\x03 \x01(\x04\x12\x0c\n\x04\x64\x61ta\x18\x04 \x01(\x0c\x12\x0b\n\x03\x65of\x18\x05 \x01(\x08\"\x1c\n\x1aTaskExecStdinWriteResponse\"\x9d\x01\n\x18TaskExecStdioReadRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\x12\x0e\n\x06offset\x18\x03 \x01(\x04\x12O\n\x0f\x66ile_descriptor\x18\x04 \x01(\x0e\x32\x36.modal.task_command_router.TaskExecStdioFileDescriptor\")\n\x19TaskExecStdioReadResponse\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c\"7\n\x13TaskExecWaitRequest\x12\x0f\n\x07task_id\x18\x01 \x01(\t\x12\x0f\n\x07\x65xec_id\x18\x02 \x01(\t\"G\n\x14TaskExecWaitResponse\x12\x0e\n\x04\x63ode\x18\x01 \x01(\x05H\x00\x12\x10\n\x06signal\x18\x02 \x01(\x05H\x00\x42\r\n\x0b\x65xit_status*\x81\x01\n\x14TaskExecStderrConfig\x12#\n\x1fTASK_EXEC_STDERR_CONFIG_DEVNULL\x10\x00\x12 \n\x1cTASK_EXEC_STDERR_CONFIG_PIPE\x10\x01\x12\"\n\x1eTASK_EXEC_STDERR_CONFIG_STDOUT\x10\x02*u\n\x1bTaskExecStdioFileDescriptor\x12*\n&TASK_EXEC_STDIO_FILE_DESCRIPTOR_STDOUT\x10\x00\x12*\n&TASK_EXEC_STDIO_FILE_DESCRIPTOR_STDERR\x10\x01*]\n\x14TaskExecStdoutConfig\x12#\n\x1fTASK_EXEC_STDOUT_CONFIG_DEVNULL\x10\x00\x12 \n\x1cTASK_EXEC_STDOUT_CONFIG_PIPE\x10\x01\x32\xf0\x04\n\x11TaskCommandRouter\x12o\n\x0cTaskExecPoll\x12..modal.task_command_router.TaskExecPollRequest\x1a/.modal.task_command_router.TaskExecPollResponse\x12r\n\rTaskExecStart\x12/.modal.task_command_router.TaskExecStartRequest\x1a\x30.modal.task_command_router.TaskExecStartResponse\x12\x81\x01\n\x12TaskExecStdinWrite\x12\x34.modal.task_command_router.TaskExecStdinWriteRequest\x1a\x35.modal.task_command_router.TaskExecStdinWriteResponse\x12\x80\x01\n\x11TaskExecStdioRead\x12\x33.modal.task_command_router.TaskExecStdioReadRequest\x1a\x34.modal.task_command_router.TaskExecStdioReadResponse0\x01\x12o\n\x0cTaskExecWait\x12..modal.task_command_router.TaskExecWaitRequest\x1a/.modal.task_command_router.TaskExecWaitResponseB:Z8github.com/modal-labs/modal/go/proto/task_command_routerb\x06proto3')
 
 _TASKEXECSTDERRCONFIG = DESCRIPTOR.enum_types_by_name['TaskExecStderrConfig']
 TaskExecStderrConfig = enum_type_wrapper.EnumTypeWrapper(_TASKEXECSTDERRCONFIG)
@@ -113,7 +113,7 @@ TaskExecWaitResponse = _reflection.GeneratedProtocolMessageType('TaskExecWaitRes
   })
 _sym_db.RegisterMessage(TaskExecWaitResponse)
 
-_TASKROUTER = DESCRIPTOR.services_by_name['TaskRouter']
+_TASKCOMMANDROUTER = DESCRIPTOR.services_by_name['TaskCommandRouter']
 if _descriptor._USE_C_DESCRIPTORS == False:
 
   DESCRIPTOR._options = None
@@ -144,6 +144,6 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _TASKEXECWAITREQUEST._serialized_end=1045
   _TASKEXECWAITRESPONSE._serialized_start=1047
   _TASKEXECWAITRESPONSE._serialized_end=1118
-  _TASKROUTER._serialized_start=1467
-  _TASKROUTER._serialized_end=2084
+  _TASKCOMMANDROUTER._serialized_start=1467
+  _TASKCOMMANDROUTER._serialized_end=2091
 # @@protoc_insertion_point(module_scope)

{modal-1.1.5.dev87 → modal-1.1.5.dev89}/modal_proto/task_command_router_pb2_grpc.py

@@ -5,7 +5,7 @@ import grpc
 from modal_proto import task_command_router_pb2 as modal__proto_dot_task__command__router__pb2
 
 
-class TaskRouterStub(object):
+class TaskCommandRouterStub(object):
     """Missing associated documentation comment in .proto file."""
 
     def __init__(self, channel):
@@ -15,33 +15,33 @@ class TaskRouterStub(object):
             channel: A grpc.Channel.
         """
         self.TaskExecPoll = channel.unary_unary(
-                '/modal.task_command_router.TaskRouter/TaskExecPoll',
+                '/modal.task_command_router.TaskCommandRouter/TaskExecPoll',
                 request_serializer=modal__proto_dot_task__command__router__pb2.TaskExecPollRequest.SerializeToString,
                 response_deserializer=modal__proto_dot_task__command__router__pb2.TaskExecPollResponse.FromString,
                 )
         self.TaskExecStart = channel.unary_unary(
-                '/modal.task_command_router.TaskRouter/TaskExecStart',
+                '/modal.task_command_router.TaskCommandRouter/TaskExecStart',
                 request_serializer=modal__proto_dot_task__command__router__pb2.TaskExecStartRequest.SerializeToString,
                 response_deserializer=modal__proto_dot_task__command__router__pb2.TaskExecStartResponse.FromString,
                 )
         self.TaskExecStdinWrite = channel.unary_unary(
-                '/modal.task_command_router.TaskRouter/TaskExecStdinWrite',
+                '/modal.task_command_router.TaskCommandRouter/TaskExecStdinWrite',
                 request_serializer=modal__proto_dot_task__command__router__pb2.TaskExecStdinWriteRequest.SerializeToString,
                 response_deserializer=modal__proto_dot_task__command__router__pb2.TaskExecStdinWriteResponse.FromString,
                 )
         self.TaskExecStdioRead = channel.unary_stream(
-                '/modal.task_command_router.TaskRouter/TaskExecStdioRead',
+                '/modal.task_command_router.TaskCommandRouter/TaskExecStdioRead',
                 request_serializer=modal__proto_dot_task__command__router__pb2.TaskExecStdioReadRequest.SerializeToString,
                 response_deserializer=modal__proto_dot_task__command__router__pb2.TaskExecStdioReadResponse.FromString,
                 )
         self.TaskExecWait = channel.unary_unary(
-                '/modal.task_command_router.TaskRouter/TaskExecWait',
+                '/modal.task_command_router.TaskCommandRouter/TaskExecWait',
                 request_serializer=modal__proto_dot_task__command__router__pb2.TaskExecWaitRequest.SerializeToString,
                 response_deserializer=modal__proto_dot_task__command__router__pb2.TaskExecWaitResponse.FromString,
                 )
 
 
-class TaskRouterServicer(object):
+class TaskCommandRouterServicer(object):
     """Missing associated documentation comment in .proto file."""
 
     def TaskExecPoll(self, request, context):
@@ -80,7 +80,7 @@ class TaskRouterServicer(object):
         raise NotImplementedError('Method not implemented!')
 
 
-def add_TaskRouterServicer_to_server(servicer, server):
+def add_TaskCommandRouterServicer_to_server(servicer, server):
     rpc_method_handlers = {
             'TaskExecPoll': grpc.unary_unary_rpc_method_handler(
                     servicer.TaskExecPoll,
@@ -109,12 +109,12 @@ def add_TaskRouterServicer_to_server(servicer, server):
             ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
-            'modal.task_command_router.TaskRouter', rpc_method_handlers)
+            'modal.task_command_router.TaskCommandRouter', rpc_method_handlers)
     server.add_generic_rpc_handlers((generic_handler,))
 
 
  # This class is part of an EXPERIMENTAL API.
-class TaskRouter(object):
+class TaskCommandRouter(object):
     """Missing associated documentation comment in .proto file."""
 
     @staticmethod
@@ -128,7 +128,7 @@ class TaskRouter(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/modal.task_command_router.TaskRouter/TaskExecPoll',
+        return grpc.experimental.unary_unary(request, target, '/modal.task_command_router.TaskCommandRouter/TaskExecPoll',
             modal__proto_dot_task__command__router__pb2.TaskExecPollRequest.SerializeToString,
             modal__proto_dot_task__command__router__pb2.TaskExecPollResponse.FromString,
             options, channel_credentials,
@@ -145,7 +145,7 @@ class TaskRouter(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/modal.task_command_router.TaskRouter/TaskExecStart',
+        return grpc.experimental.unary_unary(request, target, '/modal.task_command_router.TaskCommandRouter/TaskExecStart',
             modal__proto_dot_task__command__router__pb2.TaskExecStartRequest.SerializeToString,
             modal__proto_dot_task__command__router__pb2.TaskExecStartResponse.FromString,
             options, channel_credentials,
@@ -162,7 +162,7 @@ class TaskRouter(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/modal.task_command_router.TaskRouter/TaskExecStdinWrite',
+        return grpc.experimental.unary_unary(request, target, '/modal.task_command_router.TaskCommandRouter/TaskExecStdinWrite',
             modal__proto_dot_task__command__router__pb2.TaskExecStdinWriteRequest.SerializeToString,
             modal__proto_dot_task__command__router__pb2.TaskExecStdinWriteResponse.FromString,
             options, channel_credentials,
@@ -179,7 +179,7 @@ class TaskRouter(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_stream(request, target, '/modal.task_command_router.TaskRouter/TaskExecStdioRead',
+        return grpc.experimental.unary_stream(request, target, '/modal.task_command_router.TaskCommandRouter/TaskExecStdioRead',
             modal__proto_dot_task__command__router__pb2.TaskExecStdioReadRequest.SerializeToString,
             modal__proto_dot_task__command__router__pb2.TaskExecStdioReadResponse.FromString,
             options, channel_credentials,
@@ -196,7 +196,7 @@ class TaskRouter(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/modal.task_command_router.TaskRouter/TaskExecWait',
+        return grpc.experimental.unary_unary(request, target, '/modal.task_command_router.TaskCommandRouter/TaskExecWait',
             modal__proto_dot_task__command__router__pb2.TaskExecWaitRequest.SerializeToString,
             modal__proto_dot_task__command__router__pb2.TaskExecWaitResponse.FromString,
             options, channel_credentials,

{modal-1.1.5.dev87 → modal-1.1.5.dev89}/modal_proto/task_command_router_pb2_grpc.pyi

@@ -7,7 +7,7 @@ import collections.abc
 import grpc
 import modal_proto.task_command_router_pb2
 
-class TaskRouterStub:
+class TaskCommandRouterStub:
     def __init__(self, channel: grpc.Channel) -> None: ...
     TaskExecPoll: grpc.UnaryUnaryMultiCallable[
         modal_proto.task_command_router_pb2.TaskExecPollRequest,
@@ -35,7 +35,7 @@ class TaskRouterStub:
     ]
     """Wait for an exec'd command to exit and return the exit code."""
 
-class TaskRouterServicer(metaclass=abc.ABCMeta):
+class TaskCommandRouterServicer(metaclass=abc.ABCMeta):
     @abc.abstractmethod
     def TaskExecPoll(
         self,
@@ -72,4 +72,4 @@ class TaskRouterServicer(metaclass=abc.ABCMeta):
     ) -> modal_proto.task_command_router_pb2.TaskExecWaitResponse:
         """Wait for an exec'd command to exit and return the exit code."""
 
-def add_TaskRouterServicer_to_server(servicer: TaskRouterServicer, server: grpc.Server) -> None: ...
+def add_TaskCommandRouterServicer_to_server(servicer: TaskCommandRouterServicer, server: grpc.Server) -> None: ...

{modal-1.1.5.dev87 → modal-1.1.5.dev89}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.1.5.dev87"
+__version__ = "1.1.5.dev89"