modal 1.1.5.dev14__tar.gz → 1.1.5.dev16__tar.gz

{modal-1.1.5.dev14 → modal-1.1.5.dev16}/PKG-INFO

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

{modal-1.1.5.dev14 → modal-1.1.5.dev16}/modal/client.pyi

@@ -33,7 +33,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.1.5.dev14",
+        version: str = "1.1.5.dev16",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -164,7 +164,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.1.5.dev14",
+        version: str = "1.1.5.dev16",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.1.5.dev14 → modal-1.1.5.dev16}/modal/functions.pyi

@@ -445,7 +445,7 @@ class Function(
 
     _call_generator: ___call_generator_spec[typing_extensions.Self]
 
-    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_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."""
             ...
@@ -454,7 +454,7 @@ class Function(
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
 
-    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
+    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
 
     class __remote_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -481,7 +481,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_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.
 
@@ -505,7 +505,7 @@ class Function(
             ...
 
     _experimental_spawn: ___experimental_spawn_spec[
-        modal._functions.ReturnType, modal._functions.P, typing_extensions.Self
+        modal._functions.P, modal._functions.ReturnType, typing_extensions.Self
     ]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER, SUPERSELF]):
@@ -514,7 +514,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P, typing_extensions.Self]
 
-    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_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.
 
@@ -535,7 +535,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
+    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType, 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.1.5.dev14 → modal-1.1.5.dev16}/modal/sandbox.py

@@ -1,9 +1,11 @@
 # Copyright Modal Labs 2022
 import asyncio
+import json
 import os
 import time
 from collections.abc import AsyncGenerator, Sequence
-from typing import TYPE_CHECKING, AsyncIterator, Literal, Optional, Union, overload
+from dataclasses import dataclass
+from typing import TYPE_CHECKING, Any, AsyncIterator, Literal, Optional, Union, overload
 
 from .config import config, logger
 
@@ -99,6 +101,14 @@ class DefaultSandboxNameOverride(str):
 _DEFAULT_SANDBOX_NAME_OVERRIDE = DefaultSandboxNameOverride()
 
 
+@dataclass(frozen=True)
+class SandboxConnectCredentials:
+    """Simple data structure storing credentials for making HTTP connections to a sandbox."""
+
+    url: str
+    token: str
+
+
 class _Sandbox(_Object, type_prefix="sb"):
     """A `Sandbox` object lets you interact with a running sandbox. This API is similar to Python's
     [asyncio.subprocess.Process](https://docs.python.org/3/library/asyncio-subprocess.html#asyncio.subprocess.Process).
@@ -626,6 +636,23 @@ class _Sandbox(_Object, type_prefix="sb"):
 
         return self._tunnels
 
+    async def create_connect_token(
+        self, metadata: Optional[Union[str, dict[str, Any]]] = None
+    ) -> SandboxConnectCredentials:
+        """Create a token for making HTTP connections to the sandbox.
+
+        Also accepts an optional metadata string or dict to associate with the token. This metadata
+        will be added to the headers by the proxy when forwarding requests to the sandbox."""
+        if metadata is not None and isinstance(metadata, dict):
+            try:
+                metadata = json.dumps(metadata)
+            except Exception as e:
+                raise InvalidError(f"Failed to serialize metadata: {e}")
+
+        req = api_pb2.SandboxCreateConnectTokenRequest(sandbox_id=self.object_id, metadata=metadata)
+        resp = await retry_transient_errors(self._client.stub.SandboxCreateConnectToken, req)
+        return SandboxConnectCredentials(resp.url, resp.token)
+
     async def reload_volumes(self) -> None:
         """Reload all Volumes mounted in the Sandbox.
 

{modal-1.1.5.dev14 → modal-1.1.5.dev16}/modal/sandbox.pyi

@@ -39,6 +39,36 @@ class DefaultSandboxNameOverride(str):
 
 _DEFAULT_SANDBOX_NAME_OVERRIDE: DefaultSandboxNameOverride
 
+class SandboxConnectCredentials:
+    """Simple data structure storing credentials for making HTTP connections to a sandbox."""
+
+    url: str
+    token: str
+
+    def __init__(self, url: str, token: str) -> None:
+        """Initialize self.  See help(type(self)) for accurate signature."""
+        ...
+
+    def __repr__(self):
+        """Return repr(self)."""
+        ...
+
+    def __eq__(self, other):
+        """Return self==value."""
+        ...
+
+    def __setattr__(self, name, value):
+        """Implement setattr(self, name, value)."""
+        ...
+
+    def __delattr__(self, name):
+        """Implement delattr(self, name)."""
+        ...
+
+    def __hash__(self):
+        """Return hash(self)."""
+        ...
+
 class _Sandbox(modal._object._Object):
     """A `Sandbox` object lets you interact with a running sandbox. This API is similar to Python's
     [asyncio.subprocess.Process](https://docs.python.org/3/library/asyncio-subprocess.html#asyncio.subprocess.Process).
@@ -224,6 +254,16 @@ class _Sandbox(modal._object._Object):
         """
         ...
 
+    async def create_connect_token(
+        self, metadata: typing.Union[str, dict[str, typing.Any], None] = None
+    ) -> SandboxConnectCredentials:
+        """Create a token for making HTTP connections to the sandbox.
+
+        Also accepts an optional metadata string or dict to associate with the token. This metadata
+        will be added to the headers by the proxy when forwarding requests to the sandbox.
+        """
+        ...
+
     async def reload_volumes(self) -> None:
         """Reload all Volumes mounted in the Sandbox.
 
@@ -708,6 +748,29 @@ class Sandbox(modal.object.Object):
 
     tunnels: __tunnels_spec[typing_extensions.Self]
 
+    class __create_connect_token_spec(typing_extensions.Protocol[SUPERSELF]):
+        def __call__(
+            self, /, metadata: typing.Union[str, dict[str, typing.Any], None] = None
+        ) -> SandboxConnectCredentials:
+            """Create a token for making HTTP connections to the sandbox.
+
+            Also accepts an optional metadata string or dict to associate with the token. This metadata
+            will be added to the headers by the proxy when forwarding requests to the sandbox.
+            """
+            ...
+
+        async def aio(
+            self, /, metadata: typing.Union[str, dict[str, typing.Any], None] = None
+        ) -> SandboxConnectCredentials:
+            """Create a token for making HTTP connections to the sandbox.
+
+            Also accepts an optional metadata string or dict to associate with the token. This metadata
+            will be added to the headers by the proxy when forwarding requests to the sandbox.
+            """
+            ...
+
+    create_connect_token: __create_connect_token_spec[typing_extensions.Self]
+
     class __reload_volumes_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /) -> None:
             """Reload all Volumes mounted in the Sandbox.

{modal-1.1.5.dev14 → modal-1.1.5.dev16}/modal.egg-info/PKG-INFO

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

{modal-1.1.5.dev14 → modal-1.1.5.dev16}/modal_proto/api.proto

@@ -2156,7 +2156,10 @@ message ListPagination {
 }
 
 message MapAwaitRequest {
-  string function_call_id = 1;
+  oneof call_info {
+    string function_call_id = 1;
+    string map_token = 5;
+  }
   string last_entry_id = 2;
   double requested_at = 3; // Used for waypoints.
   float timeout = 4;
@@ -2185,11 +2188,18 @@ message MapStartOrContinueItem {
 message MapStartOrContinueRequest {
   string function_id = 1;
   string parent_input_id = 2;
-  optional string function_call_id = 3; // This is given iff this is a map continue request.
+  // Clients will send call_info on map continue requests.
+  oneof call_info {
+    string function_call_id = 3;
+    string map_token = 5;
+  }
   repeated MapStartOrContinueItem items = 4;
 }
 
 message MapStartOrContinueResponse {
+  // function_id and function_call_id are not necessary if map_token is provided.
+  // All 3 will be sent until it is safe to only send map_token.
+  string map_token = 6;
   string function_id = 1;
   string function_call_id = 2;
   uint32 max_inputs_outstanding = 3;