modal 1.0.6.dev28__tar.gz → 1.0.6.dev30__tar.gz

{modal-1.0.6.dev28 → modal-1.0.6.dev30}/PKG-INFO

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

{modal-1.0.6.dev28 → modal-1.0.6.dev30}/modal/app.py

@@ -863,6 +863,7 @@ class _App:
         # Limits the number of inputs a container handles before shutting down.
         # Use `max_inputs = 1` for single-use containers.
         max_inputs: Optional[int] = None,
+        i6pn: Optional[bool] = None,  # Whether to enable IPv6 container networking within the region.
         include_source: Optional[bool] = None,  # When `False`, don't automatically add the App source to the container.
         experimental_options: Optional[dict[str, Any]] = None,
         # Parameters below here are experimental. Use with caution!
@@ -977,6 +978,7 @@ class _App:
                 restrict_modal_access=restrict_modal_access,
                 max_inputs=max_inputs,
                 scheduler_placement=scheduler_placement,
+                i6pn_enabled=i6pn or False,
                 include_source=include_source if include_source is not None else self._include_source_default,
                 experimental_options={k: str(v) for k, v in (experimental_options or {}).items()},
                 _experimental_proxy_ip=_experimental_proxy_ip,

{modal-1.0.6.dev28 → modal-1.0.6.dev30}/modal/app.pyi

@@ -455,6 +455,7 @@ class _App:
         block_network: bool = False,
         restrict_modal_access: bool = False,
         max_inputs: typing.Optional[int] = None,
+        i6pn: typing.Optional[bool] = None,
         include_source: typing.Optional[bool] = None,
         experimental_options: typing.Optional[dict[str, typing.Any]] = None,
         _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
@@ -1043,6 +1044,7 @@ class App:
         block_network: bool = False,
         restrict_modal_access: bool = False,
         max_inputs: typing.Optional[int] = None,
+        i6pn: typing.Optional[bool] = None,
         include_source: typing.Optional[bool] = None,
         experimental_options: typing.Optional[dict[str, typing.Any]] = None,
         _experimental_scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,

{modal-1.0.6.dev28 → modal-1.0.6.dev30}/modal/client.pyi

@@ -31,7 +31,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.6.dev28",
+        version: str = "1.0.6.dev30",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -160,7 +160,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.6.dev28",
+        version: str = "1.0.6.dev30",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.0.6.dev28 → modal-1.0.6.dev30}/modal/container_process.py

@@ -1,6 +1,7 @@
 # Copyright Modal Labs 2024
 import asyncio
 import platform
+import time
 from typing import Generic, Optional, TypeVar
 
 from modal_proto import api_pb2
@@ -21,6 +22,7 @@ class _ContainerProcess(Generic[T]):
     _stdout: _StreamReader[T]
     _stderr: _StreamReader[T]
     _stdin: _StreamWriter
+    _exec_deadline: Optional[float] = None
     _text: bool
     _by_line: bool
     _returncode: Optional[int] = None
@@ -31,11 +33,13 @@ class _ContainerProcess(Generic[T]):
         client: _Client,
         stdout: StreamType = StreamType.PIPE,
         stderr: StreamType = StreamType.PIPE,
+        exec_deadline: Optional[float] = None,
         text: bool = True,
         by_line: bool = False,
     ) -> None:
         self._process_id = process_id
         self._client = client
