modal 1.4.4.dev1__tar.gz → 1.4.4.dev2__tar.gz

{modal-1.4.4.dev1 → modal-1.4.4.dev2}/PKG-INFO

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

{modal-1.4.4.dev1 → modal-1.4.4.dev2}/modal/client.pyi

@@ -35,7 +35,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.4.4.dev1",
+        version: str = "1.4.4.dev2",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -175,7 +175,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.4.4.dev1",
+        version: str = "1.4.4.dev2",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.4.4.dev1 → modal-1.4.4.dev2}/modal/experimental/flash.py

@@ -51,6 +51,7 @@ class _FlashManager:
         self.stopped = False
         self.num_heartbeat_failures = 0
         self.task_id = os.environ["MODAL_TASK_ID"]
+        self.heartbeat_task = None
 
     async def is_port_connection_healthy(
         self, process: Optional[subprocess.Popen], timeout: float = 0.5
@@ -86,13 +87,22 @@ class _FlashManager:
         host = parsed_url.hostname
         port = parsed_url.port or 443
 
+        if self.is_server:
+            await self._start_server_tunnel()
+            return
+        await self._start_flash_registration(host, port)
+
+    async def _start_server_tunnel(self) -> None:
+        # Worker-side HTTP relay owns Flash registration and drain for server tasks.
+        logger.warning(f"[Modal Flash] Server tunnel opened at {self.tunnel.url}.")
+
+    async def _start_flash_registration(self, host: str, port: int) -> None:
         try:
             await self._wait_for_port_success(host, port)
         except (Exception, KeyboardInterrupt, asyncio.CancelledError):
             await self._deregister()
             await self.tunnel_manager.__aexit__(*sys.exc_info())
             raise
-
         self.heartbeat_task = asyncio.create_task(self._run_heartbeat(host, port))
         self.drain_task = asyncio.create_task(self._drain_container())
 
@@ -209,16 +219,15 @@ class _FlashManager:
             if self.heartbeat_task:
                 self.heartbeat_task.cancel()
                 try:
+                    # NOTE(gongy): We skip calling TunnelStop to avoid interrupting in-flight requests.
+                    # It is up to the user to wait after calling .stop() to drain in-flight requests.
                     await asyncio.wait_for(self.heartbeat_task, timeout=5)
+                    logger.warning(f"[Modal Flash] Stopping heartbeat task on {self.tunnel.url}.")
                 except (asyncio.TimeoutError, asyncio.CancelledError):
                     logger.warning("[Modal Flash] Heartbeat task did not stop within 5s.")
         except Exception as e:
             logger.error(f"[Modal Flash] Error stopping: {e}")
         self.stopped = True
-        logger.warning(f"[Modal Flash] No longer accepting new requests on {self.tunnel.url}.")
-
-        # NOTE(gongy): We skip calling TunnelStop to avoid interrupting in-flight requests.
-        # It is up to the user to wait after calling .stop() to drain in-flight requests.
 
     async def close(self):
         if not self.stopped:

{modal-1.4.4.dev1 → modal-1.4.4.dev2}/modal/experimental/flash.pyi

@@ -23,6 +23,8 @@ class _FlashManager:
         self, process: typing.Optional[subprocess.Popen], timeout: float = 0.5
     ) -> tuple[bool, typing.Optional[Exception]]: ...
     async def _start(self): ...
+    async def _start_server_tunnel(self) -> None: ...
+    async def _start_flash_registration(self, host: str, port: int) -> None: ...
     async def _deregister(self): ...
     async def _drain_container(self):
         """Background task that checks if we've encountered too many failures and drains the container if so."""
@@ -63,6 +65,18 @@ class FlashManager:
 
     _start: ___start_spec
 
+    class ___start_server_tunnel_spec(typing_extensions.Protocol):
+        def __call__(self, /) -> None: ...
+        async def aio(self, /) -> None: ...
+
+    _start_server_tunnel: ___start_server_tunnel_spec
+
+    class ___start_flash_registration_spec(typing_extensions.Protocol):
+        def __call__(self, /, host: str, port: int) -> None: ...
+        async def aio(self, /, host: str, port: int) -> None: ...
+
+    _start_flash_registration: ___start_flash_registration_spec
+
     class ___deregister_spec(typing_extensions.Protocol):
         def __call__(self, /): ...
         async def aio(self, /): ...

{modal-1.4.4.dev1 → modal-1.4.4.dev2}/modal/sandbox.py

@@ -1,6 +1,7 @@
 # Copyright Modal Labs 2022
 import asyncio
 import builtins
+import enum
 import json
 import os
 import time
@@ -75,11 +76,47 @@ _default_image: _Image = _Image.debian_slim()
 # e.g. 'runsc exec ...'. So we use 2**16 as the limit.
 ARG_MAX_BYTES = 2**16
 TTL_NO_EXPIRY_SENTINEL = -1
+_V1_SANDBOX_ID_ALPHABET = frozenset("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")
+_ULID_ALPHABET = frozenset("0123456789ABCDEFGHJKMNPQRSTVWXYZ")
 
 if TYPE_CHECKING:
     import modal.app
 
 
