fastapi-cli 0.0.29__tar.gz → 0.0.31__tar.gz

{fastapi_cli-0.0.29 → fastapi_cli-0.0.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-cli
-Version: 0.0.29
+Version: 0.0.31
 Summary: Run and manage FastAPI apps from the command line with FastAPI CLI. 🚀
 Author-Email: =?utf-8?q?Sebasti=C3=A1n_Ram=C3=ADrez?= <tiangolo@gmail.com>
 License-Expression: MIT

{fastapi_cli-0.0.29 → fastapi_cli-0.0.31}/pyproject.toml

@@ -38,7 +38,7 @@ dependencies = [
     "rich-toolkit >= 0.14.8",
     "tomli >= 2.0.0; python_version < '3.11'",
 ]
-version = "0.0.29"
+version = "0.0.31"
 
 [project.optional-dependencies]
 standard = [

fastapi_cli-0.0.31/src/fastapi_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.0.31"

{fastapi_cli-0.0.29 → fastapi_cli-0.0.31}/src/fastapi_cli/cli.py

@@ -142,23 +142,25 @@ def _run(
     proxy_headers: bool = False,
     forwarded_allow_ips: str | None = None,
     public_url: str | None = None,
+    verbose: bool = False,
 ) -> None:
     with get_rich_toolkit() as toolkit:
         server_type = "development" if command == "dev" else "production"
 
-        toolkit.print_title(f"Starting {server_type} server 🚀", tag="FastAPI")
-        toolkit.print_line()
+        toolkit.print(f"Starting FastAPI in {server_type} mode", emoji="⚡️")
 
-        toolkit.print(
-            "Searching for package file structure from directories with [blue]__init__.py[/blue] files"
-        )
+        if verbose:
+            toolkit.print_line()
+            toolkit.print(
+                "Searching for package file structure from directories with [blue]__init__.py[/blue] files",
+                emoji="🔎",
+            )
 
         if entrypoint and (path or app):
             toolkit.print_line()
             toolkit.print(
                 "[error]Cannot use --entrypoint together with path or --app arguments"
             )
-            toolkit.print_line()
             raise typer.Exit(code=1)
 
         try:
@@ -172,8 +174,6 @@ def _run(
                 field = ".".join(str(loc) for loc in error["loc"])
                 toolkit.print(f"  [red]•[/red] {field}: {error['msg']}")
 
-            toolkit.print_line()
-
             raise typer.Exit(code=1) from None
 
         try:
@@ -196,46 +196,58 @@ def _run(
 
         module_data = import_data.module_data
         import_string = import_data.import_string
+        is_auto_discovery = import_data.module_config_source == "auto-discovery"
 
-        toolkit.print(f"Importing from {module_data.extra_sys_path}")
-        toolkit.print_line()
+        if verbose:
+            toolkit.print_line()
+            toolkit.print(f"Importing from {module_data.extra_sys_path}", emoji="📂")
+            toolkit.print_line()
 
-        if module_data.module_paths:
-            root_tree = _get_module_tree(module_data.module_paths)
+            if module_data.module_paths:
+                root_tree = _get_module_tree(module_data.module_paths)
+
+                toolkit.print(root_tree)
 
-            toolkit.print(root_tree, tag="module")
             toolkit.print_line()
 
-        toolkit.print(
-            "Importing the FastAPI app object from the module with the following code:",
-            tag="code",
-        )
-        toolkit.print_line()
-        toolkit.print(
-            f"[underline]from [bold]{module_data.module_import_str}[/bold] import [bold]{import_data.app_name}[/bold]"
-        )
-        toolkit.print_line()
+            toolkit.print(
+                "Importing the FastAPI app object from the module with the following code:",
+            )
+            toolkit.print_line()
+            toolkit.print(
+                f"[blue]from [bold]{module_data.module_import_str}[/bold] import [bold]{import_data.app_name}[/bold]",
+            )
+
+        # Outside --verbose, fold the resolution source into the import string
+        # line and point newcomers at --verbose for the full explanation
+        if is_auto_discovery and not verbose:
+            app_note = " [dim](auto-discovered, use --verbose to learn more)[/]"
+        else:
+            app_note = ""
 
+        toolkit.print_line()
         toolkit.print(
-            f"Using import string: [blue]{import_string}[/]",
-            tag="app",
+            f"Using import string: [blue]{import_string}[/]{app_note}", emoji="🐍"
         )
 
-        mod_source_desc = SOURCE_DESCRIPTIONS[import_data.module_config_source]
-        app_source_desc = SOURCE_DESCRIPTIONS[import_data.app_name_config_source]
-        toolkit.print_line()
-        toolkit.print("Configuration sources:", tag="info")
-        if mod_source_desc == app_source_desc:
-            toolkit.print(f" • Import string: {mod_source_desc}")
-        else:
-            toolkit.print(f" • Module: {mod_source_desc}")
-            toolkit.print(f" • App name: {app_source_desc}")
+        if verbose:
+            toolkit.print_line()
+            mod_source_desc = SOURCE_DESCRIPTIONS[import_data.module_config_source]
+            app_source_desc = SOURCE_DESCRIPTIONS[import_data.app_name_config_source]
+            toolkit.print("Configuration sources:", emoji="📋")
+            if mod_source_desc == app_source_desc:
+                toolkit.print(f"• Import string: {mod_source_desc}")
+            else:
+                toolkit.print(f"• Module: {mod_source_desc}")
+                toolkit.print(f"• App name: {app_source_desc}")
 
-        if import_data.module_config_source == "auto-discovery":
+        # Nudge to pin the entrypoint whenever it was auto-discovered, so it's
+        # explicit next time — shown in the default output, not just --verbose
+        if is_auto_discovery:
             toolkit.print_line()
             toolkit.print(
                 "You can configure an entrypoint in [blue]pyproject.toml[/] for this app with:",
-                tag="tip",
+                emoji="💡",
             )
             toolkit.print_line()
             toolkit.print(
@@ -246,25 +258,15 @@ def _run(
                     ),
                     "toml",
                     theme="ansi_light",
-                )
+                ),
             )
 
         url = public_url.rstrip("/") if public_url else f"http://{host}:{port}"
         url_docs = f"{url}/docs"
 
         toolkit.print_line()
-        toolkit.print(
-            f"Server started at [link={url}]{url}[/]",
-            f"Documentation at [link={url_docs}]{url_docs}[/]",
-            tag="server",
-        )
-
-        if command == "dev":
-            toolkit.print_line()
-            toolkit.print(
-                "Running in development mode, for production use: [bold]fastapi run[/]",
-                tag="tip",
-            )
+        toolkit.print(f"Server started at [link={url}]{url}[/]", emoji="🌐")
+        toolkit.print(f"Documentation at [link={url_docs}]{url_docs}[/]")
 
         if not uvicorn:
             raise FastAPICLIException(
@@ -272,7 +274,7 @@ def _run(
             ) from None
 
         toolkit.print_line()
-        toolkit.print("Logs:")
+        toolkit.print("Logs:", bullet=False)
         toolkit.print_line()
 
         extra_uvicorn_kwargs: dict[str, Any] = (
@@ -363,6 +365,14 @@ def dev(
             help="Comma separated list of IP Addresses to trust with proxy headers. The literal '*' means trust everything."
         ),
     ] = None,
+    verbose: Annotated[
+        bool,
+        typer.Option(
+            "--verbose",
+            "-v",
+            help="Show detailed startup output and debug logs: how the [bold]FastAPI[/bold] app was discovered, imported, and configured.",
+        ),
+    ] = False,
 ) -> Any:
     """
     Run a [bold]FastAPI[/bold] app in [yellow]development[/yellow] mode. 🧪
@@ -402,6 +412,7 @@ def dev(
         proxy_headers=proxy_headers,
         forwarded_allow_ips=forwarded_allow_ips,
         public_url=os.getenv("FASTAPI_PUBLIC_URL"),
+        verbose=verbose,
     )
 
 
@@ -471,6 +482,14 @@ def run(
             help="Comma separated list of IP Addresses to trust with proxy headers. The literal '*' means trust everything."
         ),
     ] = None,
+    verbose: Annotated[
+        bool,
+        typer.Option(
+            "--verbose",
+            "-v",
+            help="Show detailed startup output and debug logs: how the [bold]FastAPI[/bold] app was discovered, imported, and configured.",
+        ),
+    ] = False,
 ) -> Any:
     """
     Run a [bold]FastAPI[/bold] app in [green]production[/green] mode. 🚀
@@ -510,6 +529,7 @@ def run(
         proxy_headers=proxy_headers,
         forwarded_allow_ips=forwarded_allow_ips,
         public_url=os.getenv("FASTAPI_PUBLIC_URL"),
+        verbose=verbose,
     )
 
 

fastapi_cli-0.0.31/src/fastapi_cli/utils/cli.py

@@ -0,0 +1,190 @@
+import logging
+import sys
+from typing import Any
+
+from rich._loop import loop_first
+from rich.console import Console, ConsoleOptions, RenderableType, RenderResult
+from rich.segment import Segment
+from rich.text import Text
+from rich_toolkit import RichToolkit
+from rich_toolkit.element import Element
+from rich_toolkit.styles import BaseStyle
+from uvicorn.logging import DefaultFormatter
+
+logger = logging.getLogger(__name__)
+
+
+def should_use_rich_logs() -> bool:
+    """Return True when stdout is a TTY and rich logs should be used, False otherwise."""
+    return sys.stdout.isatty()
+
+
+class IndentedBlock:
+    """Indent a renderable, hanging a prefix (e.g. an emoji bullet) on the
+    first line and aligning wrapped/extra lines under the text."""
+
+    def __init__(
+        self,
+        renderable: RenderableType,
+        *,
+        first_prefix: Text,
+        prefix: Text,
+    ) -> None:
+        self.renderable = renderable
+        self.first_prefix = first_prefix
+        self.prefix = prefix
+
+        # Text renders its `end` ("\n" by default), which would break lines
+        self.first_prefix.end = ""
+        self.prefix.end = ""
+
+    def __rich_console__(
+        self, console: Console, options: ConsoleOptions
+    ) -> RenderResult:
+        prefix_width = max(self.first_prefix.cell_len, self.prefix.cell_len)
+        lines = console.render_lines(
+            self.renderable,
+            options.update_width(options.max_width - prefix_width),
+            pad=False,
+        )
+
+        new_line = Segment.line()
+
+        for first, line in loop_first(lines):
+            if any(segment.text.strip() for segment in line):
+                yield from console.render(
+                    self.first_prefix if first else self.prefix, options
+                )
+                yield from line
+
+            yield new_line
+
+
+class FastAPIStyle(BaseStyle):
+    """Uniform left indent with emoji bullets hanging to the left of the text.
+
+    ``emoji=`` renders as a bullet in a fixed column; ``bullet=False`` drops
+    the bullet column and just indents. This is a small, purpose-built subset
+    of the richer style in fastapi-cloud-cli.
+    """
+
+    content_padding = 1
+    emoji_column_width = 3
+
+    def render_element(
+        self,
+        element: Any,
+        is_active: bool = False,
+        done: bool = False,
+        parent: Element | None = None,
+        **kwargs: Any,
+    ) -> RenderableType:
+        rendered = super().render_element(
+            element=element, is_active=is_active, done=done, parent=parent, **kwargs
+        )
+
+        emoji = kwargs.get("emoji", "")
+
+        if not emoji and not kwargs.get("bullet", True):
+            indent = Text(" " * (self.content_padding + 1))
+            return IndentedBlock(rendered, first_prefix=indent, prefix=indent)
+
+        return IndentedBlock(
+            rendered,
+            first_prefix=self._get_bullet_prefix(emoji),
+            prefix=Text(" " * (self.content_padding + self.emoji_column_width)),
+        )
+
+    def _get_bullet_prefix(self, emoji: str) -> Text:
+        prefix = Text(" " * self.content_padding)
+
+        if emoji:
+            prefix.append_text(Text.from_markup(emoji))
+
+        prefix.pad_right(
+            self.content_padding + self.emoji_column_width - prefix.cell_len
+        )
+
+        return prefix
+
+
+LOG_LEVEL_COLORS = {
+    "debug": "blue",
+    "info": "cyan",
+    "warning": "yellow",
+    "warn": "yellow",
+    "error": "red",
+    "critical": "magenta",
+    "fatal": "magenta",
+}
+
+
+def _get_log_bullet(level: str) -> str:
+    """Colored bar rendered in the emoji bullet column, matching the log
+    level, like the ``fastapi cloud logs`` output."""
+    color = LOG_LEVEL_COLORS.get(level.lower(), "dim")
+
+    return f"[{color}]▕[/{color}]"
+
+
+class CustomFormatter(DefaultFormatter):
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
+        self.toolkit = get_rich_toolkit()
+
+    def formatMessage(self, record: logging.LogRecord) -> str:
+        message = record.getMessage()
+        result = self.toolkit.print_as_string(
+            message, emoji=_get_log_bullet(record.levelname)
+        )
+        # Prepend newline to fix alignment after ^C is printed by the terminal
+        if message == "Shutting down":
+            result = "\n" + result
+        return result
+
+
+def get_uvicorn_log_config() -> dict[str, Any]:
+    return {
+        "version": 1,
+        "disable_existing_loggers": False,
+        "formatters": {
+            "default": {
+                "()": CustomFormatter,
+                "fmt": "%(levelprefix)s %(message)s",
+                "use_colors": None,
+            },
+            "access": {
+                "()": CustomFormatter,
+                "fmt": "%(levelprefix)s %(client_addr)s - '%(request_line)s' %(status_code)s",
+            },
+        },
+        "handlers": {
+            "default": {
+                "formatter": "default",
+                "class": "logging.StreamHandler",
+                "stream": "ext://sys.stderr",
+            },
+            "access": {
+                "formatter": "access",
+                "class": "logging.StreamHandler",
+                "stream": "ext://sys.stdout",
+            },
+        },
+        "loggers": {
+            "uvicorn": {
+                "handlers": ["default"],
+                "level": "INFO",
+                "propagate": False,
+            },
+            "uvicorn.error": {"level": "INFO"},
+            "uvicorn.access": {
+                "handlers": ["access"],
+                "level": "INFO",
+                "propagate": False,
+            },
+        },
+    }
+
+
+def get_rich_toolkit() -> RichToolkit:
+    return RichToolkit(style=FastAPIStyle())

{fastapi_cli-0.0.29 → fastapi_cli-0.0.31}/tests/test_cli.py

@@ -1,3 +1,4 @@
+import logging
 import subprocess
 import sys
 from pathlib import Path
@@ -40,20 +41,16 @@ def test_dev() -> None:
                 "forwarded_allow_ips": None,
                 "log_config": get_uvicorn_log_config(),
             }
+        assert "Starting FastAPI in development mode" in result.output
         assert "Using import string: single_file_app:app" in result.output
-        assert "Configuration sources:" in result.output
-        assert "Module: path CLI argument" in result.output
-        assert "App name: auto-discovery" in result.output
-        assert "You can configure an entrypoint in pyproject.toml" not in result.output
-        assert "Starting development server 🚀" in result.output
         assert "Server started at http://127.0.0.1:8000" in result.output
         assert "Documentation at http://127.0.0.1:8000/docs" in result.output
-        assert (
-            "Running in development mode, for production use: fastapi run"
-            in result.output
-        )
-
-        assert "🐍 single_file_app.py" in result.output
+        # a passed path is explicit, so no source hint and no pyproject nudge
+        assert "(auto-discovered" not in result.output
+        assert "You can configure an entrypoint in pyproject.toml" not in result.output
+        # the step-by-step narration is --verbose only
+        assert "Searching for package file structure" not in result.output
+        assert "Configuration sources:" not in result.output
 
 
 def test_run_uses_uvicorn_default_log_config_without_rich_logs(
@@ -83,12 +80,16 @@ def test_dev_no_args_auto_discovery() -> None:
             assert mock_run.call_args.kwargs["host"] == "127.0.0.1"
             assert mock_run.call_args.kwargs["port"] == 8000
             assert mock_run.call_args.kwargs["reload"] is True
+        assert "Starting FastAPI in development mode" in result.output
         assert "Using import string: main:app" in result.output
-        assert "Configuration sources:" in result.output
-        assert "Import string: auto-discovery" in result.output
+        # Rich can wrap the rest of the hint based on terminal and emoji width
+        assert "(auto-discovered, use --verbose" in result.output
+        # auto-discovery nudges you to pin the entrypoint
         assert "You can configure an entrypoint in pyproject.toml" in result.output
         assert "[tool.fastapi]" in result.output
         assert 'entrypoint = "main:app"' in result.output
+        # the full breakdown stays behind --verbose
+        assert "Configuration sources:" not in result.output
 
 
 def test_dev_package() -> None:
@@ -110,22 +111,14 @@ def test_dev_package() -> None:
                 "forwarded_allow_ips": None,
                 "log_config": get_uvicorn_log_config(),
             }
+        assert "Starting FastAPI in development mode" in result.output
         assert "Using import string: nested_package.package:app" in result.output
-        assert "Module: path CLI argument" in result.output
-        assert "App name: auto-discovery" in result.output
-        assert "You can configure an entrypoint in pyproject.toml" not in result.output
-        assert "Starting development server 🚀" in result.output
         assert "Server started at http://127.0.0.1:8000" in result.output
         assert "Documentation at http://127.0.0.1:8000/docs" in result.output
-        assert (
-            "Running in development mode, for production use: fastapi run"
-            in result.output
-        )
-
-        assert "📁 package" in result.output
-        assert "└── 🐍 __init__.py" in result.output
-        assert "└── 📁 package" in result.output
-        assert "    └── 🐍 __init__.py" in result.output
+        assert "(auto-discovered" not in result.output
+        assert "You can configure an entrypoint in pyproject.toml" not in result.output
+        # the file tree is --verbose only
+        assert "📁 package" not in result.output
 
 
 def test_dev_args() -> None:
@@ -163,17 +156,12 @@ def test_dev_args() -> None:
                 "forwarded_allow_ips": None,
                 "log_config": get_uvicorn_log_config(),
             }
