modal 1.4.1.dev5__tar.gz → 1.4.2__tar.gz

{modal-1.4.1.dev5 → modal-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.4.1.dev5
+Version: 1.4.2
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License-Expression: Apache-2.0
@@ -23,7 +23,7 @@ Requires-Dist: grpclib<0.4.10,>=0.4.7; python_version < "3.14"
 Requires-Dist: grpclib<0.4.10,>=0.4.9; python_version >= "3.14"
 Requires-Dist: protobuf!=4.24.0,<7.0,>=3.19
 Requires-Dist: rich>=12.0.0
-Requires-Dist: synchronicity~=0.12.0
+Requires-Dist: synchronicity~=0.12.1
 Requires-Dist: toml
 Requires-Dist: typer>=0.9
 Requires-Dist: types-certifi

{modal-1.4.1.dev5 → modal-1.4.2}/modal/_functions.py

@@ -700,7 +700,6 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         ephemeral_disk: Optional[int] = None,
         include_source: bool = True,
         experimental_options: Optional[dict[str, str]] = None,
-        _experimental_proxy_ip: Optional[str] = None,
         restrict_output: bool = False,
         http_config: Optional[api_pb2.HTTPConfig] = None,
     ) -> "_Function":
@@ -1041,7 +1040,6 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                     # ---
                     _experimental_group_size=cluster_size or 0,  # Experimental: Clustered functions
                     _experimental_concurrent_cancellations=True,
-                    _experimental_proxy_ip=_experimental_proxy_ip,
                     # --- These are deprecated in favor of autoscaler_settings
                     warm_pool_size=min_containers or 0,
                     concurrency_limit=max_containers or 0,
@@ -1084,7 +1082,6 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                         _experimental_group_size=function_definition._experimental_group_size,
                         _experimental_buffer_containers=function_definition._experimental_buffer_containers,
                         _experimental_custom_scaling=function_definition._experimental_custom_scaling,
-                        _experimental_proxy_ip=function_definition._experimental_proxy_ip,
                         snapshot_debug=function_definition.snapshot_debug,
                         runtime_perf_record=function_definition.runtime_perf_record,
                         function_schema=function_schema,

{modal-1.4.1.dev5 → modal-1.4.2}/modal/_runtime/asgi.py

@@ -474,8 +474,11 @@ async def _proxy_lifespan_request(base_url, scope, receive, send) -> None:
                     auto_decompress=False,
                     read_bufsize=1024 * 1024,  # 1 MiB
                     connector=aiohttp.TCPConnector(
-                        limit=1000
-                    ),  # 100 is the default max, but 1000 is the max for `@modal.concurrent`.
+                        limit=1000,  # 100 is the default max, but 1000 is the max for `@modal.concurrent`.
+                        # Disable keep-alive connection reuse to avoid ServerDisconnectedError
+                        # from stale pooled connections.
+                        force_close=True,
+                    ),
                     # Note: these values will need to be kept in sync.
                     **(
                         # These options were introduced in aiohttp 3.9, and we can remove the

{modal-1.4.1.dev5 → modal-1.4.2}/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.1.dev5 → modal-1.4.2}/modal/_utils/rand_pb_testing.py

@@ -52,8 +52,9 @@ def _fill(msg, desc: Descriptor, rand: Random) -> None:
         if hasattr(field, "is_repeated"):
             is_repeated = field.is_repeated  # type: ignore
         else:
-            is_repeated = field.label == FieldDescriptor.LABEL_REPEATED
+            is_repeated = field.label == FieldDescriptor.LABEL_REPEATED  # type: ignore[attr-defined]
         if is_message:
+            assert field.message_type is not None
             msg_field = getattr(msg, field.name)
             if is_repeated:
                 num = rand.randint(0, 2)
@@ -64,6 +65,7 @@ def _fill(msg, desc: Descriptor, rand: Random) -> None:
                 _fill(msg_field, field.message_type, rand)
         else:
             if field.type == FieldDescriptor.TYPE_ENUM:
+                assert field.enum_type is not None
                 enum_values = [x.number for x in field.enum_type.values]
                 generator = lambda rand: rand.choice(enum_values)  # noqa: E731
 

{modal-1.4.1.dev5 → modal-1.4.2}/modal/_utils/sandbox_fs_utils.py

@@ -12,11 +12,13 @@ from ..exception import (
     Error as ModalError,
     InvalidError,
     NotFoundError,
+    SandboxFilesystemDirectoryNotEmptyError,
     SandboxFilesystemError,
     SandboxFilesystemFileTooLargeError,
     SandboxFilesystemIsADirectoryError,
     SandboxFilesystemNotADirectoryError,
     SandboxFilesystemNotFoundError,
+    SandboxFilesystemPathAlreadyExistsError,
     SandboxFilesystemPermissionError,
     ServiceError,
 )