+class SandboxVersion(enum.Enum):
+    V1 = 1
+    V2 = 2
+
+
+def _is_v1_sandbox_id(sandbox_id: str) -> bool:
+    prefix, separator, suffix = sandbox_id.partition("-")
+    return (
+        prefix == "sb"
+        and separator == "-"
+        and len(suffix) == 22
+        and all(ch in _V1_SANDBOX_ID_ALPHABET for ch in suffix)
+    )
+
+
+def _is_v2_sandbox_id(sandbox_id: str) -> bool:
+    prefix, separator, suffix = sandbox_id.partition("-")
+    return (
+        prefix == "sb"
+        and separator == "-"
+        and len(suffix) == 26
+        and suffix[0] in "01234567"
+        and all(ch in _ULID_ALPHABET for ch in suffix)
+    )
+
+
+def _get_sandbox_version(sandbox_id: str) -> SandboxVersion:
+    if _is_v2_sandbox_id(sandbox_id):
+        return SandboxVersion.V2
+    if _is_v1_sandbox_id(sandbox_id):
+        return SandboxVersion.V1
+    raise InvalidError(f"Invalid Sandbox ID: {sandbox_id!r}")
+
+
 def _result_returncode(result: Optional[api_pb2.GenericResult]) -> Optional[int]:
     if result is None or result.status == api_pb2.GenericResult.GENERIC_STATUS_UNSPECIFIED:
         return None
@@ -675,6 +712,11 @@ class _Sandbox(_Object, type_prefix="sb"):
 
         Features like tags, memory snapshots, volumes, network file systems, GPUs,
         custom domains, OIDC identity tokens, and proxies are not supported.
+
+        V2 sandboxes created with this method are not currently returned by
+        `Sandbox.list()` and cannot be looked up with `Sandbox.from_name()`.
+        Store `sandbox.object_id` if you need to retrieve the sandbox later, and
+        use `Sandbox.from_id(sandbox.object_id)` to reattach.
         """
         from .app import _App
 
@@ -908,10 +950,18 @@ class _Sandbox(_Object, type_prefix="sb"):
         if client is None:
             client = await _Client.from_env()
 
+        sandbox_version = _get_sandbox_version(sandbox_id)
+        is_v2 = sandbox_version == SandboxVersion.V2
         req = api_pb2.SandboxWaitRequest(sandbox_id=sandbox_id, timeout=0)
-        resp = await client.stub.SandboxWait(req)
+        if is_v2:
+            assert client._auth_token_manager
+            auth_token = await client._auth_token_manager.get_token()
+            resp = await client.stub.SandboxWaitV2(req, metadata=[("x-modal-auth-token", auth_token)])
+        else:
+            resp = await client.stub.SandboxWait(req)
 
         obj = _Sandbox._new_hydrated(sandbox_id, client, None)
+        obj._is_v2 = is_v2
 
         if resp.result.status:
             obj._result = resp.result
@@ -1000,7 +1050,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         # You can later mount this snapshot to another Sandbox:
         sandbox_session_2 = modal.Sandbox.create(...)
         sandbox_session_2.mount_image("/user_project", user_project_snapshot)
-        sandbox_session_2.ls("/user_project")
+        sandbox_session_2.filesystem.list_files("/user_project")
         ```
         """
         self._ensure_v1("mount_image")
@@ -1071,7 +1121,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         # You can later mount this snapshot to another Sandbox:
         sandbox_session_2 = modal.Sandbox.create(...)
         sandbox_session_2.mount_image("/user_project", user_project_snapshot)
-        sandbox_session_2.ls("/user_project")
+        sandbox_session_2.filesystem.list_files("/user_project")
         ```
         """
         self._ensure_v1("snapshot_directory")

{modal-1.4.4.dev1 → modal-1.4.4.dev2}/modal/sandbox.pyi

@@ -1,5 +1,6 @@
 import _typeshed
 import collections.abc
+import enum
 import google.protobuf.message
 import modal._object
 import modal._tunnel
@@ -27,6 +28,13 @@ import pathlib
 import typing
 import typing_extensions
 
+class SandboxVersion(enum.Enum):
+    V1 = 1
+    V2 = 2
+
+def _is_v1_sandbox_id(sandbox_id: str) -> bool: ...
+def _is_v2_sandbox_id(sandbox_id: str) -> bool: ...
+def _get_sandbox_version(sandbox_id: str) -> SandboxVersion: ...
 def _result_returncode(result: typing.Optional[modal_proto.api_pb2.GenericResult]) -> typing.Optional[int]: ...
 def _validate_exec_args(args: collections.abc.Sequence[str]) -> None: ...
 
@@ -333,6 +341,11 @@ class _Sandbox(modal._object._Object):
 
         Features like tags, memory snapshots, volumes, network file systems, GPUs,
         custom domains, OIDC identity tokens, and proxies are not supported.
+
+        V2 sandboxes created with this method are not currently returned by
+        `Sandbox.list()` and cannot be looked up with `Sandbox.from_name()`.
+        Store `sandbox.object_id` if you need to retrieve the sandbox later, and
+        use `Sandbox.from_id(sandbox.object_id)` to reattach.
         """
         ...
 
@@ -417,7 +430,7 @@ class _Sandbox(modal._object._Object):
         # You can later mount this snapshot to another Sandbox:
         sandbox_session_2 = modal.Sandbox.create(...)
         sandbox_session_2.mount_image("/user_project", user_project_snapshot)
-        sandbox_session_2.ls("/user_project")
+        sandbox_session_2.filesystem.list_files("/user_project")
         ```
         """
         ...
@@ -443,7 +456,7 @@ class _Sandbox(modal._object._Object):
         # You can later mount this snapshot to another Sandbox:
         sandbox_session_2 = modal.Sandbox.create(...)
         sandbox_session_2.mount_image("/user_project", user_project_snapshot)
-        sandbox_session_2.ls("/user_project")
+        sandbox_session_2.filesystem.list_files("/user_project")
         ```
         """
         ...