+        assert "Starting FastAPI in development mode" in result.output
         assert "Using import string: single_file_app:api" in result.output
-        assert "Module: path CLI argument" in result.output
-        assert "App name: --app CLI option" in result.output
-        assert "You can configure an entrypoint in pyproject.toml" not in result.output
-        assert "Starting development server 🚀" in result.output
         assert "Server started at http://192.168.0.2:8080" in result.output
         assert "Documentation at http://192.168.0.2:8080/docs" in result.output
-        assert (
-            "Running in development mode, for production use: fastapi run"
-            in result.output
-        )
+        assert "(auto-discovered" not in result.output
+        assert "You can configure an entrypoint in pyproject.toml" not in result.output
 
 
 def test_dev_env_vars() -> None:
@@ -197,17 +185,10 @@ def test_dev_env_vars() -> None:
                 "forwarded_allow_ips": None,
                 "log_config": get_uvicorn_log_config(),
             }
+        assert "Starting FastAPI in development mode" in result.output
         assert "Using import string: single_file_app:app" in result.output
-        assert "Module: path CLI argument" in result.output
-        assert "App name: auto-discovery" in result.output
-        assert "You can configure an entrypoint in pyproject.toml" not in result.output
-        assert "Starting development server 🚀" in result.output
         assert "Server started at http://127.0.0.1:8111" in result.output
         assert "Documentation at http://127.0.0.1:8111/docs" in result.output
