modAL 1.2.7.dev7__tar.gz → 1.2.7.dev10__tar.gz

{modal-1.2.7.dev7 → modal-1.2.7.dev10}/PKG-INFO

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

{modal-1.2.7.dev7 → modal-1.2.7.dev10}/modal/_container_entrypoint.py

@@ -43,7 +43,6 @@ from ._runtime.container_io_manager import (
 )
 
 if TYPE_CHECKING:
-    import modal._object
     import modal._runtime.container_io_manager
     import modal._runtime.user_code_imports
 

{modal-1.2.7.dev7 → modal-1.2.7.dev10}/modal/_utils/blob_utils.py

@@ -152,12 +152,13 @@ async def perform_multipart_upload(
     part_etags = await TaskContext.gather(*upload_coros)
 
     # The body of the complete_multipart_upload command needs some data in xml format:
-    completion_body = "<CompleteMultipartUpload>\n"
+    completion_parts = ["<CompleteMultipartUpload>"]
     for part_number, etag in enumerate(part_etags, 1):
-        completion_body += f"""<Part>\n<PartNumber>{part_number}</PartNumber>\n<ETag>"{etag}"</ETag>\n</Part>\n"""
-    completion_body += "</CompleteMultipartUpload>"
+        completion_parts.append(f"""<Part>\n<PartNumber>{part_number}</PartNumber>\n<ETag>"{etag}"</ETag>\n</Part>""")
+    completion_parts.append("</CompleteMultipartUpload>")
+    completion_body = "\n".join(completion_parts)
 
-    # etag of combined object should be md5 hex of concatendated md5 *bytes* from parts + `-{num_parts}`
+    # etag of combined object should be md5 hex of concatenated md5 *bytes* from parts + `-{num_parts}`
     bin_hash_parts = [bytes.fromhex(etag) for etag in part_etags]
 
     expected_multipart_etag = hashlib.md5(b"".join(bin_hash_parts)).hexdigest() + f"-{len(part_etags)}"

{modal-1.2.7.dev7 → modal-1.2.7.dev10}/modal/_utils/grpc_utils.py

@@ -16,8 +16,6 @@ from typing import Any, Optional, Sequence, TypeVar
 import grpclib.client
 import grpclib.config
 import grpclib.events
-import grpclib.protocol
-import grpclib.stream
 from google.protobuf.message import Message
 from google.protobuf.symbol_database import SymbolDatabase
 from grpclib import GRPCError, Status

{modal-1.2.7.dev7 → modal-1.2.7.dev10}/modal/_utils/package_utils.py

@@ -1,5 +1,4 @@
 # Copyright Modal Labs 2022
-import importlib
 import importlib.util
 import typing
 from importlib.metadata import PackageNotFoundError, files

{modal-1.2.7.dev7 → modal-1.2.7.dev10}/modal/_utils/task_command_router_client.py

@@ -521,3 +521,17 @@ class TaskCommandRouterClient:
                     await sleep_and_update_delay_and_num_retries_remaining(e)
                 else:
                     raise ConnectionError(str(e))
+
+    async def mount_image(self, request: sr_pb2.TaskMountDirectoryRequest):
+        with grpc_error_converter():
+            return await call_with_retries_on_transient_errors(
+                lambda: self._call_with_auth_retry(self._stub.TaskMountDirectory, request)
+            )
+
+    async def snapshot_directory(
+        self, request: sr_pb2.TaskSnapshotDirectoryRequest
+    ) -> sr_pb2.TaskSnapshotDirectoryResponse:
+        with grpc_error_converter():
+            return await call_with_retries_on_transient_errors(
+                lambda: self._call_with_auth_retry(self._stub.TaskSnapshotDirectory, request)
+            )

{modal-1.2.7.dev7 → modal-1.2.7.dev10}/modal/client.pyi

@@ -32,7 +32,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.2.7.dev7",
+        version: str = "1.2.7.dev10",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -163,7 +163,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.2.7.dev7",
+        version: str = "1.2.7.dev10",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.2.7.dev7 → modal-1.2.7.dev10}/modal/file_io.py

@@ -190,7 +190,7 @@ class _FileIO(Generic[T]):
 
     async def _wait(self, exec_id: str) -> bytes:
         # The logic here is similar to how output is read from `exec`
-        output = b""
+        output_buffer = io.BytesIO()
         completed = False
         retries_remaining = 10
         while not completed:
@@ -201,7 +201,7 @@ class _FileIO(Generic[T]):
                         break
                     if isinstance(data, Exception):
                         raise data
-                    output += data
+                    output_buffer.write(data)
             except (GRPCError, StreamTerminatedError) as exc:
                 if retries_remaining > 0:
                     retries_remaining -= 1
@@ -212,7 +212,7 @@ class _FileIO(Generic[T]):
                     elif isinstance(exc, StreamTerminatedError):
                         continue
                 raise
-        return output
+        return output_buffer.getvalue()
 
     def _validate_type(self, data: Union[bytes, str]) -> None:
         if self._binary and isinstance(data, str):
