modAL 1.6.3.dev1__py3-none-any.whl → 1.6.3.dev3__py3-none-any.whl

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.dev1",
+        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.dev1",
+        version: str = "1.6.3.dev3",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):

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.dev1.dist-info → modal-1.6.3.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.6.3.dev1
+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.dev1.dist-info → modal-1.6.3.dev3.dist-info}/RECORD

@@ -39,7 +39,7 @@ modal/billing.py,sha256=E1-P_P8bJFLp-bTaggYd4BaaViImPB5UdtXiY8VeAZQ,390
 modal/billing.pyi,sha256=4m7VLYNS8IiJ2I3CJx0awvrOM6BILWRVLfdeqtAYr8M,7189
 modal/call_graph.py,sha256=XGALIDn1bLchWo_goyX23bcPjzCZcfqKUo8INIfDapo,1775
 modal/client.py,sha256=cstrL0wpXCZmcvRs7Sy3QRw9Vz8zkZy8NNk0tPe38sk,22852
-modal/client.pyi,sha256=pNXtx3pvkU8Qj1VkXAtIWBbL33dCniPHemcTcou0_qw,23488
+modal/client.pyi,sha256=JMUxjhwik00qa9LbRsaInE8D8h55Tvf_KdhDfcpvNgs,23488
 modal/cloud_bucket_mount.py,sha256=ZOg69dhIFcJcwim4JP-6s1tqwOYAfgS9806jRpspifw,7511
 modal/cloud_bucket_mount.pyi,sha256=HoPe_NG5jYdVfmTNY-ZJ3-C8Eo_FzJovl9orJRjkGbE,10252
 modal/cls.py,sha256=JfDAUMrkhasm26lK7kDUNarXZA_7AvZrymf7XNSGTDM,41777
@@ -203,11 +203,11 @@ modal/sandbox/_filesystem.py,sha256=GdkMNVahPpUpfuY04HwWWwZyMID3bcut7PHXNWOIpYg,
 modal/sandbox/_sandbox.py,sha256=StQldIqilL0y9sAqNN_tzQ6pV6GWmbP3k4dYHOs5YvQ,113729
 modal/sandbox/_sidecar.py,sha256=c_vbP_ORl7POIFw3rvDZsrkBy53oJ03RxgID243p8Cw,28069
 modal/sandbox/_snapshot.py,sha256=8mB6FOecXEbgTC9dyogIEGCxTdjemuFsyfVFQyQ2Cp8,3105
-modal/sandbox/_task_command_router_client.py,sha256=qhFXy8eyGIxwxRFZkTsxJVxsAc8cWPhovOwcrHSZFq0,56712
+modal/sandbox/_task_command_router_client.py,sha256=7c4a8sutJJYAXTgBCnUo0ZjyidAvvsBImHvTQTU9zrM,56564
 modal/sandbox/sandbox.py,sha256=4ekghND9qUGf5wtIQH4mVa6PHGjHgY0UN5RKryOM05k,683
 modal/sandbox/sandbox.pyi,sha256=LWQq7mpZXYVQHKjWi9azwddlclONcdYGZ7EpPgDD0-Y,150341
 modal/skills/modal/SKILL.md,sha256=Bm-0BPTYppJoeQzA-N-Re8L6-nKnV6gspJXMl4cD0P0,5490
-modal-1.6.3.dev1.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.6.3.dev3.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=9-b8vl2EsLWD9zJqpCK8IUi5h44Bjn3i3rSdedZV4bA,6415
 modal_docs/gen_cli_docs_main.py,sha256=UPGr7O1DYTIRLwfINe2rbdh89J3cPVTU1OWL-SjxnOQ,198
@@ -219,22 +219,22 @@ modal_docs/mdmd/mdmd.py,sha256=8bwE9SOnvsY9hEXvyE3Rx0L0XhvENpPNtkWCTJCA-pw,29269
 modal_docs/mdmd/signatures.py,sha256=OASroKle763Kfumn4Ek4PABJXEGP56JMCTug44QoBx4,11327
 modal_docs/mdmd/types.py,sha256=tv7fvziPr-MeDzOp4e2pK5h3d1DXTUOO74rPqDoBn6g,736
 modal_proto/__init__.py,sha256=Hkou4lcD5tArEkW_9v9KZhLY7fl0fA9-O28beKU55pg,396
