modal 1.1.5.dev1__tar.gz → 1.1.5.dev3__tar.gz

{modal-1.1.5.dev1 → modal-1.1.5.dev3}/PKG-INFO

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

{modal-1.1.5.dev1 → modal-1.1.5.dev3}/modal/client.pyi

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

{modal-1.1.5.dev1 → modal-1.1.5.dev3}/modal/container_process.py

@@ -10,6 +10,7 @@ from ._utils.async_utils import TaskContext, synchronize_api
 from ._utils.grpc_utils import retry_transient_errors
 from ._utils.shell_utils import stream_from_stdin, write_to_fd
 from .client import _Client
+from .config import logger
 from .exception import InteractiveTimeoutError, InvalidError
 from .io_streams import _StreamReader, _StreamWriter
 from .stream_type import StreamType
@@ -136,6 +137,7 @@ class _ContainerProcess(Generic[T]):
             self._returncode = await asyncio.wait_for(self._wait_for_completion(), timeout=timeout)
         except (asyncio.TimeoutError, TimeoutError):
             self._returncode = -1
+        logger.debug(f"ContainerProcess {self._process_id} wait completed with returncode {self._returncode}")
         return self._returncode
 
     async def attach(self):

{modal-1.1.5.dev1 → modal-1.1.5.dev3}/modal/experimental/flash.py

@@ -21,7 +21,7 @@ from ..client import _Client
 from ..config import logger
 from ..exception import InvalidError
 
-MAX_FAILURES = 3
+_MAX_FAILURES = 3
 
 
 class _FlashManager:
@@ -42,7 +42,9 @@ class _FlashManager:
         self.num_failures = 0
         self.task_id = os.environ["MODAL_TASK_ID"]
 
-    async def check_port_connection(self, process: Optional[subprocess.Popen], timeout: int = 10):
+    async def is_port_connection_healthy(
+        self, process: Optional[subprocess.Popen], timeout: int = 5
+    ) -> tuple[bool, Optional[Exception]]:
         import socket
 
         start_time = time.monotonic()
@@ -50,13 +52,13 @@ class _FlashManager:
         while time.monotonic() - start_time < timeout:
             try:
                 if process is not None and process.poll() is not None:
-                    return Exception(f"Process {process.pid} exited with code {process.returncode}")
+                    return False, Exception(f"Process {process.pid} exited with code {process.returncode}")
                 with socket.create_connection(("localhost", self.port), timeout=1):
-                    return
+                    return True, None
             except (ConnectionRefusedError, OSError):
                 await asyncio.sleep(0.1)
 
-        return Exception(f"Waited too long for port {self.port} to start accepting connections")
+        return False, Exception(f"Waited too long for port {self.port} to start accepting connections")
 
     async def _start(self):
         self.tunnel = await self.tunnel_manager.__aenter__()
@@ -74,7 +76,7 @@ class _FlashManager:
         while True:
             try:
                 # Check if the container should be drained (e.g., too many failures)
-                if self.num_failures > MAX_FAILURES:
+                if self.num_failures > _MAX_FAILURES:
                     logger.warning(
                         f"[Modal Flash] Draining task {self.task_id} on {self.tunnel.url} due to too many failures."
                     )
@@ -101,35 +103,38 @@ class _FlashManager:
         first_registration = True
         while True:
             try:
-                await self.check_port_connection(process=self.process)
-                resp = await self.client.stub.FlashContainerRegister(
-                    api_pb2.FlashContainerRegisterRequest(
-                        priority=10,
-                        weight=5,
-                        host=host,
-                        port=port,
-                    ),
-                    timeout=10,
-                )
-                self.num_failures = 0
-                if first_registration:
-                    logger.warning(
-                        f"[Modal Flash] Listening at {resp.url} over {self.tunnel.url} for task_id {self.task_id}"
+                port_check_resp, port_check_error = await self.is_port_connection_healthy(process=self.process)
+                if port_check_resp:
+                    resp = await self.client.stub.FlashContainerRegister(
+                        api_pb2.FlashContainerRegisterRequest(
+                            priority=10,
+                            weight=5,
+                            host=host,
+                            port=port,
+                        ),
+                        timeout=10,
+                    )
+                    self.num_failures = 0
+                    if first_registration:
+                        logger.warning(
+                            f"[Modal Flash] Listening at {resp.url} over {self.tunnel.url} for task_id {self.task_id}"
+                        )
+                        first_registration = False
+                else:
+                    logger.error(
+                        f"[Modal Flash] Deregistering container {self.task_id} on {self.tunnel.url} "
+                        f"due to error: {port_check_error}, num_failures: {self.num_failures}"
+                    )
+                    self.num_failures += 1
+                    await retry_transient_errors(
+                        self.client.stub.FlashContainerDeregister,
+                        api_pb2.FlashContainerDeregisterRequest(),
                     )
-                    first_registration = False
             except asyncio.CancelledError:
                 logger.warning("[Modal Flash] Shutting down...")
                 break
             except Exception as e:
                 logger.error(f"[Modal Flash] Heartbeat failed: {e}")
-                self.num_failures += 1
-                logger.error(
-                    f"[Modal Flash] Deregistering container {self.tunnel.url}, num_failures: {self.num_failures}"
-                )
-                await retry_transient_errors(
-                    self.client.stub.FlashContainerDeregister,
-                    api_pb2.FlashContainerDeregisterRequest(),
-                )
 
             try:
                 await asyncio.sleep(1)
@@ -167,7 +172,9 @@ FlashManager = synchronize_api(_FlashManager)
 
 @synchronizer.create_blocking
 async def flash_forward(
-    port: int, process: Optional[subprocess.Popen] = None, health_check_url: Optional[str] = None
+    port: int,
+    process: Optional[subprocess.Popen] = None,
+    health_check_url: Optional[str] = None,
 ) -> _FlashManager:
     """
     Forward a port to the Modal Flash service, exposing that port as a stable web endpoint.

{modal-1.1.5.dev1 → modal-1.1.5.dev3}/modal/experimental/flash.pyi

@@ -15,7 +15,9 @@ class _FlashManager:
         """Initialize self.  See help(type(self)) for accurate signature."""
         ...
 
-    async def check_port_connection(self, process: typing.Optional[subprocess.Popen], timeout: int = 10): ...
+    async def is_port_connection_healthy(
+        self, process: typing.Optional[subprocess.Popen], timeout: int = 5
+    ) -> tuple[bool, typing.Optional[Exception]]: ...
     async def _start(self): ...
     async def _drain_container(self):
         """Background task that checks if we've encountered too many failures and drains the container if so."""
@@ -37,11 +39,15 @@ class FlashManager:
         health_check_url: typing.Optional[str] = None,
     ): ...
 
-    class __check_port_connection_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, /, process: typing.Optional[subprocess.Popen], timeout: int = 10): ...
-        async def aio(self, /, process: typing.Optional[subprocess.Popen], timeout: int = 10): ...
+    class __is_port_connection_healthy_spec(typing_extensions.Protocol[SUPERSELF]):
+        def __call__(
+            self, /, process: typing.Optional[subprocess.Popen], timeout: int = 5
+        ) -> tuple[bool, typing.Optional[Exception]]: ...
+        async def aio(
+            self, /, process: typing.Optional[subprocess.Popen], timeout: int = 5
+        ) -> tuple[bool, typing.Optional[Exception]]: ...
 
-    check_port_connection: __check_port_connection_spec[typing_extensions.Self]
+    is_port_connection_healthy: __is_port_connection_healthy_spec[typing_extensions.Self]
 
     class ___start_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /): ...

{modal-1.1.5.dev1 → modal-1.1.5.dev3}/modal/functions.pyi