@@ -421,10 +421,22 @@ class _FileIO(Generic[T]):
                 task_id=self._task_id,
             ),
         )
+
+        def end_of_event(item: bytes, buffer: io.BytesIO, boundary_token: bytes) -> bool:
+            if not item.endswith(b"\n"):
+                return False
+            boundary_token_size = len(boundary_token)
+            if buffer.tell() < boundary_token_size:
+                return False
+            buffer.seek(-boundary_token_size, io.SEEK_END)
+            if buffer.read(boundary_token_size) == boundary_token:
+                return True
+            return False
+
         async with TaskContext() as tc:
             tc.create_task(self._consume_watch_output(resp.exec_id))
 
-            buffer = b""
+            item_buffer = io.BytesIO()
             while True:
                 if len(self._watch_output_buffer) > 0:
                     item = self._watch_output_buffer.pop(0)
@@ -432,12 +444,12 @@ class _FileIO(Generic[T]):
                         break
                     if isinstance(item, Exception):
                         raise item
-                    buffer += item
-                    # a single event may be split across multiple messages
-                    # the end of an event is marked by two newlines
-                    if buffer.endswith(b"\n\n"):
+                    item_buffer.write(item)
+                    assert isinstance(item, bytes)
+                    # Single events may span multiple messages so we need to check for a special event boundary token
+                    if end_of_event(item, item_buffer, boundary_token=b"\n\n"):
                         try:
-                            event_json = json.loads(buffer.strip().decode())
+                            event_json = json.loads(item_buffer.getvalue().strip().decode())
                             event = FileWatchEvent(
                                 type=FileWatchEventType(event_json["event_type"]),
                                 paths=event_json["paths"],
@@ -447,7 +459,7 @@ class _FileIO(Generic[T]):
                         except (json.JSONDecodeError, KeyError, ValueError):
                             # skip invalid events
                             pass
-                        buffer = b""
+                        item_buffer = io.BytesIO()
                 else:
                     await asyncio.sleep(0.1)
 

{modal-1.2.7.dev7 → modal-1.2.7.dev10}/modal/image.py

@@ -874,6 +874,7 @@ class _Image(_Object, type_prefix="im"):
 
         rep = f"Image.from_id({image_id!r})"
         obj = _Image._from_loader(_load, rep, load_context_overrides=LoadContext(client=client))
+        obj._object_id = image_id
 
         return obj
 

{modal-1.2.7.dev7 → modal-1.2.7.dev10}/modal/io_streams.py

@@ -23,7 +23,7 @@ from grpclib.exceptions import GRPCError, StreamTerminatedError
 from modal.exception import ClientClosed, ExecTimeoutError, InvalidError
 from modal_proto import api_pb2
 
-from ._utils.async_utils import aclosing, synchronize_api
+from ._utils.async_utils import aclosing, synchronize_api, synchronizer
 from ._utils.grpc_utils import RETRYABLE_GRPC_STATUS_CODES
 from ._utils.task_command_router_client import TaskCommandRouterClient
 from .client import _Client
@@ -153,17 +153,17 @@ class _StreamReaderThroughServer(Generic[T]):
         """Fetch the entire contents of the stream until EOF."""
         logger.debug(f"{self._object_id} StreamReader fd={self._file_descriptor} read starting")
         if self._text:
-            data_str = ""
+            buffer = io.StringIO()
             async for message in _decode_bytes_stream_to_str(self._get_logs()):
-                data_str += message
+                buffer.write(message)
             logger.debug(f"{self._object_id} StreamReader fd={self._file_descriptor} read completed after EOF")
-            return cast(T, data_str)
+            return cast(T, buffer.getvalue())
         else:
-            data_bytes = b""
+            buffer = io.BytesIO()
             async for message in self._get_logs():
-                data_bytes += message
+                buffer.write(message)
             logger.debug(f"{self._object_id} StreamReader fd={self._file_descriptor} read completed after EOF")
-            return cast(T, data_bytes)
+            return cast(T, buffer.getvalue())
 
     async def _consume_container_process_stream(self):
         """Consume the container process stream and store messages in the buffer."""
@@ -566,6 +566,9 @@ class _StreamReader(Generic[T]):
         task_id: Optional[str] = None,
     ) -> None:
         """mdmd:hidden"""
+        # we can remove this once we ensure no constructors use async code
+        assert asyncio.get_running_loop() == synchronizer._get_loop(start=False)
+
         if by_line and not text:
             raise ValueError("line-buffering is only supported when text=True")
 

{modal-1.2.7.dev7 → modal-1.2.7.dev10}/modal/sandbox.py

@@ -6,6 +6,7 @@ import time
 import uuid
 from collections.abc import AsyncGenerator, Collection, Sequence
 from dataclasses import dataclass
+from pathlib import PurePosixPath
 from typing import TYPE_CHECKING, Any, AsyncIterator, Literal, Optional, Union, overload
 
 from ._pty import get_pty_info