-        assert (
-            "Running in development mode, for production use: fastapi run"
-            in result.output
-        )
 
 
 def test_dev_env_vars_and_args() -> None:
@@ -238,17 +219,68 @@ def test_dev_env_vars_and_args() -> None:
                 "forwarded_allow_ips": None,
                 "log_config": get_uvicorn_log_config(),
             }
+        assert "Starting FastAPI in development mode" in result.output
         assert "Using import string: single_file_app:app" in result.output
-        assert "Module: path CLI argument" in result.output
-        assert "App name: auto-discovery" in result.output
-        assert "You can configure an entrypoint in pyproject.toml" not in result.output
-        assert "Starting development server 🚀" in result.output
         assert "Server started at http://127.0.0.1:8080" in result.output
         assert "Documentation at http://127.0.0.1:8080/docs" in result.output
-        assert (
-            "Running in development mode, for production use: fastapi run"
-            in result.output
-        )
+
+
+def test_dev_verbose() -> None:
+    """--verbose restores the full narration and the module file tree."""
+    with changing_dir(assets_path):
+        with patch.object(uvicorn, "run") as mock_run:
+            result = runner.invoke(app, ["dev", "nested_package/package", "--verbose"])
+            assert result.exit_code == 0, result.output
+            assert mock_run.called
+        assert "Starting FastAPI in development mode" in result.output
+        assert "Searching for package file structure" in result.output
+        assert "Importing from" in result.output
+        assert "Importing the FastAPI app object" in result.output
+        assert "from nested_package.package import app" in result.output
+        assert "Using import string: nested_package.package:app" in result.output
+        # module and app come from different sources here
+        assert "Configuration sources:" in result.output
+        assert "Module: path CLI argument" in result.output
+        assert "App name: auto-discovery" in result.output
+        # the file tree
+        assert "📁 package" in result.output
+        assert "🐍 __init__.py" in result.output
+        # the source hint is folded away in verbose mode
+        assert "(auto-discovered, use --verbose to learn more)" not in result.output
+
+
+def test_dev_verbose_auto_discovery() -> None:
+    """--verbose with auto-discovery shows the single 'import string' source."""
+    with changing_dir(assets_path / "default_files" / "default_main"):
+        with patch.object(uvicorn, "run") as mock_run:
+            result = runner.invoke(app, ["dev", "--verbose"])
+            assert result.exit_code == 0, result.output
+            assert mock_run.called
+        assert "Searching for package file structure" in result.output
+        assert "Importing the FastAPI app object" in result.output
+        assert "Using import string: main:app" in result.output
+        assert "Configuration sources:" in result.output
+        # module and app share the same source (auto-discovery)
+        assert "Import string: auto-discovery" in result.output
+        # auto-discovery still nudges to pin the entrypoint
+        assert "You can configure an entrypoint in pyproject.toml" in result.output
+
+
+def test_global_verbose_enables_debug_logging() -> None:
+    with changing_dir(assets_path):
+        with patch.object(uvicorn, "run"):
+            result = runner.invoke(app, ["--verbose", "dev", "single_file_app.py"])
+            assert result.exit_code == 0, result.output
+
+    assert logging.getLogger("fastapi_cli").level == logging.DEBUG
+
+    # a run without --verbose resets the level
+    with changing_dir(assets_path):
+        with patch.object(uvicorn, "run"):
+            result = runner.invoke(app, ["dev", "single_file_app.py"])
+            assert result.exit_code == 0, result.output
+
+    assert logging.getLogger("fastapi_cli").level == logging.INFO
 
 
 def test_entrypoint_mutually_exclusive_with_path() -> None:
@@ -287,11 +319,8 @@ def test_run() -> None:
                 "forwarded_allow_ips": None,
                 "log_config": get_uvicorn_log_config(),
             }
+        assert "Starting FastAPI in production mode" in result.output
         assert "Using import string: single_file_app:app" in result.output
-        assert "Module: path CLI argument" in result.output
-        assert "App name: auto-discovery" in result.output
-        assert "You can configure an entrypoint in pyproject.toml" not in result.output
-        assert "Starting production server 🚀" in result.output
         assert "Server started at http://0.0.0.0:8000" in result.output
         assert "Documentation at http://0.0.0.0:8000/docs" in result.output
 
@@ -317,14 +346,10 @@ def test_run_trust_proxy() -> None:
                 "forwarded_allow_ips": "*",
                 "log_config": get_uvicorn_log_config(),
             }
+        assert "Starting FastAPI in production mode" in result.output
         assert "Using import string: single_file_app:app" in result.output
-        assert "Starting production server 🚀" in result.output
         assert "Server started at http://0.0.0.0:8000" in result.output
         assert "Documentation at http://0.0.0.0:8000/docs" in result.output
-        assert (
-            "Running in development mode, for production use: fastapi run"
-            not in result.output
-        )
 
 
 def test_run_args() -> None:
