modal 1.5.6.dev27__tar.gz → 1.5.6.dev28__tar.gz

{modal-1.5.6.dev27 → modal-1.5.6.dev28}/PKG-INFO

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

{modal-1.5.6.dev27 → modal-1.5.6.dev28}/modal/_partial_function.py

@@ -282,7 +282,6 @@ class _MethodDecoratorType:
 
 # TODO(elias): fix support for coroutine type unwrapping for methods (static typing)
 def _method(
-    _warn_parentheses_missing=None,  # mdmd:line-hidden
     *,
     # Set this to True if it's a non-generator function returning
     # a [sync/async] generator object
@@ -300,10 +299,6 @@ def _method(
                 ...
         ```
     """
-    if _warn_parentheses_missing is not None:
-        raise InvalidError(
-            "Positional arguments are not allowed. Did you forget parentheses? Suggestion: `@modal.method()`."
-        )
 
     def wrapper(obj: Callable[..., Any] | _PartialFunction) -> _PartialFunction:
         flags = _PartialFunctionFlags.CALLABLE_INTERFACE
@@ -336,7 +331,6 @@ def _parse_custom_domains(custom_domains: Iterable[str] | None = None) -> list[a
 
 
 def _fastapi_endpoint(
-    _warn_parentheses_missing=None,  # mdmd:line-hidden
     *,
     method: str = "GET",  # REST method for the created endpoint.
     label: str | None = None,  # Label for created endpoint. Final subdomain will be <workspace>--<label>.modal.run.
@@ -362,15 +356,6 @@ def _fastapi_endpoint(
 
     *Added in v0.73.82*: This function replaces the deprecated `@web_endpoint` decorator.
     """
-    if isinstance(_warn_parentheses_missing, str):
-        # Probably passing the method string as a positional argument.
-        raise InvalidError(
-            f'Positional arguments are not allowed. Suggestion: `@modal.fastapi_endpoint(method="{method}")`.'
-        )
-    elif _warn_parentheses_missing is not None:
-        raise InvalidError(
-            "Positional arguments are not allowed. Did you forget parentheses? Suggestion: `@modal.fastapi_endpoint()`."
-        )
 
     webhook_config = api_pb2.WebhookConfig(
         type=api_pb2.WEBHOOK_TYPE_FUNCTION,
@@ -400,7 +385,6 @@ def _fastapi_endpoint(
 
 
 def _web_endpoint(
-    _warn_parentheses_missing=None,  # mdmd:line-hidden
     *args,
     **kwargs,
 ) -> None:
@@ -413,7 +397,6 @@ def _web_endpoint(
 
 
 def _asgi_app(
-    _warn_parentheses_missing=None,  # mdmd:line-hidden
     *,
     label: str | None = None,  # Label for created endpoint. Final subdomain will be <workspace>--<label>.modal.run.
     custom_domains: Iterable[str] | None = None,  # Deploy this endpoint on a custom domain.
@@ -437,12 +420,6 @@ def _asgi_app(
     To learn how to use Modal with popular web frameworks, see the
     [guide on Web Functions](https://modal.com/docs/guide/webhooks).
     """
-    if isinstance(_warn_parentheses_missing, str):
-        raise InvalidError(f'Positional arguments are not allowed. Suggestion: `@modal.asgi_app(label="{label}")`.')
-    elif _warn_parentheses_missing is not None:
-        raise InvalidError(
-            "Positional arguments are not allowed. Did you forget parentheses? Suggestion: `@modal.asgi_app()`."
-        )
 
     webhook_config = api_pb2.WebhookConfig(
         type=api_pb2.WEBHOOK_TYPE_ASGI_APP,
@@ -468,7 +445,6 @@ def _asgi_app(
 
 
 def _wsgi_app(
-    _warn_parentheses_missing=None,  # mdmd:line-hidden
     *,
     label: str | None = None,  # Label for created endpoint. Final subdomain will be <workspace>--<label>.modal.run.
     custom_domains: Iterable[str] | None = None,  # Deploy this endpoint on a custom domain.
@@ -494,12 +470,6 @@ def _wsgi_app(
     To learn how to use this decorator with popular web frameworks, see the
     [guide on Web Functions](https://modal.com/docs/guide/webhooks).
     """
-    if isinstance(_warn_parentheses_missing, str):
-        raise InvalidError(f'Positional arguments are not allowed. Suggestion: `@modal.wsgi_app(label="{label}")`.')
-    elif _warn_parentheses_missing is not None:
-        raise InvalidError(
-            "Positional arguments are not allowed. Did you forget parentheses? Suggestion: `@modal.wsgi_app()`."
-        )
 
     webhook_config = api_pb2.WebhookConfig(
         type=api_pb2.WEBHOOK_TYPE_WSGI_APP,
@@ -588,17 +558,12 @@ def _web_server(
 
 
 def _enter(
-    _warn_parentheses_missing=None,  # mdmd:line-hidden
     *,
     snap: bool = False,
 ) -> Callable[[_PartialFunction | NullaryMethod], _PartialFunction]:
     """Decorator for methods which should be executed when a new container is started.
 
     See the [lifeycle function guide](https://modal.com/docs/guide/lifecycle-functions#enter) for more information."""
-    if _warn_parentheses_missing is not None:
-        raise InvalidError(
-            "Positional arguments are not allowed. Did you forget parentheses? Suggestion: `@modal.enter()`."
-        )
 
     flags = _PartialFunctionFlags.ENTER_PRE_SNAPSHOT if snap else _PartialFunctionFlags.ENTER_POST_SNAPSHOT
     params = _PartialFunctionParams()
@@ -615,14 +580,10 @@ def _enter(
     return wrapper
 
 
-def _exit(_warn_parentheses_missing=None) -> Callable[[NullaryMethod], _PartialFunction]:
+def _exit() -> Callable[[NullaryMethod], _PartialFunction]:
     """Decorator for methods which should be executed when a container is about to exit.
 
     See the [lifeycle function guide](https://modal.com/docs/guide/lifecycle-functions#exit) for more information."""
-    if _warn_parentheses_missing is not None:
-        raise InvalidError(
-            "Positional arguments are not allowed. Did you forget parentheses? Suggestion: `@modal.exit()`."
-        )
 
     flags = _PartialFunctionFlags.EXIT
     params = _PartialFunctionParams()
@@ -639,7 +600,6 @@ def _exit(_warn_parentheses_missing=None) -> Callable[[NullaryMethod], _PartialF
 
 
 def _batched(
-    _warn_parentheses_missing=None,  # mdmd:line-hidden
     *,
     max_batch_size: int,
     wait_ms: int,
@@ -670,10 +630,6 @@ def _batched(
 
     See the [dynamic batching guide](https://modal.com/docs/guide/dynamic-batching) for more information.
     """
-    if _warn_parentheses_missing is not None:
-        raise InvalidError(
-            "Positional arguments are not allowed. Did you forget parentheses? Suggestion: `@modal.batched()`."
-        )
     if max_batch_size < 1:
         raise InvalidError("max_batch_size must be a positive integer.")
     if max_batch_size > MAX_MAX_BATCH_SIZE:
@@ -700,7 +656,6 @@ def _batched(
 
 
 def _concurrent(
-    _warn_parentheses_missing=None,  # mdmd:line-hidden
     *,
     max_inputs: int | None = None,  # Hard limit on each container's input concurrency
     target_inputs: int | None = None,  # Input concurrency that Modal's autoscaler should target
@@ -749,10 +704,6 @@ def _concurrent(
     in `@app.function()` and `@app.cls()`.
 
     """
-    if _warn_parentheses_missing is not None:
-        raise InvalidError(
-            "Positional arguments are not allowed. Did you forget parentheses? Suggestion: `@modal.concurrent()`."
-        )
 
     if max_inputs is not None and target_inputs is not None and target_inputs > max_inputs:
         raise InvalidError("`target_inputs` parameter cannot be greater than `max_inputs`.")
@@ -777,9 +728,7 @@ def _concurrent(
     return wrapper
 
 
-def _sessioned(
-    _warn_parentheses_missing=None,  # mdmd:line-hidden
-) -> Callable[
+def _sessioned() -> Callable[
     [Callable[P, ReturnType] | _PartialFunction[P, ReturnType, ReturnType]],
     _PartialFunction[P, ReturnType, ReturnType],
 ]:
@@ -822,11 +771,6 @@ def _sessioned(
         server.sessions.terminate(session.token)
         ```
     """
-    if _warn_parentheses_missing is not None:
-        raise InvalidError(
-            "Positional arguments are not allowed. Did you forget parentheses? Suggestion: `@modal.sessioned()`."
-        )
-
     flags = _PartialFunctionFlags.SESSIONED
     params = _PartialFunctionParams()
 

{modal-1.5.6.dev27 → modal-1.5.6.dev28}/modal/_server.py

@@ -4,6 +4,8 @@ import json
 import typing
 from datetime import datetime, timedelta, timezone
 
+from typing_extensions import Self
+
 from modal_proto import api_pb2
 
 from ._functions import _Function
@@ -73,7 +75,7 @@ class _Server:
     _user_cls: type | None = None  # None if remote
     _service_function: _Function
     _app: "modal.app._App | None" = None  # None if remote
-    _is_sessioned: bool | None = None  # None if remote
+    _is_sessioned: bool | None = None  # None until known (via local set or remote hydration)
 
     def _get_user_cls(self) -> type:
         assert self._user_cls is not None
@@ -248,8 +250,22 @@ class _Server:
         # This is required since we want to support @livemethod() decorated methods
         service_function = self._get_service_function()
         await service_function.hydrate(client)
+        if service_function._function_info is not None:
+            self._is_sessioned = service_function._function_info._sessioned
         return self
 
+    @classmethod
+    def _new_from_function(cls, object_id: str, client: _Client, metadata: api_pb2.FunctionHandleMetadata) -> Self:
+        """mdmd:hidden
+
+        Callers which already have handle metadata for a Server service function can use this method to
+        create a hydrated handle without having to do an unnecessary RPC.
+        """
+
+        obj = cls()
+        obj._service_function = _Function._new_hydrated(object_id, client, metadata)
+        return obj
+
     # ============ Construction ============
     @staticmethod
     def _from_local(
@@ -478,7 +494,7 @@ class _ServerSessionsManager:
         self._server = server
 
     def _validate(self) -> None:
-        if self._server._is_local() and self._server._is_sessioned is False:
+        if self._server._is_sessioned is False:
             raise InvalidError("`sessions` requires `@modal.sessioned()` on the Server.")
 
     async def start(self, idle_timeout: int = 600) -> ServerSessionCredentials:
@@ -504,12 +520,12 @@ class _ServerSessionsManager:
             server.sessions.terminate(session.token)
             ```
         """
-        self._validate()
         if not isinstance(idle_timeout, int) or idle_timeout <= 0:
             raise InvalidError("`idle_timeout` must be a positive integer.")
 
         fn = self._server._get_service_function()
         url = await self._server.get_url()
+        self._validate()
         assert url is not None, "Server has no URL."
 
         headers = {
@@ -545,10 +561,9 @@ class _ServerSessionsManager:
             server.sessions.terminate(session.token)
             ```
         """
-        self._validate()
-
         fn = self._server._get_service_function()
         url = await self._server.get_url()
+        self._validate()
         assert url is not None, "Server has no URL."
 
         headers = {

{modal-1.5.6.dev27 → modal-1.5.6.dev28}/modal/_server.pyi

@@ -7,6 +7,7 @@ import modal.app
 import modal.client
 import modal.server
 import modal.types
+import modal_proto.api_pb2
 import typing
 import typing_extensions
 
@@ -165,6 +166,17 @@ class _Server:
         """
         ...
 
+    @classmethod
+    def _new_from_function(
+        cls, object_id: str, client: modal.client._Client, metadata: modal_proto.api_pb2.FunctionHandleMetadata
+    ) -> typing_extensions.Self:
+        """mdmd:hidden
+
+        Callers which already have handle metadata for a Server service function can use this method to
+        create a hydrated handle without having to do an unnecessary RPC.
+        """
+        ...
+
     @staticmethod
     def _from_local(
         wrapped_user_cls: typing.Union[type, modal._partial_function._PartialFunction],

{modal-1.5.6.dev27 → modal-1.5.6.dev28}/modal/app.py

@@ -727,9 +727,7 @@ class _App:
         """
         return self._local_state.web_endpoints
 
-    def local_entrypoint(
-        self, _warn_parentheses_missing: Any = None, *, name: str | None = None
-    ) -> Callable[[Callable[..., Any]], _LocalEntrypoint]:
+    def local_entrypoint(self, *, name: str | None = None) -> Callable[[Callable[..., Any]], _LocalEntrypoint]:
         """Decorate a function to be used as a CLI entrypoint for a Modal App.
 
         These functions can be used to define code that runs locally to set up the app,
@@ -784,8 +782,6 @@ class _App:
             Currently, `str`, `int`, `float`, `bool`, and `datetime.datetime` are supported.
             Use `modal run app_module.py --help` for more information on usage.
         """
-        if _warn_parentheses_missing:
-            raise InvalidError("Did you forget parentheses? Suggestion: `@app.local_entrypoint()`.")
         if name is not None and not isinstance(name, str):
             raise InvalidError("Invalid value for `name`: Must be string.")
 
@@ -804,7 +800,6 @@ class _App:
     @handle_deprecated_parameters
     def function(
         self,
-        _warn_parentheses_missing=None,  # mdmd:line-hidden
         *,
         image: _Image | None = None,
         schedule: Schedule | None = None,
@@ -890,11 +885,6 @@ class _App:
         Returns:
             A decorator that registers the wrapped callable or partial as a Modal `Function`.
         """
-        if isinstance(_warn_parentheses_missing, _Image):
-            # Handle edge case where maybe (?) some users passed image as a positional arg
-            raise InvalidError("`image` needs to be a keyword argument: `@app.function(image=image)`.")
-        if _warn_parentheses_missing:
-            raise InvalidError("Did you forget parentheses? Suggestion: `@app.function()`.")
 
         if image is None:
             image = self._get_default_image()
@@ -1063,7 +1053,6 @@ class _App:
     @handle_deprecated_parameters
     def cls(
         self,
-        _warn_parentheses_missing=None,  # mdmd:line-hidden
         *,
         image: _Image | None = None,
         env: dict[str, str | None] | None = None,
@@ -1096,7 +1085,7 @@ class _App:
         experimental_options: dict[str, Any] | None = None,
         _experimental_restrict_output: bool = False,
         max_inputs: int | None = None,
-    ) -> Callable[[CLS_T | _PartialFunction], CLS_T]:
+    ) -> Callable[[CLS_T | _PartialFunction[..., Any, Any]], CLS_T]:
         """
         Decorator to register a new Modal [Cls](https://modal.com/docs/sdk/py/latest/Cls) with this App.
 
@@ -1141,8 +1130,6 @@ class _App:
         Returns:
             A decorator that registers the wrapped class or partial as a Modal `Cls`.
         """
-        if _warn_parentheses_missing:
-            raise InvalidError("Did you forget parentheses? Suggestion: `@app.cls()`.")
 
         if max_inputs is not None:
             if not isinstance(max_inputs, int):
@@ -1161,7 +1148,7 @@ class _App:
         if env:
             secrets = [*secrets, _Secret.from_dict(env)]
 
-        def wrapper(wrapped_cls: CLS_T | _PartialFunction) -> CLS_T:
+        def wrapper(wrapped_cls: CLS_T | _PartialFunction[..., Any, Any]) -> CLS_T:
             local_state = self._local_state
             # Check if the decorated object is a class
             http_config = None
@@ -1306,7 +1293,6 @@ class _App:
 
     def server(
         self,
-        _warn_parentheses_missing=None,  # mdmd:line-hidden
         *,
         image: _Image | None = None,  # The image to run as the container for the server
         env: dict[str, str | None] | None = None,  # Environment variables to set in the container
@@ -1342,7 +1328,7 @@ class _App:
         include_source: bool | None = None,  # Whether to add source to container
         # Experimental options
         experimental_options: dict[str, Any] | None = None,
-    ) -> Callable[[type[Any] | _PartialFunction], _Server]:
+    ) -> Callable[[type[Any] | _PartialFunction[..., Any, Any]], _Server]:
         """
         Decorator to register a new Modal Server with this App.
 
@@ -1407,8 +1393,6 @@ class _App:
                     self.proc.terminate()
             ```
         """
-        if _warn_parentheses_missing:
-            raise InvalidError("Did you forget parentheses? Suggestion: `@app.server()`.")
 
         # Validate HTTP server config
         validate_http_server_config(
@@ -1455,7 +1439,7 @@ class _App:
         if env:
             secrets_list.append(_Secret.from_dict(env))
 
-        def wrapper(wrapped_user_cls: type[Any] | _PartialFunction | Callable) -> _Server:
+        def wrapper(wrapped_user_cls: type[Any] | _PartialFunction[..., Any, Any] | Callable[..., Any]) -> _Server:
             _Server._validate_wrapped_user_cls_decorators(wrapped_user_cls, enable_memory_snapshot)
 
             # Validate the server class

{modal-1.5.6.dev27 → modal-1.5.6.dev28}/modal/app.pyi

@@ -487,7 +487,7 @@ class _App:
         ...
 
     def local_entrypoint(
-        self, _warn_parentheses_missing: typing.Any = None, *, name: typing.Optional[str] = None
+        self, *, name: typing.Optional[str] = None
     ) -> collections.abc.Callable[[collections.abc.Callable[..., typing.Any]], _LocalEntrypoint]:
         """Decorate a function to be used as a CLI entrypoint for a Modal App.
 
@@ -547,7 +547,6 @@ class _App:
 
     def function(
         self,
-        _warn_parentheses_missing=None,
         *,
         image: typing.Optional[modal._image._Image] = None,
         schedule: typing.Optional[modal.schedule.Schedule] = None,
@@ -646,7 +645,6 @@ class _App:
     )
     def cls(
         self,
-        _warn_parentheses_missing=None,
         *,
         image: typing.Optional[modal._image._Image] = None,
         env: typing.Optional[dict[str, typing.Optional[str]]] = None,
@@ -684,7 +682,9 @@ class _App:
         experimental_options: typing.Optional[dict[str, typing.Any]] = 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]:
+    ) -> collections.abc.Callable[
+        [typing.Union[CLS_T, modal._partial_function._PartialFunction[..., typing.Any, typing.Any]]], CLS_T
+    ]:
         """Decorator to register a new Modal [Cls](https://modal.com/docs/sdk/py/latest/Cls) with this App.
 
         Args:
@@ -732,7 +732,6 @@ class _App:
 
     def server(
         self,
-        _warn_parentheses_missing=None,
         *,
         image: typing.Optional[modal._image._Image] = None,
         env: typing.Optional[dict[str, typing.Optional[str]]] = None,
@@ -769,7 +768,8 @@ class _App:
         include_source: typing.Optional[bool] = None,
         experimental_options: typing.Optional[dict[str, typing.Any]] = None,
     ) -> collections.abc.Callable[
-        [typing.Union[type[typing.Any], modal._partial_function._PartialFunction]], modal._server._Server
+        [typing.Union[type[typing.Any], modal._partial_function._PartialFunction[..., typing.Any, typing.Any]]],
+        modal._server._Server,
     ]:
         """Decorator to register a new Modal Server with this App.
 
@@ -1525,7 +1525,7 @@ class App:
         ...
 
     def local_entrypoint(
-        self, _warn_parentheses_missing: typing.Any = None, *, name: typing.Optional[str] = None
+        self, *, name: typing.Optional[str] = None
     ) -> collections.abc.Callable[[collections.abc.Callable[..., typing.Any]], LocalEntrypoint]:
         """Decorate a function to be used as a CLI entrypoint for a Modal App.
 
@@ -1585,7 +1585,6 @@ class App:
 
     def function(
         self,
-        _warn_parentheses_missing=None,
         *,
         image: typing.Optional[modal.image.Image] = None,
         schedule: typing.Optional[modal.schedule.Schedule] = None,
@@ -1684,7 +1683,6 @@ class App:
     )
     def cls(
         self,
-        _warn_parentheses_missing=None,
         *,
         image: typing.Optional[modal.image.Image] = None,
         env: typing.Optional[dict[str, typing.Optional[str]]] = None,
@@ -1722,7 +1720,9 @@ class App:
         experimental_options: typing.Optional[dict[str, typing.Any]] = 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]:
+    ) -> collections.abc.Callable[
+        [typing.Union[CLS_T, modal.partial_function.PartialFunction[..., typing.Any, typing.Any]]], CLS_T
+    ]:
         """Decorator to register a new Modal [Cls](https://modal.com/docs/sdk/py/latest/Cls) with this App.
 
         Args:
@@ -1770,7 +1770,6 @@ class App:
 
     def server(
         self,
-        _warn_parentheses_missing=None,
         *,
         image: typing.Optional[modal.image.Image] = None,
         env: typing.Optional[dict[str, typing.Optional[str]]] = None,
@@ -1807,7 +1806,8 @@ class App:
         include_source: typing.Optional[bool] = None,
         experimental_options: typing.Optional[dict[str, typing.Any]] = None,
     ) -> collections.abc.Callable[
-        [typing.Union[type[typing.Any], modal.partial_function.PartialFunction]], modal.server.Server
+        [typing.Union[type[typing.Any], modal.partial_function.PartialFunction[..., typing.Any, typing.Any]]],
+        modal.server.Server,
     ]:
         """Decorator to register a new Modal Server with this App.
 

{modal-1.5.6.dev27 → modal-1.5.6.dev28}/modal/cli/app.py

@@ -9,7 +9,7 @@ from typing import Literal, get_args
 
 import click
 import rich
-from click import UsageError
+from click import ClickException, UsageError
 from google.protobuf.json_format import MessageToDict
 from rich.table import Column, Table
 from rich.text import Text
@@ -29,6 +29,7 @@ from .._utils.time_utils import timestamp_to_localized_str
 from ._help import ModalGroup
 from ._logs import _run_logs_command, _validate_logs_args
 from .utils import (
+    HEADER_ONLY,
     confirm_or_suggest_yes,
     display_table,
     env_option,
@@ -97,10 +98,34 @@ async def resolve_app_identifier(
 
 @app_cli.command("list")
 @env_option
-@click.option("--json", is_flag=True, default=False)
+@click.option("--json", help="Output as JSON.", is_flag=True, default=False)
+@click.option(
+    "--limit",
+    default=0,
+    help="Show at most N results. Use 0 to list every result. Default is 0.",
+)
 @synchronizer.create_blocking
-async def list_(env: str | None = None, json: bool = False):
-    """List Apps that are running, deployed or recently stopped."""
+async def list_(env: str | None = None, json: bool = False, limit: int = 0):
+    """List Apps that are running, deployed or recently stopped.
+
+    Examples:
+
+    Limit output to 30 apps:
+
+    ```
+    modal app list --limit 30
+    ```
+
+    Display output in JSON:
+
+    ```
+    modal app list --json
+    ```
+
+    """
+    if not isinstance(limit, int) or limit < 0:
+        raise ClickException("--limit must be an integer value greater than or equal to 0.")
+
     env = ensure_env(env)
     client = await _Client.from_env()
 
@@ -108,14 +133,6 @@ async def list_(env: str | None = None, json: bool = False):
         api_pb2.AppListRequest(environment_name=_get_environment_name(env))
     )
 
-    columns: list[Column | str] = [
-        Column("App ID", min_width=25),  # Ensure that App ID is not truncated in slim terminals
-        "Description",
-        "State",
-        "Tasks",
-        "Created at",
-        "Stopped at",
-    ]
     rows: list[list[Text | str | None]] = []
     for app_stats in resp.apps:
         state = APP_STATE_TO_MESSAGE.get(app_stats.state, Text("unknown", style="gray"))
@@ -129,9 +146,24 @@ async def list_(env: str | None = None, json: bool = False):
                 timestamp_to_localized_str(app_stats.stopped_at, json),
             ]
         )
+    rows.sort(key=lambda s: (int(s[3]), s[4]), reverse=True)  # type: ignore
+    rows_trunc = rows
+    if limit:
+        rows_trunc = rows[:limit]
+
+    app_id_width = max([len(r[0]) for r in rows]) if len(rows) else 25  # type: ignore
+    columns: list[Column | str] = [
+        Column("App ID", min_width=app_id_width, no_wrap=True),
+        Column("Description", min_width=1, overflow="fold"),
+        Column("State", min_width=1, overflow="fold"),
+        Column("Tasks", min_width=1, overflow="fold"),
+        Column("Created at", min_width=1, overflow="fold"),
+        Column("Stopped at", min_width=1, overflow="fold"),
+    ]
 
     env_part = f" in environment '{env}'" if env else ""
-    display_table(columns, rows, json, title=f"Apps{env_part}")
+    app_count_part = f" ({len(rows_trunc)} of {len(rows)})" if len(rows_trunc) < len(rows) else ""
+    display_table(columns, rows_trunc, json, title=f"Apps{env_part}{app_count_part}", table_box=HEADER_ONLY)
 
 
 @app_cli.command("logs", no_args_is_help=True)
@@ -688,7 +720,11 @@ async def info(app_identifier: str, *, env: str | None = None, json: bool = Fals
         )
         return
 
+    name_width = max((Text(name).cell_len for name in [*app_info.functions, *app_info.servers]), default=0)
+    label_width = max(len("Deployment:"), name_width + 2)
     header = Table(show_header=False, box=None, pad_edge=False, padding=(0, 1))
+    header.add_column(width=label_width)
+    header.add_column(overflow="fold")
     header.add_row(Text("App:"), Text(app_info.description))
     header.add_row(Text("App ID:"), Text(app_info.app_id))
     header.add_row(Text("State:"), Text(state.plain))
@@ -706,7 +742,6 @@ async def info(app_identifier: str, *, env: str | None = None, json: bool = Fals
     event("Created", lifecycle.created_at, lifecycle.created_by)
     output.print(header)
 
-    name_width = max((len(name) for name in [*app_info.functions, *app_info.servers]), default=0)
     for title, entries in (("Functions", app_info.functions), ("Servers", app_info.servers)):
         if not entries:
             continue
@@ -716,8 +751,8 @@ async def info(app_identifier: str, *, env: str | None = None, json: bool = Fals
             if index:
                 output.print("")
             identity = Table(show_header=False, box=None, pad_edge=False, padding=(0, 1))
-            identity.add_column(width=name_width + 2)
-            identity.add_column(no_wrap=True)
+            identity.add_column(width=label_width)
+            identity.add_column(width=26, overflow="fold")
             identity.add_row(Text(f"  {name}"), Text(function_id))
             output.print(identity)
             if function_id not in resp.function_info_summaries: