modal 1.5.2.dev4__tar.gz → 1.5.2.dev6__tar.gz

{modal-1.5.2.dev4 → modal-1.5.2.dev6}/PKG-INFO

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

{modal-1.5.2.dev4 → modal-1.5.2.dev6}/modal/_utils/blob_utils.py

@@ -138,6 +138,13 @@ async def _upload_to_s3_url(
                     text = await resp.text()
                 except Exception:
                     text = "<no body>"
+
+                if "The Content-MD5 you specified did not match what we received." in text:
+                    raise ExecutionError(
+                        "Hash mismatch during upload. This may be caused by files changing while an upload is in "
+                        "progress. Please try again."
+                    )
+
                 raise ExecutionError(f"Put to url {upload_url} failed with status {resp.status}: {text}")
 
             # client side ETag checksum verification

{modal-1.5.2.dev4 → modal-1.5.2.dev6}/modal/cli/image.py

@@ -10,10 +10,12 @@ from typing import Optional
 import click
 
 from modal._environments import ensure_env
+from modal._image import _parse_named_image_ref
 from modal._utils.async_utils import synchronizer
 from modal._utils.time_utils import timestamp_to_localized_str
 from modal.cli.utils import display_table, env_option
 from modal.client import _Client
+from modal.exception import InvalidError
 from modal.output import OutputManager
 from modal_proto import api_pb2
 
@@ -21,6 +23,8 @@ from ._help import ModalGroup
 
 IMAGE_NAMES_LIST_PAGE_SIZE = 100
 IMAGE_NAMES_LIST_PAGE_DELAY_SECONDS = 1.0
+IMAGE_NAMES_HISTORY_PAGE_SIZE = 100
+IMAGE_NAMES_HISTORY_PAGE_DELAY_SECONDS = 1.0
 
 image_cli = ModalGroup(name="image", help="Manage Images.")
 image_names_cli = ModalGroup(name="names", help="Manage Modal Image names.")
@@ -49,6 +53,20 @@ def _tag_item_row(item: api_pb2.ImageListTagsItem) -> tuple[str, str, str]:
     )
 
 
+def _history_item_json(item: api_pb2.ImageTagRevisionsItem) -> dict[str, str]:
+    return {
+        "image_id": item.image_id,
+        "published_at": timestamp_to_localized_str(item.created_at, True) or "-",
+    }
+
+
+def _history_item_row(item: api_pb2.ImageTagRevisionsItem) -> tuple[str, str]:
+    return (
+        item.image_id,
+        timestamp_to_localized_str(item.created_at, False) or "-",
+    )
+
+
 async def _iter_tag_pages(
     client: _Client, env: str, prefix: str
 ) -> AsyncIterator[tuple[str, list[api_pb2.ImageListTagsItem]]]:
