modal 1.4.2.dev4__tar.gz → 1.4.2.dev6__tar.gz

{modal-1.4.2.dev4 → modal-1.4.2.dev6}/PKG-INFO

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

{modal-1.4.2.dev4 → modal-1.4.2.dev6}/modal/_utils/grpc_utils.py

@@ -216,7 +216,11 @@ def create_channel(
         for k, v in metadata.items():
             event.metadata[k] = v
 
-        logger.debug(f"Sending request to {event.method_name}")
+        idempotency_key = typing.cast(Optional[str], event.metadata.get("x-idempotency-key"))
+        if idempotency_key is None:
+            logger.debug(f"Sending request to {event.method_name}")
+        else:
+            logger.debug(f"Sending request to {event.method_name} ({idempotency_key[:8]})")
 
     grpclib.events.listen(channel, grpclib.events.SendRequest, send_request)
 
@@ -288,12 +292,14 @@ def process_exception_before_retry(
     n_retries: int,
     delay: float,
     idempotency_key: str,
+    rpc_elapsed: float,
 ):
     """Process exception before retry, used by `_retry_transient_errors`."""
     with suppress_tb_frame():
         if final_attempt:
             logger.debug(
-                f"Final attempt failed with {repr(exc)} {n_retries=} {delay=} for {fn_name} ({idempotency_key[:8]})"
+                f"Final attempt failed with {repr(exc)} {n_retries=} {delay=} {rpc_elapsed=:0.2f}s "
+                f"for {fn_name} ({idempotency_key[:8]})"
             )
             if isinstance(exc, OSError):
                 raise ConnectionError(str(exc))
@@ -310,7 +316,10 @@ def process_exception_before_retry(
             # we handle in the retry logic once we drop this check!
             raise exc
 
-    logger.debug(f"Retryable failure {repr(exc)} {n_retries=} {delay=} for {fn_name} ({idempotency_key[:8]})")
+    logger.debug(
+        f"Retryable failure {repr(exc)} {n_retries=} {delay=} {rpc_elapsed=:0.2f}s "
+        f"for {fn_name} ({idempotency_key[:8]})"
+    )
 
 
 async def _retry_transient_errors(
@@ -373,6 +382,7 @@ async def _retry_transient_errors(
         else:
             timeout = None
 
+        attempt_started_at = time.monotonic()
         try:
             with suppress_tb_frame():
                 return await fn_callable(req, metadata=attempt_metadata, timeout=timeout)
@@ -409,7 +419,13 @@ async def _retry_transient_errors(
 
                 with suppress_tb_frame():
                     process_exception_before_retry(
-                        exc, final_attempt, fn.name, n_retries, server_delay, idempotency_key
+                        exc,
+                        final_attempt,
+                        fn.name,
+                        n_retries,
+                        server_delay,
+                        idempotency_key,
+                        time.monotonic() - attempt_started_at,
                     )
 
                 now = time.time()
@@ -438,7 +454,15 @@ async def _retry_transient_errors(
                 final_attempt = False
 
             with suppress_tb_frame():
-                process_exception_before_retry(exc, final_attempt, fn.name, n_retries, delay, idempotency_key)
+                process_exception_before_retry(
+                    exc,
+                    final_attempt,
+                    fn.name,
+                    n_retries,
+                    delay,
+                    idempotency_key,
+                    time.monotonic() - attempt_started_at,
+                )
 
             n_retries += 1
 

{modal-1.4.2.dev4 → modal-1.4.2.dev6}/modal/_utils/task_command_router_client.py

@@ -502,7 +502,8 @@ class TaskCommandRouterClient:
                 jwt, url = v1_resp.jwt, v1_resp.url
 
             # Ensure the server URL remains stable for the lifetime of this client.
-            assert url == self._server_url, "Task router URL changed during session"
+            if url != self._server_url:
+                logger.warning("Task router URL changed during session")
             self._jwt = jwt
             self._jwt_exp = _parse_jwt_expiration(jwt)
 

{modal-1.4.2.dev4 → modal-1.4.2.dev6}/modal/cli/app.py

@@ -351,6 +351,65 @@ async def rollback(
     rich.print("[green]✓[/green] Deployment rollback successful!")
 
 
+@app_cli.command("rollover", no_args_is_help=True)
+@synchronizer.create_blocking
+async def rollover(
+    app_identifier: str = APP_IDENTIFIER,
+    *,
+    strategy: str = typer.Option(
+        "rolling",
+        help="Strategy for rollover",
+        click_type=click.Choice(get_args(DEPLOYMENT_STRATEGY_TYPE)),
+    ),
+    env: Optional[str] = ENV_OPTION,
+):
+    """Rollover an App.
+
+    A rollover replaces existing containers with fresh ones built from the same
+    App version — useful for refreshing containers without changing your code.
+    The rollover appears as a new entry in the App's deployment history.
+
+    **Examples:**
+
+    Rollover an App using a rolling deployment. Running containers are now considered
+    outdated and new containers will replace them.
+
+    ```
+    modal app rollover my-app
+    ```
+
+    Rollover an App by termatining all running containers. Inputs on the queue will
+    start new containers.
+
+    ```
+    modal app rollover my-app --strategy recreate
+    ```
+    """
+    env = ensure_env(env)
+    output_mgr = OutputManager.get()
+    output_mgr.print(f"🔨 Starting app rollover with {strategy} strategy")
+    t0 = time.monotonic()
+
+    client = await _Client.from_env()
+    app_id = await get_app_id.aio(app_identifier, env, client)
+
+    req = api_pb2.AppRolloverRequest(app_id=app_id)
+    response = await client.stub.AppRollover(req)
+    print_server_warnings(response.server_warnings)
+
+    if strategy == "recreate":
+        try:
+            await _stop_and_wait_for_containers(client, app_id, response.deployed_at, env)
+        except Exception as exc:
+            warnings.warn(f"App updated successfully, but containers did not all terminate. {exc}", UserWarning)
+            output_mgr.print(f"\nView Deployment: [magenta]{response.url}[/magenta]")
+            sys.exit(1)
+
+    duration = time.monotonic() - t0
+    output_mgr.step_completed(f"Rollover completed in {duration:.3f}s with {strategy} strategy! 🎉")
+    output_mgr.print(f"\nView Deployment: [magenta]{response.url}[/magenta]")
+
+
 @app_cli.command("stop", no_args_is_help=True)
 @synchronizer.create_blocking
 async def stop(
@@ -471,62 +530,3 @@ async def dashboard(
 
     url = f"https://modal.com/id/{app_id}"
     open_url_and_display(url, "App dashboard")
-
-
-@app_cli.command("rollover", no_args_is_help=True, context_settings={"ignore_unknown_options": True})
-@synchronizer.create_blocking
-async def rollover(
-    app_identifier: str = APP_IDENTIFIER,
-    *,
-    strategy: str = typer.Option(
-        "rolling",
-        help="Strategy for rollover",
-        click_type=click.Choice(get_args(DEPLOYMENT_STRATEGY_TYPE)),
-    ),
-    env: Optional[str] = ENV_OPTION,
-):
-    """Rollover an App.
-
-    A rollover replaces existing containers with fresh ones built from the same
-    App version — useful for refreshing containers without changing your code.
-    The rollover appears as a new entry in the App's deployment history.
-
-    **Examples:**
-
-    Rollover an App using a rolling deployment. Running containers are now considered
-    outdated and new containers will replace them.
-
-    ```
-    modal app rollover my-app
-    ```
-
-    Rollover an App by termatining all running containers. Inputs on the queue will
-    start new containers.
-
-    ```
-    modal app rollover my-app --strategy recreate
-    ```
-    """
-    env = ensure_env(env)
-    output_mgr = OutputManager.get()
-    output_mgr.print(f"🔨 Starting app rollover with {strategy} strategy")
-    t0 = time.monotonic()
-
-    client = await _Client.from_env()
-    app_id = await get_app_id.aio(app_identifier, env, client)
-
-    req = api_pb2.AppRolloverRequest(app_id=app_id)
-    response = await client.stub.AppRollover(req)
-    print_server_warnings(response.server_warnings)
-
-    if strategy == "recreate":
-        try:
-            await _stop_and_wait_for_containers(client, app_id, response.deployed_at, env)
-        except Exception as exc:
-            warnings.warn(f"App updated successfully, but containers did not all terminate. {exc}", UserWarning)
-            output_mgr.print(f"\nView Deployment: [magenta]{response.url}[/magenta]")
-            sys.exit(1)
-
-    duration = time.monotonic() - t0
-    output_mgr.step_completed(f"Rollover completed in {duration:.3f}s with {strategy} strategy! 🎉")
-    output_mgr.print(f"\nView Deployment: [magenta]{response.url}[/magenta]")

{modal-1.4.2.dev4 → modal-1.4.2.dev6}/modal/client.pyi

@@ -35,7 +35,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.4.2.dev4",
+        version: str = "1.4.2.dev6",
     ):
         """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.4.2.dev4",
+        version: str = "1.4.2.dev6",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.4.2.dev4 → modal-1.4.2.dev6}/modal/dict.py

@@ -84,8 +84,8 @@ class DictInfo:
 class _DictManager:
     """Namespace with methods for managing named Dict objects."""
 
-    @staticmethod
     async def create(
+        self,
         name: str,  # Name to use for the new Dict
         *,
         allow_existing: bool = False,  # If True, no-op when the Dict already exists
@@ -137,8 +137,8 @@ class _DictManager:
             if not allow_existing:
                 raise
 
-    @staticmethod
     async def list(
+        self,
         *,
         max_objects: Optional[int] = None,  # Limit results to this size
         created_before: Optional[Union[datetime, str]] = None,  # Limit based on creation date
@@ -205,8 +205,8 @@ class _DictManager:
         ]
         return dicts[:max_objects] if max_objects is not None else dicts
 
-    @staticmethod
     async def delete(
+        self,
         name: str,  # Name of the Dict to delete
         *,
         allow_missing: bool = False,  # If True, don't raise an error if the Dict doesn't exist
@@ -299,8 +299,8 @@ class _Dict(_Object, type_prefix="di"):
 
     @classproperty
     @classmethod
-    def objects(cls) -> type[_DictManager]:
-        return _DictManager
+    def objects(cls) -> _DictManager:
+        return _DictManager()
 
     @property
     def name(self) -> Optional[str]:

{modal-1.4.2.dev4 → modal-1.4.2.dev6}/modal/dict.pyi

@@ -44,8 +44,8 @@ class DictInfo:
 
 class _DictManager:
     """Namespace with methods for managing named Dict objects."""
-    @staticmethod
     async def create(
+        self,
         name: str,
         *,
         allow_existing: bool = False,
@@ -80,8 +80,8 @@ class _DictManager:
         """
         ...
 
-    @staticmethod
     async def list(
+        self,
         *,
         max_objects: typing.Optional[int] = None,
         created_before: typing.Union[datetime.datetime, str, None] = None,
@@ -114,8 +114,8 @@ class _DictManager:
         """
         ...
 
-    @staticmethod
     async def delete(
+        self,
         name: str,
         *,
         allow_missing: bool = False,
@@ -224,7 +224,7 @@ class DictManager:
             """
             ...
 
-    create: typing.ClassVar[__create_spec]
+    create: __create_spec
 
     class __list_spec(typing_extensions.Protocol):
         def __call__(
@@ -297,7 +297,7 @@ class DictManager:
             """
             ...
 
-    list: typing.ClassVar[__list_spec]
+    list: __list_spec
 
     class __delete_spec(typing_extensions.Protocol):
         def __call__(
@@ -360,7 +360,7 @@ class DictManager:
             """
             ...
 
-    delete: typing.ClassVar[__delete_spec]
+    delete: __delete_spec
 
 class _Dict(modal._object._Object):
     """Distributed dictionary for storage in Modal apps.
@@ -413,7 +413,7 @@ class _Dict(modal._object._Object):
 
     @synchronicity.classproperty
     @classmethod
-    def objects(cls) -> type[_DictManager]: ...
+    def objects(cls) -> _DictManager: ...
     @property
     def name(self) -> typing.Optional[str]: ...
     def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
@@ -655,7 +655,7 @@ class Dict(modal.object.Object):
 
     @synchronicity.classproperty
     @classmethod
-    def objects(cls) -> type[DictManager]: ...
+    def objects(cls) -> DictManager: ...
     @property
     def name(self) -> typing.Optional[str]: ...
     def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...

{modal-1.4.2.dev4 → modal-1.4.2.dev6}/modal/functions.pyi

@@ -348,7 +348,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."""
             ...
@@ -357,7 +357,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]:
@@ -384,7 +384,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.
 
@@ -407,7 +407,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: ...
@@ -415,7 +415,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.
 
@@ -436,7 +436,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."""

{modal-1.4.2.dev4 → modal-1.4.2.dev6}/modal/queue.py

@@ -49,8 +49,8 @@ class QueueInfo:
 class _QueueManager:
     """Namespace with methods for managing named Queue objects."""
 
-    @staticmethod
     async def create(
+        self,
         name: str,  # Name to use for the new Queue
         *,
         allow_existing: bool = False,  # If True, no-op when the Queue already exists
@@ -102,8 +102,8 @@ class _QueueManager:
             if not allow_existing:
                 raise
 
-    @staticmethod
     async def list(
+        self,
         *,
         max_objects: Optional[int] = None,  # Limit results to this size
         created_before: Optional[Union[datetime, str]] = None,  # Limit based on creation date
@@ -170,8 +170,8 @@ class _QueueManager:
         ]
         return queues[:max_objects] if max_objects is not None else queues
 
-    @staticmethod
     async def delete(
+        self,
         name: str,  # Name of the Queue to delete
         *,
         allow_missing: bool = False,  # If True, don't raise an error if the Queue doesn't exist
@@ -292,8 +292,8 @@ class _Queue(_Object, type_prefix="qu"):
 
     @classproperty
     @classmethod
-    def objects(cls) -> type[_QueueManager]:
-        return _QueueManager
+    def objects(cls) -> _QueueManager:
+        return _QueueManager()
 
     @property
     def name(self) -> Optional[str]:

{modal-1.4.2.dev4 → modal-1.4.2.dev6}/modal/queue.pyi

@@ -33,8 +33,8 @@ class QueueInfo:
 
 class _QueueManager:
     """Namespace with methods for managing named Queue objects."""
-    @staticmethod
     async def create(
+        self,
         name: str,
         *,
         allow_existing: bool = False,
@@ -69,8 +69,8 @@ class _QueueManager:
         """
         ...
 
-    @staticmethod
     async def list(
+        self,
         *,
         max_objects: typing.Optional[int] = None,
         created_before: typing.Union[datetime.datetime, str, None] = None,
@@ -103,8 +103,8 @@ class _QueueManager:
         """
         ...
 
-    @staticmethod
     async def delete(
+        self,
         name: str,
         *,
         allow_missing: bool = False,
@@ -213,7 +213,7 @@ class QueueManager:
             """
             ...
 
-    create: typing.ClassVar[__create_spec]
+    create: __create_spec
 
     class __list_spec(typing_extensions.Protocol):
         def __call__(
@@ -286,7 +286,7 @@ class QueueManager:
             """
             ...
 
-    list: typing.ClassVar[__list_spec]
+    list: __list_spec
 
     class __delete_spec(typing_extensions.Protocol):
         def __call__(
@@ -349,7 +349,7 @@ class QueueManager:
             """
             ...
 
-    delete: typing.ClassVar[__delete_spec]
+    delete: __delete_spec
 
 class _Queue(modal._object._Object):
     """Distributed, FIFO queue for data flow in Modal apps.
@@ -432,7 +432,7 @@ class _Queue(modal._object._Object):
 
     @synchronicity.classproperty
     @classmethod
-    def objects(cls) -> type[_QueueManager]: ...
+    def objects(cls) -> _QueueManager: ...
     @property
     def name(self) -> typing.Optional[str]: ...
     def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
@@ -728,7 +728,7 @@ class Queue(modal.object.Object):
 
     @synchronicity.classproperty
     @classmethod
-    def objects(cls) -> type[QueueManager]: ...
+    def objects(cls) -> QueueManager: ...
     @property
     def name(self) -> typing.Optional[str]: ...
     def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...

{modal-1.4.2.dev4 → modal-1.4.2.dev6}/modal/sandbox_fs.py

@@ -61,7 +61,7 @@ class _SandboxFilesystem:
         **Usage**
 
         ```python fixture:sandbox
-        sandbox.filesystem.write_bytes(b"Hello, world!\n", "/tmp/hello.bin")
+        sandbox.filesystem.write_bytes(b"Hello, world!\\n", "/tmp/hello.bin")
         contents = sandbox.filesystem.read_bytes("/tmp/hello.bin")
         print(contents.decode("utf-8"))
         ```
@@ -97,7 +97,7 @@ class _SandboxFilesystem:
         **Usage**
 
         ```python fixture:sandbox
-        sandbox.filesystem.write_text("Hello, world!\n", "/tmp/hello.txt")
+        sandbox.filesystem.write_text("Hello, world!\\n", "/tmp/hello.txt")
         contents = sandbox.filesystem.read_text("/tmp/hello.txt")
         print(contents)
         ```
@@ -140,7 +140,7 @@ class _SandboxFilesystem:
         **Usage**
 
         ```python fixture:sandbox
-        sandbox.filesystem.write_text("Hello, world!\n", "/tmp/hello.txt")
+        sandbox.filesystem.write_text("Hello, world!\\n", "/tmp/hello.txt")
         sandbox.filesystem.copy_to_local("/tmp/hello.txt", "/tmp/local-hello.txt")
         ```
         """
@@ -201,7 +201,7 @@ class _SandboxFilesystem:
         **Usage**
 
         ```python fixture:sandbox
-        sandbox.filesystem.write_bytes(b"Hello, world!\n", "/tmp/hello.bin")
+        sandbox.filesystem.write_bytes(b"Hello, world!\\n", "/tmp/hello.bin")
         ```
         """
         validate_absolute_remote_path(remote_path, "write_bytes")
@@ -241,7 +241,7 @@ class _SandboxFilesystem:
         **Usage**
 
         ```python fixture:sandbox
-        sandbox.filesystem.write_text("Hello, world!\n", "/tmp/hello.txt")
+        sandbox.filesystem.write_text("Hello, world!\\n", "/tmp/hello.txt")
         ```
         """
         validate_absolute_remote_path(remote_path, "write_text")
@@ -273,7 +273,7 @@ class _SandboxFilesystem:
         from pathlib import Path
 
         local_path = Path(tempfile.mktemp())
-        local_path.write_text("Hello, world!\n")
+        local_path.write_text("Hello, world!\\n")
         sandbox.filesystem.copy_from_local(local_path, "/tmp/hello.txt")
         ```
         """