@@ -445,7 +445,7 @@ class Function(
 
     _call_generator: ___call_generator_spec[typing_extensions.Self]
 
-    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         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."""
             ...
@@ -454,7 +454,7 @@ class Function(
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
 
-    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
+    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
 
     class __remote_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -481,7 +481,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         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.
 
@@ -505,7 +505,7 @@ class Function(
             ...
 
     _experimental_spawn: ___experimental_spawn_spec[
-        modal._functions.P, modal._functions.ReturnType, typing_extensions.Self
+        modal._functions.ReturnType, modal._functions.P, typing_extensions.Self
     ]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER, SUPERSELF]):
@@ -514,7 +514,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P, typing_extensions.Self]
 
-    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         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.
 
@@ -535,7 +535,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function."""

{modal-1.1.5.dev1 → modal-1.1.5.dev3}/modal/io_streams.py

@@ -21,6 +21,7 @@ from modal_proto import api_pb2
 from ._utils.async_utils import synchronize_api
 from ._utils.grpc_utils import RETRYABLE_GRPC_STATUS_CODES, retry_transient_errors
 from .client import _Client
+from .config import logger
 from .stream_type import StreamType
 
 if TYPE_CHECKING:
@@ -180,6 +181,7 @@ class _StreamReader(Generic[T]):
         """
         data_str = ""
         data_bytes = b""
+        logger.debug(f"{self._object_id} StreamReader fd={self._file_descriptor} read starting")
         async for message in self._get_logs():
             if message is None:
                 break
@@ -188,6 +190,7 @@ class _StreamReader(Generic[T]):
             else:
                 data_bytes += message
 
+        logger.debug(f"{self._object_id} StreamReader fd={self._file_descriptor} read completed after EOF")
         if self._text:
             return cast(T, data_str)
         else:
@@ -232,6 +235,7 @@ class _StreamReader(Generic[T]):
                     elif isinstance(exc, ClientClosed):
                         # If the client was closed, the user has triggered a cleanup.
                         break
+                logger.error(f"{self._object_id} stream read failure while consuming process output: {exc}")
                 raise exc
 
     async def _stream_container_process(self) -> AsyncGenerator[tuple[Optional[bytes], str], None]:

{modal-1.1.5.dev1 → modal-1.1.5.dev3}/modal/sandbox.py

@@ -5,6 +5,8 @@ import time
 from collections.abc import AsyncGenerator, Sequence
 from typing import TYPE_CHECKING, AsyncIterator, Literal, Optional, Union, overload
 
+from .config import config, logger
+
 if TYPE_CHECKING:
     import _typeshed
 
@@ -26,7 +28,6 @@ from ._utils.grpc_utils import retry_transient_errors
 from ._utils.mount_utils import validate_network_file_systems, validate_volumes
 from ._utils.name_utils import is_valid_object_name
 from .client import _Client
-from .config import config
 from .container_process import _ContainerProcess
 from .exception import AlreadyExistsError, ExecutionError, InvalidError, SandboxTerminatedError, SandboxTimeoutError
 from .file_io import FileWatchEvent, FileWatchEventType, _FileIO
@@ -588,6 +589,7 @@ class _Sandbox(_Object, type_prefix="sb"):
             req = api_pb2.SandboxWaitRequest(sandbox_id=self.object_id, timeout=10)
             resp = await retry_transient_errors(self._client.stub.SandboxWait, req)
             if resp.result.status:
+                logger.debug(f"Sandbox {self.object_id} wait completed with status {resp.result.status}")
                 self._result = resp.result
 
                 if resp.result.status == api_pb2.GenericResult.GENERIC_STATUS_TIMEOUT:
@@ -757,6 +759,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         resp = await retry_transient_errors(self._client.stub.ContainerExec, req)
         by_line = bufsize == 1
         exec_deadline = time.monotonic() + int(timeout) + CONTAINER_EXEC_TIMEOUT_BUFFER if timeout else None
+        logger.debug(f"Created ContainerProcess for exec_id {resp.exec_id} on Sandbox {self.object_id}")
         return _ContainerProcess(
             resp.exec_id,
             self._client,

{modal-1.1.5.dev1 → modal-1.1.5.dev3}/modal.egg-info/PKG-INFO

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

{modal-1.1.5.dev1 → modal-1.1.5.dev3}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.1.5.dev1"
+__version__ = "1.1.5.dev3"