@@ -73,6 +91,36 @@ async def _iter_tag_pages(
         await asyncio.sleep(IMAGE_NAMES_LIST_PAGE_DELAY_SECONDS)
 
 
+async def _fetch_history_page(
+    client: _Client,
+    env: str,
+    tag: str,
+    page_token: str,
+) -> api_pb2.ImageTagRevisionsResponse:
+    return await client.stub.ImageTagRevisions(
+        api_pb2.ImageTagRevisionsRequest(
+            tag=tag,
+            environment_name=env,
+            max_objects=IMAGE_NAMES_HISTORY_PAGE_SIZE,
+            page_token=page_token,
+        )
+    )
+
+
+async def _iter_history_pages(
+    client: _Client, env: str, tag: str, first_page: api_pb2.ImageTagRevisionsResponse
+) -> AsyncIterator[api_pb2.ImageTagRevisionsResponse]:
+    response = first_page
+
+    while True:
+        yield response
+
+        if not response.next_page_token:
+            return
+        await asyncio.sleep(IMAGE_NAMES_HISTORY_PAGE_DELAY_SECONDS)
+        response = await _fetch_history_page(client, env, tag, response.next_page_token)
+
+
 @image_names_cli.command("list", help="List named Images.")
 @env_option
 @click.option("--prefix", default="", help="Only include named image tags that start with this prefix.")
@@ -108,3 +156,52 @@ async def list_(
         count += len(page_items)
 
     _print_result_summary(count)
+
+
+@image_names_cli.command("history", help="Show publishing history for a named Image.", hidden=True)
+@click.argument("name")
+@env_option
+@click.option("--json", is_flag=True, default=False)
+@synchronizer.create_blocking
+async def history(
+    name: str,
+    env: Optional[str] = None,
+    json: bool = False,
+):
+    env = ensure_env(env)
+    try:
+        name_tag = _parse_named_image_ref(name)
+    except InvalidError as exc:
+        raise click.UsageError(str(exc)) from exc
+    client = await _Client.from_env()
+
+    first_page = await _fetch_history_page(client, env, name_tag, "")
+    if not first_page.items:
+        raise click.ClickException(f"No publishing history found for named image {first_page.tag!r}.")
+
+    if json:
+        click.echo("[", nl=False)
+        count = 0
+        async for response in _iter_history_pages(client, env, name_tag, first_page):
+            for item in response.items:
+                if count:
+                    click.echo(",", nl=False)
+                click.echo(json_module.dumps(_history_item_json(item)), nl=False)
+                count += 1
+        click.echo("]")
+        return
+
+    count = 0
+    show_title = True
+    async for response in _iter_history_pages(client, env, name_tag, first_page):
+        if response.items:
+            title = f"History for {response.tag}" if show_title else ""
+            display_table(
+                ["Image ID", "Published at"],
+                [_history_item_row(item) for item in response.items],
+                title=title,
+            )
+            show_title = False
+        count += len(response.items)
+
+    _print_result_summary(count)

{modal-1.5.2.dev4 → modal-1.5.2.dev6}/modal/client.pyi

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

{modal-1.5.2.dev4 → modal-1.5.2.dev6}/modal/functions.pyi

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

{modal-1.5.2.dev4 → modal-1.5.2.dev6}/modal/sandbox.py

@@ -2282,6 +2282,62 @@ class _Sandbox(_Object, type_prefix="sb"):
             # Fetch the next batch starting from the end of the current one.
             before_timestamp = resp.sandboxes[-1].created_at
 
+    @staticmethod
+    async def _experimental_list(
+        *, app_id: str | None = None, client: _Client | None = None
+    ) -> AsyncGenerator["_Sandbox", None]:
+        """List v2 Sandboxes in an App.
+
+        This function lists v2 sandboxes, ie sandboxes created via modal.Sandbox._experimental_create.
+        Filtering based on tags is not yet supported.
+
+        Args:
+            app_id: The App to list Sandboxes under.
+            client: Optional client to use for the session.
+
+        Yields:
+            `Sandbox` objects that are currently running in the App.
+        """
+        if not app_id:
+            raise InvalidError(
+                "Sandbox._experimental_list requires an `app_id`:\n\n"
+                'app = modal.App.lookup("my-app")\n'
+                "Sandbox._experimental_list(app_id=app.app_id)"
+            )
+
+        before_timestamp = None
+        if client is None:
+            client = await _Client.from_env()
+
+        assert client._auth_token_manager
+        while True:
+            req = api_pb2.SandboxListRequest(
+                app_id=app_id,
+                before_timestamp=before_timestamp,
+                include_finished=False,
+            )
+
+            # Fetches a batch of sandboxes. SandboxListV2 authenticates via the
+            # auth-token metadata, like the other V2 sandbox RPCs.
+            auth_token = await client._auth_token_manager.get_token()
+            resp = await client.stub.SandboxListV2(req, metadata=[("x-modal-auth-token", auth_token)])
+
+            if not resp.sandboxes:
+                return
+
+            for sandbox_info in resp.sandboxes:
+                sandbox_info: api_pb2.SandboxInfo
+                obj = _Sandbox._new_hydrated(sandbox_info.id, client, None)
+                # SandboxListV2 only returns V2 sandboxes; mark them as such so
+                # operations like wait/terminate/exec use the V2 RPCs and stdio.
+                obj._is_v2 = True
+                obj._hydrate_metadata_v2()
+                obj._result = sandbox_info.task_info.result
+                yield obj
+
+            # Fetch the next batch starting from the end of the current one.
+            before_timestamp = resp.sandboxes[-1].created_at
+
 
 class _SidecarContainer:
     """Handle to an additional container running in a Sandbox."""

{modal-1.5.2.dev4 → modal-1.5.2.dev6}/modal/sandbox.pyi

@@ -942,6 +942,24 @@ class _Sandbox(modal._object._Object):
         """
         ...
 
+    @staticmethod
+    def _experimental_list(
+        *, app_id: typing.Optional[str] = None, client: typing.Optional[modal.client._Client] = None
+    ) -> collections.abc.AsyncGenerator[_Sandbox, None]:
+        """List v2 Sandboxes in an App.
+
+        This function lists v2 sandboxes, ie sandboxes created via modal.Sandbox._experimental_create.
+        Filtering based on tags is not yet supported.
+
+        Args:
+            app_id: The App to list Sandboxes under.
+            client: Optional client to use for the session.
+
+        Yields:
+            `Sandbox` objects that are currently running in the App.
+        """
+        ...
+
 class _SidecarContainer:
     """Handle to an additional container running in a Sandbox."""
 
@@ -2790,6 +2808,43 @@ class Sandbox(modal.object.Object):
 
     list: typing.ClassVar[__list_spec]
 
+    class ___experimental_list_spec(typing_extensions.Protocol):
+        def __call__(
+            self, /, *, app_id: typing.Optional[str] = None, client: typing.Optional[modal.client.Client] = None
+        ) -> typing.Generator[Sandbox, None, None]:
+            """List v2 Sandboxes in an App.
+
+            This function lists v2 sandboxes, ie sandboxes created via modal.Sandbox._experimental_create.
+            Filtering based on tags is not yet supported.
+
+            Args:
+                app_id: The App to list Sandboxes under.
+                client: Optional client to use for the session.
+
+            Yields:
+                `Sandbox` objects that are currently running in the App.
+            """
+            ...
+
+        def aio(
+            self, /, *, app_id: typing.Optional[str] = None, client: typing.Optional[modal.client.Client] = None
+        ) -> collections.abc.AsyncGenerator[Sandbox, None]:
+            """List v2 Sandboxes in an App.
+
+            This function lists v2 sandboxes, ie sandboxes created via modal.Sandbox._experimental_create.
+            Filtering based on tags is not yet supported.
+
+            Args:
+                app_id: The App to list Sandboxes under.
+                client: Optional client to use for the session.
+
+            Yields:
+                `Sandbox` objects that are currently running in the App.
+            """
+            ...
+
+    _experimental_list: typing.ClassVar[___experimental_list_spec]
+
 _default_image: modal._image._Image
 
 _MAIN_CONTAINER_NAME: str

{modal-1.5.2.dev4 → modal-1.5.2.dev6}/modal.egg-info/PKG-INFO

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

{modal-1.5.2.dev4 → modal-1.5.2.dev6}/modal_docs/mdmd/mdmd.py

@@ -3,9 +3,9 @@
 
 import html
 import inspect
+import logging
 import re
 import typing
-import warnings
 from collections.abc import Callable
 from enum import Enum, EnumMeta
 from types import ModuleType
@@ -15,6 +15,8 @@ import synchronicity.synchronizer
 from .signatures import get_signature, parse_params_from_signature, strip_signature
 from .types import ParsedDoc, ParsedParam, ParsedRaise
 
+logger = logging.getLogger(__name__)
+
 
 def _escape_svelte_html_attr(value: str) -> str:
     """Escape text for double-quoted HTML / Svelte component attributes.
@@ -475,7 +477,7 @@ def module_str(header, module, title_level="#", filter_items: Callable[[ModuleTy
                 object_docs.append(f"{member_title_level} {qual_name}\n\n")
                 object_docs.append(item_doc)
             else:
-                warnings.warn(f"Not sure how to document: {name} ({item}")
+                logger.warning(f"[mdmd] Not sure how to document {name} ({item.__class__.__name__})")
 
     if object_docs:
         return "".join(header + object_docs)

{modal-1.5.2.dev4 → modal-1.5.2.dev6}/modal_proto/api_grpc.py

@@ -891,6 +891,18 @@ class ModalClientBase(abc.ABC):
     async def WorkspaceNameLookup(self, stream: 'grpclib.server.Stream[google.protobuf.empty_pb2.Empty, modal_proto.api_pb2.WorkspaceNameLookupResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def WorkspaceSetDefaultEnvironment(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.WorkspaceSetDefaultEnvironmentRequest, google.protobuf.empty_pb2.Empty]') -> None:
+        pass
+
+    @abc.abstractmethod
+    async def WorkspaceSetImageBuilderVersion(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.WorkspaceSetImageBuilderVersionRequest, modal_proto.api_pb2.WorkspaceSetImageBuilderVersionResponse]') -> None:
+        pass
+
+    @abc.abstractmethod
+    async def WorkspaceSettings(self, stream: 'grpclib.server.Stream[google.protobuf.empty_pb2.Empty, modal_proto.api_pb2.WorkspaceSettingsResponse]') -> None:
+        pass
+
     def __mapping__(self) -> typing.Dict[str, grpclib.const.Handler]:
         return {
             '/modal.client.ModalClient/AppClientDisconnect': grpclib.const.Handler(
@@ -2201,6 +2213,24 @@ class ModalClientBase(abc.ABC):
                 google.protobuf.empty_pb2.Empty,
                 modal_proto.api_pb2.WorkspaceNameLookupResponse,
             ),
+            '/modal.client.ModalClient/WorkspaceSetDefaultEnvironment': grpclib.const.Handler(
+                self.WorkspaceSetDefaultEnvironment,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.WorkspaceSetDefaultEnvironmentRequest,
+                google.protobuf.empty_pb2.Empty,
+            ),
+            '/modal.client.ModalClient/WorkspaceSetImageBuilderVersion': grpclib.const.Handler(
+                self.WorkspaceSetImageBuilderVersion,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.WorkspaceSetImageBuilderVersionRequest,
+                modal_proto.api_pb2.WorkspaceSetImageBuilderVersionResponse,
+            ),
+            '/modal.client.ModalClient/WorkspaceSettings': grpclib.const.Handler(
+                self.WorkspaceSettings,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                google.protobuf.empty_pb2.Empty,
+                modal_proto.api_pb2.WorkspaceSettingsResponse,
+            ),
         }
 
 
@@ -3515,3 +3545,21 @@ class ModalClientStub:
             google.protobuf.empty_pb2.Empty,
             modal_proto.api_pb2.WorkspaceNameLookupResponse,
         )
+        self.WorkspaceSetDefaultEnvironment = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/WorkspaceSetDefaultEnvironment',
+            modal_proto.api_pb2.WorkspaceSetDefaultEnvironmentRequest,
+            google.protobuf.empty_pb2.Empty,
+        )
+        self.WorkspaceSetImageBuilderVersion = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/WorkspaceSetImageBuilderVersion',
+            modal_proto.api_pb2.WorkspaceSetImageBuilderVersionRequest,
+            modal_proto.api_pb2.WorkspaceSetImageBuilderVersionResponse,
+        )
+        self.WorkspaceSettings = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/WorkspaceSettings',
+            google.protobuf.empty_pb2.Empty,
+            modal_proto.api_pb2.WorkspaceSettingsResponse,
+        )