@@ -365,17 +390,10 @@ def test_run_args() -> None:
                 "log_config": get_uvicorn_log_config(),
             }
 
+        assert "Starting FastAPI in production mode" in result.output
         assert "Using import string: single_file_app:api" in result.output
-        assert "Module: path CLI argument" in result.output
-        assert "App name: --app CLI option" in result.output
-        assert "You can configure an entrypoint in pyproject.toml" not in result.output
-        assert "Starting production server 🚀" in result.output
         assert "Server started at http://192.168.0.2:8080" in result.output
         assert "Documentation at http://192.168.0.2:8080/docs" in result.output
-        assert (
-            "Running in development mode, for production use: fastapi run"
-            not in result.output
-        )
 
 
 def test_run_env_vars() -> None:
@@ -399,11 +417,8 @@ def test_run_env_vars() -> None:
                 "forwarded_allow_ips": None,
                 "log_config": get_uvicorn_log_config(),
             }
+        assert "Starting FastAPI in production mode" in result.output
         assert "Using import string: single_file_app:app" in result.output
-        assert "Module: path CLI argument" in result.output
-        assert "App name: auto-discovery" in result.output
-        assert "You can configure an entrypoint in pyproject.toml" not in result.output
-        assert "Starting production server 🚀" in result.output
         assert "Server started at http://0.0.0.0:8111" in result.output
         assert "Documentation at http://0.0.0.0:8111/docs" in result.output
 
