modAL 1.2.3.dev11__tar.gz → 1.2.3.dev13__tar.gz

{modal-1.2.3.dev11 → modal-1.2.3.dev13}/PKG-INFO

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

{modal-1.2.3.dev11 → modal-1.2.3.dev13}/modal/_functions.py

@@ -536,6 +536,7 @@ class _InputPlaneInvocation:
     async def _get_metadata(input_plane_region: str, client: _Client) -> list[tuple[str, str]]:
         if not input_plane_region:
             return []
+        assert client._auth_token_manager, "Client is not open"
         token = await client._auth_token_manager.get_token()
         return [("x-modal-input-plane-region", input_plane_region), ("x-modal-auth-token", token)]
 

{modal-1.2.3.dev11 → modal-1.2.3.dev13}/modal/_load_context.py

@@ -66,8 +66,9 @@ class LoadContext:
 
         Returns a new instance (no in place mutation)"""
 
+        is_valid_client = self._client is not None and not self._client._snapshotted
         return LoadContext(
-            client=await _Client.from_env() if self._client is None else self.client,
+            client=self.client if is_valid_client else await _Client.from_env(),
             environment_name=self._environment_name or config.get("environment") or "",
             app_id=self._app_id,
         )

{modal-1.2.3.dev11 → modal-1.2.3.dev13}/modal/_object.py

@@ -43,7 +43,7 @@ class _Object:
     _prefix_to_type: ClassVar[dict[str, type]] = {}
 
     # For constructors
-    _load: Optional[Callable[[Self, Resolver, LoadContext, Optional[str]], Awaitable[None]]]
+    _load: Optional[Callable[[Self, Resolver, LoadContext, Optional[str]], Awaitable[None]]] = None
     _preload: Optional[Callable[[Self, Resolver, LoadContext, Optional[str]], Awaitable[None]]]
     _rep: str
     _is_another_app: bool
@@ -308,11 +308,17 @@ class _Object:
                 # memory snapshots capture references which must be rehydrated
                 # on restore to handle staleness.
                 logger.debug(f"rehydrating {self} after snapshot")
-                self._is_hydrated = False  # un-hydrate and re-resolve
-                # Set the client on LoadContext before loading
-                root_load_context = LoadContext(client=client)
-                resolver = Resolver()
-                await resolver.load(typing.cast(_Object, self), root_load_context)
+                if self._hydrate_lazily:
+                    logger.debug(f"reloading lazy {self} from server")
+                    self._is_hydrated = False  # un-hydrate and re-resolve
+                    # we don't set an explicit Client here, relying on the default
+                    # env client to be applied by LoadContext.apply_default
+                    root_load_context = LoadContext.empty()
+                    resolver = Resolver()
+                    await resolver.load(typing.cast(_Object, self), root_load_context)
+                else:
+                    logger.debug(f"reloading non-lazy {self} by replacing client")
+                    self._client = client or await _Client.from_env()
                 self._is_rehydrated = True
                 logger.debug(f"rehydrated {self} with client {id(self.client)}")
         elif not self._hydrate_lazily:

{modal-1.2.3.dev11 → modal-1.2.3.dev13}/modal/client.py

@@ -5,7 +5,7 @@ import platform
 import sys
 import urllib.parse
 import warnings
-from collections.abc import AsyncGenerator, AsyncIterator, Collection, Mapping
+from collections.abc import AsyncGenerator, Collection, Mapping
 from typing import Any, ClassVar, Optional, TypeVar, Union
 
 import grpclib.client
@@ -14,7 +14,7 @@ from google.protobuf.message import Message
 from synchronicity.async_wrap import asynccontextmanager
 
 from modal._utils.async_utils import synchronizer
-from modal_proto import api_grpc, api_pb2, modal_api_grpc
+from modal_proto import api_pb2, modal_api_grpc
 from modal_version import __version__
 
 from ._traceback import print_server_warnings
@@ -70,10 +70,10 @@ class _Client:
     _client_from_env: ClassVar[Optional["_Client"]] = None
     _client_from_env_lock: ClassVar[Optional[asyncio.Lock]] = None
     _cancellation_context: TaskContext
-    _cancellation_context_event_loop: asyncio.AbstractEventLoop = None
-    _stub: Optional[api_grpc.ModalClientStub]
-    _auth_token_manager: _AuthTokenManager = None
-    _snapshotted: bool
+    _cancellation_context_event_loop: Optional[asyncio.AbstractEventLoop] = None
+    _stub: Optional[modal_api_grpc.ModalClientModal]
+    _auth_token_manager: Optional[_AuthTokenManager] = None
+    _snapshotted: bool = False
 
     def __init__(
         self,
@@ -90,8 +90,8 @@ class _Client:
         self._credentials = credentials
         self.version = version
         self._closed = False
-        self._stub: Optional[modal_api_grpc.ModalClientModal] = None
-        self._auth_token_manager: Optional[_AuthTokenManager] = None
+        self._stub = None
+        self._auth_token_manager = None
         self._snapshotted = False
         self._owner_pid = None
 
@@ -163,7 +163,7 @@ class _Client:
 
     @classmethod
     @asynccontextmanager
-    async def anonymous(cls, server_url: str) -> AsyncIterator["_Client"]:
+    async def anonymous(cls, server_url: str) -> AsyncGenerator["_Client", None]:
         """mdmd:hidden
         Create a connection with no credentials; to be used for token creation.
         """

{modal-1.2.3.dev11 → modal-1.2.3.dev13}/modal/client.pyi

@@ -5,7 +5,6 @@ import google.protobuf.message
 import grpclib.client
 import modal._utils.async_utils
 import modal._utils.auth_token_manager
-import modal_proto.api_grpc
 import modal_proto.modal_api_grpc
 import synchronicity.combined_types
 import typing
@@ -23,9 +22,9 @@ class _Client:
     _client_from_env: typing.ClassVar[typing.Optional[_Client]]
     _client_from_env_lock: typing.ClassVar[typing.Optional[asyncio.locks.Lock]]
     _cancellation_context: modal._utils.async_utils.TaskContext
-    _cancellation_context_event_loop: asyncio.events.AbstractEventLoop
-    _stub: typing.Optional[modal_proto.api_grpc.ModalClientStub]
-    _auth_token_manager: modal._utils.auth_token_manager._AuthTokenManager
+    _cancellation_context_event_loop: typing.Optional[asyncio.events.AbstractEventLoop]
+    _stub: typing.Optional[modal_proto.modal_api_grpc.ModalClientModal]
+    _auth_token_manager: typing.Optional[modal._utils.auth_token_manager._AuthTokenManager]
     _snapshotted: bool
 
     def __init__(
@@ -33,7 +32,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.2.3.dev11",
+        version: str = "1.2.3.dev13",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -154,9 +153,9 @@ class Client:
     _client_from_env: typing.ClassVar[typing.Optional[Client]]
     _client_from_env_lock: typing.ClassVar[typing.Optional[asyncio.locks.Lock]]
     _cancellation_context: modal._utils.async_utils.TaskContext
-    _cancellation_context_event_loop: asyncio.events.AbstractEventLoop
-    _stub: typing.Optional[modal_proto.api_grpc.ModalClientStub]
-    _auth_token_manager: modal._utils.auth_token_manager._AuthTokenManager
+    _cancellation_context_event_loop: typing.Optional[asyncio.events.AbstractEventLoop]
+    _stub: typing.Optional[modal_proto.modal_api_grpc.ModalClientModal]
+    _auth_token_manager: typing.Optional[modal._utils.auth_token_manager._AuthTokenManager]
     _snapshotted: bool
 
     def __init__(
@@ -164,7 +163,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.2.3.dev11",
+        version: str = "1.2.3.dev13",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.2.3.dev11 → modal-1.2.3.dev13}/modal/functions.pyi

@@ -408,7 +408,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."""
             ...
