modAL 1.6.3.dev2__tar.gz → 1.6.3.dev3__tar.gz

{modal-1.6.3.dev2 → modal-1.6.3.dev3}/PKG-INFO

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

{modal-1.6.3.dev2 → modal-1.6.3.dev3}/modal/client.pyi

@@ -80,7 +80,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.6.3.dev2",
+        version: str = "1.6.3.dev3",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):
@@ -290,7 +290,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.6.3.dev2",
+        version: str = "1.6.3.dev3",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):

{modal-1.6.3.dev2 → modal-1.6.3.dev3}/modal/sandbox/_task_command_router_client.py

@@ -137,7 +137,8 @@ async def call_with_retries_on_transient_errors(
             the caller to decide whether to further translate the surfaced
             exception (e.g., into a TimeoutError) based on the deadline check.
             The caller is also responsible for propagating the remaining budget
-            into `func()` (typically as the per-call gRPC timeout).
+            into `func()` (typically as the per-call gRPC timeout). A server-requested
+            throttle wait that doesn't fit before the deadline raises a TimeoutError.
         rpc_name: RPC name to include in retry diagnostics.
         exec_id: Execution ID to include in retry diagnostics, for correlating
             the retries of concurrent executions.
@@ -170,10 +171,8 @@ async def call_with_retries_on_transient_errors(
             return False
         return fits_deadline(0.0)
 
-    def can_retry_throttled(delay: float) -> bool:
-        if max_throttle_wait is not None and throttle_wait_total + delay > max_throttle_wait:
-            return False
-        return fits_deadline(delay)
+    def fits_throttle_budget(delay: float) -> bool:
+        return max_throttle_wait is None or throttle_wait_total + delay <= max_throttle_wait
 
     async def sleep_and_advance(e: Exception, *, count_failure: bool = True, throttle_delay: float | None = None):
         nonlocal delay_secs, num_retries, num_throttled_retries, throttle_wait_total, consecutive_failures, warned
@@ -215,7 +214,9 @@ async def call_with_retries_on_transient_errors(
             except GRPCError as e:
                 retry_after = server_retry_after(e)
                 if retry_after is not None:
-                    if not can_retry_throttled(retry_after):
+                    if not fits_deadline(retry_after):
+                        raise ModalTimeoutError("Timeout expired") from e
+                    if not fits_throttle_budget(retry_after):
                         raise
                     # Throttling says nothing about the connection's health.
                     await sleep_and_advance(e, count_failure=False, throttle_delay=retry_after)
@@ -1244,13 +1245,7 @@ class TaskCommandRouterClient:
                     timeout_deadline=timeout_deadline,
                 )
         except Exception as exc:
-            # A throttled call whose server-requested wait doesn't fit the remaining
-            # budget is given up without sleeping, so treat it as a timeout too.
-            retry_after = server_retry_after_secs(getattr(exc, "_grpc_details", None)) or 0.0
-            if (
-                time.monotonic() + retry_after >= timeout_deadline
-                or getattr(exc, "_grpc_status", None) == Status.DEADLINE_EXCEEDED
-            ):
+            if time.monotonic() >= timeout_deadline or getattr(exc, "_grpc_status", None) == Status.DEADLINE_EXCEEDED:
                 raise ModalTimeoutError("Timeout expired")
             raise
 

{modal-1.6.3.dev2 → modal-1.6.3.dev3}/modal.egg-info/PKG-INFO

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

{modal-1.6.3.dev2 → modal-1.6.3.dev3}/modal_proto/api_grpc.py

@@ -127,6 +127,18 @@ class ModalClientBase(abc.ABC):
     async def AttemptStart(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.AttemptStartRequest, modal_proto.api_pb2.AttemptStartResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def AuditLogV2Count(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.AuditLogV2CountRequest, modal_proto.api_pb2.AuditLogV2CountResponse]') -> None:
+        pass
+
+    @abc.abstractmethod
+    async def AuditLogV2List(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.AuditLogV2ListRequest, modal_proto.api_pb2.AuditLogV2ListResponse]') -> None:
+        pass
+
+    @abc.abstractmethod
+    async def AuditLogV2Plan(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.AuditLogV2PlanRequest, modal_proto.api_pb2.AuditLogV2PlanResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def AuthTokenGet(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.AuthTokenGetRequest, modal_proto.api_pb2.AuthTokenGetResponse]') -> None:
         pass
@@ -1251,6 +1263,24 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.AttemptStartRequest,
                 modal_proto.api_pb2.AttemptStartResponse,
             ),
+            '/modal.client.ModalClient/AuditLogV2Count': grpclib.const.Handler(
+                self.AuditLogV2Count,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.AuditLogV2CountRequest,
+                modal_proto.api_pb2.AuditLogV2CountResponse,
+            ),
+            '/modal.client.ModalClient/AuditLogV2List': grpclib.const.Handler(
+                self.AuditLogV2List,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.AuditLogV2ListRequest,
+                modal_proto.api_pb2.AuditLogV2ListResponse,
+            ),
+            '/modal.client.ModalClient/AuditLogV2Plan': grpclib.const.Handler(
+                self.AuditLogV2Plan,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.AuditLogV2PlanRequest,
+                modal_proto.api_pb2.AuditLogV2PlanResponse,
+            ),
             '/modal.client.ModalClient/AuthTokenGet': grpclib.const.Handler(
                 self.AuthTokenGet,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -2859,6 +2889,24 @@ class ModalClientStub:
             modal_proto.api_pb2.AttemptStartRequest,
             modal_proto.api_pb2.AttemptStartResponse,
         )
+        self.AuditLogV2Count = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/AuditLogV2Count',
+            modal_proto.api_pb2.AuditLogV2CountRequest,
+            modal_proto.api_pb2.AuditLogV2CountResponse,
+        )
+        self.AuditLogV2List = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/AuditLogV2List',
+            modal_proto.api_pb2.AuditLogV2ListRequest,
+            modal_proto.api_pb2.AuditLogV2ListResponse,
+        )
+        self.AuditLogV2Plan = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/AuditLogV2Plan',
+            modal_proto.api_pb2.AuditLogV2PlanRequest,
+            modal_proto.api_pb2.AuditLogV2PlanResponse,
+        )
         self.AuthTokenGet = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/AuthTokenGet',