@@ -153,6 +155,76 @@ def make_read_file_command(remote_path: str) -> str:
     return json.dumps({"ReadFile": {"path": remote_path}})
 
 
+def make_remove_command(remote_path: str, recursive: bool) -> str:
+    """Build the JSON command string for a Remove operation.
+
+    The returned JSON must match the `Command` enum in the modal-sandbox-fs-tools
+    Rust crate (crates/modal-sandbox-fs-tools/src/lib.rs). Treat changes to
+    this schema like protobuf changes: fields must not be removed or renamed,
+    only added with backwards-compatible defaults.
+    """
+    return json.dumps({"Remove": {"path": remote_path, "recursive": recursive}})
+
+
+def raise_remove_error(returncode: int, stderr: Union[str, bytes], remote_path: str) -> NoReturn:
+    if payload := try_parse_error_payload(stderr):
+        logger.debug(
+            f"sandbox-fs-tools remove error: path={remote_path}, "
+            f"error_kind={payload.error_kind}, message={payload.message}, detail={payload.detail}"
+        )
+        if payload.error_kind == "NotFound":
+            raise SandboxFilesystemNotFoundError(f"{payload.message}: {remote_path}")
+        if payload.error_kind == "DirectoryNotEmpty":
+            raise SandboxFilesystemDirectoryNotEmptyError(f"{payload.message}: {remote_path}")
+        if payload.error_kind == "NotSupported":
+            raise InvalidError(
+                f"{payload.message}: {remote_path} - this operation is not supported for CloudBucketMounts"
+            )
+        if payload.error_kind == "PermissionDenied":
+            raise SandboxFilesystemPermissionError(f"{payload.message}: {remote_path}")
+        raise SandboxFilesystemError(payload.message)
+
+    if stderr_text := _stderr_to_text(stderr):
+        logger.debug(f"Unstructured modal-sandbox-fs-tools stderr: {stderr_text}")
+    raise SandboxFilesystemError(f"Operation on '{remote_path}' failed with exit code {returncode}")
+
+
+def make_make_directory_command(remote_path: str, create_parents: bool) -> str:
+    """Build the JSON command string for a MakeDirectory operation.
+
+    The returned JSON must match the `Command` enum in the modal-sandbox-fs-tools
+    Rust crate (crates/modal-sandbox-fs-tools/src/lib.rs). Treat changes to
+    this schema like protobuf changes: fields must not be removed or renamed,
+    only added with backwards-compatible defaults.
+    """
+    return json.dumps({"MakeDirectory": {"path": remote_path, "parents": create_parents}})
+
+
+def raise_make_directory_error(returncode: int, stderr: Union[str, bytes], remote_path: str) -> NoReturn:
+    if payload := try_parse_error_payload(stderr):
+        logger.debug(
+            f"sandbox-fs-tools make_directory error: path={remote_path}, "
+            f"error_kind={payload.error_kind}, message={payload.message}, detail={payload.detail}"
+        )
+        if payload.error_kind == "NotFound":
+            raise SandboxFilesystemNotFoundError(f"{payload.message}: {remote_path}")
+        if payload.error_kind == "PathAlreadyExists":
+            raise SandboxFilesystemPathAlreadyExistsError(f"{payload.message}: {remote_path}")
+        if payload.error_kind == "NotDirectory":
+            raise SandboxFilesystemNotADirectoryError(f"{payload.message}: {remote_path}")
+        if payload.error_kind == "PermissionDenied":
+            raise SandboxFilesystemPermissionError(f"{payload.message}: {remote_path}")
+        if payload.error_kind == "NotSupported":
+            raise InvalidError(
+                f"{payload.message}: {remote_path} - this operation is not supported for CloudBucketMounts"
+            )
+        raise SandboxFilesystemError(payload.message)
+
+    if stderr_text := _stderr_to_text(stderr):
+        logger.debug(f"Unstructured modal-sandbox-fs-tools stderr: {stderr_text}")
+    raise SandboxFilesystemError(f"Operation on '{remote_path}' failed with exit code {returncode}")
+
+
 def validate_absolute_remote_path(remote_path: str, operation: str) -> None:
     if not PurePosixPath(remote_path).is_absolute():
         raise InvalidError(f"Sandbox.filesystem.{operation}() currently only supports absolute remote_path values")

{modal-1.4.1.dev5 → modal-1.4.2}/modal/_utils/task_command_router_client.py

