modAL 1.2.3.dev15__tar.gz → 1.2.4__tar.gz

{modal-1.2.3.dev15 → modal-1.2.4}/PKG-INFO

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

{modal-1.2.3.dev15 → modal-1.2.4}/modal/_tunnel.py

@@ -51,13 +51,17 @@ class Tunnel:
 
 
 @asynccontextmanager
-async def _forward(port: int, *, unencrypted: bool = False, client: Optional[_Client] = None) -> AsyncIterator[Tunnel]:
+async def _forward(
+    port: int, *, unencrypted: bool = False, h2_enabled: bool = False, client: Optional[_Client] = None
+) -> AsyncIterator[Tunnel]:
     """Expose a port publicly from inside a running Modal container, with TLS.
 
     If `unencrypted` is set, this also exposes the TCP socket without encryption on a random port
     number. This can be used to SSH into a container (see example below). Note that it is on the public Internet, so
     make sure you are using a secure protocol over TCP.
 
+    If `h2_enabled` is set, the TLS server will advertise support for HTTP/2.
+
     **Important:** This is an experimental API which may change in the future.
 
     **Usage:**
@@ -168,6 +172,8 @@ async def _forward(port: int, *, unencrypted: bool = False, client: Optional[_Cl
         raise InvalidError(f"The port argument should be an int, not {port!r}")
     if port < 1 or port > 65535:
         raise InvalidError(f"Invalid port number {port}")
+    if h2_enabled and unencrypted:
+        raise InvalidError("H2 can only be used with encrypted ports")
 
     if not client:
         client = await _Client.from_env()
@@ -175,8 +181,11 @@ async def _forward(port: int, *, unencrypted: bool = False, client: Optional[_Cl
     if client.client_type != api_pb2.CLIENT_TYPE_CONTAINER:
         raise InvalidError("Forwarding ports only works inside a Modal container")
 
+    tunnel_type = api_pb2.TUNNEL_TYPE_H2 if h2_enabled else api_pb2.TUNNEL_TYPE_UNSPECIFIED
     try:
-        response = await client.stub.TunnelStart(api_pb2.TunnelStartRequest(port=port, unencrypted=unencrypted))
+        response = await client.stub.TunnelStart(
+            api_pb2.TunnelStartRequest(port=port, unencrypted=unencrypted, tunnel_type=tunnel_type)
+        )
     except GRPCError as exc:
         if exc.status == Status.ALREADY_EXISTS:
             raise InvalidError(f"Port {port} is already forwarded")

{modal-1.2.3.dev15 → modal-1.2.4}/modal/_tunnel.pyi

@@ -54,7 +54,11 @@ class Tunnel:
         ...
 
 def _forward(
-    port: int, *, unencrypted: bool = False, client: typing.Optional[modal.client._Client] = None
+    port: int,
+    *,
+    unencrypted: bool = False,
+    h2_enabled: bool = False,
+    client: typing.Optional[modal.client._Client] = None,
 ) -> typing.AsyncContextManager[Tunnel]:
     '''Expose a port publicly from inside a running Modal container, with TLS.
 
@@ -62,6 +66,8 @@ def _forward(
     number. This can be used to SSH into a container (see example below). Note that it is on the public Internet, so
     make sure you are using a secure protocol over TCP.
 
+    If `h2_enabled` is set, the TLS server will advertise support for HTTP/2.
+
     **Important:** This is an experimental API which may change in the future.
 
     **Usage:**
@@ -171,7 +177,13 @@ def _forward(
 
 class __forward_spec(typing_extensions.Protocol):
     def __call__(
-        self, /, port: int, *, unencrypted: bool = False, client: typing.Optional[modal.client.Client] = None
+        self,
+        /,
+        port: int,
+        *,
+        unencrypted: bool = False,
+        h2_enabled: bool = False,
+        client: typing.Optional[modal.client.Client] = None,
     ) -> synchronicity.combined_types.AsyncAndBlockingContextManager[Tunnel]:
         '''Expose a port publicly from inside a running Modal container, with TLS.
 
@@ -179,6 +191,8 @@ class __forward_spec(typing_extensions.Protocol):
         number. This can be used to SSH into a container (see example below). Note that it is on the public Internet, so
         make sure you are using a secure protocol over TCP.
 
+        If `h2_enabled` is set, the TLS server will advertise support for HTTP/2.
+
         **Important:** This is an experimental API which may change in the future.
 
         **Usage:**
@@ -287,7 +301,13 @@ class __forward_spec(typing_extensions.Protocol):
         ...
 
     def aio(
-        self, /, port: int, *, unencrypted: bool = False, client: typing.Optional[modal.client.Client] = None
+        self,
+        /,
+        port: int,
+        *,
+        unencrypted: bool = False,
+        h2_enabled: bool = False,
+        client: typing.Optional[modal.client.Client] = None,
     ) -> typing.AsyncContextManager[Tunnel]:
         '''Expose a port publicly from inside a running Modal container, with TLS.
 
@@ -295,6 +315,8 @@ class __forward_spec(typing_extensions.Protocol):
         number. This can be used to SSH into a container (see example below). Note that it is on the public Internet, so
         make sure you are using a secure protocol over TCP.
 
+        If `h2_enabled` is set, the TLS server will advertise support for HTTP/2.
+
         **Important:** This is an experimental API which may change in the future.
 
         **Usage:**

{modal-1.2.3.dev15 → modal-1.2.4}/modal/_utils/grpc_utils.py

@@ -271,15 +271,13 @@ def process_exception_before_retry(
     fn_name: str,
     n_retries: int,
     delay: float,
-    total_deadline: Optional[float],
     idempotency_key: str,
 ):
     """Process exception before retry, used by `_retry_transient_errors`."""
     with suppress_tb_frames(1):
         if final_attempt:
             logger.debug(
-                f"Final attempt failed with {repr(exc)} {n_retries=} {delay=} "
-                f"{total_deadline=} for {fn_name} ({idempotency_key[:8]})"
+                f"Final attempt failed with {repr(exc)} {n_retries=} {delay=} for {fn_name} ({idempotency_key[:8]})"
             )
             if isinstance(exc, OSError):
                 raise ConnectionError(str(exc))
@@ -358,6 +356,7 @@ async def _retry_transient_errors(
             timeout = min(timeouts)  # In case the function provided both types of timeouts
         else:
             timeout = None
+
         try:
             with suppress_tb_frames(1):
                 return await fn_callable(req, metadata=attempt_metadata, timeout=timeout)
@@ -366,21 +365,29 @@ async def _retry_transient_errors(
             # in grpclib<=0.4.7. See above (search for `write_appdata`).
 
             # Server side instruction for retries
-            if isinstance(exc, GRPCError) and (server_retry_policy := get_server_retry_policy(exc)):
+            max_throttle_wait: Optional[int] = config.get("max_throttle_wait")
+            if (
+                max_throttle_wait != 0
+                and isinstance(exc, GRPCError)
+                and (server_retry_policy := get_server_retry_policy(exc))
+            ):
                 server_delay = server_retry_policy.retry_after_secs
 
-                # When `total_deadline` is not defined and server gives instruction for retries, then use
-                # `max_throttle_wait`.
-                if total_deadline is None and (max_throttle_wait := config.get("max_throttle_wait")):
-                    total_deadline = t0 + max_throttle_wait
+                now = time.time()
 
-                final_attempt = (
-                    total_deadline is not None
-                    and time.time() + server_delay + retry.attempt_timeout_floor >= total_deadline
+                # We check if the timeout will be reached **after** the sleep, so we can raise an error early
+                # without needing to actually sleep.
+                total_timeout_will_be_reached = (
+                    retry.total_timeout is not None and (now + server_delay - t0) >= retry.total_timeout
+                )
+                max_throttle_will_be_reached = (
+                    max_throttle_wait is not None and (now + server_delay - t0) >= max_throttle_wait
                 )
+                final_attempt = total_timeout_will_be_reached or max_throttle_will_be_reached
+
                 with suppress_tb_frames(1):
                     process_exception_before_retry(
-                        exc, final_attempt, fn.name, n_retries, server_delay, total_deadline, idempotency_key
+                        exc, final_attempt, fn.name, n_retries, server_delay, idempotency_key
                     )
 
                 now = time.time()
@@ -411,9 +418,7 @@ async def _retry_transient_errors(
                 final_attempt = False
 
             with suppress_tb_frames(1):
-                process_exception_before_retry(
-                    exc, final_attempt, fn.name, n_retries, delay, total_deadline, idempotency_key
-                )
+                process_exception_before_retry(exc, final_attempt, fn.name, n_retries, delay, idempotency_key)
 
             n_retries += 1
 

{modal-1.2.3.dev15 → modal-1.2.4}/modal/client.pyi

@@ -28,11 +28,7 @@ class _Client:
     _snapshotted: bool
 
     def __init__(
-        self,
-        server_url: str,
-        client_type: int,
-        credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.2.3.dev15",
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "1.2.4"
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -159,11 +155,7 @@ class Client:
     _snapshotted: bool
 
     def __init__(
-        self,
-        server_url: str,
-        client_type: int,
-        credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.2.3.dev15",
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "1.2.4"
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.2.3.dev15 → modal-1.2.4}/modal/config.py

@@ -221,13 +221,6 @@ def _enforce_suffix_rules(x: str) -> str:
     return x
 
 
-def _int_or_none(x: str) -> Optional[int]:
-    if not x:
-        return None
-    x_int = int(x)
-    return x_int if x_int > 0 else None
-
-
 class _Setting(typing.NamedTuple):
     default: typing.Any = None
     transform: typing.Callable[[str], typing.Any] = lambda x: x  # noqa: E731
@@ -269,7 +262,7 @@ _SETTINGS = {
         transform=lambda s: _check_value(["pickle", "cbor"])(s.lower()),
     ),
     "dev_suffix": _Setting("", transform=_enforce_suffix_rules),
-    "max_throttle_wait": _Setting(None, transform=_int_or_none),
+    "max_throttle_wait": _Setting(None, transform=lambda x: int(x) if x else None),
 }
 
 

{modal-1.2.3.dev15 → modal-1.2.4}/modal/experimental/flash.py

@@ -30,13 +30,14 @@ class _FlashManager:
         port: int,
         process: Optional[subprocess.Popen] = None,
         health_check_url: Optional[str] = None,
+        h2_enabled: bool = False,
     ):
         self.client = client
         self.port = port
         # Health check is not currently being used
         self.health_check_url = health_check_url
         self.process = process
-        self.tunnel_manager = _forward_tunnel(port, client=client)
+        self.tunnel_manager = _forward_tunnel(port, h2_enabled=h2_enabled, client=client)
         self.stopped = False
         self.num_failures = 0
         self.task_id = os.environ["MODAL_TASK_ID"]
@@ -170,6 +171,7 @@ async def flash_forward(
     port: int,
     process: Optional[subprocess.Popen] = None,
     health_check_url: Optional[str] = None,
+    h2_enabled: bool = False,
 ) -> _FlashManager:
     """
     Forward a port to the Modal Flash service, exposing that port as a stable web endpoint.
