modal 1.1.5.dev86__tar.gz → 1.1.5.dev88__tar.gz

{modal-1.1.5.dev86 → modal-1.1.5.dev88}/PKG-INFO

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

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

{modal-1.1.5.dev86 → modal-1.1.5.dev88}/modal.egg-info/PKG-INFO

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

{modal-1.1.5.dev86 → modal-1.1.5.dev88}/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
@@ -183,5 +185,11 @@ modal_proto/sandbox_router_pb2.py
 modal_proto/sandbox_router_pb2.pyi
 modal_proto/sandbox_router_pb2_grpc.py
 modal_proto/sandbox_router_pb2_grpc.pyi
+modal_proto/task_command_router.proto
+modal_proto/task_command_router_grpc.py
+modal_proto/task_command_router_pb2.py
+modal_proto/task_command_router_pb2.pyi
+modal_proto/task_command_router_pb2_grpc.py
+modal_proto/task_command_router_pb2_grpc.pyi
 modal_version/__init__.py
 modal_version/__main__.py

{modal-1.1.5.dev86 → modal-1.1.5.dev88}/modal_proto/api.proto

@@ -2760,6 +2760,8 @@ message SandboxCreateResponse {
 // Used to get a JWT and URL for direct access to a sandbox router server
 // running on the modal-worker, so the client can issue exec commands (and other
 // operations as they become available) directly to the worker.
+// DEPRECATED: Use TaskGetCommandRouterAccessRequest instead.
+// TODO(saltzm): Remove this.
 message SandboxGetCommandRouterAccessRequest {
   string sandbox_id = 1;
 }
@@ -3163,6 +3165,18 @@ message TaskGetAutoscalingMetricsResponse {
   AutoscalingMetrics metrics = 1;
 }
 
+// Used to get a JWT and URL for direct access to a task command router
+// running on the modal-worker, so the client can issue exec commands (and other
+// operations as they become available) directly to the worker.
+message TaskGetCommandRouterAccessRequest {
+  string task_id = 1;
+}
+
+message TaskGetCommandRouterAccessResponse {
+  string jwt = 1;
+  string url = 2;
+}
+
 message TaskInfo {
   string id = 1;
   double started_at = 2;
@@ -3780,6 +3794,7 @@ service ModalClient {
   rpc TaskClusterHello(TaskClusterHelloRequest) returns (TaskClusterHelloResponse);
   rpc TaskCurrentInputs(google.protobuf.Empty) returns (TaskCurrentInputsResponse);
   rpc TaskGetAutoscalingMetrics(TaskGetAutoscalingMetricsRequest) returns (TaskGetAutoscalingMetricsResponse); // Used for flash autoscaling
+  rpc TaskGetCommandRouterAccess(TaskGetCommandRouterAccessRequest) returns (TaskGetCommandRouterAccessResponse);
   rpc TaskList(TaskListRequest) returns (TaskListResponse);
   rpc TaskResult(TaskResultRequest) returns (google.protobuf.Empty);
 

{modal-1.1.5.dev86 → modal-1.1.5.dev88}/modal_proto/api_grpc.py

@@ -618,6 +618,10 @@ class ModalClientBase(abc.ABC):
     async def TaskGetAutoscalingMetrics(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.TaskGetAutoscalingMetricsRequest, modal_proto.api_pb2.TaskGetAutoscalingMetricsResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def TaskGetCommandRouterAccess(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.TaskGetCommandRouterAccessRequest, modal_proto.api_pb2.TaskGetCommandRouterAccessResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def TaskList(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.TaskListRequest, modal_proto.api_pb2.TaskListResponse]') -> None:
         pass
@@ -1620,6 +1624,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.TaskGetAutoscalingMetricsRequest,
                 modal_proto.api_pb2.TaskGetAutoscalingMetricsResponse,
             ),
+            '/modal.client.ModalClient/TaskGetCommandRouterAccess': grpclib.const.Handler(
+                self.TaskGetCommandRouterAccess,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.TaskGetCommandRouterAccessRequest,
+                modal_proto.api_pb2.TaskGetCommandRouterAccessResponse,
+            ),
             '/modal.client.ModalClient/TaskList': grpclib.const.Handler(
                 self.TaskList,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -2676,6 +2686,12 @@ class ModalClientStub:
             modal_proto.api_pb2.TaskGetAutoscalingMetricsRequest,
             modal_proto.api_pb2.TaskGetAutoscalingMetricsResponse,
         )
+        self.TaskGetCommandRouterAccess = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/TaskGetCommandRouterAccess',
+            modal_proto.api_pb2.TaskGetCommandRouterAccessRequest,
+            modal_proto.api_pb2.TaskGetCommandRouterAccessResponse,
+        )
         self.TaskList = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/TaskList',