@@ -436,11 +451,8 @@ def test_run_env_vars_and_args() -> None:
                 "forwarded_allow_ips": None,
                 "log_config": get_uvicorn_log_config(),
             }
+        assert "Starting FastAPI in production mode" in result.output
         assert "Using import string: single_file_app:app" in result.output
-        assert "Module: path CLI argument" in result.output
-        assert "App name: auto-discovery" in result.output
-        assert "You can configure an entrypoint in pyproject.toml" not in result.output
-        assert "Starting production server 🚀" in result.output
         assert "Server started at http://0.0.0.0:8080" in result.output
         assert "Documentation at http://0.0.0.0:8080/docs" in result.output
 
@@ -485,7 +497,7 @@ def test_public_url_env_var(command: str, public_url: str) -> None:
 
         assert "Using import string: single_file_app:app" in result.output
         assert (
-            f"Starting {'development' if command == 'dev' else 'production'} server 🚀"
+            f"Starting FastAPI in {'development' if command == 'dev' else 'production'} mode"
             in result.output
         )
         expected_url_base = public_url.rstrip("/")
@@ -601,7 +613,8 @@ def test_dev_with_import_string() -> None:
                 "log_config": get_uvicorn_log_config(),
             }
         assert "Using import string: single_file_app:api" in result.output
