modAL 1.2.3.dev15__py3-none-any.whl → 1.2.3.dev16__py3-none-any.whl

modal/_utils/grpc_utils.py

@@ -271,15 +271,13 @@ def process_exception_before_retry(
     fn_name: str,
     n_retries: int,
     delay: float,
-    total_deadline: Optional[float],
     idempotency_key: str,
 ):
     """Process exception before retry, used by `_retry_transient_errors`."""
     with suppress_tb_frames(1):
         if final_attempt:
             logger.debug(
-                f"Final attempt failed with {repr(exc)} {n_retries=} {delay=} "
-                f"{total_deadline=} for {fn_name} ({idempotency_key[:8]})"
+                f"Final attempt failed with {repr(exc)} {n_retries=} {delay=} for {fn_name} ({idempotency_key[:8]})"
             )
             if isinstance(exc, OSError):
                 raise ConnectionError(str(exc))
@@ -358,6 +356,7 @@ async def _retry_transient_errors(
             timeout = min(timeouts)  # In case the function provided both types of timeouts
         else:
             timeout = None
+
         try:
             with suppress_tb_frames(1):
                 return await fn_callable(req, metadata=attempt_metadata, timeout=timeout)
@@ -366,21 +365,29 @@ async def _retry_transient_errors(
             # in grpclib<=0.4.7. See above (search for `write_appdata`).
 
             # Server side instruction for retries
-            if isinstance(exc, GRPCError) and (server_retry_policy := get_server_retry_policy(exc)):
+            max_throttle_wait: Optional[int] = config.get("max_throttle_wait")
+            if (
+                max_throttle_wait != 0
+                and isinstance(exc, GRPCError)
+                and (server_retry_policy := get_server_retry_policy(exc))
+            ):
                 server_delay = server_retry_policy.retry_after_secs
 
-                # When `total_deadline` is not defined and server gives instruction for retries, then use
-                # `max_throttle_wait`.
-                if total_deadline is None and (max_throttle_wait := config.get("max_throttle_wait")):
-                    total_deadline = t0 + max_throttle_wait
+                now = time.time()
 
-                final_attempt = (
-                    total_deadline is not None
-                    and time.time() + server_delay + retry.attempt_timeout_floor >= total_deadline
+                # We check if the timeout will be reached **after** the sleep, so we can raise an error early
+                # without needing to actually sleep.
+                total_timeout_will_be_reached = (
+                    retry.total_timeout is not None and (now + server_delay - t0) >= retry.total_timeout
+                )
+                max_throttle_will_be_reached = (
+                    max_throttle_wait is not None and (now + server_delay - t0) >= max_throttle_wait
                 )
+                final_attempt = total_timeout_will_be_reached or max_throttle_will_be_reached
+
                 with suppress_tb_frames(1):
                     process_exception_before_retry(
-                        exc, final_attempt, fn.name, n_retries, server_delay, total_deadline, idempotency_key
+                        exc, final_attempt, fn.name, n_retries, server_delay, idempotency_key
                     )
 
                 now = time.time()
@@ -411,9 +418,7 @@ async def _retry_transient_errors(
                 final_attempt = False
 
             with suppress_tb_frames(1):
-                process_exception_before_retry(
-                    exc, final_attempt, fn.name, n_retries, delay, total_deadline, idempotency_key
-                )
+                process_exception_before_retry(exc, final_attempt, fn.name, n_retries, delay, idempotency_key)
 
             n_retries += 1
 

modal/client.pyi

@@ -32,7 +32,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.2.3.dev15",
+        version: str = "1.2.3.dev16",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -163,7 +163,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.2.3.dev15",
+        version: str = "1.2.3.dev16",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

modal/config.py

@@ -221,13 +221,6 @@ def _enforce_suffix_rules(x: str) -> str:
     return x
 
 
-def _int_or_none(x: str) -> Optional[int]:
-    if not x:
-        return None
-    x_int = int(x)
-    return x_int if x_int > 0 else None
-
-
 class _Setting(typing.NamedTuple):
     default: typing.Any = None
     transform: typing.Callable[[str], typing.Any] = lambda x: x  # noqa: E731
@@ -269,7 +262,7 @@ _SETTINGS = {
         transform=lambda s: _check_value(["pickle", "cbor"])(s.lower()),
     ),
     "dev_suffix": _Setting("", transform=_enforce_suffix_rules),
-    "max_throttle_wait": _Setting(None, transform=_int_or_none),
+    "max_throttle_wait": _Setting(None, transform=lambda x: int(x) if x else None),
 }
 
 

{modal-1.2.3.dev15.dist-info → modal-1.2.3.dev16.dist-info}/METADATA

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

{modal-1.2.3.dev15.dist-info → modal-1.2.3.dev16.dist-info}/RECORD

@@ -26,12 +26,12 @@ modal/app.pyi,sha256=nI_Tibj-rI5I7dJFJnczbHvcmVzCvvCih0tMzoQlr_Y,50835
 modal/billing.py,sha256=zmQ3bcCJlwa4KD1IA_QgdWpm1pn13c-7qfy79iEauYI,195
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=k1CqQ_0t4-vHylkqYZgYCnClg-FT0QrTPAKivL01A_k,14354
-modal/client.pyi,sha256=zMiMyLkDECv-um8xP_nXTYekpY0J2oED0ErIY7lDdso,13148
+modal/client.pyi,sha256=aZlrkkekFOI4eHfHtEjrFyctSVzw38l47F3Paa3n28c,13148
 modal/cloud_bucket_mount.py,sha256=cvVj5Rt4nDHoQbTneoJPTaAcnl_Ab_mrsjnnzd0v9OI,6013
 modal/cloud_bucket_mount.pyi,sha256=vXusGMOUk9HjCs4lhxteuCK4xLQclPfugGWKo7LECEA,7539
 modal/cls.py,sha256=4T__mtYlQUnkatif1Wnr8Ld9DN_ySydHj2UwhRg89ok,41984
 modal/cls.pyi,sha256=p8Unbfr0yUdAzYYnD7erSRO7dH-87HkAg4oAn6srBzA,27424
-modal/config.py,sha256=gmL1zcJlyhX_hKE1Xm_86KysXfTUiutVSASxXgHFztQ,13534
+modal/config.py,sha256=byOUVfUibX9Ixrhbz5z4HDcgn-8S5OFicD6xGUErqZs,13415
 modal/container_process.py,sha256=KG2ZkFOWe2KN1b8dFSBLBoW5pWoRxBzJ20MLhDTicJs,16749
 modal/container_process.pyi,sha256=xMKr-VbQsydS8AbhAys9UTpHHnH2QRyINpPtPG7NwmI,8373
 modal/dict.py,sha256=Omfmj3fUyg7ijTI33Z97geyK7MW8T31LRm-N7pZqSwU,21582
@@ -104,7 +104,7 @@ modal/_utils/docker_utils.py,sha256=h1uETghR40mp_y3fSWuZAfbIASH1HMzuphJHghAL6DU,
 modal/_utils/function_utils.py,sha256=wL2AA8aEftxCBATPStHgKDRPxrFjPAv-rHt0Wb7y9Ts,28629
 modal/_utils/git_utils.py,sha256=qtUU6JAttF55ZxYq51y55OR58B0tDPZsZWK5dJe6W5g,3182
 modal/_utils/grpc_testing.py,sha256=H1zHqthv19eGPJz2HKXDyWXWGSqO4BRsxah3L5Xaa8A,8619
-modal/_utils/grpc_utils.py,sha256=1jmpMRuShYdnqmCLUfQt5bO9KFioAjVmkjjEBhyz_18,16263
+modal/_utils/grpc_utils.py,sha256=kGYfkZNoYzaDCeeDxL8Z1oMRcGRMBpLS40B2tYUAnS8,16417
 modal/_utils/hash_utils.py,sha256=zg3J6OGxTFGSFri1qQ12giDz90lWk8bzaxCTUCRtiX4,3034
 modal/_utils/http_utils.py,sha256=yeTFsXYr0rYMEhB7vBP7audG9Uc7OLhzKBANFDZWVt0,2451
 modal/_utils/jwt_utils.py,sha256=fxH9plyrbAemTbjSsQtzIdDXE9QXxvMC4DiUZ16G0aA,1360
@@ -158,7 +158,7 @@ modal/experimental/__init__.py,sha256=sCwNbBLcR2t-jhrpwtMAPGKt2WNqXBg0xkNZdyB-6C
 modal/experimental/flash.py,sha256=RKS3X3h4tY_mOLcMzbRs5tNCLPFL01dBAhCZSqCeBgA,26675
 modal/experimental/flash.pyi,sha256=uwinKAYxpunNNfBj58FP88DXb535Qik4F6tnJKPAIwQ,14696
 modal/experimental/ipython.py,sha256=TrCfmol9LGsRZMeDoeMPx3Hv3BFqQhYnmD_iH0pqdhk,2904
-modal-1.2.3.dev15.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.2.3.dev16.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=c1yfBS_x--gL5bs0N4ihMwqwX8l3IBWSkBAKNNIi6bQ,3801
 modal_docs/gen_reference_docs.py,sha256=d_CQUGQ0rfw28u75I2mov9AlS773z9rG40-yq5o7g2U,6359
@@ -186,10 +186,10 @@ modal_proto/task_command_router_pb2.py,sha256=_pD2ZpU0bNzhwBdzmLoLyLtAtftI_Agxwn
 modal_proto/task_command_router_pb2.pyi,sha256=EyDgXPLr7alqjXYERV8w_MPuO404x0uCppmSkrfE9IE,14589
 modal_proto/task_command_router_pb2_grpc.py,sha256=uEQ0HdrCp8v-9bB5yIic9muA8spCShLHY6Bz9cCgOUE,10114
 modal_proto/task_command_router_pb2_grpc.pyi,sha256=s3Yxsrawdj4nr8vqQqsAxyX6ilWaGbdECy425KKbLIA,3301
-modal_version/__init__.py,sha256=zYqIo07pfBOafxOQqy2ixFUKAuoev-A5xeuVBgFXN_Y,121
+modal_version/__init__.py,sha256=W4GhojSH5h6GCtV3WlNQg5YXcoazI5vU-5Vy9Qsx6ko,121
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal-1.2.3.dev15.dist-info/METADATA,sha256=gKLHENGMQmHESi0ICzHHU5JB8fqE__EaiGy5x1oRi48,2490
-modal-1.2.3.dev15.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-1.2.3.dev15.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.2.3.dev15.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.2.3.dev15.dist-info/RECORD,,
+modal-1.2.3.dev16.dist-info/METADATA,sha256=ZsNb5qRrYwKAuduKDY5MN2iECZ93D5vnvXxDijyGyG8,2490
+modal-1.2.3.dev16.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-1.2.3.dev16.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.2.3.dev16.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.2.3.dev16.dist-info/RECORD,,

modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.2.3.dev15"
+__version__ = "1.2.3.dev16"