@@ -1219,6 +1232,11 @@ class Sandbox(modal.object.Object):
 
             Features like tags, memory snapshots, volumes, network file systems, GPUs,
             custom domains, OIDC identity tokens, and proxies are not supported.
+
+            V2 sandboxes created with this method are not currently returned by
+            `Sandbox.list()` and cannot be looked up with `Sandbox.from_name()`.
+            Store `sandbox.object_id` if you need to retrieve the sandbox later, and
+            use `Sandbox.from_id(sandbox.object_id)` to reattach.
             """
             ...
 
@@ -1257,6 +1275,11 @@ class Sandbox(modal.object.Object):
 
             Features like tags, memory snapshots, volumes, network file systems, GPUs,
             custom domains, OIDC identity tokens, and proxies are not supported.
+
+            V2 sandboxes created with this method are not currently returned by
+            `Sandbox.list()` and cannot be looked up with `Sandbox.from_name()`.
+            Store `sandbox.object_id` if you need to retrieve the sandbox later, and
+            use `Sandbox.from_id(sandbox.object_id)` to reattach.
             """
             ...
 
@@ -1420,7 +1443,7 @@ class Sandbox(modal.object.Object):
             # You can later mount this snapshot to another Sandbox:
             sandbox_session_2 = modal.Sandbox.create(...)
             sandbox_session_2.mount_image("/user_project", user_project_snapshot)
-            sandbox_session_2.ls("/user_project")
+            sandbox_session_2.filesystem.list_files("/user_project")
             ```
             """
             ...
@@ -1445,7 +1468,7 @@ class Sandbox(modal.object.Object):
             # You can later mount this snapshot to another Sandbox:
             sandbox_session_2 = modal.Sandbox.create(...)
             sandbox_session_2.mount_image("/user_project", user_project_snapshot)
-            sandbox_session_2.ls("/user_project")
+            sandbox_session_2.filesystem.list_files("/user_project")
             ```
             """
             ...
@@ -1486,7 +1509,7 @@ class Sandbox(modal.object.Object):
             # You can later mount this snapshot to another Sandbox:
             sandbox_session_2 = modal.Sandbox.create(...)
             sandbox_session_2.mount_image("/user_project", user_project_snapshot)
-            sandbox_session_2.ls("/user_project")
+            sandbox_session_2.filesystem.list_files("/user_project")
             ```
             """
             ...
@@ -1503,7 +1526,7 @@ class Sandbox(modal.object.Object):
             # You can later mount this snapshot to another Sandbox:
             sandbox_session_2 = modal.Sandbox.create(...)
             sandbox_session_2.mount_image("/user_project", user_project_snapshot)
-            sandbox_session_2.ls("/user_project")
+            sandbox_session_2.filesystem.list_files("/user_project")
             ```
             """
             ...

{modal-1.4.4.dev1 → modal-1.4.4.dev2}/modal.egg-info/PKG-INFO

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

{modal-1.4.4.dev1 → modal-1.4.4.dev2}/modal_proto/api_grpc.py

@@ -263,6 +263,10 @@ class ModalClientBase(abc.ABC):
     async def EndpointCreate(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EndpointCreateRequest, modal_proto.api_pb2.EndpointCreateResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def EndpointList(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EndpointListRequest, modal_proto.api_pb2.EndpointListResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def EnvironmentCreate(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.EnvironmentCreateRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
@@ -1183,6 +1187,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.EndpointCreateRequest,
                 modal_proto.api_pb2.EndpointCreateResponse,
             ),
+            '/modal.client.ModalClient/EndpointList': grpclib.const.Handler(
+                self.EndpointList,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.EndpointListRequest,
+                modal_proto.api_pb2.EndpointListResponse,
+            ),
             '/modal.client.ModalClient/EnvironmentCreate': grpclib.const.Handler(
                 self.EnvironmentCreate,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -2383,6 +2393,12 @@ class ModalClientStub:
             modal_proto.api_pb2.EndpointCreateRequest,
             modal_proto.api_pb2.EndpointCreateResponse,
         )
+        self.EndpointList = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/EndpointList',
+            modal_proto.api_pb2.EndpointListRequest,
+            modal_proto.api_pb2.EndpointListResponse,
+        )
         self.EnvironmentCreate = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/EnvironmentCreate',