@@ -600,6 +601,49 @@ class _Sandbox(_Object, type_prefix="sb"):
 
         return image
 
+    async def _experimental_mount_image(self, path: Union[PurePosixPath, str], image: Optional[_Image]):
+        """Mount an Image at a path in the Sandbox filesystem."""
+
+        image_id = None
+
+        if image:
+            if not image._object_id:
+                # FIXME
+                raise InvalidError("Image has not been built.")
+            image_id = image._object_id
+        else:
+            image_id = ""  # empty string indicates mount an empty dir
+
+        task_id = await self._get_task_id()
+        if (command_router_client := await self._get_command_router_client(task_id)) is None:
+            raise InvalidError("Mounting directories requires direct Sandbox control - please contact Modal support.")
+
+        posix_path = PurePosixPath(path)
+        if not posix_path.is_absolute():
+            raise InvalidError(f"Mount path must be absolute; got: {posix_path}")
+        path_bytes = posix_path.as_posix().encode("utf8")
+
+        req = sr_pb2.TaskMountDirectoryRequest(task_id=task_id, path=path_bytes, image_id=image_id)
+        await command_router_client.mount_image(req)
+
+    async def _experimental_snapshot_directory(self, path: Union[PurePosixPath, str]) -> _Image:
+        """Snapshot local changes to a previously mounted Image, creating a new Image."""
+
+        task_id = await self._get_task_id()
+        if (command_router_client := await self._get_command_router_client(task_id)) is None:
+            raise InvalidError(
+                "Snapshotting directories requires direct Sandbox control - please contact Modal support."
+            )
+
+        posix_path = PurePosixPath(path)
+        if not posix_path.is_absolute():
+            raise InvalidError(f"Snapshot path must be absolute; got: {posix_path}")
+        path_bytes = posix_path.as_posix().encode("utf8")
+
+        req = sr_pb2.TaskSnapshotDirectoryRequest(task_id=task_id, path=path_bytes)
+        res = await command_router_client.snapshot_directory(req)
+        return _Image._new_hydrated(res.image_id, self._client, None)
+
     # Live handle methods
 
     async def wait(self, raise_on_termination: bool = True):

{modal-1.2.7.dev7 → modal-1.2.7.dev10}/modal/sandbox.pyi

@@ -22,6 +22,7 @@ import modal.stream_type
 import modal.volume
 import modal_proto.api_pb2
 import os
+import pathlib
 import typing
 import typing_extensions
 
@@ -254,6 +255,18 @@ class _Sandbox(modal._object._Object):
         """
         ...
 
+    async def _experimental_mount_image(
+        self, path: typing.Union[pathlib.PurePosixPath, str], image: typing.Optional[modal.image._Image]
+    ):
+        """Mount an Image at a path in the Sandbox filesystem."""
+        ...
+
+    async def _experimental_snapshot_directory(
+        self, path: typing.Union[pathlib.PurePosixPath, str]
+    ) -> modal.image._Image:
+        """Snapshot local changes to a previously mounted Image, creating a new Image."""
+        ...
+
     async def wait(self, raise_on_termination: bool = True):
         """Wait for the Sandbox to finish running."""
         ...
@@ -820,6 +833,32 @@ class Sandbox(modal.object.Object):
 
     snapshot_filesystem: __snapshot_filesystem_spec[typing_extensions.Self]
 
+    class ___experimental_mount_image_spec(typing_extensions.Protocol[SUPERSELF]):
+        def __call__(
+            self, /, path: typing.Union[pathlib.PurePosixPath, str], image: typing.Optional[modal.image.Image]
+        ):
+            """Mount an Image at a path in the Sandbox filesystem."""
+            ...
+
+        async def aio(
+            self, /, path: typing.Union[pathlib.PurePosixPath, str], image: typing.Optional[modal.image.Image]
+        ):
+            """Mount an Image at a path in the Sandbox filesystem."""
+            ...
+
+    _experimental_mount_image: ___experimental_mount_image_spec[typing_extensions.Self]
+
+    class ___experimental_snapshot_directory_spec(typing_extensions.Protocol[SUPERSELF]):
+        def __call__(self, /, path: typing.Union[pathlib.PurePosixPath, str]) -> modal.image.Image:
+            """Snapshot local changes to a previously mounted Image, creating a new Image."""
+            ...
+
+        async def aio(self, /, path: typing.Union[pathlib.PurePosixPath, str]) -> modal.image.Image:
+            """Snapshot local changes to a previously mounted Image, creating a new Image."""
+            ...
+
+    _experimental_snapshot_directory: ___experimental_snapshot_directory_spec[typing_extensions.Self]
+
     class __wait_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /, raise_on_termination: bool = True):
             """Wait for the Sandbox to finish running."""

{modal-1.2.7.dev7 → modal-1.2.7.dev10}/modal.egg-info/PKG-INFO

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

{modal-1.2.7.dev7 → modal-1.2.7.dev10}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.2.7.dev7"
+__version__ = "1.2.7.dev10"