@@ -122,6 +122,18 @@ async def fetch_command_router_access(server_client, task_id: str) -> api_pb2.Ta
     )
 
 
+async def fetch_command_router_access_v2(
+    server_client, sandbox_id: str
+) -> api_pb2.SandboxGetCommandRouterAccessResponse:
+    """Fetch direct command router access info from Modal server for a V2 sandbox."""
+    assert server_client._auth_token_manager
+    auth_token = await server_client._auth_token_manager.get_token()
+    return await server_client.stub.SandboxGetCommandRouterAccess(
+        api_pb2.SandboxGetCommandRouterAccessRequest(sandbox_id=sandbox_id),
+        metadata=[("x-modal-auth-token", auth_token)],
+    )
+
+
 def _finalize_channel(loop, channel):
     if not loop.is_closed():
         # only run if loop has not shut down
@@ -139,27 +151,19 @@ class TaskCommandRouterClient:
     """
 
     @classmethod
-    async def try_init(
+    async def _connect(
         cls,
         server_client,
         task_id: str,
-    ) -> Optional["TaskCommandRouterClient"]:
-        """Attempt to initialize a TaskCommandRouterClient by fetching direct access.
-
-        Returns None if command router access is not enabled (FAILED_PRECONDITION).
-        """
-        try:
-            resp = await fetch_command_router_access(server_client, task_id)
-        except ConflictError:
-            logger.debug(f"Command router access is not enabled for task {task_id}")
-            return None
-
-        logger.debug(f"Using command router access for task {task_id}")
-
-        # Build and connect a channel to the task command router now that we have access info.
-        o = urllib.parse.urlparse(resp.url)
+        url: str,
+        jwt: str,
+        *,
+        sandbox_id: Optional[str] = None,
+    ) -> "TaskCommandRouterClient":
+        """Build a connected client from a jwt and url."""
+        o = urllib.parse.urlparse(url)
         if o.scheme != "https":
-            raise ValueError(f"Task router URL must be https, got: {resp.url}")
+            raise ValueError(f"Task router URL must be https, got: {url}")
 
         host, _, port_str = o.netloc.partition(":")
         port = int(port_str) if port_str else 443
@@ -189,7 +193,38 @@ class TaskCommandRouterClient:
         loop = asyncio.get_running_loop()
         jwt_refresh_lock = asyncio.Lock()
 
-        return cls(server_client, task_id, resp.url, resp.jwt, channel, loop, jwt_refresh_lock)
+        return cls(server_client, task_id, url, jwt, channel, loop, jwt_refresh_lock, sandbox_id=sandbox_id)
+
+    @classmethod
+    async def try_init(
+        cls,
+        server_client,
+        task_id: str,
+    ) -> Optional["TaskCommandRouterClient"]:
+        """Attempt to initialize a TaskCommandRouterClient by fetching direct access.
+
+        Returns None if command router access is not enabled (FAILED_PRECONDITION).
+        """
+        try:
+            resp = await fetch_command_router_access(server_client, task_id)
+        except ConflictError:
+            logger.debug(f"Command router access is not enabled for task {task_id}")
+            return None
+
+        logger.debug(f"Using command router access for task {task_id}")
+        return await cls._connect(server_client, task_id, resp.url, resp.jwt)
+
+    @classmethod
+    async def init_v2(
+        cls,
+        server_client,
+        sandbox_id: str,
+        task_id: str,
+    ) -> "TaskCommandRouterClient":
+        """Initialize a TaskCommandRouterClient for a V2 sandbox."""
+        resp = await fetch_command_router_access_v2(server_client, sandbox_id)
+        logger.debug(f"Using command router access for sandbox {sandbox_id}")
+        return await cls._connect(server_client, task_id, resp.url, resp.jwt, sandbox_id=sandbox_id)
 
     def __init__(
         self,
@@ -201,6 +236,7 @@ class TaskCommandRouterClient:
         loop: asyncio.AbstractEventLoop,
         jwt_refresh_lock: asyncio.Lock,
         *,
+        sandbox_id: Optional[str] = None,
         stream_stdio_retry_delay_secs: float = 0.01,
         stream_stdio_retry_delay_factor: float = 2,
         stream_stdio_max_retries: int = 10,
@@ -213,6 +249,7 @@ class TaskCommandRouterClient:
         # Attach bearer token on all requests to the worker-side router service.
         self._server_client = server_client
         self._task_id = task_id
+        self._sandbox_id = sandbox_id
         self._server_url = server_url
         self._jwt = jwt
         self._channel = channel
@@ -237,6 +274,10 @@ class TaskCommandRouterClient:
 
         self._stub = TaskCommandRouterStub(self._channel)
 
+    @property
+    def _is_v2_sandbox(self) -> bool:
+        return self._sandbox_id is not None
+
     def _get_metadata(self):
         return {"authorization": f"Bearer {self._jwt}"}
 
@@ -452,14 +493,22 @@ class TaskCommandRouterClient:
                 )
                 return
 
-            logger.debug(f"Refreshing JWT for exec with task ID {self._task_id}")
-            resp = await fetch_command_router_access(self._server_client, self._task_id)
-            logger.debug(f"Finished refreshing JWT for exec with task ID {self._task_id}")
+            if self._is_v2_sandbox:
+                logger.debug(f"Refreshing JWT for exec with sandbox ID {self._sandbox_id}")
+                v2_resp = await fetch_command_router_access_v2(self._server_client, self._sandbox_id)
+                logger.debug(f"Finished refreshing JWT for exec with sandbox ID {self._sandbox_id}")
+                jwt, url = v2_resp.jwt, v2_resp.url
+            else:
+                logger.debug(f"Refreshing JWT for exec with task ID {self._task_id}")
+                v1_resp = await fetch_command_router_access(self._server_client, self._task_id)
+                logger.debug(f"Finished refreshing JWT for exec with task ID {self._task_id}")
+                jwt, url = v1_resp.jwt, v1_resp.url
 
             # Ensure the server URL remains stable for the lifetime of this client.
-            assert resp.url == self._server_url, "Task router URL changed during session"
-            self._jwt = resp.jwt
-            self._jwt_exp = _parse_jwt_expiration(resp.jwt)
+            if url != self._server_url:
+                logger.warning("Task router URL changed during session")
+            self._jwt = jwt
+            self._jwt_exp = _parse_jwt_expiration(jwt)
 
     async def _call_with_auth_retry(self, func, *args, **kwargs):
         try:
@@ -571,6 +620,12 @@ class TaskCommandRouterClient:
                 lambda: self._call_with_auth_retry(self._stub.TaskMountDirectory, request)
             )
 
+    async def unmount_image(self, request: sr_pb2.TaskUnmountDirectoryRequest):
+        with grpc_error_converter():
+            return await call_with_retries_on_transient_errors(
+                lambda: self._call_with_auth_retry(self._stub.TaskUnmountDirectory, request)
+            )
+
     async def snapshot_directory(
         self, request: sr_pb2.TaskSnapshotDirectoryRequest
     ) -> sr_pb2.TaskSnapshotDirectoryResponse:

{modal-1.4.1.dev5 → modal-1.4.2}/modal/_utils/time_utils.py

@@ -164,6 +164,61 @@ def parse_date_range(s: str, tz: Optional[tzinfo] = None) -> tuple[datetime, dat
     raise ValueError(f"Unrecognized range: '{s}'. Accepted values: {accepted}")
 
 
+def relative_timestamp(dt: datetime) -> str:
+    """Convert a tz-aware datetime to a human-readable relative time string.
+
+    Examples: "just now", "30 seconds ago", "5 minutes ago", "2 hours ago",
+    "yesterday", "3 days ago", "2 weeks ago", "3 months ago", "1 year ago".
+
+    Raises ValueError if the datetime is naive (no tzinfo).
+    """
+    if dt.tzinfo is None:
+        raise ValueError("datetime must be timezone-aware")
+
+    now = datetime.now(timezone.utc)
+    delta = now - dt
+    total_seconds = int(delta.total_seconds())
+
+    if total_seconds < 0:
+        return "just now"
+
+    if total_seconds < 10:
+        return "just now"
+    if total_seconds < 60:
+        return f"{total_seconds} seconds ago"
+    if total_seconds < 120:
+        return "1 minute ago"
+
+    minutes = total_seconds // 60
+    if minutes < 60:
+        return f"{minutes} minutes ago"
+    if minutes < 120:
+        return "1 hour ago"
+
+    hours = minutes // 60
+    if hours < 24:
+        return f"{hours} hours ago"
+    if hours < 48:
+        return "yesterday"
+
+    days = hours // 24
+    if days < 14:
+        return f"{days} days ago"
+
+    weeks = days // 7
+    if days < 60:
+        return f"{weeks} weeks ago"
+
+    months = days // 30
+    if days < 365:
+        return f"{months} months ago"
+
+    years = days // 365
+    if years == 1:
+        return "1 year ago"
+    return f"{years} years ago"
+
+
 def locale_tz() -> tzinfo:
     return datetime.now().astimezone().tzinfo
 

{modal-1.4.1.dev5 → modal-1.4.2}/modal/app.py

@@ -753,7 +753,6 @@ class _App:
         include_source: Optional[bool] = None,
         experimental_options: Optional[dict[str, Any]] = None,
         # Parameters below here are experimental. Use with caution!
-        _experimental_proxy_ip: Optional[str] = None,  # IP address of proxy
         _experimental_restrict_output: bool = False,  # Don't use pickle for return values
         # Parameters below here are deprecated. Please update your code as suggested
         max_inputs: Optional[int] = None,  # Replaced with `single_use_containers`
@@ -914,7 +913,6 @@ class _App:
                 rdma=rdma,
                 include_source=include_source if include_source is not None else local_state.include_source_default,
                 experimental_options={k: str(v) for k, v in (experimental_options or {}).items()},
-                _experimental_proxy_ip=_experimental_proxy_ip,
                 restrict_output=_experimental_restrict_output,
             )
 
@@ -968,7 +966,6 @@ class _App:
         include_source: Optional[bool] = None,  # When `False`, don't automatically add the App source to the container.
         experimental_options: Optional[dict[str, Any]] = None,
         # Parameters below here are experimental. Use with caution!
-        _experimental_proxy_ip: Optional[str] = None,  # IP address of proxy
         _experimental_restrict_output: bool = False,  # Don't use pickle for return values
         # Parameters below here are deprecated. Please update your code as suggested
         max_inputs: Optional[int] = None,  # Replaced with `single_use_containers`
@@ -1115,7 +1112,6 @@ class _App:
                 rdma=rdma,
                 include_source=include_source if include_source is not None else local_state.include_source_default,
                 experimental_options={k: str(v) for k, v in (experimental_options or {}).items()},
-                _experimental_proxy_ip=_experimental_proxy_ip,
                 restrict_output=_experimental_restrict_output,
             )
 
@@ -1290,12 +1286,12 @@ class _App:
 
         ```python
         app_a = modal.App("a")
-        @app.function()
+        @app_a.function()
         def foo():
             ...
 
         app_b = modal.App("b")
-        @app.function()
+        @app_b.function()
         def bar():
             ...
 

{modal-1.4.1.dev5 → modal-1.4.2}/modal/app.pyi

@@ -497,7 +497,6 @@ class _App:
         i6pn: typing.Optional[bool] = None,
         include_source: typing.Optional[bool] = None,
         experimental_options: typing.Optional[dict[str, typing.Any]] = None,
-        _experimental_proxy_ip: typing.Optional[str] = None,
         _experimental_restrict_output: bool = False,
         max_inputs: typing.Optional[int] = None,
     ) -> _FunctionDecoratorType:
@@ -545,7 +544,6 @@ class _App:
         i6pn: typing.Optional[bool] = None,
         include_source: typing.Optional[bool] = None,
         experimental_options: typing.Optional[dict[str, typing.Any]] = None,
-        _experimental_proxy_ip: typing.Optional[str] = None,
         _experimental_restrict_output: bool = False,
         max_inputs: typing.Optional[int] = None,
     ) -> collections.abc.Callable[[typing.Union[CLS_T, modal._partial_function._PartialFunction]], CLS_T]:
@@ -618,12 +616,12 @@ class _App:
 
         ```python
         app_a = modal.App("a")
-        @app.function()
+        @app_a.function()
         def foo():
             ...
 
         app_b = modal.App("b")
-        @app.function()
+        @app_b.function()
         def bar():
             ...
 
@@ -1215,7 +1213,6 @@ class App:
         i6pn: typing.Optional[bool] = None,
         include_source: typing.Optional[bool] = None,
         experimental_options: typing.Optional[dict[str, typing.Any]] = None,
-        _experimental_proxy_ip: typing.Optional[str] = None,
         _experimental_restrict_output: bool = False,
         max_inputs: typing.Optional[int] = None,
     ) -> _FunctionDecoratorType:
@@ -1263,7 +1260,6 @@ class App:
         i6pn: typing.Optional[bool] = None,
         include_source: typing.Optional[bool] = None,
         experimental_options: typing.Optional[dict[str, typing.Any]] = None,
-        _experimental_proxy_ip: typing.Optional[str] = None,
         _experimental_restrict_output: bool = False,
         max_inputs: typing.Optional[int] = None,
     ) -> collections.abc.Callable[[typing.Union[CLS_T, modal.partial_function.PartialFunction]], CLS_T]:
@@ -1334,12 +1330,12 @@ class App:
 
         ```python
         app_a = modal.App("a")
-        @app.function()
+        @app_a.function()
         def foo():
             ...
 
         app_b = modal.App("b")
-        @app.function()
+        @app_b.function()
         def bar():
             ...