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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-cli
-Version: 0.0.27
+Version: 0.0.29
 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
@@ -48,9 +48,6 @@ Description-Content-Type: text/markdown
 <a href="https://github.com/fastapi/fastapi-cli/actions/workflows/test.yml" target="_blank">
     <img src="https://github.com/fastapi/fastapi-cli/actions/workflows/test.yml/badge.svg" alt="Test">
 </a>
-<a href="https://github.com/fastapi/fastapi-cli/actions/workflows/publish.yml" target="_blank">
-    <img src="https://github.com/fastapi/fastapi-cli/actions/workflows/publish.yml/badge.svg" alt="Publish">
-</a>
 <a href="https://coverage-badge.samuelcolvin.workers.dev/redirect/fastapi/fastapi-cli" target="_blank">
     <img src="https://coverage-badge.samuelcolvin.workers.dev/fastapi/fastapi-cli.svg" alt="Coverage">
 <a href="https://pypi.org/project/fastapi-cli" target="_blank">

{fastapi_cli-0.0.27 → fastapi_cli-0.0.29}/README.md

@@ -3,9 +3,6 @@
 <a href="https://github.com/fastapi/fastapi-cli/actions/workflows/test.yml" target="_blank">
     <img src="https://github.com/fastapi/fastapi-cli/actions/workflows/test.yml/badge.svg" alt="Test">
 </a>
-<a href="https://github.com/fastapi/fastapi-cli/actions/workflows/publish.yml" target="_blank">
-    <img src="https://github.com/fastapi/fastapi-cli/actions/workflows/publish.yml/badge.svg" alt="Publish">
-</a>
 <a href="https://coverage-badge.samuelcolvin.workers.dev/redirect/fastapi/fastapi-cli" target="_blank">
     <img src="https://coverage-badge.samuelcolvin.workers.dev/fastapi/fastapi-cli.svg" alt="Coverage">
 <a href="https://pypi.org/project/fastapi-cli" target="_blank">

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

@@ -38,7 +38,7 @@ dependencies = [
     "rich-toolkit >= 0.14.8",
     "tomli >= 2.0.0; python_version < '3.11'",
 ]
-version = "0.0.27"
+version = "0.0.29"
 
 [project.optional-dependencies]
 standard = [
@@ -171,10 +171,14 @@ error-on-warning = true
 extend-exclude = [
     "coverage/",
     "dist/",
-    "release-notes.md",
     "htmlcov/",
     "uv.lock",
 ]
 
+[tool.typos.default]
+extend-ignore-re = [
+    "@[a-zA-Z0-9](?:-?[a-zA-Z0-9])*",
+]
+
 [tool.typos.default.extend-identifiers]
 alls = "alls"

fastapi_cli-0.0.29/src/fastapi_cli/__init__.py

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

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

@@ -20,7 +20,11 @@ from fastapi_cli.exceptions import FastAPICLIException
 
 from . import __version__
 from .logging import setup_logging
-from .utils.cli import get_rich_toolkit, get_uvicorn_log_config
+from .utils.cli import (
+    get_rich_toolkit,
+    get_uvicorn_log_config,
+    should_use_rich_logs,
+)
 
 app = typer.Typer(
     rich_markup_mode="rich", context_settings={"help_option_names": ["-h", "--help"]}
@@ -271,6 +275,10 @@ def _run(
         toolkit.print("Logs:")
         toolkit.print_line()
 
+        extra_uvicorn_kwargs: dict[str, Any] = (
+            {"log_config": get_uvicorn_log_config()} if should_use_rich_logs() else {}
+        )
+
         uvicorn.run(
             app=import_string,
             host=host,
@@ -285,7 +293,7 @@ def _run(
             root_path=root_path,
             proxy_headers=proxy_headers,
             forwarded_allow_ips=forwarded_allow_ips,
-            log_config=get_uvicorn_log_config(),
+            **extra_uvicorn_kwargs,
         )
 
 

{fastapi_cli-0.0.27 → fastapi_cli-0.0.29}/src/fastapi_cli/utils/cli.py

@@ -1,4 +1,5 @@
 import logging
+import sys
 from typing import Any
 
 from rich_toolkit import RichToolkit, RichToolkitTheme
@@ -20,6 +21,11 @@ class CustomFormatter(DefaultFormatter):
         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,
@@ -48,7 +54,11 @@ def get_uvicorn_log_config() -> dict[str, Any]:
             },
         },
         "loggers": {
-            "uvicorn": {"handlers": ["default"], "level": "INFO"},
+            "uvicorn": {
+                "handlers": ["default"],
+                "level": "INFO",
+                "propagate": False,
+            },
             "uvicorn.error": {"level": "INFO"},
             "uvicorn.access": {
                 "handlers": ["access"],

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

@@ -16,6 +16,11 @@ runner = CliRunner()
 assets_path = Path(__file__).parent / "assets"
 
 
+@pytest.fixture(autouse=True)
+def force_rich_logs(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setattr("fastapi_cli.cli.should_use_rich_logs", lambda: True)
+
+
 def test_dev() -> None:
     with changing_dir(assets_path):
         with patch.object(uvicorn, "run") as mock_run:
@@ -51,6 +56,21 @@ def test_dev() -> None:
         assert "🐍 single_file_app.py" in result.output
 
 
+def test_run_uses_uvicorn_default_log_config_without_rich_logs(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setattr("fastapi_cli.cli.should_use_rich_logs", lambda: False)
+
+    with changing_dir(assets_path):
+        with patch.object(uvicorn, "run") as mock_run:
+            result = runner.invoke(app, ["run", "single_file_app.py"])
+            assert result.exit_code == 0, result.output
+            assert mock_run.called
+            assert mock_run.call_args
+
+    assert "log_config" not in mock_run.call_args.kwargs
+
+
 def test_dev_no_args_auto_discovery() -> None:
     """Test that auto-discovery works when no args and no pyproject.toml entrypoint"""
     with changing_dir(assets_path / "default_files" / "default_main"):

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

@@ -1,9 +1,15 @@
+import io
 import logging
+import sys
 from logging.config import dictConfig
 
-from pytest import LogCaptureFixture
+from pytest import LogCaptureFixture, MonkeyPatch
 
-from fastapi_cli.utils.cli import CustomFormatter, get_uvicorn_log_config
+from fastapi_cli.utils.cli import (
+    CustomFormatter,
+    get_uvicorn_log_config,
+    should_use_rich_logs,
+)
 
 
 def test_get_uvicorn_config_uses_custom_formatter() -> None:
@@ -11,6 +17,15 @@ def test_get_uvicorn_config_uses_custom_formatter() -> None:
 
     assert config["formatters"]["default"]["()"] is CustomFormatter
     assert config["formatters"]["access"]["()"] is CustomFormatter
+    assert config["loggers"]["uvicorn"]["propagate"] is False
+
+
+def test_should_use_rich_logs_is_false_without_tty(
+    monkeypatch: MonkeyPatch,
+) -> None:
+    monkeypatch.setattr(sys, "stdout", io.StringIO())
+
+    assert should_use_rich_logs() is False
 
 
 def test_custom_formatter() -> None:

fastapi_cli-0.0.27/src/fastapi_cli/__init__.py

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