modal 1.3.1.dev1__tar.gz → 1.3.1.dev3__tar.gz

{modal-1.3.1.dev1 → modal-1.3.1.dev3}/PKG-INFO

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

{modal-1.3.1.dev1 → modal-1.3.1.dev3}/modal/_utils/blob_utils.py

@@ -4,7 +4,6 @@ import dataclasses
 import hashlib
 import os
 import platform
-import random
 import time
 from collections.abc import AsyncIterator
 from contextlib import AbstractContextManager, contextmanager
@@ -58,10 +57,8 @@ MULTIPART_UPLOAD_THRESHOLD = 1024**3
 # For block based storage like volumefs2: the size of a block
 BLOCK_SIZE: int = 8 * 1024 * 1024
 
-HEALTHY_R2_UPLOAD_PERCENTAGE = 0.95
 
-
-@retry(n_attempts=5, base_delay=0.5, timeout=None)
+@retry(n_attempts=3, base_delay=0.3, timeout=None)
 async def _upload_to_s3_url(
     upload_url,
     payload: "BytesIOSegmentPayload",
@@ -191,13 +188,10 @@ def get_content_length(data: BinaryIO) -> int:
 async def _blob_upload_with_fallback(
     items, blob_ids: list[str], callback, content_length: int
 ) -> tuple[str, bool, int]:
+    """Try uploading to each provider in order, with fallback on failure."""
     r2_throughput_bytes_s = 0
     r2_failed = False
     for idx, (item, blob_id) in enumerate(zip(items, blob_ids)):
-        # We want to default to R2 95% of the time and S3 5% of the time.
-        # To ensure the failure path is continuously exercised.
-        if idx == 0 and len(items) > 1 and random.random() > HEALTHY_R2_UPLOAD_PERCENTAGE:
-            continue
         try:
             if blob_id.endswith(":r2"):
                 t0 = time.monotonic_ns()
@@ -207,7 +201,7 @@ async def _blob_upload_with_fallback(
             else:
                 await callback(item)
             return blob_id, r2_failed, r2_throughput_bytes_s
-        except Exception as _:
+        except Exception:
             if blob_id.endswith(":r2"):
                 r2_failed = True
             # Ignore all errors except the last one, since we're out of fallback options.

{modal-1.3.1.dev1 → modal-1.3.1.dev3}/modal/_utils/task_command_router_client.py

@@ -5,6 +5,8 @@ import json
 import ssl
 import time
 import urllib.parse
+import weakref
+from contextlib import suppress
 from typing import AsyncGenerator, Optional
 
 import grpclib.client
@@ -106,6 +108,15 @@ async def fetch_command_router_access(server_client, task_id: str) -> api_pb2.Ta
     )
 
 
+def _finalize_channel(loop, channel):
+    if not loop.is_closed():
+        # only run if loop has not shut down
+        # call_soon_threadsafe could throw if the loop is torn down after calling
+        # is_closed. This is safe to ignore.
+        with suppress(Exception):
+            loop.call_soon_threadsafe(channel.close)
+
+
 class TaskCommandRouterClient:
     """
     Client used to talk directly to TaskCommandRouter service on worker hosts.
@@ -199,44 +210,17 @@ class TaskCommandRouterClient:
 
         self._closed = False
 
-        async def send_request(event: grpclib.events.SendRequest) -> None:
-            # This will get the most recent JWT for every request. No need to
-            # lock _jwt_refresh_lock: reads and writes happen on the
-            # single-threaded event loop and variable assignment is atomic.
-            event.metadata["authorization"] = f"Bearer {self._jwt}"
-
-        grpclib.events.listen(self._channel, grpclib.events.SendRequest, send_request)
+        self._channel_finalizer = weakref.finalize(
+            self,
+            _finalize_channel,
+            loop,
+            channel,
+        )
 
         self._stub = TaskCommandRouterStub(self._channel)
 
-    def __del__(self) -> None:
-        """Best-effort cleanup if the caller forgot to close().
-
-        This object is typically used through synchronicity wrappers, which means this finalizer
-        may run on a different thread than the event loop that owns the channel. Closing the
-        channel is therefore scheduled onto the owning loop using call_soon_threadsafe.
-
-        Use getattr in the event that attributes are not yet initialized or the
-        object is in a half-torn-down state.
-        """
-        if getattr(self, "_closed", False):
-            return
-        self._closed = True
-
-        channel = getattr(self, "_channel", None)
-        if channel is None:
-            return
-
-        loop = getattr(self, "_loop", None)
-
-        if loop is not None and not loop.is_closed():
-            try:
-                loop.call_soon_threadsafe(channel.close)
-            except Exception:
-                # call_soon_threadsafe could throw if the loop is torn down
-                # after calling is_closed. This is safe to ignore, and we don't
-                # want to raise an exception from a destructor.
-                pass
+    def _get_metadata(self):
+        return {"authorization": f"Bearer {self._jwt}"}
 
     async def close(self) -> None:
         """Close the client."""
@@ -245,6 +229,9 @@ class TaskCommandRouterClient:
 
         self._closed = True
         self._channel.close()
+        if self._channel_finalizer.alive:
+            # skip the finalizer if we've closed the channel anyway
+            self._channel_finalizer.detach()
 
     async def exec_start(self, request: sr_pb2.TaskExecStartRequest) -> sr_pb2.TaskExecStartResponse:
         """Start an exec'd command, properly retrying on transient errors."""
@@ -420,12 +407,12 @@ class TaskCommandRouterClient:
 
     async def _call_with_auth_retry(self, func, *args, **kwargs):
         try:
-            return await func(*args, **kwargs)
+            return await func(*args, **kwargs, metadata=self._get_metadata())
         except GRPCError as exc:
             if exc.status == Status.UNAUTHENTICATED:
                 await self._refresh_jwt()
                 # Retry with the original arguments preserved
-                return await func(*args, **kwargs)
+                return await func(*args, **kwargs, metadata=self._get_metadata())
             raise
 
     async def _stream_stdio(
@@ -460,7 +447,7 @@ class TaskCommandRouterClient:
         while True:
             timeout = max(0, deadline - time.monotonic()) if deadline is not None else None
             try:
-                stream = self._stub.TaskExecStdioRead.open(timeout=timeout)
+                stream = self._stub.TaskExecStdioRead.open(timeout=timeout, metadata=self._get_metadata())
                 async with stream as s:
                     req = sr_pb2.TaskExecStdioReadRequest(
                         task_id=task_id,

{modal-1.3.1.dev1 → modal-1.3.1.dev3}/modal/client.pyi

@@ -33,7 +33,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.3.1.dev1",
+        version: str = "1.3.1.dev3",
     ):
         """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.3.1.dev1",
+        version: str = "1.3.1.dev3",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.3.1.dev1 → modal-1.3.1.dev3}/modal/functions.pyi

@@ -407,7 +407,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."""
             ...
@@ -416,7 +416,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]:
@@ -443,7 +443,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.
 
@@ -466,7 +466,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: ...
@@ -474,7 +474,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.
 
@@ -495,7 +495,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.1.dev1 → modal-1.3.1.dev3}/modal.egg-info/PKG-INFO

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

{modal-1.3.1.dev1 → modal-1.3.1.dev3}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.3.1.dev1"
+__version__ = "1.3.1.dev3"