modAL 1.3.6.dev5__tar.gz → 1.3.6.dev7__tar.gz

{modal-1.3.6.dev5 → modal-1.3.6.dev7}/PKG-INFO

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

{modal-1.3.6.dev5 → modal-1.3.6.dev7}/modal/client.pyi

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

{modal-1.3.6.dev5 → modal-1.3.6.dev7}/modal/experimental/__init__.py

@@ -1,6 +1,5 @@
 # Copyright Modal Labs 2025
 import os
-import shlex
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Literal, Optional, Union
@@ -229,133 +228,6 @@ async def raw_registry_image(
     )
 
 
-def _install_cuda_command() -> str:
-    """Command to install CUDA Toolkit (nvcc) inside a container."""
-    arch = "x86_64"  # instruction set architecture for the CPU, all Modal machines are x86_64
-    distro = "debian12"  # the distribution and version number of our OS (GNU/Linux)
-    filename = "cuda-keyring_1.1-1_all.deb"  # NVIDIA signing key file
-    cuda_keyring_url = f"https://developer.download.nvidia.com/compute/cuda/repos/{distro}/{arch}/{filename}"
-
-    major, minor = 12, 8
-    max_cuda_version = f"{major}-{minor}"
-
-    return (
-        f"wget {cuda_keyring_url} && "
-        + f"dpkg -i {filename} && "
-        + f"rm -f {filename} && "
-        + f"apt-get update && apt-get install -y cuda-nvcc-{max_cuda_version}"
-    )
-
-
-@synchronizer.create_blocking
-async def notebook_base_image(*, python_version: Optional[str] = None, force_build: bool = False) -> _Image:
-    """Default image used for Modal notebook kernels, with common libraries.
-
-    This can be used to bootstrap development workflows quickly. We don't
-    recommend using this image for production Modal Functions though, as it may
-    change at any time in the future.
-    """
-    # Include several common packages, as well as kernelshim dependencies (except 'modal').
-    # These packages aren't pinned, so they may change over time with builds.
-    #
-    # We plan to use `--exclude-newer` in the future, with date-specific image builds.
-    base_image = _Image.debian_slim(python_version=python_version)
-
-    environment_packages: list[str] = [
-        "accelerate",
-        "aiohttp",
-        "altair",
-        "anthropic",
-        "asyncpg",
-        "beautifulsoup4",
-        "bokeh",
-        "boto3[crt]",
-        "click",
-        "diffusers[torch,flax]",
-        "dm-sonnet",
-        "flax",
-        "ftfy",
-        "h5py",
-        "urllib3",
-        "httpx",
-        "huggingface-hub",
-        "ipywidgets",
-        "jax[cuda12]",
-        "keras",
-        "matplotlib",
-        "nbformat",
-        "numba",
-        "numpy",
-        "openai",
-        "optax",
-        "pandas",
-        "plotly[express]",
-        "polars",
-        "psycopg2",
-        "requests",
-        "safetensors",
-        "scikit-image",
-        "scikit-learn",
-        "scipy",
-        "seaborn",
-        "sentencepiece",
-        "sqlalchemy",
-        "statsmodels",
-        "sympy",
-        "tabulate",
-        "tensorboard",
-        "toml",
-        "transformers",
-        "triton",
-        "typer",
-        "vega-datasets",
-        "watchfiles",
-        "websockets",
-    ]
-
-    # Kernelshim dependencies. (see NOTEBOOK_KERNELSHIM_DEPENDENCIES)
-    kernelshim_packages: list[str] = [
-        "authlib>=1.3",
-        "basedpyright>=1.28",
-        "fastapi>=0.100",
-        "ipykernel>=6",
-        "pydantic>=2",
-        "pyzmq>=26",
-        "ruff>=0.11",
-        "uvicorn>=0.32",
-    ]
-
-    commands: list[str] = [
-        "apt-get update",
-        "apt-get install -y "
-        + "libpq-dev pkg-config cmake git curl wget unzip zip libsqlite3-dev openssh-server vim ffmpeg",
-        _install_cuda_command(),
-        # Install uv since it's faster than pip for installing packages.
-        "pip install uv",
-        # https://github.com/astral-sh/uv/issues/11480
-        "pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu129",
-        f"uv pip install --system {shlex.join(sorted(environment_packages))}",
-        f"uv pip install --system {shlex.join(sorted(kernelshim_packages))}",
-    ]
-
-    def build_dockerfile(version: ImageBuilderVersion) -> DockerfileSpec:
-        return DockerfileSpec(
-            commands=[
-                "FROM base",
-                *(f"RUN {cmd}" for cmd in commands),
-                "ENV PATH=/usr/local/cuda/bin:$PATH",
-            ],
-            context_files={},
-        )
-
-    return _Image._from_args(
-        base_images={"base": base_image},
-        dockerfile_function=build_dockerfile,
-        force_build=force_build,
-        _namespace=api_pb2.DEPLOYMENT_NAMESPACE_GLOBAL,
-    )
-
-
 @synchronizer.create_blocking
 async def image_delete(
     image_id: str,

{modal-1.3.6.dev5 → modal-1.3.6.dev7}/modal/sandbox.py

@@ -35,7 +35,7 @@ from ._utils.name_utils import check_object_name
 from ._utils.task_command_router_client import TaskCommandRouterClient
 from .client import _Client
 from .container_process import _ContainerProcess
-from .exception import ClientClosed, ExecutionError, InvalidError, SandboxTerminatedError, SandboxTimeoutError
+from .exception import ClientClosed, Error, ExecutionError, InvalidError, SandboxTerminatedError, SandboxTimeoutError
 from .file_io import FileWatchEvent, FileWatchEventType, _FileIO, ls, mkdir, rm, watch
 from .gpu import GPU_T
 from .image import _Image
@@ -549,7 +549,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         self._attached = False
 
     @property
-    def _client(self):
+    def _client(self) -> _Client:
         self._ensure_attached()
         return self.__client
 
@@ -883,9 +883,15 @@ class _Sandbox(_Object, type_prefix="sb"):
 
         return self.returncode
 
-    async def _get_task_id(self) -> str:
+    async def _get_task_id(self, raise_if_task_complete=False) -> str:
         while not self._task_id:
             resp = await self._client.stub.SandboxGetTaskId(api_pb2.SandboxGetTaskIdRequest(sandbox_id=self.object_id))
+            # If the sandbox is terminated before it gets scheduled it can have a task result without a task_id
+            if not resp.task_id and raise_if_task_complete and resp.HasField("task_result"):
+                # When task_result is set, the task has finished, which could be any GenericResult.
+                # For now, we'll raise a generic Error and not be specific about the error type
+                msg = resp.task_result.exception or "Sandbox already finished"
+                raise Error(msg)
             self._task_id = resp.task_id
             if not self._task_id:
                 await asyncio.sleep(0.5)
@@ -1017,7 +1023,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         secret_coros = [secret.hydrate(client=self._client) for secret in secrets]
         await TaskContext.gather(*secret_coros)
 
-        task_id = await self._get_task_id()
+        task_id = await self._get_task_id(raise_if_task_complete=True)
         kwargs = {
             "task_id": task_id,
             "pty_info": pty_info,

{modal-1.3.6.dev5 → modal-1.3.6.dev7}/modal/sandbox.pyi

@@ -237,7 +237,7 @@ class _Sandbox(modal._object._Object):
         ...
 
     @property
-    def _client(self): ...
+    def _client(self) -> modal.client._Client: ...
     @_client.setter
     def _client(self, value): ...
     def _ensure_attached(self): ...
@@ -377,7 +377,7 @@ class _Sandbox(modal._object._Object):
         """
         ...
 
-    async def _get_task_id(self) -> str: ...
+    async def _get_task_id(self, raise_if_task_complete=False) -> str: ...
     async def _get_command_router_client(
         self, task_id: str
     ) -> typing.Optional[modal._utils.task_command_router_client.TaskCommandRouterClient]: ...
@@ -844,7 +844,7 @@ class Sandbox(modal.object.Object):
     detach: __detach_spec
 
     @property
-    def _client(self): ...
+    def _client(self) -> modal.client.Client: ...
     @_client.setter
     def _client(self, value): ...
     def _ensure_attached(self): ...
@@ -1164,8 +1164,8 @@ class Sandbox(modal.object.Object):
     poll: __poll_spec
 
     class ___get_task_id_spec(typing_extensions.Protocol):
-        def __call__(self, /) -> str: ...
-        async def aio(self, /) -> str: ...
+        def __call__(self, /, raise_if_task_complete=False) -> str: ...
+        async def aio(self, /, raise_if_task_complete=False) -> str: ...
 
     _get_task_id: ___get_task_id_spec
 

{modal-1.3.6.dev5 → modal-1.3.6.dev7}/modal/sandbox_fs.py

@@ -5,7 +5,6 @@ import random
 import string
 import time
 import weakref
-from contextlib import suppress
 from pathlib import Path
 from typing import Union, cast
 
@@ -284,14 +283,11 @@ class _SandboxFilesystem:
             with translate_exec_errors("copy_from_local", remote_path):
                 process = await self._sandbox.exec(_SANDBOX_FS_TOOLS_PATH, make_write_file_command(remote_path))
                 while True:
-                    try:
-                        chunk = file_obj.read(TASK_COMMAND_ROUTER_MAX_BUFFER_SIZE)
-                    except Exception:
-                        # Best-effort EOF so the container process doesn't hang.
-                        with suppress(Exception):
-                            process.stdin.write_eof()
-                            await process.stdin.drain()
-                        raise
+                    # TODO(saltzm): If this fails, the ContainerProcess will remain alive indefinitely since
+                    # stdin will remain open. Unfortunately we can't just call write_eof either, since that
+                    # would lead to a partially written file being persisted. We should catch exceptions
+                    # from this and kill the ContainerProcess when we have a way to do this.
+                    chunk = file_obj.read(TASK_COMMAND_ROUTER_MAX_BUFFER_SIZE)
                     if not chunk:
                         break
                     total_bytes += len(chunk)

{modal-1.3.6.dev5 → modal-1.3.6.dev7}/modal.egg-info/PKG-INFO

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

{modal-1.3.6.dev5 → modal-1.3.6.dev7}/modal_proto/api_grpc.py

@@ -519,10 +519,18 @@ class ModalClientBase(abc.ABC):
     async def SandboxGetTaskId(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxGetTaskIdRequest, modal_proto.api_pb2.SandboxGetTaskIdResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def SandboxGetTaskIdV2(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxGetTaskIdRequest, modal_proto.api_pb2.SandboxGetTaskIdResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def SandboxGetTunnels(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxGetTunnelsRequest, modal_proto.api_pb2.SandboxGetTunnelsResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def SandboxGetTunnelsV2(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxGetTunnelsRequest, modal_proto.api_pb2.SandboxGetTunnelsResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def SandboxList(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxListRequest, modal_proto.api_pb2.SandboxListResponse]') -> None:
         pass
@@ -571,10 +579,18 @@ class ModalClientBase(abc.ABC):
     async def SandboxTerminate(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxTerminateRequest, modal_proto.api_pb2.SandboxTerminateResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def SandboxTerminateV2(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxTerminateRequest, modal_proto.api_pb2.SandboxTerminateResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def SandboxWait(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxWaitRequest, modal_proto.api_pb2.SandboxWaitResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def SandboxWaitV2(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxWaitRequest, modal_proto.api_pb2.SandboxWaitResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def SecretDelete(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SecretDeleteRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
@@ -1503,12 +1519,24 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.SandboxGetTaskIdRequest,
                 modal_proto.api_pb2.SandboxGetTaskIdResponse,
             ),
+            '/modal.client.ModalClient/SandboxGetTaskIdV2': grpclib.const.Handler(
+                self.SandboxGetTaskIdV2,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.SandboxGetTaskIdRequest,
+                modal_proto.api_pb2.SandboxGetTaskIdResponse,
+            ),
             '/modal.client.ModalClient/SandboxGetTunnels': grpclib.const.Handler(
                 self.SandboxGetTunnels,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 modal_proto.api_pb2.SandboxGetTunnelsRequest,
                 modal_proto.api_pb2.SandboxGetTunnelsResponse,
             ),
+            '/modal.client.ModalClient/SandboxGetTunnelsV2': grpclib.const.Handler(
+                self.SandboxGetTunnelsV2,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.SandboxGetTunnelsRequest,
+                modal_proto.api_pb2.SandboxGetTunnelsResponse,
+            ),
             '/modal.client.ModalClient/SandboxList': grpclib.const.Handler(
                 self.SandboxList,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -1581,12 +1609,24 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.SandboxTerminateRequest,
                 modal_proto.api_pb2.SandboxTerminateResponse,
             ),
+            '/modal.client.ModalClient/SandboxTerminateV2': grpclib.const.Handler(
+                self.SandboxTerminateV2,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.SandboxTerminateRequest,
+                modal_proto.api_pb2.SandboxTerminateResponse,
+            ),
             '/modal.client.ModalClient/SandboxWait': grpclib.const.Handler(
                 self.SandboxWait,
                 grpclib.const.Cardinality.UNARY_UNARY,
                 modal_proto.api_pb2.SandboxWaitRequest,
                 modal_proto.api_pb2.SandboxWaitResponse,
             ),
+            '/modal.client.ModalClient/SandboxWaitV2': grpclib.const.Handler(
+                self.SandboxWaitV2,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.SandboxWaitRequest,
+                modal_proto.api_pb2.SandboxWaitResponse,
+            ),
             '/modal.client.ModalClient/SecretDelete': grpclib.const.Handler(
                 self.SecretDelete,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -2607,12 +2647,24 @@ class ModalClientStub:
             modal_proto.api_pb2.SandboxGetTaskIdRequest,
             modal_proto.api_pb2.SandboxGetTaskIdResponse,
         )
+        self.SandboxGetTaskIdV2 = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/SandboxGetTaskIdV2',
+            modal_proto.api_pb2.SandboxGetTaskIdRequest,
+            modal_proto.api_pb2.SandboxGetTaskIdResponse,
+        )
         self.SandboxGetTunnels = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/SandboxGetTunnels',
             modal_proto.api_pb2.SandboxGetTunnelsRequest,
             modal_proto.api_pb2.SandboxGetTunnelsResponse,
         )
+        self.SandboxGetTunnelsV2 = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/SandboxGetTunnelsV2',
+            modal_proto.api_pb2.SandboxGetTunnelsRequest,
+            modal_proto.api_pb2.SandboxGetTunnelsResponse,
+        )
         self.SandboxList = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/SandboxList',
@@ -2685,12 +2737,24 @@ class ModalClientStub:
             modal_proto.api_pb2.SandboxTerminateRequest,
             modal_proto.api_pb2.SandboxTerminateResponse,
         )
+        self.SandboxTerminateV2 = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/SandboxTerminateV2',
+            modal_proto.api_pb2.SandboxTerminateRequest,
+            modal_proto.api_pb2.SandboxTerminateResponse,
+        )
         self.SandboxWait = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/SandboxWait',
             modal_proto.api_pb2.SandboxWaitRequest,
             modal_proto.api_pb2.SandboxWaitResponse,
         )
+        self.SandboxWaitV2 = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/SandboxWaitV2',
+            modal_proto.api_pb2.SandboxWaitRequest,
+            modal_proto.api_pb2.SandboxWaitResponse,
+        )
         self.SecretDelete = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/SecretDelete',