-        assert "Import string: --entrypoint CLI option" in result.output
+        # an explicit entrypoint is not auto-discovery
+        assert "(auto-discovered" not in result.output
         assert "You can configure an entrypoint in pyproject.toml" not in result.output
 
 
@@ -625,7 +638,7 @@ def test_run_with_import_string() -> None:
                 "log_config": get_uvicorn_log_config(),
             }
         assert "Using import string: single_file_app:app" in result.output
-        assert "Import string: --entrypoint CLI option" in result.output
+        assert "(auto-discovered" not in result.output
         assert "You can configure an entrypoint in pyproject.toml" not in result.output
 
 

{fastapi_cli-0.0.29 → fastapi_cli-0.0.31}/tests/test_cli_pyproject.py

@@ -26,8 +26,9 @@ def test_dev_with_pyproject_app_config_uses() -> None:
         assert mock_run.call_args.kwargs["reload"] is True
 
         assert "Using import string: my_module:app" in result.output
-        assert "Configuration sources:" in result.output
-        assert "Import string: entrypoint in pyproject.toml" in result.output
+        # a configured entrypoint is not auto-discovery
+        assert "(auto-discovered" not in result.output
+        assert "Configuration sources:" not in result.output
 
 
 def test_run_with_pyproject_app_config() -> None:
@@ -44,8 +45,8 @@ def test_run_with_pyproject_app_config() -> None:
         assert mock_run.call_args.kwargs["reload"] is False
 
         assert "Using import string: my_module:app" in result.output
