modal 1.6.4.dev10__tar.gz → 1.6.4.dev11__tar.gz

{modal-1.6.4.dev10 → modal-1.6.4.dev11}/PKG-INFO

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

{modal-1.6.4.dev10 → modal-1.6.4.dev11}/modal/__init__.py

@@ -1,4 +1,5 @@
 # Copyright Modal Labs 2022
+import os
 import sys
 
 if sys.version_info[:2] < (3, 10):
@@ -59,6 +60,16 @@ except Exception:
     print()
     raise
 
+if sys.version_info[:2] == (3, 10) and os.environ.get("MODAL_IS_REMOTE") != "1":
+    from ._utils.deprecation import deprecation_warning
+
+    deprecation_warning(
+        (2026, 11, 4),
+        "Python 3.10 is EOL and Modal will not support it in version 1.7.0. "
+        "Please upgrade your local Python to 3.11 or later.",
+        show_source=False,
+    )
+
 
 __all__ = [
     "__version__",

{modal-1.6.4.dev10 → modal-1.6.4.dev11}/modal/_function_variants.py

@@ -408,6 +408,7 @@ def _make_function_variant(
         if not base_function._is_hydrated:
             await base_function.hydrate(load_context.client)
 
+        base_function._check_not_observability_only()
         assert base_function._client and base_function._client._stub
 
         if parameter_schema is None:

{modal-1.6.4.dev10 → modal-1.6.4.dev11}/modal/_functions.py

@@ -119,6 +119,15 @@ if TYPE_CHECKING:
     import modal.functions
 
 MAX_INTERNAL_FAILURE_COUNT = 8
+_OBSERVABILITY_ONLY_APIS = (
+    ".logs",
+    ".metrics",
+    ".info()",
+    ".stats()",
+    ".get_current_stats()",
+    ".get_web_url()",
+    ".autoscaler.settings()",
+)
 TERMINAL_STATUSES = (
     api_pb2.GenericResult.GENERIC_STATUS_SUCCESS,
     api_pb2.GenericResult.GENERIC_STATUS_TERMINATED,
@@ -651,6 +660,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
     _base_function: "_Function | None" = None
     _app_id: str | None = None
     _function_info: FunctionInfo | None = None
+    _is_observability_only: bool = False
 
     async def _get_log_query_data(self) -> _LogQueryData:
         await self.hydrate()
@@ -1398,6 +1408,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
 
         """
 
+        self._check_not_observability_only()
         deprecation_warning(
             (2026, 10, 16),
             "`Function.update_autoscaler()` is deprecated and will be removed in a future version "
@@ -1485,16 +1496,15 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                 # refine the error message
                 msg = f"Lookup failed for {called_from} '{function_id}': {exc}."
                 raise NotFoundError(msg) from None
-            if called_from == "Function" and (response.function.is_server or response.function.is_class):
-                if response.function.is_server:
-                    raise InvalidError(f"{function_id} is a Server. Use \n ``modal.Server.from_id('{function_id}')``")
-                raise InvalidError(f"{function_id} is a Cls and cannot be loaded with Function.from_id().")
+            if called_from == "Function" and response.function.is_server:
+                raise InvalidError(f"{function_id} is a Server. Use \n ``modal.Server.from_id('{function_id}')``")
             if called_from == "Server" and not response.function.is_server:
                 if response.function.is_class:
                     raise InvalidError(f"{function_id} is a Cls and cannot be loaded with Server.from_id().")
                 raise InvalidError(f"{function_id} is a Function. Use \n ``modal.Function.from_id('{function_id}')``")
             self._hydrate(function_id, load_context.client, response.handle_metadata)
             self._function_info = FunctionInfo._from_function_proto(response.function)
+            self._is_observability_only = called_from == "Function" and response.function.is_class
 
         rep = f"modal.Function.from_id('{function_id}')"
         return cls._from_loader(
@@ -1514,6 +1524,11 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         object with metadata from Modal servers until the first
         time it is actually used.
 
+        If the ID belongs to a Cls, the Function only supports the following APIs:
+        `.logs`, `.metrics`, `.info()`, `.stats()`, `.get_current_stats()`,
+        `.get_web_url()` and `.autoscaler.settings()`. Use `modal.Cls.from_name(...)`
+        to invoke all other methods.
+
         Args:
             function_id: ID of the function.
             client: Modal client to use; defaults to `Client.from_env()` when omitted.
@@ -1744,6 +1759,18 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                 + f"or call it locally: {self._function_name}.local()"
             )
 
+    def _check_not_observability_only(self):
+        if self._is_observability_only:
+            assert self._function_name
+            class_name = self._function_name.removesuffix(".*")
+            apis = [f"`{name}`" for name in _OBSERVABILITY_ONLY_APIS]
+            allowed_apis = ", ".join(apis[:-1]) + " and " + apis[-1]
+            raise InvalidError(
+                f"`{self.object_id}` belongs to the Cls `{class_name}`. A Function loaded with "
+                f"`Function.from_id` only supports {allowed_apis}. "
+                "Use `modal.Cls.from_name(...)` to invoke all other methods."
+            )
+
     @live_method
     async def get_web_url(self) -> str | None:
         """URL for addressing a Web Function via HTTP.
@@ -1779,6 +1806,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         config_method_name: str,
     ) -> "_Function[P, ReturnType, OriginalReturnType]":
         base_function = self._base_function or self
+        base_function._check_not_observability_only()
         combined_options = self._options.merge_options(new_options)
 
         # For "True Functions" (i.e. not the Function inside a Cls), we will use
@@ -1941,6 +1969,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         _SynchronizedQueue is used instead of asyncio.Queue so that the main thread can put
         items in the queue safely.
         """
+        self._check_not_observability_only()
         self._check_no_web_url("map")
         if self._is_generator:
             raise InvalidError("A generator function cannot be called with `.map(...)`.")
@@ -1978,6 +2007,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
 
     @live_method
     async def _spawn_map(self, input_queue: _SynchronizedQueue) -> "_FunctionCall[ReturnType]":
+        self._check_not_observability_only()
         self._check_no_web_url("spawn_map")
         if self._is_generator:
             raise InvalidError("A generator function cannot be called with `.spawn_map(...)`.")
@@ -1995,6 +2025,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         return fc
 
     async def _call_function(self, args, kwargs) -> ReturnType:
+        self._check_not_observability_only()
         invocation: _Invocation | _InputPlaneInvocation
         if self._input_plane_url:
             invocation = await _InputPlaneInvocation.create(
@@ -2024,6 +2055,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         function_call_invocation_type: "api_pb2.FunctionCallInvocationType.ValueType",
         from_spawn_map: bool = False,
     ) -> _Invocation:
+        self._check_not_observability_only()
         return await _Invocation.create(
             self,
             args,
@@ -2037,6 +2069,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
     @live_method_gen
     @synchronizer.no_input_translation
     async def _call_generator(self, args, kwargs):
+        self._check_not_observability_only()
         invocation: _Invocation | _InputPlaneInvocation
         if self._input_plane_url:
             invocation = await _InputPlaneInvocation.create(
@@ -2093,6 +2126,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             Values produced by the remote generator.
         """
         # TODO: Generics/TypeVars
+        self._check_not_observability_only()
         self._check_no_web_url("remote_gen")
 
         if not self._is_generator:
@@ -2669,6 +2703,7 @@ class _FunctionAutoscalerManager:
         if not self._function._is_hydrated:
             await self._function.hydrate()
 
+        self._function._check_not_observability_only()
         settings: api_pb2.AutoscalerSettings = api_pb2.AutoscalerSettings()
 
         if min_containers != UNSET_PARAMETER:

{modal-1.6.4.dev10 → modal-1.6.4.dev11}/modal/_image.py

@@ -37,6 +37,7 @@ from ._serialization import get_preferred_payload_format, serialize
 from ._supports_logs import _ImageLogQueryData
 from ._utils.async_utils import TaskContext, deprecate_aio_usage, synchronizer
 from ._utils.blob_utils import MAX_OBJECT_SIZE_BYTES
+from ._utils.deprecation import deprecation_warning
 from ._utils.docker_utils import (
     extract_copy_command_patterns,
     find_dockerignore_file,
@@ -87,6 +88,23 @@ SUPPORTED_PYTHON_SERIES: dict[ImageBuilderVersion, list[str]] = {
     "2023.12": ["3.10", "3.11", "3.12"],
 }
 
+
+def _uses_python_310(metadata: api_pb2.ImageMetadata | None) -> bool:
+    return metadata is not None and bool(re.match(r"Python 3\.10\.", metadata.python_version_info))
+
+
+def _warn_if_python_310(image_id: str, metadata: api_pb2.ImageMetadata | None) -> None:
+    if _uses_python_310(metadata):
+        deprecation_warning(
+            (2026, 11, 4),
+            f"Image {image_id} uses Python 3.10, which is EOL. Modal 1.7.0 and later will not run or deploy apps "
+            "that use Images with Python 3.10; apps already deployed with older clients keep working. "
+            "Please update the Image to use Python 3.11 or later "
+            "(e.g. via `python_version=` or `add_python=`).",
+            show_source=False,
+        )
+
+
 LOCAL_REQUIREMENTS_DIR = Path(__file__).parent / "builder"
 CONTAINER_REQUIREMENTS_PATH = "/modal_requirements.txt"
 
@@ -877,6 +895,8 @@ class _Image(_Object, type_prefix="im"):
                 raise ImageBuildError("Unknown status %s!" % result.status, image_id)
 
             self._hydrate(image_id, load_context.client, metadata)
+            if not any(_uses_python_310(base._metadata) for base in base_images.values()):
+                _warn_if_python_310(image_id, metadata)
             local_mounts: set[_Mount] = set()
             for base in base_images.values():
                 local_mounts |= base._serve_mounts
@@ -1098,6 +1118,7 @@ class _Image(_Object, type_prefix="im"):
         async def _load(self: _Image, resolver: Resolver, load_context: LoadContext, existing_object_id: str | None):
             resp = await load_context.client._stub.ImageFromId(api_pb2.ImageFromIdRequest(image_id=image_id))
             self._hydrate(resp.image_id, load_context.client, resp.metadata)
+            _warn_if_python_310(resp.image_id, resp.metadata)
 
         rep = f"Image.from_id({image_id!r})"
 

{modal-1.6.4.dev10 → modal-1.6.4.dev11}/modal/_type_manager.py

@@ -1,4 +1,5 @@
 # Copyright Modal Labs 2025
+import types
 import typing
 from typing import Any
 
@@ -186,6 +187,12 @@ class SchemaRegistry:
 
     def get_proto_generic_type(self, declared_type: type):
         if origin := typing_extensions.get_origin(declared_type):
+            if origin in (typing.Union, types.UnionType):
+                args = [arg for arg in typing_extensions.get_args(declared_type) if arg is not type(None)]
+                if len(args) == 1:
+                    return self.get_proto_generic_type(args[0])
+                return unknown_type_schema(declared_type)
+
             base_type = origin
         else:
             base_type = declared_type

{modal-1.6.4.dev10 → modal-1.6.4.dev11}/modal/_utils/name_utils.py

@@ -16,6 +16,13 @@ def replace_invalid_subdomain_chars(label: str) -> str:
     return re.sub("[^a-z0-9-]", "-", label.lower())
 
 
+app_id_regex = re.compile("^ap-[a-zA-Z0-9]{22}$")
+
+
+def is_app_id(identifier: str) -> bool:
+    return app_id_regex.match(identifier) is not None
+
+
 def is_valid_object_name(name: str) -> bool:
     return (
         # Limit object name length
@@ -23,7 +30,7 @@ def is_valid_object_name(name: str) -> bool:
         # Limit character set
         and re.match("^[a-zA-Z0-9-_.]+$", name) is not None
         # Avoid collisions with App IDs
-        and re.match("^ap-[a-zA-Z0-9]{22}$", name) is None
+        and not is_app_id(name)
     )
 
 

{modal-1.6.4.dev10 → modal-1.6.4.dev11}/modal/cli/profile.py

@@ -5,11 +5,12 @@ import os
 from contextlib import suppress
 
 import click
-from rich.json import JSON
-from rich.table import Table
+from rich.box import SIMPLE_HEAD
+from rich.text import Text
 
 from modal import config as config_module
 from modal._utils.async_utils import synchronizer
+from modal.cli.utils import display_table
 from modal.config import (
     Config,
     _lookup_workspace,
@@ -28,7 +29,7 @@ profile_cli = ModalGroup(name="profile", help="Switch between Modal profiles.")
 @profile_cli.command("list", help="Show all Modal profiles and highlight the active one.")
 @click.option("--json", is_flag=True, default=False)
 @synchronizer.create_blocking
-async def list_(json: bool | None = False):
+async def list_(json: bool = False):
     config = Config()
     profiles = config_profiles()
     lookup_coros = [
@@ -44,22 +45,6 @@ async def list_(json: bool | None = False):
     ]
     responses = await asyncio.gather(*lookup_coros, return_exceptions=True)
 
-    rows = []
-    for profile, resp in zip(profiles, responses):
-        active = profile == config_module._profile
-        if isinstance(resp, AuthError):
-            workspace = "Unknown (authentication failure)"
-        elif isinstance(resp, TimeoutError):
-            workspace = "Unknown (timed out)"
-        elif isinstance(resp, Exception):
-            # Catch-all for other exceptions, like incorrect server url
-            workspace = "Unknown (profile misconfigured)"
-        else:
-            assert not isinstance(resp, BaseException)
-            workspace = resp.username
-        content = ["•" if active else "", profile, workspace]
-        rows.append((active, content))
-
     env_based_workspace: str | None = None
     credential_env_vars = (
         "MODAL_TOKEN_ID",
@@ -87,18 +72,44 @@ async def list_(json: bool | None = False):
 
     output = OutputManager.get()
     highlight = "bold green" if env_based_workspace is None else "yellow"
-    if json:
-        json_data = []
-        for active, content in rows:
-            json_data.append({"name": content[1], "workspace": content[2], "active": active})
-        output.print(JSON.from_data(json_data))
+
+    if not json:
+        table_columns = ["  Profile", "Workspace"]
     else:
-        table = Table(" ", "Profile", "Workspace")
-        for active, content in rows:
-            table.add_row(*content, style=highlight if active else "dim")
-        output.print(table)
+        table_columns = ["name", "workspace", "active"]
+
+    table_rows: list[list[str | Text | bool]] = []
+    for profile, resp in zip(profiles, responses):
+        active = profile == config_module._profile
+
+        if isinstance(resp, AuthError):
+            workspace = "Unknown (authentication failure)"
+        elif isinstance(resp, TimeoutError):
+            workspace = "Unknown (timed out)"
+        elif isinstance(resp, Exception):
+            # Catch-all for other exceptions, like incorrect server url
+            workspace = "Unknown (profile misconfigured)"
+        else:
+            assert not isinstance(resp, BaseException)
+            workspace = resp.username
+
+        if json:
+            table_rows.append([profile, workspace, active])
+            continue
+
+        rendered_profile = f"• {profile}" if active else f"  {profile}"
+        style = highlight if active else "dim"
+
+        table_rows.append(
+            [
+                Text(rendered_profile, style=style),
+                Text(workspace, style=style),
+            ]
+        )
+
+    display_table(table_columns, table_rows, json=json, table_box=SIMPLE_HEAD)
 
-    if env_based_workspace is not None:
+    if not json and env_based_workspace is not None:
         output.print(
             f"[yellow]Using [bold]{env_based_workspace}[/bold] workspace based on environment variables[/yellow]"
         )

{modal-1.6.4.dev10 → modal-1.6.4.dev11}/modal/cli/token.py

@@ -70,18 +70,7 @@ async def info():
         output.print(f"[bold]Expires at:[/bold] [white]{expires_dt.strftime('%Y-%m-%d %H:%M:%S %Z')}[/white]")
 
 
-@token_cli.command("new")
-@click.option("--activate/--no-activate", default=True, help=_ACTIVATE_HELP)
-@click.option("--verify/--no-verify", default=True, help=_VERIFY_HELP)
-@click.option(
-    "--expires-in",
-    default=None,
-    help="Lifetime of the new token, e.g. 12h, 7d, or 90d. Defaults to the workspace's maximum allowed lifetime.",
-)
-@click.option("--source", default=None, hidden=True)
-@synchronizer.create_blocking
-async def new(activate: bool, verify: bool, expires_in: str | None, source: str | None):
-    """Create a new token by using an authenticated web session."""
+def _validate_expires_in(expires_in: str | None) -> int | None:
     expires_in_seconds: int | None = None
     if expires_in is not None:
         try:
@@ -94,7 +83,74 @@ async def new(activate: bool, verify: bool, expires_in: str | None, source: str
             raise click.BadParameter("Duration must be positive.", param_hint="--expires-in")
         if expires_in_seconds > 2**32 - 1:
             raise click.BadParameter("Duration is too large.", param_hint="--expires-in")
-    await _new_token(activate=activate, verify=verify, source=source, expires_in_seconds=expires_in_seconds)
+
+    return expires_in_seconds
+
+
+@token_cli.command("new")
+@click.option("--activate/--no-activate", default=True, help=_ACTIVATE_HELP)
+@click.option("--verify/--no-verify", default=True, help=_VERIFY_HELP)
+@click.option(
+    "--expires-in",
+    default=None,
+    help="Lifetime of the new token, e.g. 12h, 7d, or 90d. Defaults to the workspace's maximum allowed lifetime.",
+)
+@click.option(
+    "--delete-existing",
+    default=False,
+    is_flag=True,
+    help="In addition to creating a new token, delete the existing token in the active profile",
+)
+@click.option("--source", default=None, hidden=True)
+@synchronizer.create_blocking
+async def new(
+    activate: bool,
+    verify: bool,
+    expires_in: str | None,
+    delete_existing: bool,
+    source: str | None,
+):
+    """Create a new token by using an authenticated web session."""
+
+    await _new_token(
+        activate=activate,
+        verify=verify,
+        source=source,
+        expires_in_seconds=_validate_expires_in(expires_in),
+        delete_existing=delete_existing,
+    )
+
+
+@token_cli.command("rotate")
+@click.option(
+    "--expires-in",
+    default=None,
+    help="Lifetime of the new token, e.g. 12h, 7d, or 90d. Defaults to the workspace's maximum allowed lifetime.",
+)
+@synchronizer.create_blocking
+async def rotate(expires_in: str | None):
+    """Create a new token in a web session, then delete the current token.
+
+    Note that this is equivalent to `modal token new --delete-existing --no-activate`. You may also
+    optionally provide a custom expiration window with `--expires-in`. If not provided, the token's
+    TTL will fall back to the workspace default.
+
+    Examples:
+
+    ```bash
+    modal token rotate
+
+    # Set a custom TTL of 1 week
+    modal token rotate --expires-in 7d
+    ```
+    """
+
+    await _new_token(
+        activate=False,
+        verify=True,
+        expires_in_seconds=_validate_expires_in(expires_in),
+        delete_existing=True,
+    )
 
 
 @token_cli.command("set")
@@ -102,12 +158,19 @@ async def new(activate: bool, verify: bool, expires_in: str | None, source: str
 @click.option("--token-secret", default=None, help="Account token secret.")
 @click.option("--activate/--no-activate", default=True, help=_ACTIVATE_HELP)
 @click.option("--verify/--no-verify", default=True, help=_VERIFY_HELP)
+@click.option(
+    "--delete-existing",
+    default=False,
+    is_flag=True,
+    help="In addition to setting a new token, delete the existing token in the active profile",
+)
 @synchronizer.create_blocking
 async def set(
     token_id: str | None,
     token_secret: str | None,
     activate: bool,
     verify: bool,
+    delete_existing: bool,
 ):
     """Set account credentials for connecting to Modal.
 
@@ -117,4 +180,10 @@ async def set(
         token_id = getpass.getpass("Token ID:")
     if token_secret is None:
         token_secret = getpass.getpass("Token secret:")
-    await _set_token(token_id, token_secret, activate=activate, verify=verify)
+    await _set_token(
+        token_id,
+        token_secret,
+        activate=activate,
+        verify=verify,
+        delete_existing=delete_existing,
+    )

{modal-1.6.4.dev10 → modal-1.6.4.dev11}/modal/client.py

@@ -360,6 +360,7 @@ class _Client:
                             "Run `modal profile list` to see available profiles, or "
                             f"`modal token new --profile {profile}` to configure it."
                         )
+
                     raise AuthError(
                         "Token missing. Could not authenticate client."
                         " If you have token credentials, see modal.com/docs/sdk/py/latest/config for setup help."

{modal-1.6.4.dev10 → modal-1.6.4.dev11}/modal/client.pyi

@@ -87,7 +87,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.6.4.dev10",
+        version: str = "1.6.4.dev11",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):
@@ -304,7 +304,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.6.4.dev10",
+        version: str = "1.6.4.dev11",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):

{modal-1.6.4.dev10 → modal-1.6.4.dev11}/modal/config.py

@@ -521,6 +521,7 @@ def _store_user_config(
     """Internal method, used by the CLI to set tokens."""
     if profile is None:
         profile = _profile
+
     user_config = _read_user_config()
     user_config.setdefault(profile, {}).update(**new_settings)
     if active_profile is not None:

{modal-1.6.4.dev10 → modal-1.6.4.dev11}/modal/functions.pyi

@@ -65,6 +65,7 @@ class Function(
     _base_function: typing.Optional[Function]
     _app_id: typing.Optional[str]
     _function_info: typing.Optional[modal.types.FunctionInfo]
+    _is_observability_only: bool
 
     def __init__(self, *args, **kwargs):
         """mdmd:hidden"""
@@ -319,6 +320,11 @@ class Function(
         object with metadata from Modal servers until the first
         time it is actually used.
 
+        If the ID belongs to a Cls, the Function only supports the following APIs:
+        `.logs`, `.metrics`, `.info()`, `.stats()`, `.get_current_stats()`,
+        `.get_web_url()` and `.autoscaler.settings()`. Use `modal.Cls.from_name(...)`
+        to invoke all other methods.
+
         Args:
             function_id: ID of the function.
             client: Modal client to use; defaults to `Client.from_env()` when omitted.
@@ -428,6 +434,7 @@ class Function(
     def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
     def _get_metadata(self): ...
     def _check_no_web_url(self, fn_name: str): ...
+    def _check_not_observability_only(self): ...
 
     class __get_web_url_spec(typing_extensions.Protocol):
         def __call__(self, /) -> typing.Optional[str]:
@@ -619,7 +626,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.
 
@@ -644,7 +651,7 @@ class Function(
             """
             ...
 
-    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]:
@@ -694,7 +701,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.
 
@@ -727,7 +734,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: ...
@@ -735,7 +742,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.
 
@@ -768,7 +775,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     @property
     def _raw_f_(self) -> collections.abc.Callable[..., typing.Any]: ...