modal 1.5.6.dev31__tar.gz → 1.6.1.dev0__tar.gz

{modal-1.5.6.dev31 → modal-1.6.1.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.5.6.dev31
+Version: 1.6.1.dev0
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License-Expression: Apache-2.0

{modal-1.5.6.dev31 → modal-1.6.1.dev0}/modal/_functions.py

@@ -7,7 +7,7 @@ import time
 import typing
 import warnings
 from collections import OrderedDict
-from collections.abc import AsyncGenerator, AsyncIterator, Callable, Collection, Sequence
+from collections.abc import AsyncGenerator, Callable, Collection, Sequence
 from dataclasses import dataclass
 from datetime import datetime, timedelta, timezone
 from pathlib import PurePosixPath
@@ -1749,14 +1749,14 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         return list(self._experimental_flash_urls) if self._experimental_flash_urls else None
 
     async def _fetch_flash_auth_token(self, retry: Retry) -> str:
-        resp = await self.client.stub.FunctionGetFlashAuthToken(
+        resp = await self.client._stub.FunctionGetFlashAuthToken(
             api_pb2.FunctionGetFlashAuthTokenRequest(function_id=self.object_id), retry=retry
         )
         return resp.token
 
     async def _get_flash_auth_token(self) -> str:
         if self._flash_token_manager is None:
-            self._flash_token_manager = _AuthTokenManager(self.client.stub, fetch=self._fetch_flash_auth_token)
+            self._flash_token_manager = _AuthTokenManager(self.client._stub, fetch=self._fetch_flash_auth_token)
         return await self._flash_token_manager.get_token()
 
     def _apply_dynamic_config(
@@ -2405,7 +2405,7 @@ class _FunctionCall(typing.Generic[ReturnType], _Object, type_prefix="fc"):
         return await self._invocation().poll_function(timeout=timeout, index=index)
 
     @live_method_gen
-    async def iter(self, *, start: int = 0, end: int | None = None) -> AsyncIterator[ReturnType]:
+    async def iter(self, *, start: int = 0, end: int | None = None) -> AsyncGenerator[ReturnType, None]:
         """Iterate in-order over the results of the function call.
 
         Optionally, specify a range [start, end) to iterate over.

{modal-1.5.6.dev31 → modal-1.6.1.dev0}/modal/_object.py

@@ -4,10 +4,10 @@ import typing
 import uuid
 from collections.abc import Awaitable, Callable, Hashable, Sequence
 from functools import wraps
-from typing import ClassVar
+from typing import Any, AsyncContextManager, AsyncGenerator, AsyncIterator, ClassVar, ParamSpec, TypeVar
 
 from google.protobuf.message import Message
-from typing_extensions import Self
+from typing_extensions import Concatenate, Self
 
 from ._load_context import LoadContext
 from ._resolver import Resolver
@@ -38,18 +38,24 @@ def _get_environment_name(
         return config.get("environment") or ""
 
 
-def live_method(method):
+P = ParamSpec("P")
+T = TypeVar("T")
+
+
+def live_method(method: Callable[Concatenate[Any, P], Awaitable[T]]) -> Callable[Concatenate[Any, P], Awaitable[T]]:
     @wraps(method)
-    async def wrapped(self, *args, **kwargs):
+    async def wrapped(self, *args: P.args, **kwargs: P.kwargs) -> T:
         await self.hydrate()
         return await method(self, *args, **kwargs)
 
     return wrapped
 
 
-def live_method_gen(method):
+def live_method_gen(
+    method: Callable[Concatenate[Any, P], AsyncGenerator[T, None]],
+) -> Callable[Concatenate[Any, P], AsyncIterator[T]]:
     @wraps(method)
-    async def wrapped(self, *args, **kwargs):
+    async def wrapped(self, *args: P.args, **kwargs: P.kwargs) -> AsyncIterator[T]:
         await self.hydrate()
         async with aclosing(method(self, *args, **kwargs)) as stream:
             async for item in stream:
@@ -58,14 +64,16 @@ def live_method_gen(method):
     return wrapped
 
 
-def live_method_contextmanager(method):
+def live_method_contextmanager(
+    method: Callable[Concatenate[Any, P], AsyncContextManager[T]],
+) -> Callable[Concatenate[Any, P], AsyncContextManager[T]]:
     # make sure a wrapped function returning an async context manager
     # will not require both an `await func.aio()` and `async with`
     # which would have been the case if it was wrapped in live_method
 
     @wraps(method)
     @contextlib.asynccontextmanager
-    async def wrapped(self, *args, **kwargs):
+    async def wrapped(self, *args: P.args, **kwargs: P.kwargs):
         await self.hydrate()
         async with method(self, *args, **kwargs) as ctx:
             yield ctx
@@ -75,7 +83,7 @@ def live_method_contextmanager(method):
 
 class _Object:
     _type_prefix: ClassVar[str | None] = None
-    _prefix_to_type: ClassVar[dict[str, type]] = {}
+    _prefix_to_type: ClassVar[dict[str, type["_Object"]]] = {}
 
     # For constructors
     _load: Callable[[Self, Resolver, LoadContext, str | None], Awaitable[None]] | None = None

{modal-1.5.6.dev31 → modal-1.6.1.dev0}/modal/_partial_function.py

@@ -732,7 +732,7 @@ def _sessioned() -> Callable[
     [Callable[P, ReturnType] | _PartialFunction[P, ReturnType, ReturnType]],
     _PartialFunction[P, ReturnType, ReturnType],
 ]:
-    """Decorator that enables sessions on a Server.
+    """Decorator that enables sticky sessions on a Server.
 
     Every request must carry a session token obtained from a session start request; requests with the same token are
     routed to the same container until the session is idle for `idle_timeout` seconds or explicitly terminated. A

{modal-1.5.6.dev31 → modal-1.6.1.dev0}/modal/_server.py

@@ -113,7 +113,7 @@ class _Server:
 
     @property
     def sessions(self) -> "_ServerSessionsManager":
-        """Start and terminate sessions on a Server decorated with `@modal.sessioned()`."""
+        """Start and terminate sticky sessions on a Server decorated with `@modal.sessioned()`."""
         return _ServerSessionsManager(self)
 
     async def info(self, *, refresh: bool = False) -> ServerInfo:
@@ -160,7 +160,7 @@ class _Server:
         This interface is experimental and may change or be removed without warning.
         """
         service_function = self._get_service_function()
-        response = await service_function.client.stub.FlashContainerList(
+        response = await service_function.client._stub.FlashContainerList(
             api_pb2.FlashContainerListRequest(function_id=service_function.object_id)
         )
         return [
@@ -473,13 +473,13 @@ class _Server:
         request.until.FromDatetime(until)
         if container:
             request.container_id = container
-        stats = await self._get_service_function().client.stub.ServerGetTimeRangeStats(request)
+        stats = await self._get_service_function().client._stub.ServerGetTimeRangeStats(request)
         return ServerStats._from_proto(stats)
 
 
 @retry(n_attempts=5, base_delay=0.5, attempt_timeout=65, total_timeout=200)
 async def _post_session_control(url: str, headers: dict[str, str]) -> tuple[int, str, str]:
-    """POST to a session control endpoint, retrying connection errors and 5xx. Returns (status, reason, body)."""
+    """POST to a sticky session control endpoint, retrying connection errors and 5xx. Returns (status, reason, body)."""
     async with ClientSessionRegistry.get_session().post(url, headers=headers) as resp:
         body = await resp.text()
         if resp.status >= 400:
@@ -501,11 +501,11 @@ class _ServerSessionsManager:
             raise InvalidError("`sessions` requires `@modal.sessioned()` on the Server.")
 
     async def start(self, idle_timeout: int = 600) -> ServerSessionCredentials:
-        """Start a session and return its ID and token.
+        """Start a sticky session and return its ID and token.
 
-        Requests to the server URL that carry the returned token are routed to the same container until the session
-        has had no connections for `idle_timeout` seconds or is terminated. A container won't be scaled down for as long
-        as it holds a live session.
+        Requests to the server URL that carry the returned token are routed to the same container until the
+        session has had no connections for `idle_timeout` seconds or is terminated. A container won't be scaled down
+        for as long as it holds a live session.
 
         Args:
             idle_timeout: Seconds without an in-flight request before the session ends.
@@ -550,7 +550,9 @@ class _ServerSessionsManager:
             raise ExecutionError("Failed to start session: unexpected response from server") from None
 
     async def terminate(self, token: str) -> None:
-        """Terminate a session. New requests to it will be rejected. Container will continue serving other sessions.
+        """Terminate a sticky session.
+
+        New requests to it will be rejected. The container continues serving other sessions.
 
         Args:
             token: The `token` of the `ServerSessionCredentials` to terminate.

{modal-1.5.6.dev31 → modal-1.6.1.dev0}/modal/_server.pyi

@@ -67,7 +67,7 @@ class _Server:
 
     @property
     def sessions(self) -> _ServerSessionsManager:
-        """Start and terminate sessions on a Server decorated with `@modal.sessioned()`."""
+        """Start and terminate sticky sessions on a Server decorated with `@modal.sessioned()`."""
         ...
 
     async def info(self, *, refresh: bool = False) -> modal.types.ServerInfo:
@@ -272,7 +272,7 @@ class _Server:
         ...
 
 async def _post_session_control(url: str, headers: dict[str, str]) -> tuple[int, str, str]:
-    """POST to a session control endpoint, retrying connection errors and 5xx. Returns (status, reason, body)."""
+    """POST to a sticky session control endpoint, retrying connection errors and 5xx. Returns (status, reason, body)."""
     ...
 
 class _ServerSessionsManager:
@@ -283,11 +283,11 @@ class _ServerSessionsManager:
 
     def _validate(self) -> None: ...
     async def start(self, idle_timeout: int = 600) -> modal.types.ServerSessionCredentials:
-        """Start a session and return its ID and token.
+        """Start a sticky session and return its ID and token.
 
-        Requests to the server URL that carry the returned token are routed to the same container until the session
-        has had no connections for `idle_timeout` seconds or is terminated. A container won't be scaled down for as long
-        as it holds a live session.
+        Requests to the server URL that carry the returned token are routed to the same container until the
+        session has had no connections for `idle_timeout` seconds or is terminated. A container won't be scaled down
+        for as long as it holds a live session.
 
         Args:
             idle_timeout: Seconds without an in-flight request before the session ends.
@@ -308,7 +308,9 @@ class _ServerSessionsManager:
         ...
 
     async def terminate(self, token: str) -> None:
-        """Terminate a session. New requests to it will be rejected. Container will continue serving other sessions.
+        """Terminate a sticky session.
+
+        New requests to it will be rejected. The container continues serving other sessions.
 
         Args:
             token: The `token` of the `ServerSessionCredentials` to terminate.
@@ -334,11 +336,11 @@ class ServerSessionsManager:
 
     class __start_spec(typing_extensions.Protocol):
         def __call__(self, /, idle_timeout: int = 600) -> modal.types.ServerSessionCredentials:
-            """Start a session and return its ID and token.
+            """Start a sticky session and return its ID and token.
 
-            Requests to the server URL that carry the returned token are routed to the same container until the session
-            has had no connections for `idle_timeout` seconds or is terminated. A container won't be scaled down for as long
-            as it holds a live session.
+            Requests to the server URL that carry the returned token are routed to the same container until the
+            session has had no connections for `idle_timeout` seconds or is terminated. A container won't be scaled down
+            for as long as it holds a live session.
 
             Args:
                 idle_timeout: Seconds without an in-flight request before the session ends.
@@ -359,11 +361,11 @@ class ServerSessionsManager:
             ...
 
         async def aio(self, /, idle_timeout: int = 600) -> modal.types.ServerSessionCredentials:
-            """Start a session and return its ID and token.
+            """Start a sticky session and return its ID and token.
 
-            Requests to the server URL that carry the returned token are routed to the same container until the session
-            has had no connections for `idle_timeout` seconds or is terminated. A container won't be scaled down for as long
-            as it holds a live session.
+            Requests to the server URL that carry the returned token are routed to the same container until the
+            session has had no connections for `idle_timeout` seconds or is terminated. A container won't be scaled down
+            for as long as it holds a live session.
 
             Args:
                 idle_timeout: Seconds without an in-flight request before the session ends.
@@ -387,7 +389,9 @@ class ServerSessionsManager:
 
     class __terminate_spec(typing_extensions.Protocol):
         def __call__(self, /, token: str) -> None:
-            """Terminate a session. New requests to it will be rejected. Container will continue serving other sessions.
+            """Terminate a sticky session.
+
+            New requests to it will be rejected. The container continues serving other sessions.
 
             Args:
                 token: The `token` of the `ServerSessionCredentials` to terminate.
@@ -404,7 +408,9 @@ class ServerSessionsManager:
             ...
 
         async def aio(self, /, token: str) -> None:
-            """Terminate a session. New requests to it will be rejected. Container will continue serving other sessions.
+            """Terminate a sticky session.
+
+            New requests to it will be rejected. The container continues serving other sessions.
 
             Args:
                 token: The `token` of the `ServerSessionCredentials` to terminate.