modal 1.1.5.dev52__tar.gz → 1.1.5.dev54__tar.gz

{modal-1.1.5.dev52 → modal-1.1.5.dev54}/PKG-INFO

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

{modal-1.1.5.dev52 → modal-1.1.5.dev54}/modal/_utils/function_utils.py

@@ -492,7 +492,12 @@ async def _process_result(result: api_pb2.GenericResult, data_format: int, stub,
     elif result.status == api_pb2.GenericResult.GENERIC_STATUS_INTERNAL_FAILURE:
         raise InternalFailure(result.exception)
     elif result.status != api_pb2.GenericResult.GENERIC_STATUS_SUCCESS:
-        if data and data_format == api_pb2.DATA_FORMAT_PICKLE:
+        if data and data_format in (api_pb2.DATA_FORMAT_PICKLE, api_pb2.DATA_FORMAT_UNSPECIFIED):
+            # *Unspecified data format here but data present usually means that the exception
+            # was created by the server representing an exception that occurred during container
+            # startup (crash looping) that eventually got escalated to input failures.
+            # TaskResult doesn't specify data format, so these results don't have that metadata
+            # the moment.
             try:
                 exc = deserialize(data, client)
             except DeserializationError as deser_exc:

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

{modal-1.1.5.dev52 → modal-1.1.5.dev54}/modal.egg-info/PKG-INFO

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

{modal-1.1.5.dev52 → modal-1.1.5.dev54}/modal_proto/api.proto

@@ -7,6 +7,7 @@ package modal.client;
 import "modal_proto/options.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/struct.proto";
+import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";
 
 enum AppDeployVisibility {
@@ -3546,6 +3547,24 @@ message WebhookConfig {
   bool requires_proxy_auth = 10;
 }
 
+
+message WorkspaceBillingReportItem {
+  string object_id = 1;
+  string description = 2;
+  string environment_name = 3;
+  google.protobuf.Timestamp interval = 4;
+  string cost = 5;
+  map<string, string> tags = 6;
+}
+
+message WorkspaceBillingReportRequest {
+  // Workspace ID will be implicit in the request metadata
+  google.protobuf.Timestamp start_timestamp = 1;
+  google.protobuf.Timestamp end_timestamp = 2;
+  string resolution = 3;  // e.g. 'd' or 'h'; server defines what we accept
+  repeated string tag_names = 4;
+}
+
 message WorkspaceNameLookupResponse {
   string workspace_name = 1 [deprecated=true];
   string username = 2;
@@ -3777,5 +3796,6 @@ service ModalClient {
   rpc VolumeRename(VolumeRenameRequest) returns (google.protobuf.Empty);
 
   // Workspaces
+  rpc WorkspaceBillingReport(WorkspaceBillingReportRequest) returns (stream WorkspaceBillingReportItem);
   rpc WorkspaceNameLookup(google.protobuf.Empty) returns (WorkspaceNameLookupResponse);
 }

{modal-1.1.5.dev52 → modal-1.1.5.dev54}/modal_proto/api_grpc.py

@@ -12,6 +12,7 @@ if typing.TYPE_CHECKING:
 import modal_proto.options_pb2
 import google.protobuf.empty_pb2
 import google.protobuf.struct_pb2
+import google.protobuf.timestamp_pb2
 import google.protobuf.wrappers_pb2
 import modal_proto.api_pb2
 
@@ -702,6 +703,10 @@ class ModalClientBase(abc.ABC):
     async def VolumeRename(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.VolumeRenameRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def WorkspaceBillingReport(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.WorkspaceBillingReportRequest, modal_proto.api_pb2.WorkspaceBillingReportItem]') -> None:
+        pass
+
     @abc.abstractmethod
     async def WorkspaceNameLookup(self, stream: 'grpclib.server.Stream[google.protobuf.empty_pb2.Empty, modal_proto.api_pb2.WorkspaceNameLookupResponse]') -> None:
         pass
@@ -1734,6 +1739,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.VolumeRenameRequest,
                 google.protobuf.empty_pb2.Empty,
             ),
+            '/modal.client.ModalClient/WorkspaceBillingReport': grpclib.const.Handler(
+                self.WorkspaceBillingReport,
+                grpclib.const.Cardinality.UNARY_STREAM,
+                modal_proto.api_pb2.WorkspaceBillingReportRequest,
+                modal_proto.api_pb2.WorkspaceBillingReportItem,
+            ),
             '/modal.client.ModalClient/WorkspaceNameLookup': grpclib.const.Handler(
                 self.WorkspaceNameLookup,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -2772,6 +2783,12 @@ class ModalClientStub:
             modal_proto.api_pb2.VolumeRenameRequest,
             google.protobuf.empty_pb2.Empty,
         )
+        self.WorkspaceBillingReport = grpclib.client.UnaryStreamMethod(
+            channel,
+            '/modal.client.ModalClient/WorkspaceBillingReport',
+            modal_proto.api_pb2.WorkspaceBillingReportRequest,
+            modal_proto.api_pb2.WorkspaceBillingReportItem,
+        )
         self.WorkspaceNameLookup = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/WorkspaceNameLookup',