modal 1.5.1.dev8__tar.gz → 1.5.1.dev9__tar.gz

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.5.1.dev8
+Version: 1.5.1.dev9
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License-Expression: Apache-2.0
@@ -45,7 +45,7 @@ access to serverless cloud compute from Python scripts on your local computer.
 See the [online documentation](https://modal.com/docs/guide) for many
 [example applications](https://modal.com/docs/examples),
 a [user guide](https://modal.com/docs/guide), and the detailed
-[API reference](https://modal.com/docs/reference).
+[API reference](https://modal.com/docs/sdk/py/latest).
 
 ## Installation
 

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/README.md

@@ -12,7 +12,7 @@ access to serverless cloud compute from Python scripts on your local computer.
 See the [online documentation](https://modal.com/docs/guide) for many
 [example applications](https://modal.com/docs/examples),
 a [user guide](https://modal.com/docs/guide), and the detailed
-[API reference](https://modal.com/docs/reference).
+[API reference](https://modal.com/docs/sdk/py/latest).
 
 ## Installation
 

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/_billing.py

@@ -80,7 +80,7 @@ class BillingReportItem:
             environment_name=pb_item.environment_name,
             interval_start=pb_item.interval.ToDatetime().replace(tzinfo=timezone.utc),
             cost=Decimal(pb_item.cost),
-            cost_by_resource={k: Decimal(str(v)) for k, v in pb_item.cost_by_resource.items()},
+            cost_by_resource={k: Decimal(v) for k, v in pb_item.cost_by_resource.items()},
             tags=dict(pb_item.tags),
         )
 
@@ -120,7 +120,7 @@ async def _workspace_billing_report(
     case, we recommend leaving a buffer after the end of the query interval.
 
     It's also possible to generate reports using the
-    [`modal billing report`](https://modal.com/docs/reference/cli/billing) CLI command. The CLI
+    [`modal billing report`](https://modal.com/docs/cli/latest/billing) CLI command. The CLI
     has a few convenience features for generating reports across relative time ranges.
 
     """

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/_environments.py

@@ -428,8 +428,9 @@ class _EnvironmentBillingManager:
             Modal's billing model evolves.
 
             It's also possible to generate reports using the
-            [`modal environment billing report`](https://modal.com/docs/reference/cli/environment) CLI command.
-            The CLI has a few convenience features for generating reports across relative time ranges.
+            [`modal environment billing report`](https://modal.com/docs/cli/latest/environment#modal-environment-billing-report)
+            CLI command.  The CLI has a few convenience features for generating
+            reports across relative time ranges.
 
             """
             + BILLING_DOCSTRING

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/_functions.py

@@ -1912,9 +1912,9 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             **kwargs: Keyword arguments forwarded to the remote function.
 
         Returns:
-            A [`modal.FunctionCall`](https://modal.com/docs/reference/modal.FunctionCall) object
+            A [`modal.FunctionCall`](https://modal.com/docs/sdk/py/latest/modal.FunctionCall) object
             that can later be polled or waited for using
-            [`.get(timeout=...)`](https://modal.com/docs/reference/modal.FunctionCall#get).
+            [`.get(timeout=...)`](https://modal.com/docs/sdk/py/latest/modal.FunctionCall#get).
         """
         self._check_no_web_url("spawn")
         if self._is_generator:
@@ -2065,7 +2065,7 @@ class _FunctionCall(typing.Generic[ReturnType], _Object, type_prefix="fc"):
         """Returns a structure representing the call graph from a given root
         call ID, along with the status of execution for each node.
 
-        See [`modal.call_graph`](https://modal.com/docs/reference/modal.call_graph) reference page
+        See [`modal.call_graph`](https://modal.com/docs/sdk/py/latest/modal.call_graph) reference page
         for documentation on the structure of the returned `InputInfo` items.
 
         Returns:
@@ -2083,7 +2083,7 @@ class _FunctionCall(typing.Generic[ReturnType], _Object, type_prefix="fc"):
         terminate_containers: bool = False,
     ):
         """Cancels the function call, which will stop its execution and mark its inputs as
-        [`TERMINATED`](https://modal.com/docs/reference/modal.call_graph#modalcall_graphinputstatus).
+        [`TERMINATED`](https://modal.com/docs/sdk/py/latest/modal.call_graph#modalcall_graphinputstatus).
 
         If `terminate_containers=True` - the containers running the cancelled inputs are all terminated
         causing any non-cancelled inputs on those containers to be rescheduled in new containers.

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/_partial_function.py

@@ -477,7 +477,7 @@ def _wsgi_app(
     Web Server Gateway Interface (WSGI) is a standard for synchronous Python web apps.
     It has been [succeeded by the ASGI interface](https://asgi.readthedocs.io/en/latest/introduction.html#wsgi-compatibility)
     which is compatible with ASGI and supports additional functionality such as web sockets.
-    Modal supports ASGI via [`asgi_app`](https://modal.com/docs/reference/modal.asgi_app).
+    Modal supports ASGI via [`asgi_app`](https://modal.com/docs/sdk/py/latest/modal.asgi_app).
 
     Examples:
         ```python

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/_server.py

@@ -49,7 +49,7 @@ class _Server:
     See [lifecycle hooks](https://modal.com/docs/guide/lifecycle-functions) for more information.
 
     Generally, you will not construct a Server directly.
-    Instead, use the [`@app.server()`](https://modal.com/docs/reference/modal.App#server) decorator.
+    Instead, use the [`@app.server()`](https://modal.com/docs/sdk/py/latest/modal.App#server) decorator.
 
     ```python notest
     @app.server(port=8000, routing_region="us-east")

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/_utils/task_command_router_client.py

@@ -491,6 +491,27 @@ class TaskCommandRouterClient:
                 lambda: self._call_with_auth_retry(self._stub.SandboxStdinWriteV2, request)
             )
 
+    async def sandbox_wait_until_ready(self, task_id: str, timeout: float) -> sr_pb2.SandboxWaitUntilReadyTcrResponse:
+        """Wait until the sandbox's readiness probe reports ready.
+
+        Args:
+            task_id: The task ID hosting the sandbox.
+            timeout: Maximum time in seconds for the worker to wait.
+        Raises:
+            TimeoutError: If the sandbox does not become ready within `timeout`.
+        """
+        request = sr_pb2.SandboxWaitUntilReadyTcrRequest(task_id=task_id, timeout=timeout)
+        with grpc_error_converter():
+            try:
+                return await asyncio.wait_for(
+                    call_with_retries_on_transient_errors(
+                        lambda: self._call_with_auth_retry(self._stub.SandboxWaitUntilReady, request, timeout=timeout),
+                    ),
+                    timeout=timeout,
+                )
+            except asyncio.TimeoutError:
+                raise ModalTimeoutError("Timeout expired")
+
     async def exec_poll(self, task_id: str, exec_id: str, deadline: float | None = None) -> sr_pb2.TaskExecPollResponse:
         """Poll for the exit status of an exec'd command, properly retrying on transient errors.
 
@@ -784,6 +805,12 @@ class TaskCommandRouterClient:
                 lambda: self._call_with_auth_retry(self._stub.TaskUnmountDirectory, request)
             )
 
+    async def set_network_access(self, request: sr_pb2.TaskSetNetworkAccessRequest):
+        with grpc_error_converter():
+            return await call_with_retries_on_transient_errors(
+                lambda: self._call_with_auth_retry(self._stub.TaskSetNetworkAccess, request)
+            )
+
     async def _snapshot_with_deadline(self, rpc, request, *, timeout: float, **kwargs):
         # helper method for snapshot_directory and snapshot_filesystem to handle grpc
         # deadlines in a consistent way, converting any error to TimeoutError after passing

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/_workspace.py

@@ -151,8 +151,9 @@ class _WorkspaceBillingManager:
             Modal's billing model evolves.
 
             It's also possible to generate reports using the
-            [`modal billing report`](https://modal.com/docs/reference/cli/billing) CLI command. The CLI
-            has a few convenience features for generating reports across relative time ranges.
+            [`modal billing report`](https://modal.com/docs/cli/latest/billing#modal-billing-report)
+            CLI command. The CLI has a few convenience features for generating reports across relative
+            time ranges.
 
             """
             + BILLING_DOCSTRING

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/app.py

@@ -710,7 +710,7 @@ class _App:
         Modal functions can also be used as CLI entrypoints, but unlike `local_entrypoint`,
         those functions are executed remotely directly.
 
-        Note that an explicit [`app.run()`](https://modal.com/docs/reference/modal.App#run) is not needed, as an
+        Note that an explicit [`app.run()`](https://modal.com/docs/sdk/py/latest/modal.App#run) is not needed, as an
         [app](https://modal.com/docs/guide/apps) is automatically created for you.
 
         Args:
@@ -1066,7 +1066,7 @@ class _App:
         max_inputs: int | None = None,
     ) -> Callable[[CLS_T | _PartialFunction], CLS_T]:
         """
-        Decorator to register a new Modal [Cls](https://modal.com/docs/reference/modal.Cls) with this App.
+        Decorator to register a new Modal [Cls](https://modal.com/docs/sdk/py/latest/modal.Cls) with this App.
 
         Args:
             image: The image to run as the container for the class service.
@@ -1290,6 +1290,7 @@ class _App:
         scaleup_window: int | None = None,  # Stabilization window (seconds) of sustained demand before scaling up
         scaledown_window: int | None = None,  # Max idle time before scaling down (seconds)
         proxy: _Proxy | None = None,  # Modal Proxy to use in front of this server
+        unauthenticated: bool = False,  # Whether the endpoint requires proxy authentication, required by default.
         port: int = 8000,  # Port the HTTP server listens on
         startup_timeout: int = 30,  # Maximum startup time in seconds
         exit_grace_period: int = 0,  # Grace period for in-flight requests on shutdown
@@ -1334,10 +1335,11 @@ class _App:
             scaledown_window: Max idle time before scaling down (seconds).
             proxy: Modal Proxy to use in front of this server.
             port: Port the HTTP server listens on.
+            unauthenticated: Whether the endpoint requires proxy authentication, required by default.
             startup_timeout: Maximum startup time in seconds.
             exit_grace_period: Grace period for in-flight requests on shutdown.
             routing_region: Region to route Server requests through.
-            h2_enabled: Enable HTTP/2 in the container.
+            h2_enabled: Enable HTTP/2.
             target_concurrency: Target concurrency for the server; 0 disables autoscaling.
             cloud: Cloud provider (aws, gcp, oci, auto).
             region: Region(s) to run on.
@@ -1385,6 +1387,7 @@ class _App:
             startup_timeout=startup_timeout,
             exit_grace_period=exit_grace_period,
             h2_enabled=h2_enabled,
+            unauthenticated=unauthenticated,
         )
 
         # Build secrets list

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/app.pyi

@@ -494,7 +494,7 @@ class _App:
         Modal functions can also be used as CLI entrypoints, but unlike `local_entrypoint`,
         those functions are executed remotely directly.
 
-        Note that an explicit [`app.run()`](https://modal.com/docs/reference/modal.App#run) is not needed, as an
+        Note that an explicit [`app.run()`](https://modal.com/docs/sdk/py/latest/modal.App#run) is not needed, as an
         [app](https://modal.com/docs/guide/apps) is automatically created for you.
 
         Args:
@@ -683,7 +683,7 @@ class _App:
         _experimental_restrict_output: bool = False,
         max_inputs: typing.Optional[int] = None,
     ) -> collections.abc.Callable[[typing.Union[CLS_T, modal._partial_function._PartialFunction]], CLS_T]:
-        """Decorator to register a new Modal [Cls](https://modal.com/docs/reference/modal.Cls) with this App.
+        """Decorator to register a new Modal [Cls](https://modal.com/docs/sdk/py/latest/modal.Cls) with this App.
 
         Args:
             image: The image to run as the container for the class service.
@@ -751,6 +751,7 @@ class _App:
         scaleup_window: typing.Optional[int] = None,
         scaledown_window: typing.Optional[int] = None,
         proxy: typing.Optional[modal.proxy._Proxy] = None,
+        unauthenticated: bool = False,
         port: int = 8000,
         startup_timeout: int = 30,
         exit_grace_period: int = 0,
@@ -795,10 +796,11 @@ class _App:
             scaledown_window: Max idle time before scaling down (seconds).
             proxy: Modal Proxy to use in front of this server.
             port: Port the HTTP server listens on.
+            unauthenticated: Whether the endpoint requires proxy authentication, required by default.
             startup_timeout: Maximum startup time in seconds.
             exit_grace_period: Grace period for in-flight requests on shutdown.
             routing_region: Region to route Server requests through.
-            h2_enabled: Enable HTTP/2 in the container.
+            h2_enabled: Enable HTTP/2.
             target_concurrency: Target concurrency for the server; 0 disables autoscaling.
             cloud: Cloud provider (aws, gcp, oci, auto).
             region: Region(s) to run on.
@@ -1495,7 +1497,7 @@ class App:
         Modal functions can also be used as CLI entrypoints, but unlike `local_entrypoint`,
         those functions are executed remotely directly.
 
-        Note that an explicit [`app.run()`](https://modal.com/docs/reference/modal.App#run) is not needed, as an
+        Note that an explicit [`app.run()`](https://modal.com/docs/sdk/py/latest/modal.App#run) is not needed, as an
         [app](https://modal.com/docs/guide/apps) is automatically created for you.
 
         Args:
@@ -1684,7 +1686,7 @@ class App:
         _experimental_restrict_output: bool = False,
         max_inputs: typing.Optional[int] = None,
     ) -> collections.abc.Callable[[typing.Union[CLS_T, modal.partial_function.PartialFunction]], CLS_T]:
-        """Decorator to register a new Modal [Cls](https://modal.com/docs/reference/modal.Cls) with this App.
+        """Decorator to register a new Modal [Cls](https://modal.com/docs/sdk/py/latest/modal.Cls) with this App.
 
         Args:
             image: The image to run as the container for the class service.
@@ -1752,6 +1754,7 @@ class App:
         scaleup_window: typing.Optional[int] = None,
         scaledown_window: typing.Optional[int] = None,
         proxy: typing.Optional[modal.proxy.Proxy] = None,
+        unauthenticated: bool = False,
         port: int = 8000,
         startup_timeout: int = 30,
         exit_grace_period: int = 0,
@@ -1794,10 +1797,11 @@ class App:
             scaledown_window: Max idle time before scaling down (seconds).
             proxy: Modal Proxy to use in front of this server.
             port: Port the HTTP server listens on.
+            unauthenticated: Whether the endpoint requires proxy authentication, required by default.
             startup_timeout: Maximum startup time in seconds.
             exit_grace_period: Grace period for in-flight requests on shutdown.
             routing_region: Region to route Server requests through.
-            h2_enabled: Enable HTTP/2 in the container.
+            h2_enabled: Enable HTTP/2.
             target_concurrency: Target concurrency for the server; 0 disables autoscaling.
             cloud: Cloud provider (aws, gcp, oci, auto).
             region: Region(s) to run on.

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/billing.pyi

@@ -134,7 +134,7 @@ class __workspace_billing_report_spec(typing_extensions.Protocol):
         case, we recommend leaving a buffer after the end of the query interval.
 
         It's also possible to generate reports using the
-        [`modal billing report`](https://modal.com/docs/reference/cli/billing) CLI command. The CLI
+        [`modal billing report`](https://modal.com/docs/cli/latest/billing) CLI command. The CLI
         has a few convenience features for generating reports across relative time ranges.
         """
         ...
@@ -176,7 +176,7 @@ class __workspace_billing_report_spec(typing_extensions.Protocol):
         case, we recommend leaving a buffer after the end of the query interval.
 
         It's also possible to generate reports using the
-        [`modal billing report`](https://modal.com/docs/reference/cli/billing) CLI command. The CLI
+        [`modal billing report`](https://modal.com/docs/cli/latest/billing) CLI command. The CLI
         has a few convenience features for generating reports across relative time ranges.
         """
         ...

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/cli/_help.py

@@ -98,7 +98,7 @@ def _build_epilog(cmd: click.Command) -> RenderableType | None:
     return Text(cmd.epilog)
 
 
-def _group_commands_by_panel(group: click.Group) -> dict[str, list[tuple[str, click.Command]]]:
+def group_commands_by_panel(group: click.Group) -> dict[str, list[tuple[str, click.Command]]]:
     """Bucket visible subcommands, preserving registration order."""
     panels: dict[str, list[tuple[str, click.Command]]] = {}
     for name, sub in group.commands.items():
@@ -109,7 +109,7 @@ def _group_commands_by_panel(group: click.Group) -> dict[str, list[tuple[str, cl
 
 
 def _build_commands(group: click.Group, available_width: int) -> RenderableType | None:
-    panels = _group_commands_by_panel(group)
+    panels = group_commands_by_panel(group)
     if not panels:
         return None
 
@@ -229,7 +229,7 @@ class ModalGroup(click.Group):
     def format_commands(self, ctx: click.Context, formatter: click.HelpFormatter) -> None:
         # Replaces click's single flat "Commands:" section with one section per
         # panel so the simple-style help output still preserves grouping.
-        for panel_name, items in _group_commands_by_panel(self).items():
+        for panel_name, items in group_commands_by_panel(self).items():
             rows = [(name, sub.get_short_help_str(limit=80)) for name, sub in items]
             with formatter.section(panel_name):
                 formatter.write_dl(rows)

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/cli/billing.py

@@ -107,7 +107,7 @@ async def report(
     or by requesting a date range using `--for` (e.g., `--for today`, `--for 'last month'`).
 
     This command provides a CLI frontend for the
-    [`Workspace.billing.report`](https://modal.com/docs/reference/modal.Workspace#billingreport) API.
+    [`Workspace.billing.report`](https://modal.com/docs/sdk/py/latest/modal.Workspace#billingreport) API.
 
     Note that, as with the API, the start date is inclusive and the end date is exclusive.
     Data will be reported for full intervals only. Using `--for` is a convenient way to define a

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/cli/changelog.py

@@ -10,7 +10,7 @@ from modal._vendor.version import Version
 
 from ._help import ModalCommand
 
-CHANGELOG_URL = "https://modal.com/docs/reference/changelog.md"
+CHANGELOG_URL = "https://modal.com/docs/sdk/py/changelog.md"
 
 
 @dataclass

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/cli/config.py

@@ -14,7 +14,7 @@ config_cli = ModalGroup(
     help="""
     Manage client configuration for the current profile.
 
-    Refer to https://modal.com/docs/reference/modal.config for a full explanation
+    Refer to https://modal.com/docs/sdk/py/latest/modal.config for a full explanation
     of what these options mean, and how to set them.
     """,
 )

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/cli/environment.py

@@ -230,7 +230,8 @@ async def environment_billing(
     or by requesting a date range using `--for` (e.g., `--for today`, `--for 'last month'`).
 
     This command provides a CLI frontend for the
-    [`Environment.billing.report`](https://modal.com/docs/reference/modal.Environment#billingreport) API.
+    [`Environment.billing.report`](https://modal.com/docs/sdk/py/latest/modal.Environment#billingreport)
+    API.
 
     Note that, as with the API, the start date is inclusive and the end date is exclusive.
     Data will be reported for full intervals only. Using `--for` is a convenient way to define a

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/cli/shell.py

@@ -358,7 +358,7 @@ def shell(
     modal shell hello_world.py::my_function
     ```
 
-    Or, if you're using a [modal.Cls](https://modal.com/docs/reference/modal.Cls)
+    Or, if you're using a [modal.Cls](https://modal.com/docs/sdk/py/latest/modal.Cls)
     you can refer to a `@modal.method` directly:
 
     ```

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/client.py

@@ -235,7 +235,7 @@ class _Client:
             else:
                 raise AuthError(
                     "Token missing. Could not authenticate client."
-                    " If you have token credentials, see modal.com/docs/reference/modal.config for setup help."
+                    " If you have token credentials, see modal.com/docs/sdk/py/latest/modal.config for setup help."
                     " If you are a new user, register an account at modal.com, then run `modal token new`."
                 )
 

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/client.pyi

@@ -35,7 +35,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.1.dev8",
+        version: str = "1.5.1.dev9",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -205,7 +205,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.1.dev8",
+        version: str = "1.5.1.dev9",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/cls.py

@@ -446,10 +446,10 @@ Obj = synchronize_api(_Obj)
 class _Cls(_Object, type_prefix="cs"):
     """
     Cls adds method pooling and [lifecycle hook](https://modal.com/docs/guide/lifecycle-functions) behavior
-    to [modal.Function](https://modal.com/docs/reference/modal.Function).
+    to [modal.Function](https://modal.com/docs/sdk/py/latest/modal.Function).
 
     Generally, you will not construct a Cls directly.
-    Instead, use the [`@app.cls()`](https://modal.com/docs/reference/modal.App#cls) decorator on the App object.
+    Instead, use the [`@app.cls()`](https://modal.com/docs/sdk/py/latest/modal.App#cls) decorator on the App object.
     """
 
     _class_service_function: _Function | None  # The _Function (read "service") serving *all* methods of the class

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/cls.pyi

@@ -241,10 +241,10 @@ class Obj:
 
 class _Cls(modal._object._Object):
     """Cls adds method pooling and [lifecycle hook](https://modal.com/docs/guide/lifecycle-functions) behavior
-    to [modal.Function](https://modal.com/docs/reference/modal.Function).
+    to [modal.Function](https://modal.com/docs/sdk/py/latest/modal.Function).
 
     Generally, you will not construct a Cls directly.
-    Instead, use the [`@app.cls()`](https://modal.com/docs/reference/modal.App#cls) decorator on the App object.
+    Instead, use the [`@app.cls()`](https://modal.com/docs/sdk/py/latest/modal.App#cls) decorator on the App object.
     """
 
     _class_service_function: typing.Optional[modal._functions._Function]
@@ -444,10 +444,10 @@ class _Cls(modal._object._Object):
 
 class Cls(modal.object.Object):
     """Cls adds method pooling and [lifecycle hook](https://modal.com/docs/guide/lifecycle-functions) behavior
-    to [modal.Function](https://modal.com/docs/reference/modal.Function).
+    to [modal.Function](https://modal.com/docs/sdk/py/latest/modal.Function).
 
     Generally, you will not construct a Cls directly.
-    Instead, use the [`@app.cls()`](https://modal.com/docs/reference/modal.App#cls) decorator on the App object.
+    Instead, use the [`@app.cls()`](https://modal.com/docs/sdk/py/latest/modal.App#cls) decorator on the App object.
     """
 
     _class_service_function: typing.Optional[modal.functions.Function]

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/exception.py

@@ -47,7 +47,7 @@ UserCodeException = synchronicity.exceptions.UserCodeException  # Deprecated typ
 
 class Error(Exception):
     """
-    Base class for all Modal errors. See [`modal.exception`](https://modal.com/docs/reference/modal.exception)
+    Base class for all Modal errors. See [`modal.exception`](https://modal.com/docs/sdk/py/latest/modal.exception)
     for the specialized error classes.
 
     Examples:

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/functions.pyi

@@ -617,9 +617,9 @@ class Function(
                 **kwargs: Keyword arguments forwarded to the remote function.
 
             Returns:
-                A [`modal.FunctionCall`](https://modal.com/docs/reference/modal.FunctionCall) object
+                A [`modal.FunctionCall`](https://modal.com/docs/sdk/py/latest/modal.FunctionCall) object
                 that can later be polled or waited for using
-                [`.get(timeout=...)`](https://modal.com/docs/reference/modal.FunctionCall#get).
+                [`.get(timeout=...)`](https://modal.com/docs/sdk/py/latest/modal.FunctionCall#get).
             """
             ...
 
@@ -633,9 +633,9 @@ class Function(
                 **kwargs: Keyword arguments forwarded to the remote function.
 
             Returns:
-                A [`modal.FunctionCall`](https://modal.com/docs/reference/modal.FunctionCall) object
+                A [`modal.FunctionCall`](https://modal.com/docs/sdk/py/latest/modal.FunctionCall) object
                 that can later be polled or waited for using
-                [`.get(timeout=...)`](https://modal.com/docs/reference/modal.FunctionCall#get).
+                [`.get(timeout=...)`](https://modal.com/docs/sdk/py/latest/modal.FunctionCall#get).
             """
             ...
 
@@ -1031,7 +1031,7 @@ class FunctionCall(typing.Generic[modal._functions.ReturnType], modal.object.Obj
             """Returns a structure representing the call graph from a given root
             call ID, along with the status of execution for each node.
 
-            See [`modal.call_graph`](https://modal.com/docs/reference/modal.call_graph) reference page
+            See [`modal.call_graph`](https://modal.com/docs/sdk/py/latest/modal.call_graph) reference page
             for documentation on the structure of the returned `InputInfo` items.
 
             Returns:
@@ -1043,7 +1043,7 @@ class FunctionCall(typing.Generic[modal._functions.ReturnType], modal.object.Obj
             """Returns a structure representing the call graph from a given root
             call ID, along with the status of execution for each node.
 
-            See [`modal.call_graph`](https://modal.com/docs/reference/modal.call_graph) reference page
+            See [`modal.call_graph`](https://modal.com/docs/sdk/py/latest/modal.call_graph) reference page
             for documentation on the structure of the returned `InputInfo` items.
 
             Returns:
@@ -1056,7 +1056,7 @@ class FunctionCall(typing.Generic[modal._functions.ReturnType], modal.object.Obj
     class __cancel_spec(typing_extensions.Protocol):
         def __call__(self, /, terminate_containers: bool = False):
             """Cancels the function call, which will stop its execution and mark its inputs as
-            [`TERMINATED`](https://modal.com/docs/reference/modal.call_graph#modalcall_graphinputstatus).
+            [`TERMINATED`](https://modal.com/docs/sdk/py/latest/modal.call_graph#modalcall_graphinputstatus).
 
             If `terminate_containers=True` - the containers running the cancelled inputs are all terminated
             causing any non-cancelled inputs on those containers to be rescheduled in new containers.
@@ -1068,7 +1068,7 @@ class FunctionCall(typing.Generic[modal._functions.ReturnType], modal.object.Obj
 
         async def aio(self, /, terminate_containers: bool = False):
             """Cancels the function call, which will stop its execution and mark its inputs as
-            [`TERMINATED`](https://modal.com/docs/reference/modal.call_graph#modalcall_graphinputstatus).
+            [`TERMINATED`](https://modal.com/docs/sdk/py/latest/modal.call_graph#modalcall_graphinputstatus).
 
             If `terminate_containers=True` - the containers running the cancelled inputs are all terminated
             causing any non-cancelled inputs on those containers to be rescheduled in new containers.

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/partial_function.pyi

@@ -169,7 +169,7 @@ def wsgi_app(
     Web Server Gateway Interface (WSGI) is a standard for synchronous Python web apps.
     It has been [succeeded by the ASGI interface](https://asgi.readthedocs.io/en/latest/introduction.html#wsgi-compatibility)
     which is compatible with ASGI and supports additional functionality such as web sockets.
-    Modal supports ASGI via [`asgi_app`](https://modal.com/docs/reference/modal.asgi_app).
+    Modal supports ASGI via [`asgi_app`](https://modal.com/docs/sdk/py/latest/modal.asgi_app).
 
     Examples:
         ```python

{modal-1.5.1.dev8 → modal-1.5.1.dev9}/modal/runner.py

@@ -149,8 +149,22 @@ async def _create_all_objects(
     resolver = Resolver()
     output_mgr = OutputManager.get()
     with output_mgr.display_object_tree():
-        # Get current objects, and reset all objects
-        tag_to_object_id = {**running_app.function_ids, **running_app.class_ids}
+        # Get current objects, and reset all objects.
+        # Only reuse an existing object id when its type matches the object now being
+        # deployed under that tag. The server tracks function and class ids separately,
+        # so a tag that previously named a Function (fu-) but now names a Cls (cs-), or
+        # vice versa, finds no match here and gets a fresh id instead of failing. The old
+        # object is no longer referenced and is cleaned up when the new layout is published.
+        tag_to_object_id = {}
+        for tag, obj in indexed_objects.items():
+            if isinstance(obj, _Function):
+                existing_object_id = running_app.function_ids.get(tag)
+            elif isinstance(obj, _Cls):
+                existing_object_id = running_app.class_ids.get(tag)
+            else:
+                existing_object_id = None
+            if existing_object_id is not None:
+                tag_to_object_id[tag] = existing_object_id
         running_app.function_ids = {}
         running_app.class_ids = {}
 
@@ -170,16 +184,6 @@ async def _create_all_objects(
             # Note: preload only currently implemented for Functions, returns None otherwise
             # this is to ensure that directly referenced functions from the global scope has
             # ids associated with them when they are serialized into other functions
-            if existing_object_id is not None and not obj._is_id_type(existing_object_id):
-                expected_type = obj.__class__.__name__.strip("_")
-                expected_prefix = getattr(obj.__class__, "_type_prefix", None)
-                prefix_hint = f" (expected prefix {expected_prefix}-)" if expected_prefix else ""
-                raise InvalidError(
-                    f"Existing object id {existing_object_id} is not a {expected_type} id{prefix_hint}. "
-                    "This usually means the object name was previously used for a different type. "
-                    "Rename the object/app or stop the previous deployment and redeploy."
-                )
-
             await resolver.preload(obj, load_context, existing_object_id)
             if obj.is_hydrated:
                 tag_to_object_id[tag] = obj.object_id