-modal_proto/api_grpc.py,sha256=2apBkgs2G86IrW4qJCxIGk7EOH-N99FrGuRdEZsG8mk,209554
-modal_proto/api_pb2.py,sha256=WVqXaIN3OMJpInUbXj5qDvgJEl7cADa1kHfdEvzqozo,607556
-modal_proto/api_pb2.pyi,sha256=ClMVnxVRcKY6PvV8zJtGGy1gh17daVJfQnpQiIbArkI,842160
-modal_proto/api_pb2_grpc.py,sha256=V8X-LVyMUUgK8_fz6l96LOtOwRtdxgDvNaPatgrKWu8,448419
-modal_proto/api_pb2_grpc.pyi,sha256=zPleMbOEfMvYo-bN3VOIjoOYgYL2uncDpPxXtC85g94,105391
-modal_proto/modal_api_grpc.py,sha256=70vJTOo756_hHoE_svqkbrqO-FnTAEJhQ-D6LANg43M,32964
+modal_proto/api_grpc.py,sha256=ON1VhznpxU1aYKG9NuYzdS9xEyKJGHPEcnl_KpFqKT8,211869
+modal_proto/api_pb2.py,sha256=i1ZHj6Ib_6H9A4-Nc2A_kYJ9iuTqPFr9h5mSgNREKDI,615874
+modal_proto/api_pb2.pyi,sha256=FPb1Rk2zuIBDlNQN0ddYYWmYgbylq7dXsGXBEMO5Cz0,854938
+modal_proto/api_pb2_grpc.py,sha256=57bvHFN8Jx7fvLuiR7M7nfhBeC19vV0ff_G1StRzvLA,453372
+modal_proto/api_pb2_grpc.pyi,sha256=SRpUAPcooPEgclr12YXQtHwKkvDtflGRTz0bSCgGjSo,106570
+modal_proto/modal_api_grpc.py,sha256=UtaD1fZ6XaGpnfXgfbPHUz89gLtBIOH-3reuuW8-e_A,33314
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal_proto/task_command_router_grpc.py,sha256=LOkoiKSoyesfTsViPwDI88-V8bG4oDH6S2MBm84hMLA,22335
 modal_proto/task_command_router_pb2.py,sha256=ysC0d8p3YxwyOpP3B-qDlvE81Yo4ntQiwiGZ8qSb0kg,43514
 modal_proto/task_command_router_pb2.pyi,sha256=FDcd5t3ZCmQHUjefOzg07iglrgKYcBrzFvdKIWsEMHI,50628
 modal_proto/task_command_router_pb2_grpc.py,sha256=8iGUGwEVbqOsZWPJ7OsQ9OKUGaSCf9Dr2tvb04Ww6d4,44620
 modal_proto/task_command_router_pb2_grpc.pyi,sha256=26Fq9RQo09B9KLHsgdpRuw-I6Z4-2jrXLQkuDzB-moI,15097
-modal_version/__init__.py,sha256=u2qrbxI_YL-KZRwsXsYMQsHn-MkQSRROMWlQ6dxqBho,120
+modal_version/__init__.py,sha256=5GsNaeA620SiVlMRXrW3DTAE1pZK0GVmOUb-oNc_dyA,120
 modal_version/__main__.py,sha256=nLUbubxKx7GXNzJIkTB7M7_u8080LyLM0IS0rzFkC_c,119
-modal-1.6.3.dev1.dist-info/METADATA,sha256=_aXXgr3hBF7sUeTXQ7uIAiJ4sE9um9agCrMRqhOGW8Y,2577
-modal-1.6.3.dev1.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-modal-1.6.3.dev1.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.6.3.dev1.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.6.3.dev1.dist-info/RECORD,,
+modal-1.6.3.dev3.dist-info/METADATA,sha256=Vju-PUh4UoThF-iMhMKgz2_IMdvUDJ4GMA9rT8LbsAk,2577
+modal-1.6.3.dev3.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+modal-1.6.3.dev3.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.6.3.dev3.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.6.3.dev3.dist-info/RECORD,,

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',