@@ -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, 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]:
@@ -444,7 +444,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.
 
@@ -468,7 +468,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]):
@@ -477,7 +477,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.
 
@@ -498,7 +498,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.3.dev11 → modal-1.2.3.dev13}/modal.egg-info/PKG-INFO

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

{modal-1.2.3.dev11 → modal-1.2.3.dev13}/modal_proto/api.proto

@@ -1550,6 +1550,7 @@ message Function {
   uint32 startup_timeout_secs = 86;
   repeated DataFormat supported_input_formats = 87; // can be used as inputs
   repeated DataFormat supported_output_formats = 88;
+  optional HTTPConfig http_config = 89;
 }
 
 message FunctionAsyncInvokeRequest {
@@ -1728,6 +1729,7 @@ message FunctionData {
   uint32 startup_timeout_secs = 36;
   repeated DataFormat supported_input_formats = 37;
   repeated DataFormat supported_output_formats = 38;
+  optional HTTPConfig http_config = 39;
 }
 
 message FunctionExtended {
@@ -2088,6 +2090,12 @@ message GenericResult {  // Used for both tasks and function outputs
   string propagation_reason = 13; // (?)
 }
 
+message HTTPConfig {
+  uint32 port = 1;
+  repeated string proxy_regions = 2;
+  uint32 startup_timeout = 3;
+  uint32 exit_grace_period = 4;
+}
 
 message Image {
   repeated BaseImage base_images = 5;