modAL 1.3.6.dev8__tar.gz → 1.3.6.dev10__tar.gz

{modal-1.3.6.dev8 → modal-1.3.6.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.3.6.dev8
+Version: 1.3.6.dev10
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License-Expression: Apache-2.0
@@ -36,7 +36,6 @@ Dynamic: license-file
 
 [![PyPI Version](https://img.shields.io/pypi/v/modal.svg)](https://pypi.org/project/modal/)
 [![License](https://img.shields.io/badge/license-apache_2.0-darkviolet.svg)](https://github.com/modal-labs/modal-client/blob/master/LICENSE)
-[![Tests](https://github.com/modal-labs/modal-client/actions/workflows/ci-cd.yml/badge.svg)](https://github.com/modal-labs/modal-client/actions/workflows/ci-cd.yml)
 [![Slack](https://img.shields.io/badge/slack-join-blue.svg?logo=slack)](https://modal.com/slack)
 
 The [Modal](https://modal.com/) Python SDK provides convenient, on-demand

{modal-1.3.6.dev8 → modal-1.3.6.dev10}/README.md

@@ -2,7 +2,6 @@
 
 [![PyPI Version](https://img.shields.io/pypi/v/modal.svg)](https://pypi.org/project/modal/)
 [![License](https://img.shields.io/badge/license-apache_2.0-darkviolet.svg)](https://github.com/modal-labs/modal-client/blob/master/LICENSE)
-[![Tests](https://github.com/modal-labs/modal-client/actions/workflows/ci-cd.yml/badge.svg)](https://github.com/modal-labs/modal-client/actions/workflows/ci-cd.yml)
 [![Slack](https://img.shields.io/badge/slack-join-blue.svg?logo=slack)](https://modal.com/slack)
 
 The [Modal](https://modal.com/) Python SDK provides convenient, on-demand

{modal-1.3.6.dev8 → modal-1.3.6.dev10}/modal/_utils/async_utils.py

@@ -345,12 +345,24 @@ def synchronize_api(obj, target_module=None):
 RETRY_N_ATTEMPTS_OVERRIDE: Optional[int] = None
 
 
-def retry(direct_fn=None, *, n_attempts=3, base_delay=0, delay_factor=2, timeout=90):
+def retry(
+    direct_fn=None,
+    *,
+    n_attempts=3,
+    base_delay=0,
+    delay_factor=2,
+    attempt_timeout: Optional[float] = 90,
+    attempt_timeout_factor=1,
+):
     """Decorator that calls an async function multiple times, with a given timeout.
 
     If a `base_delay` is provided, the function is given an exponentially
     increasing delay on each run, up until the maximum number of attempts.
 
+    If `attempt_timeout_factor` is set to a value > 1, the per-attempt timeout
+    increases exponentially (starting from `attempt_timeout`, multiplied by
+    `attempt_timeout_factor` after each failed attempt).
+
     Usage:
 
     ```
@@ -375,10 +387,11 @@ def retry(direct_fn=None, *, n_attempts=3, base_delay=0, delay_factor=2, timeout
                 local_n_attempts = n_attempts
 
             delay = base_delay
+            current_attempt_timeout = attempt_timeout
             for i in range(local_n_attempts):
                 t0 = time.time()
                 try:
-                    return await asyncio.wait_for(fn(*args, **kwargs), timeout=timeout)
+                    return await asyncio.wait_for(fn(*args, **kwargs), timeout=current_attempt_timeout)
                 except asyncio.CancelledError:
                     logger.debug(f"Function {fn} was cancelled")
                     raise
@@ -392,6 +405,8 @@ def retry(direct_fn=None, *, n_attempts=3, base_delay=0, delay_factor=2, timeout
                     )
                 await asyncio.sleep(delay)
                 delay *= delay_factor
+                if current_attempt_timeout is not None:
+                    current_attempt_timeout *= attempt_timeout_factor
 
         return f_wrapped
 

{modal-1.3.6.dev8 → modal-1.3.6.dev10}/modal/_utils/blob_utils.py

@@ -58,7 +58,7 @@ MULTIPART_UPLOAD_THRESHOLD = 1024**3
 BLOCK_SIZE: int = 8 * 1024 * 1024
 
 
-@retry(n_attempts=3, base_delay=0.3, timeout=None)
+@retry(n_attempts=3, base_delay=0.3, attempt_timeout=None)
 async def _upload_to_s3_url(
     upload_url,
     payload: "BytesIOSegmentPayload",
@@ -310,7 +310,7 @@ async def blob_upload_file(
     return blob_id
 
 
-@retry(n_attempts=5, base_delay=0.1, timeout=None)
+@retry(n_attempts=5, base_delay=0.1, attempt_timeout=None)
 async def _download_from_url(download_url: str) -> bytes:
     async with ClientSessionRegistry.get_session().get(download_url) as s3_resp:
         # S3 signal to slow down request rate.

{modal-1.3.6.dev8 → modal-1.3.6.dev10}/modal/_utils/grpc_utils.py

@@ -89,6 +89,10 @@ RETRYABLE_GRPC_STATUS_CODES = [
     Status.UNKNOWN,
 ]
 SERVER_RETRY_WARNING_TIME_INTERVAL = 30.0
+# Initial per-attempt timeout for TCP/TLS handshake in connect_channel.
+# Doubles each attempt (attempt_timeout_factor=2): 0.5 + 1 + 2 + 4 + 8 = 15.5s + ~1.5s inter-attempt delays.
+CONNECT_TIMEOUT = 0.5
+DEFAULT_MAX_RETRIES = 3
 
 
 @dataclass
@@ -117,7 +121,7 @@ class ConnectionManager:
             self._channels[server_url] = create_channel(server_url, self._metadata)
             try:
                 await connect_channel(self._channels[server_url])
-            except OSError as exc:
+            except (OSError, asyncio.TimeoutError) as exc:
                 raise ConnectionError("Could not connect to the Modal server.") from exc
         return self._channels[server_url]
 
@@ -221,7 +225,7 @@ def create_channel(
     return channel
 
 
-@retry(n_attempts=5, base_delay=0.1)
+@retry(n_attempts=5, base_delay=0.1, attempt_timeout=CONNECT_TIMEOUT, attempt_timeout_factor=2)
 async def connect_channel(channel: grpclib.client.Channel):
     """Connect to socket and raise exceptions when there is a connection issue."""
     await channel.__connect__()
@@ -246,7 +250,7 @@ class Retry:
     base_delay: float = 0.1
     max_delay: float = 1
     delay_factor: float = 2
-    max_retries: Optional[int] = 3
+    max_retries: Optional[int] = DEFAULT_MAX_RETRIES
     additional_status_codes: list = field(default_factory=list)
     attempt_timeout: Optional[float] = None  # timeout for each attempt
     total_timeout: Optional[float] = None  # timeout for the entire function call
@@ -257,7 +261,7 @@ class Retry:
 async def retry_transient_errors(
     fn: "grpclib.client.UnaryUnaryMethod[RequestType, ResponseType]",
     req: RequestType,
-    max_retries: Optional[int] = 3,
+    max_retries: Optional[int] = DEFAULT_MAX_RETRIES,
 ) -> ResponseType:
     """Minimum API version of _retry_transient_errors that works with grpclib.client.UnaryUnaryMethod.
 
@@ -373,7 +377,13 @@ async def _retry_transient_errors(
         try:
             with suppress_tb_frame():
                 return await fn_callable(req, metadata=attempt_metadata, timeout=timeout)
-        except (StreamTerminatedError, GRPCError, OSError, asyncio.TimeoutError, AttributeError) as exc:
+        except (
+            StreamTerminatedError,
+            GRPCError,
+            OSError,
+            asyncio.TimeoutError,
+            AttributeError,
+        ) as exc:
             # Note that we only catch AttributeError to handle a specific case that works around a bug
             # in grpclib<=0.4.7. See above (search for `write_appdata`).
 

{modal-1.3.6.dev8 → modal-1.3.6.dev10}/modal/_utils/task_command_router_client.py

@@ -242,6 +242,44 @@ class TaskCommandRouterClient:
                 lambda: self._call_with_auth_retry(self._stub.TaskExecStart, request)
             )
 
+    async def container_create(self, request: sr_pb2.TaskContainerCreateRequest) -> sr_pb2.TaskContainerCreateResponse:
+        """Create an additional container via task command router."""
+        with grpc_error_converter():
+            return await call_with_retries_on_transient_errors(
+                lambda: self._call_with_auth_retry(self._stub.TaskContainerCreate, request)
+            )
+
+    async def container_terminate(
+        self,
+        request: sr_pb2.TaskContainerTerminateRequest,
+    ) -> sr_pb2.TaskContainerTerminateResponse:
+        """Terminate an additional container via task command router."""
+        with grpc_error_converter():
+            return await call_with_retries_on_transient_errors(
+                lambda: self._call_with_auth_retry(self._stub.TaskContainerTerminate, request)
+            )
+
+    async def container_wait(self, request: sr_pb2.TaskContainerWaitRequest) -> sr_pb2.TaskContainerWaitResponse:
+        """Wait for an additional container via task command router."""
+        with grpc_error_converter():
+            return await call_with_retries_on_transient_errors(
+                lambda: self._call_with_auth_retry(self._stub.TaskContainerWait, request)
+            )
+
+    async def container_get(self, request: sr_pb2.TaskContainerGetRequest) -> sr_pb2.TaskContainerGetResponse:
+        """Get the latest tracked container for a logical name via task command router."""
+        with grpc_error_converter():
+            return await call_with_retries_on_transient_errors(
+                lambda: self._call_with_auth_retry(self._stub.TaskContainerGet, request)
+            )
+
+    async def container_list(self, request: sr_pb2.TaskContainerListRequest) -> sr_pb2.TaskContainerListResponse:
+        """List sandbox containers via task command router."""
+        with grpc_error_converter():
+            return await call_with_retries_on_transient_errors(
+                lambda: self._call_with_auth_retry(self._stub.TaskContainerList, request)
+            )
+
     async def exec_stdio_read(
         self,
         task_id: str,

{modal-1.3.6.dev8 → modal-1.3.6.dev10}/modal/cli/shell.py

@@ -18,6 +18,7 @@ from ..mount import _Mount
 from ..runner import interactive_shell
 from ..sandbox import Sandbox
 from ..secret import Secret
+from ..stream_type import StreamType
 from ..volume import Volume
 from .container import exec
 from .import_refs import (
@@ -64,26 +65,75 @@ def _is_valid_modal_id(ref: str, prefix: str) -> bool:
     return ref.startswith(prefix) and len(ref[len(prefix) :]) > 0 and ref[len(prefix) :].isalnum()
 
 
+def _parse_sandbox_container_ref(ref: str) -> tuple[str, Optional[str]]:
+    """Parse a sandbox:container reference into (sandbox_id, container_name).
+
+    Supports the pattern `sb-xyz:container_name` for accessing sandbox containers.
+    Returns (ref, None) if no container name is specified.
+    """
+    if _is_valid_modal_id(ref, "sb-"):
+        return ref, None
+
+    if ":" in ref:
+        parts = ref.split(":", 1)
+        sandbox_id, container_name = parts[0], parts[1]
+        if _is_valid_modal_id(sandbox_id, "sb-") and container_name:
+            return sandbox_id, container_name
+
+    return ref, None
+
+
 def _is_running_container_ref(ref: Optional[str]) -> bool:
     if ref is None:
         return False
-    return _is_valid_modal_id(ref, "sb-") or _is_valid_modal_id(ref, "ta-")
+    sandbox_id, _ = _parse_sandbox_container_ref(ref)
+    return _is_valid_modal_id(sandbox_id, "sb-") or _is_valid_modal_id(ref, "ta-")
+
+
+def _start_shell_in_sandbox_container(sandbox_id: str, container_name: str, cmd: str, pty: bool) -> None:
+    """Shell into a named container within a sandbox."""
+    try:
+        sandbox = Sandbox.from_id(sandbox_id)
+    except NotFoundError:
+        raise ClickException(f"Sandbox '{sandbox_id}' not found (is it still running?)")
+    except Exception as e:
+        raise ClickException(f"Error connecting to Sandbox '{sandbox_id}': {str(e)}")
+
+    try:
+        sandbox_container = sandbox._experimental_containers.get(name=container_name)
+        if pty:
+            process = sandbox_container.exec(*shlex.split(cmd), pty=pty)
+            process.attach()
+        else:
+            process = sandbox_container.exec(
+                *shlex.split(cmd), pty=pty, stdout=StreamType.STDOUT, stderr=StreamType.STDOUT
+            )
+            process.wait()
+    except NotFoundError:
+        raise ClickException(f"Container '{container_name}' not found in Sandbox '{sandbox_id}'.")
+    except Exception as e:
+        raise ClickException(f"Error exec-ing into container '{container_name}' in Sandbox '{sandbox_id}': {str(e)}")
 
 
 def _start_shell_in_running_container(ref: str, cmd: str, pty: bool) -> None:
-    if _is_valid_modal_id(ref, "sb-"):
+    sandbox_id, container_name = _parse_sandbox_container_ref(ref)
+
+    if container_name is not None:
+        return _start_shell_in_sandbox_container(sandbox_id, container_name, cmd, pty)
+
+    if _is_valid_modal_id(sandbox_id, "sb-"):
         try:
-            sandbox = Sandbox.from_id(ref)
+            sandbox = Sandbox.from_id(sandbox_id)
             ref = sandbox._get_task_id()
-        except NotFoundError as e:
-            raise ClickException(f"Sandbox '{ref}' not found (is it still running?)")
+        except NotFoundError:
+            raise ClickException(f"Sandbox '{sandbox_id}' not found (is it still running?)")
         except Exception as e:
-            raise ClickException(f"Error connecting to Sandbox '{ref}': {str(e)}")
+            raise ClickException(f"Error connecting to Sandbox '{sandbox_id}': {str(e)}")
 
     assert _is_valid_modal_id(ref, "ta-")
     try:
         exec(container_id=ref, command=shlex.split(cmd), pty=pty)
-    except NotFoundError as e:
+    except NotFoundError:
         raise ClickException(f"Container '{ref}' not found (is it still running?)")
     except Exception as e:
         raise ClickException(f"Error connecting to container '{ref}': {str(e)}")

{modal-1.3.6.dev8 → modal-1.3.6.dev10}/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.dev8",
+        version: str = "1.3.6.dev10",
     ):
         """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.dev8",
+        version: str = "1.3.6.dev10",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.3.6.dev8 → modal-1.3.6.dev10}/modal/functions.pyi

@@ -408,7 +408,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."""
             ...
@@ -417,7 +417,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]
+    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]:
@@ -444,7 +444,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.
 
@@ -467,7 +467,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: ...
@@ -475,7 +475,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.
 
@@ -496,7 +496,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."""