-        assert "Configuration sources:" in result.output
-        assert "Import string: entrypoint in pyproject.toml" in result.output
+        assert "(auto-discovered" not in result.output
+        assert "Configuration sources:" not in result.output
 
 
 def test_cli_arg_overrides_pyproject_config() -> None:
@@ -58,9 +59,8 @@ def test_cli_arg_overrides_pyproject_config() -> None:
         assert result.exit_code == 0, result.output
 
         assert mock_run.call_args.kwargs["app"] == "another_module:app"
-        assert "Configuration sources:" in result.output
-        assert "Module: path CLI argument" in result.output
-        assert "App name: auto-discovery" in result.output
+        assert "Using import string: another_module:app" in result.output
+        assert "Configuration sources:" not in result.output
 
 
 def test_pyproject_app_config_invalid_format() -> None:

{fastapi_cli-0.0.29 → fastapi_cli-0.0.31}/tests/test_utils_cli.py

@@ -47,7 +47,8 @@ def test_custom_formatter() -> None:
 
     formatted = formatter.formatMessage(record)
 
-    assert "INFO" in formatted
+    # the log level is shown as a colored bar bullet, like `fastapi cloud logs`
+    assert "▕" in formatted
     assert "127.0.0.1" in formatted
     assert "GET / HTTP/1.1" in formatted
     assert "200" in formatted

fastapi_cli-0.0.29/src/fastapi_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.0.29"

fastapi_cli-0.0.29/src/fastapi_cli/utils/cli.py

@@ -1,91 +0,0 @@
-import logging
-import sys
-from typing import Any
-
-from rich_toolkit import RichToolkit, RichToolkitTheme
-from rich_toolkit.styles import TaggedStyle
-from uvicorn.logging import DefaultFormatter
-
-
-class CustomFormatter(DefaultFormatter):
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        super().__init__(*args, **kwargs)
-        self.toolkit = get_rich_toolkit()
-
-    def formatMessage(self, record: logging.LogRecord) -> str:
-        message = record.getMessage()
-        result = self.toolkit.print_as_string(message, tag=record.levelname)
-        # Prepend newline to fix alignment after ^C is printed by the terminal
-        if message == "Shutting down":
-            result = "\n" + result
-        return result
-
-
-def should_use_rich_logs() -> bool:
-    """Return True when stdout is a TTY and rich logs should be used, False otherwise."""
-    return sys.stdout.isatty()
-
-
-def get_uvicorn_log_config() -> dict[str, Any]:
-    return {
-        "version": 1,
-        "disable_existing_loggers": False,
-        "formatters": {
-            "default": {
-                "()": CustomFormatter,
-                "fmt": "%(levelprefix)s %(message)s",
-                "use_colors": None,
-            },
-            "access": {
-                "()": CustomFormatter,
-                "fmt": "%(levelprefix)s %(client_addr)s - '%(request_line)s' %(status_code)s",
-            },
-        },
-        "handlers": {
-            "default": {
-                "formatter": "default",
-                "class": "logging.StreamHandler",
-                "stream": "ext://sys.stderr",
-            },
-            "access": {
-                "formatter": "access",
-                "class": "logging.StreamHandler",
-                "stream": "ext://sys.stdout",
-            },
-        },
-        "loggers": {
-            "uvicorn": {
-                "handlers": ["default"],
-                "level": "INFO",
-                "propagate": False,
-            },
-            "uvicorn.error": {"level": "INFO"},
-            "uvicorn.access": {
-                "handlers": ["access"],
-                "level": "INFO",
-                "propagate": False,
-            },
-        },
-    }
-
-
-logger = logging.getLogger(__name__)
-
-
-def get_rich_toolkit() -> RichToolkit:
-    theme = RichToolkitTheme(
-        style=TaggedStyle(tag_width=11),
-        theme={
-            "tag.title": "white on #009485",
-            "tag": "white on #007166",
-            "placeholder": "grey85",
-            "text": "white",
-            "selected": "#007166",
-            "result": "grey85",
-            "progress": "on #007166",
-            "error": "red",
-            "log.info": "black on blue",
-        },
-    )
-
-    return RichToolkit(theme=theme)