@@ -178,7 +180,7 @@ async def flash_forward(
     """
     client = await _Client.from_env()
 
-    manager = _FlashManager(client, port, process=process, health_check_url=health_check_url)
+    manager = _FlashManager(client, port, process=process, health_check_url=health_check_url, h2_enabled=h2_enabled)
     await manager._start()
     return manager
 

{modal-1.2.3.dev15 → modal-1.2.4}/modal/experimental/flash.pyi

@@ -10,6 +10,7 @@ class _FlashManager:
         port: int,
         process: typing.Optional[subprocess.Popen] = None,
         health_check_url: typing.Optional[str] = None,
+        h2_enabled: bool = False,
     ):
         """Initialize self.  See help(type(self)) for accurate signature."""
         ...
@@ -36,6 +37,7 @@ class FlashManager:
         port: int,
         process: typing.Optional[subprocess.Popen] = None,
         health_check_url: typing.Optional[str] = None,
+        h2_enabled: bool = False,
     ): ...
 
     class __is_port_connection_healthy_spec(typing_extensions.Protocol[SUPERSELF]):
@@ -92,6 +94,7 @@ class __flash_forward_spec(typing_extensions.Protocol):
         port: int,
         process: typing.Optional[subprocess.Popen] = None,
         health_check_url: typing.Optional[str] = None,
+        h2_enabled: bool = False,
     ) -> FlashManager:
         """Forward a port to the Modal Flash service, exposing that port as a stable web endpoint.
         This is a highly experimental method that can break or be removed at any time without warning.
@@ -105,6 +108,7 @@ class __flash_forward_spec(typing_extensions.Protocol):
         port: int,
         process: typing.Optional[subprocess.Popen] = None,
         health_check_url: typing.Optional[str] = None,
+        h2_enabled: bool = False,
     ) -> FlashManager:
         """Forward a port to the Modal Flash service, exposing that port as a stable web endpoint.
         This is a highly experimental method that can break or be removed at any time without warning.

{modal-1.2.3.dev15 → modal-1.2.4}/modal/sandbox.py

@@ -938,7 +938,8 @@ class _Sandbox(_Object, type_prefix="sb"):
         elif stderr == StreamType.DEVNULL:
             stderr_config = sr_pb2.TaskExecStderrConfig.TASK_EXEC_STDERR_CONFIG_DEVNULL
         elif stderr == StreamType.STDOUT:
-            stderr_config = sr_pb2.TaskExecStderrConfig.TASK_EXEC_STDERR_CONFIG_STDOUT
+            # Stream stderr to the client so that it can be printed locally in the reader.
+            stderr_config = sr_pb2.TaskExecStderrConfig.TASK_EXEC_STDERR_CONFIG_PIPE
         else:
             raise ValueError("Unsupported StreamType for stderr")
 

{modal-1.2.3.dev15 → modal-1.2.4}/modal.egg-info/PKG-INFO

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

{modal-1.2.3.dev15 → modal-1.2.4}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.2.3.dev15"
+__version__ = "1.2.4"