modal 1.3.6.dev8__tar.gz → 1.3.6.dev9__tar.gz

{modal-1.3.6.dev8 → modal-1.3.6.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.3.6.dev8
+Version: 1.3.6.dev9
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License-Expression: Apache-2.0
@@ -36,7 +36,6 @@ Dynamic: license-file
 
 [![PyPI Version](https://img.shields.io/pypi/v/modal.svg)](https://pypi.org/project/modal/)
 [![License](https://img.shields.io/badge/license-apache_2.0-darkviolet.svg)](https://github.com/modal-labs/modal-client/blob/master/LICENSE)
-[![Tests](https://github.com/modal-labs/modal-client/actions/workflows/ci-cd.yml/badge.svg)](https://github.com/modal-labs/modal-client/actions/workflows/ci-cd.yml)
 [![Slack](https://img.shields.io/badge/slack-join-blue.svg?logo=slack)](https://modal.com/slack)
 
 The [Modal](https://modal.com/) Python SDK provides convenient, on-demand

{modal-1.3.6.dev8 → modal-1.3.6.dev9}/README.md

@@ -2,7 +2,6 @@
 
 [![PyPI Version](https://img.shields.io/pypi/v/modal.svg)](https://pypi.org/project/modal/)
 [![License](https://img.shields.io/badge/license-apache_2.0-darkviolet.svg)](https://github.com/modal-labs/modal-client/blob/master/LICENSE)
-[![Tests](https://github.com/modal-labs/modal-client/actions/workflows/ci-cd.yml/badge.svg)](https://github.com/modal-labs/modal-client/actions/workflows/ci-cd.yml)
 [![Slack](https://img.shields.io/badge/slack-join-blue.svg?logo=slack)](https://modal.com/slack)
 
 The [Modal](https://modal.com/) Python SDK provides convenient, on-demand

{modal-1.3.6.dev8 → modal-1.3.6.dev9}/modal/_utils/async_utils.py

@@ -345,12 +345,24 @@ def synchronize_api(obj, target_module=None):
 RETRY_N_ATTEMPTS_OVERRIDE: Optional[int] = None
 
 
-def retry(direct_fn=None, *, n_attempts=3, base_delay=0, delay_factor=2, timeout=90):
+def retry(
+    direct_fn=None,
+    *,
+    n_attempts=3,
+    base_delay=0,
+    delay_factor=2,
+    attempt_timeout: Optional[float] = 90,
+    attempt_timeout_factor=1,
+):
     """Decorator that calls an async function multiple times, with a given timeout.
 
     If a `base_delay` is provided, the function is given an exponentially
     increasing delay on each run, up until the maximum number of attempts.
 
+    If `attempt_timeout_factor` is set to a value > 1, the per-attempt timeout
+    increases exponentially (starting from `attempt_timeout`, multiplied by
+    `attempt_timeout_factor` after each failed attempt).
+
     Usage:
 
     ```
@@ -375,10 +387,11 @@ def retry(direct_fn=None, *, n_attempts=3, base_delay=0, delay_factor=2, timeout
                 local_n_attempts = n_attempts
 
             delay = base_delay
+            current_attempt_timeout = attempt_timeout
             for i in range(local_n_attempts):
                 t0 = time.time()
                 try:
-                    return await asyncio.wait_for(fn(*args, **kwargs), timeout=timeout)
+                    return await asyncio.wait_for(fn(*args, **kwargs), timeout=current_attempt_timeout)
                 except asyncio.CancelledError:
                     logger.debug(f"Function {fn} was cancelled")
                     raise
@@ -392,6 +405,8 @@ def retry(direct_fn=None, *, n_attempts=3, base_delay=0, delay_factor=2, timeout
                     )
                 await asyncio.sleep(delay)
                 delay *= delay_factor
+                if current_attempt_timeout is not None:
+                    current_attempt_timeout *= attempt_timeout_factor
 
         return f_wrapped
 

{modal-1.3.6.dev8 → modal-1.3.6.dev9}/modal/_utils/blob_utils.py

@@ -58,7 +58,7 @@ MULTIPART_UPLOAD_THRESHOLD = 1024**3
 BLOCK_SIZE: int = 8 * 1024 * 1024
 
 
-@retry(n_attempts=3, base_delay=0.3, timeout=None)
+@retry(n_attempts=3, base_delay=0.3, attempt_timeout=None)
 async def _upload_to_s3_url(
     upload_url,
     payload: "BytesIOSegmentPayload",
@@ -310,7 +310,7 @@ async def blob_upload_file(
     return blob_id
 
 
-@retry(n_attempts=5, base_delay=0.1, timeout=None)
+@retry(n_attempts=5, base_delay=0.1, attempt_timeout=None)
 async def _download_from_url(download_url: str) -> bytes:
     async with ClientSessionRegistry.get_session().get(download_url) as s3_resp:
         # S3 signal to slow down request rate.

{modal-1.3.6.dev8 → modal-1.3.6.dev9}/modal/_utils/grpc_utils.py

@@ -89,6 +89,10 @@ RETRYABLE_GRPC_STATUS_CODES = [
     Status.UNKNOWN,
 ]
 SERVER_RETRY_WARNING_TIME_INTERVAL = 30.0
+# Initial per-attempt timeout for TCP/TLS handshake in connect_channel.
+# Doubles each attempt (attempt_timeout_factor=2): 0.5 + 1 + 2 + 4 + 8 = 15.5s + ~1.5s inter-attempt delays.
+CONNECT_TIMEOUT = 0.5
+DEFAULT_MAX_RETRIES = 3
 
 
 @dataclass
@@ -117,7 +121,7 @@ class ConnectionManager:
             self._channels[server_url] = create_channel(server_url, self._metadata)
             try:
                 await connect_channel(self._channels[server_url])
-            except OSError as exc:
+            except (OSError, asyncio.TimeoutError) as exc:
                 raise ConnectionError("Could not connect to the Modal server.") from exc
         return self._channels[server_url]
 
@@ -221,7 +225,7 @@ def create_channel(
     return channel
 
 
-@retry(n_attempts=5, base_delay=0.1)
+@retry(n_attempts=5, base_delay=0.1, attempt_timeout=CONNECT_TIMEOUT, attempt_timeout_factor=2)
 async def connect_channel(channel: grpclib.client.Channel):
     """Connect to socket and raise exceptions when there is a connection issue."""
     await channel.__connect__()
@@ -246,7 +250,7 @@ class Retry:
     base_delay: float = 0.1
     max_delay: float = 1
     delay_factor: float = 2
-    max_retries: Optional[int] = 3
+    max_retries: Optional[int] = DEFAULT_MAX_RETRIES
     additional_status_codes: list = field(default_factory=list)
     attempt_timeout: Optional[float] = None  # timeout for each attempt
     total_timeout: Optional[float] = None  # timeout for the entire function call
@@ -257,7 +261,7 @@ class Retry:
 async def retry_transient_errors(
     fn: "grpclib.client.UnaryUnaryMethod[RequestType, ResponseType]",
     req: RequestType,
-    max_retries: Optional[int] = 3,
+    max_retries: Optional[int] = DEFAULT_MAX_RETRIES,
 ) -> ResponseType:
     """Minimum API version of _retry_transient_errors that works with grpclib.client.UnaryUnaryMethod.
 
@@ -373,7 +377,13 @@ async def _retry_transient_errors(
         try:
             with suppress_tb_frame():
                 return await fn_callable(req, metadata=attempt_metadata, timeout=timeout)
-        except (StreamTerminatedError, GRPCError, OSError, asyncio.TimeoutError, AttributeError) as exc:
+        except (
+            StreamTerminatedError,
+            GRPCError,
+            OSError,
+            asyncio.TimeoutError,
+            AttributeError,
+        ) as exc:
             # Note that we only catch AttributeError to handle a specific case that works around a bug
             # in grpclib<=0.4.7. See above (search for `write_appdata`).
 

{modal-1.3.6.dev8 → modal-1.3.6.dev9}/modal/client.pyi

@@ -35,7 +35,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.3.6.dev8",
+        version: str = "1.3.6.dev9",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -171,7 +171,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.3.6.dev8",
+        version: str = "1.3.6.dev9",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.3.6.dev8 → modal-1.3.6.dev9}/modal/functions.pyi

@@ -408,7 +408,7 @@ class Function(
 
     _call_generator: ___call_generator_spec
 
-    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER:
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
@@ -417,7 +417,7 @@ class Function(
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
 
-    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType]
+    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P]
 
     class __remote_gen_spec(typing_extensions.Protocol):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -444,7 +444,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """[Experimental] Calls the function with the given arguments, without waiting for the results.
 
@@ -467,7 +467,7 @@ class Function(
             """
             ...
 
-    _experimental_spawn: ___experimental_spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    _experimental_spawn: ___experimental_spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> None: ...
@@ -475,7 +475,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P]
 
-    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """Calls the function with the given arguments, without waiting for the results.
 
@@ -496,7 +496,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function."""

{modal-1.3.6.dev8 → modal-1.3.6.dev9}/modal/volume.py

@@ -740,7 +740,7 @@ class _Volume(_Object, type_prefix="vo"):
         except modal.exception.NotFoundError as exc:
             raise FileNotFoundError(exc.args[0])
 
-        @retry(n_attempts=5, base_delay=0.1, timeout=None)
+        @retry(n_attempts=5, base_delay=0.1, attempt_timeout=None)
         async def read_block(block_url: str) -> bytes:
             async with ClientSessionRegistry.get_session().get(block_url) as get_response:
                 get_response.raise_for_status()
@@ -806,7 +806,7 @@ class _Volume(_Object, type_prefix="vo"):
         write_lock = asyncio.Lock()
         start_pos = fileobj.tell()
 
-        @retry(n_attempts=5, base_delay=0.1, timeout=None)
+        @retry(n_attempts=5, base_delay=0.1, attempt_timeout=None)
         async def download_block(idx, url) -> int:
             block_start_pos = start_pos + idx * BLOCK_SIZE
             num_bytes_written = 0
@@ -1369,7 +1369,7 @@ async def _put_missing_blocks(
         file_progress.pending_blocks.add(missing_block.block_index)
         task_progress_cb = functools.partial(progress_cb, task_id=file_progress.task_id)
 
-        @retry(n_attempts=11, base_delay=0.5, timeout=None)
+        @retry(n_attempts=11, base_delay=0.5, attempt_timeout=None)
         async def put_missing_block_attempt(payload: BytesIOSegmentPayload) -> bytes:
             with payload.reset_on_error(subtract_progress=True):
                 async with ClientSessionRegistry.get_session().put(

{modal-1.3.6.dev8 → modal-1.3.6.dev9}/modal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.3.6.dev8
+Version: 1.3.6.dev9
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License-Expression: Apache-2.0
@@ -36,7 +36,6 @@ Dynamic: license-file
 
 [![PyPI Version](https://img.shields.io/pypi/v/modal.svg)](https://pypi.org/project/modal/)
 [![License](https://img.shields.io/badge/license-apache_2.0-darkviolet.svg)](https://github.com/modal-labs/modal-client/blob/master/LICENSE)
-[![Tests](https://github.com/modal-labs/modal-client/actions/workflows/ci-cd.yml/badge.svg)](https://github.com/modal-labs/modal-client/actions/workflows/ci-cd.yml)
 [![Slack](https://img.shields.io/badge/slack-join-blue.svg?logo=slack)](https://modal.com/slack)
 
 The [Modal](https://modal.com/) Python SDK provides convenient, on-demand

{modal-1.3.6.dev8 → modal-1.3.6.dev9}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2026
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.3.6.dev8"
+__version__ = "1.3.6.dev9"

{modal-1.3.6.dev8 → modal-1.3.6.dev9}/pyproject.toml

@@ -28,7 +28,7 @@ dependencies = [
     "types-certifi",
     "types-toml",
     "watchfiles",
-    "typing_extensions~=4.6"
+    "typing_extensions~=4.6",
 ]
 keywords = ["modal", "client", "cloud", "serverless", "infrastructure"]
 classifiers = [
@@ -37,6 +37,51 @@ classifiers = [
     "Programming Language :: Python :: 3"
 ]
 
+[dependency-groups]
+dev = [
+    "cbor2==5.7.0",
+    "fastapi~=0.125",
+    "flaky~=3.8",
+    "grpclib==0.4.9",
+    "invoke~=2.2",
+    "httpx~=0.27.2",
+    "pyjwt~=2.10.1",
+    "pre-commit>=2.21,<4",
+    "mypy~=1.18.2",
+    "packaging>=23.1",
+    "pytest~=8.4.0",
+    "pytest-asyncio @ git+https://github.com/modal-labs/pytest-asyncio.git@af3f2d721b842309749cd26e5bbdd210e17d80c8",
+    "pytest-env~=1.1.5",
+    "pytest-markdown-docs==0.9.1",
+    "pytest-timeout~=2.4.0",
+    "python-dotenv~=1.0.0",
+    "requests~=2.32.4",
+    "ruff~=0.9.6",
+    "setuptools<82", # Required by grpcio-tools for pkg_resources (v82+ removed pkg_resources)"
+    "types-croniter~=1.0.8",
+    "types-python-dateutil~=2.8.10",
+    "types-requests~=2.31.0",
+    "types-setuptools~=57.4.11",
+    "types-six~=1.16.21",
+    "types-toml~=0.10.4",
+    "wheel~=0.38.1",
+    "nbclient~=0.10.2",
+    "notebook~=7.5.4",
+    "jupytext~=1.19.1",
+    "pyright~=1.1.351",
+    "console-ctrl~=0.1.0",
+    "zstandard~=0.25.0",
+    "synchronicity[compile]==0.11.1",
+    "python-json-logger==2.0.7",
+    "build~=1.3.0",
+
+    "mypy-protobuf",
+    "grpcio-tools",
+]
+
+[tool.uv.extra-build-dependencies]
+grpcio-tools = ["setuptools<82"]
+
 [project.urls]
 Homepage = "https://modal.com"
 Source = "https://github.com/modal-labs/modal-client"
@@ -122,6 +167,7 @@ extend-select = ['PLR1702']
 "modal_docs/**" = ['T201']
 "modal_global_objects/**" = ['T201']
 "tasks.py" = ['T201']
+"compile_protos.py" = ['T201']
 "modal/__init__.py" = ['T201']
 "modal/experimental/ipython.py" = ['T201']