+        self._exec_deadline = exec_deadline
         self._text = text
         self._by_line = by_line
         self._stdout = _StreamReader[T](
@@ -92,6 +96,11 @@ class _ContainerProcess(Generic[T]):
         """
         if self._returncode is not None:
             return self._returncode
+        if self._exec_deadline and time.monotonic() >= self._exec_deadline:
+            # TODO(matt): In the future, it would be nice to raise a ContainerExecTimeoutError to make it
+            # clear to the user that their sandbox terminated due to a timeout
+            self._returncode = -1
+            return self._returncode
 
         req = api_pb2.ContainerExecWaitRequest(exec_id=self._process_id, timeout=0)
         resp: api_pb2.ContainerExecWaitResponse = await retry_transient_errors(self._client.stub.ContainerExecWait, req)
@@ -102,22 +111,33 @@ class _ContainerProcess(Generic[T]):
 
         return None
 
-    async def wait(self) -> int:
-        """Wait for the container process to finish running. Returns the exit code."""
-
-        if self._returncode is not None:
-            return self._returncode
-
+    async def _wait_for_completion(self) -> int:
         while True:
             req = api_pb2.ContainerExecWaitRequest(exec_id=self._process_id, timeout=10)
             resp: api_pb2.ContainerExecWaitResponse = await retry_transient_errors(
                 self._client.stub.ContainerExecWait, req
             )
             if resp.completed:
-                self._returncode = resp.exit_code
-                return self._returncode
+                return resp.exit_code
+
+    async def wait(self) -> int:
+        """Wait for the container process to finish running. Returns the exit code."""
+        if self._returncode is not None:
+            return self._returncode
+
+        try:
+            timeout = None
+            if self._exec_deadline:
+                timeout = self._exec_deadline - time.monotonic()
+                if timeout <= 0:
+                    raise TimeoutError()
+            self._returncode = await asyncio.wait_for(self._wait_for_completion(), timeout=timeout)
+        except (asyncio.TimeoutError, TimeoutError):
+            self._returncode = -1
+        return self._returncode
 
     async def attach(self):
+        """mdmd:hidden"""
         if platform.system() == "Windows":
             print("interactive exec is not currently supported on Windows.")
             return

{modal-1.0.6.dev28 → modal-1.0.6.dev30}/modal/container_process.pyi

@@ -31,6 +31,7 @@ class _ContainerProcess(typing.Generic[T]):
     _stdout: modal.io_streams._StreamReader[T]
     _stderr: modal.io_streams._StreamReader[T]
     _stdin: modal.io_streams._StreamWriter
+    _exec_deadline: typing.Optional[float]
     _text: bool
     _by_line: bool
     _returncode: typing.Optional[int]
@@ -41,6 +42,7 @@ class _ContainerProcess(typing.Generic[T]):
         client: modal.client._Client,
         stdout: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
         stderr: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
+        exec_deadline: typing.Optional[float] = None,
         text: bool = True,
         by_line: bool = False,
     ) -> None:
@@ -75,11 +77,14 @@ class _ContainerProcess(typing.Generic[T]):
         """
         ...
 
+    async def _wait_for_completion(self) -> int: ...
     async def wait(self) -> int:
         """Wait for the container process to finish running. Returns the exit code."""
         ...
 
-    async def attach(self): ...
+    async def attach(self):
+        """mdmd:hidden"""
+        ...
 
 SUPERSELF = typing.TypeVar("SUPERSELF", covariant=True)
 
@@ -108,6 +113,7 @@ class ContainerProcess(typing.Generic[T]):
     _stdout: modal.io_streams.StreamReader[T]
     _stderr: modal.io_streams.StreamReader[T]
     _stdin: modal.io_streams.StreamWriter
+    _exec_deadline: typing.Optional[float]
     _text: bool
     _by_line: bool
     _returncode: typing.Optional[int]
@@ -118,6 +124,7 @@ class ContainerProcess(typing.Generic[T]):
         client: modal.client.Client,
         stdout: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
         stderr: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
+        exec_deadline: typing.Optional[float] = None,
         text: bool = True,
         by_line: bool = False,
     ) -> None: ...
@@ -157,6 +164,12 @@ class ContainerProcess(typing.Generic[T]):
 
     poll: __poll_spec[typing_extensions.Self]
 
+    class ___wait_for_completion_spec(typing_extensions.Protocol[SUPERSELF]):
+        def __call__(self, /) -> int: ...
+        async def aio(self, /) -> int: ...
+
+    _wait_for_completion: ___wait_for_completion_spec[typing_extensions.Self]
+
     class __wait_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /) -> int:
             """Wait for the container process to finish running. Returns the exit code."""
@@ -169,7 +182,12 @@ class ContainerProcess(typing.Generic[T]):
     wait: __wait_spec[typing_extensions.Self]
 
     class __attach_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, /): ...
-        async def aio(self, /): ...
+        def __call__(self, /):
+            """mdmd:hidden"""
+            ...
+
+        async def aio(self, /):
+            """mdmd:hidden"""
+            ...
 
     attach: __attach_spec[typing_extensions.Self]

{modal-1.0.6.dev28 → modal-1.0.6.dev30}/modal/sandbox.py

@@ -1,6 +1,7 @@
 # Copyright Modal Labs 2022
 import asyncio
 import os
+import time
 from collections.abc import AsyncGenerator, Sequence
 from typing import TYPE_CHECKING, AsyncIterator, Literal, Optional, Union, overload
 
@@ -49,6 +50,10 @@ _default_image: _Image = _Image.debian_slim()
 # e.g. 'runsc exec ...'. So we use 2**16 as the limit.
 ARG_MAX_BYTES = 2**16
 
+
+# This buffer extends the user-supplied timeout on ContainerExec-related RPCs. This was introduced to
+# give any in-flight status codes/IO data more time to reach the client before the stream is closed.
+CONTAINER_EXEC_TIMEOUT_BUFFER = 5
 if TYPE_CHECKING:
     import modal.app
 
@@ -665,7 +670,16 @@ class _Sandbox(_Object, type_prefix="sb"):
         )
         resp = await retry_transient_errors(self._client.stub.ContainerExec, req)
         by_line = bufsize == 1
-        return _ContainerProcess(resp.exec_id, self._client, stdout=stdout, stderr=stderr, text=text, by_line=by_line)
+        exec_deadline = time.monotonic() + int(timeout) + CONTAINER_EXEC_TIMEOUT_BUFFER if timeout else None
+        return _ContainerProcess(
+            resp.exec_id,
+            self._client,
+            stdout=stdout,
+            stderr=stderr,
+            text=text,
+            exec_deadline=exec_deadline,
+            by_line=by_line,
+        )
 
     async def _experimental_snapshot(self) -> _SandboxSnapshot:
         await self._get_task_id()

{modal-1.0.6.dev28 → modal-1.0.6.dev30}/modal.egg-info/PKG-INFO

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

{modal-1.0.6.dev28 → modal-1.0.6.dev30}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.0.6.dev28"
+__version__ = "1.0.6.dev30"