modAL 1.2.6.dev2__tar.gz → 1.2.6.dev4__tar.gz

{modal-1.2.6.dev2 → modal-1.2.6.dev4}/PKG-INFO

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

{modal-1.2.6.dev2 → modal-1.2.6.dev4}/modal/_utils/task_command_router_client.py

@@ -403,7 +403,10 @@ class TaskCommandRouterClient:
                 )
                 return
 
+            logger.debug(f"Refreshing JWT for exec with task ID {self._task_id}")
             resp = await fetch_command_router_access(self._server_client, self._task_id)
+            logger.debug(f"Finished refreshing JWT for exec with task ID {self._task_id}")
+
             # Ensure the server URL remains stable for the lifetime of this client.
             assert resp.url == self._server_url, "Task router URL changed during session"
             self._jwt = resp.jwt
@@ -434,7 +437,9 @@ class TaskCommandRouterClient:
         delay_secs = self.stream_stdio_retry_delay_secs
         delay_factor = self.stream_stdio_retry_delay_factor
         num_retries_remaining = self.stream_stdio_max_retries
-        num_auth_retries = 0
+        # Flag to prevent infinite auth retries in the event that the JWT
+        # refresh yields an invalid JWT somehow or that the JWT is otherwise invalid.
+        did_auth_retry = False
 
         async def sleep_and_update_delay_and_num_retries_remaining(e: Exception):
             nonlocal delay_secs, num_retries_remaining
@@ -458,25 +463,28 @@ class TaskCommandRouterClient:
                         file_descriptor=file_descriptor,
                     )
 
-                    # Scope auth retry strictly to the initial send (where headers/auth are sent).
+                    # Auth retry is scoped to a single refresh per streaming attempt. While auth metadata is
+                    # sent on request start, UNAUTHENTICATED may sometimes surface during iteration,
+                    # so we handle it at both send and receive boundaries.
                     try:
                         await s.send_message(req, end=True)
+                        async for item in s:
+                            # We successfully authenticated after a JWT refresh, reset the auth retry flag.
+                            if did_auth_retry:
+                                did_auth_retry = False
+                            # Reset retry backoff after any successful chunk.
+                            delay_secs = self.stream_stdio_retry_delay_secs
+                            offset += len(item.data)
+                            yield item
                     except GRPCError as exc:
-                        if exc.status == Status.UNAUTHENTICATED and num_auth_retries < 1:
+                        if exc.status == Status.UNAUTHENTICATED and not did_auth_retry:
                             await self._refresh_jwt()
-                            num_auth_retries += 1
+                            # Mark that we've retried authentication for this streaming attempt, to
+                            # prevent subsequent retries.
+                            did_auth_retry = True
                             continue
                         raise
 
-                    # We successfully authenticated, reset the auth retry count.
-                    num_auth_retries = 0
-
-                    async for item in s:
-                        # Reset retry backoff after any successful chunk.
-                        delay_secs = self.stream_stdio_retry_delay_secs
-                        offset += len(item.data)
-                        yield item
-
                 # We successfully streamed all output.
                 return
             except GRPCError as e:

{modal-1.2.6.dev2 → modal-1.2.6.dev4}/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.6.dev2",
+        version: str = "1.2.6.dev4",
     ):
         """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.6.dev2",
+        version: str = "1.2.6.dev4",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.2.6.dev2 → modal-1.2.6.dev4}/modal/functions.pyi

@@ -409,7 +409,7 @@ class Function(
 
     _call_generator: ___call_generator_spec[typing_extensions.Self]
 
-    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         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."""
             ...
@@ -418,7 +418,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, typing_extensions.Self]
+    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
 
     class __remote_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -445,7 +445,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         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.
 
@@ -469,7 +469,7 @@ class Function(
             ...
 
     _experimental_spawn: ___experimental_spawn_spec[
-        modal._functions.P, modal._functions.ReturnType, typing_extensions.Self
+        modal._functions.ReturnType, modal._functions.P, typing_extensions.Self
     ]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER, SUPERSELF]):
@@ -478,7 +478,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P, typing_extensions.Self]
 
-    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         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.
 
@@ -499,7 +499,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function."""

{modal-1.2.6.dev2 → modal-1.2.6.dev4}/modal.egg-info/PKG-INFO

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

{modal-1.2.6.dev2 → modal-1.2.6.dev4}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.2.6.dev2"
+__version__ = "1.2.6.dev4"

{modal-1.2.6.dev2 → modal-1.2.6.dev4}/pyproject.toml

@@ -81,6 +81,7 @@ filterwarnings = [
     "ignore:Type google._upb.*MapContainer uses PyType_Spec.*Python 3.14:DeprecationWarning",
     "error::modal.exception.DeprecationError",
     "ignore:There is no current event loop:DeprecationWarning",  # pytest-asyncio internals
+    "ignore:distutils Version classes are deprecated:DeprecationWarning",  # pytest-freezegun internals
 ]
 
 [tool.ruff]