modal 1.0.4.dev10__py3-none-any.whl → 1.0.5__py3-none-any.whl

modal/_utils/grpc_utils.py

@@ -28,6 +28,7 @@ from grpclib.protocol import H2Protocol
 from modal.exception import AuthError, ConnectionError
 from modal_version import __version__
 
+from .async_utils import retry
 from .logger import logger
 
 RequestType = TypeVar("RequestType", bound=Message)
@@ -167,8 +168,9 @@ def create_channel(
     return channel
 
 
+@retry(n_attempts=5, base_delay=0.1)
 async def connect_channel(channel: grpclib.client.Channel):
-    """Connects socket (potentially raising errors raising to connectivity."""
+    """Connect to socket and raise exceptions when there is a connection issue."""
     await channel.__connect__()
 
 
@@ -198,6 +200,7 @@ async def retry_transient_errors(
     total_timeout: Optional[float] = None,  # timeout for the entire function call
     attempt_timeout_floor=2.0,  # always have at least this much timeout (only for total_timeout)
     retry_warning_message: Optional[RetryWarningMessage] = None,
+    metadata: list[tuple[str, str]] = [],
 ) -> ResponseType:
     """Retry on transient gRPC failures with back-off until max_retries is reached.
     If max_retries is None, retry forever."""
@@ -216,9 +219,13 @@ async def retry_transient_errors(
         total_deadline = None
 
     while True:
-        metadata = [("x-idempotency-key", idempotency_key), ("x-retry-attempt", str(n_retries))]
+        attempt_metadata = [
+            ("x-idempotency-key", idempotency_key),
+            ("x-retry-attempt", str(n_retries)),
+            *metadata,
+        ]
         if n_retries > 0:
-            metadata.append(("x-retry-delay", str(time.time() - t0)))
+            attempt_metadata.append(("x-retry-delay", str(time.time() - t0)))
         timeouts = []
         if attempt_timeout is not None:
             timeouts.append(attempt_timeout)
@@ -229,7 +236,7 @@ async def retry_transient_errors(
         else:
             timeout = None
         try:
-            return await fn(*args, metadata=metadata, timeout=timeout)
+            return await fn(*args, metadata=attempt_metadata, timeout=timeout)
         except (StreamTerminatedError, GRPCError, OSError, asyncio.TimeoutError, AttributeError) as exc:
             if isinstance(exc, GRPCError) and exc.status not in status_codes:
                 if exc.status == Status.UNAUTHENTICATED:

modal/app.py

@@ -550,8 +550,8 @@ class _App:
         modal run app_module.py
         ```
 
-        Note that an explicit [`app.run()`](/docs/reference/modal.App#run) is not needed, as an
-        [app](/docs/guide/apps) is automatically created for you.
+        Note that an explicit [`app.run()`](https://modal.com/docs/reference/modal.App#run) is not needed, as an
+        [app](https://modal.com/docs/guide/apps) is automatically created for you.
 
         **Multiple Entrypoints**
 
@@ -657,7 +657,7 @@ class _App:
         _experimental_buffer_containers: Optional[int] = None,  # Now stable API with `buffer_containers`
         allow_cross_region_volumes: Optional[bool] = None,  # Always True on the Modal backend now
     ) -> _FunctionDecoratorType:
-        """Decorator to register a new Modal [Function](/docs/reference/modal.Function) with this App."""
+        """Decorator to register a new Modal Function with this App."""
         if isinstance(_warn_parentheses_missing, _Image):
             # Handle edge case where maybe (?) some users passed image as a positional arg
             raise InvalidError("`image` needs to be a keyword argument: `@app.function(image=image)`.")
@@ -731,7 +731,7 @@ class _App:
                         dedent(
                             """
                             The `@app.function` decorator must apply to functions in global scope,
-                            unless `serialize=True` is set.
+                            unless `serialized=True` is set.
                             If trying to apply additional decorators, they may need to use `functools.wraps`.
                             """
                         )
@@ -881,7 +881,7 @@ class _App:
         allow_cross_region_volumes: Optional[bool] = None,  # Always True on the Modal backend now
     ) -> Callable[[Union[CLS_T, _PartialFunction]], CLS_T]:
         """
-        Decorator to register a new Modal [Cls](/docs/reference/modal.Cls) with this App.
+        Decorator to register a new Modal [Cls](https://modal.com/docs/reference/modal.Cls) with this App.
         """
         if _warn_parentheses_missing:
             raise InvalidError("Did you forget parentheses? Suggestion: `@app.cls()`.")