fastapi-cli 0.0.17__tar.gz → 0.0.19__tar.gz

{fastapi_cli-0.0.17 → fastapi_cli-0.0.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-cli
-Version: 0.0.17
+Version: 0.0.19
 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
@@ -19,7 +19,6 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Framework :: FastAPI
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -31,7 +30,7 @@ Project-URL: Documentation, https://fastapi.tiangolo.com/fastapi-cli/
 Project-URL: Repository, https://github.com/fastapi/fastapi-cli
 Project-URL: Issues, https://github.com/fastapi/fastapi-cli/issues
 Project-URL: Changelog, https://github.com/fastapi/fastapi-cli/blob/main/release-notes.md
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Requires-Dist: typer>=0.15.1
 Requires-Dist: uvicorn[standard]>=0.15.0
 Requires-Dist: rich-toolkit>=0.14.8
@@ -41,6 +40,8 @@ Requires-Dist: uvicorn[standard]>=0.15.0; extra == "standard"
 Requires-Dist: fastapi-cloud-cli>=0.1.1; extra == "standard"
 Provides-Extra: standard-no-fastapi-cloud-cli
 Requires-Dist: uvicorn[standard]>=0.15.0; extra == "standard-no-fastapi-cloud-cli"
+Provides-Extra: new
+Requires-Dist: fastapi-new>=0.0.2; python_version >= "3.10" and extra == "new"
 Description-Content-Type: text/markdown
 
 # FastAPI CLI

{fastapi_cli-0.0.17 → fastapi_cli-0.0.19}/pdm_build.py

@@ -1,5 +1,5 @@
 import os
-from typing import Any, Dict
+from typing import Any
 
 from pdm.backend.hooks import Context
 
@@ -9,12 +9,12 @@ TIANGOLO_BUILD_PACKAGE = os.getenv("TIANGOLO_BUILD_PACKAGE", "fastapi-cli")
 def pdm_build_initialize(context: Context):
     metadata = context.config.metadata
     # Get custom config for the current package, from the env var
-    config: Dict[str, Any] = context.config.data["tool"]["tiangolo"][
+    config: dict[str, Any] = context.config.data["tool"]["tiangolo"][
         "_internal-slim-build"
     ]["packages"].get(TIANGOLO_BUILD_PACKAGE)
     if not config:
         return
-    project_config: Dict[str, Any] = config["project"]
+    project_config: dict[str, Any] = config["project"]
     # Override main [project] configs with custom configs for this package
     for key, value in project_config.items():
         metadata[key] = value

{fastapi_cli-0.0.17 → fastapi_cli-0.0.19}/pyproject.toml

@@ -5,7 +5,7 @@ description = "Run and manage FastAPI apps from the command line with FastAPI CL
 authors = [
     { name = "Sebastián Ramírez", email = "tiangolo@gmail.com" },
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 readme = "README.md"
 license = "MIT"
 license-files = [
@@ -26,7 +26,6 @@ classifiers = [
     "Framework :: FastAPI",
     "Intended Audience :: Developers",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
@@ -40,7 +39,7 @@ dependencies = [
     "rich-toolkit >= 0.14.8",
     "tomli >= 2.0.0; python_version < '3.11'",
 ]
-version = "0.0.17"
+version = "0.0.19"
 
 [project.optional-dependencies]
 standard = [
@@ -50,6 +49,9 @@ standard = [
 standard-no-fastapi-cloud-cli = [
     "uvicorn[standard] >= 0.15.0",
 ]
+new = [
+    "fastapi-new >= 0.0.2 ; python_version >= '3.10'",
+]
 
 [project.urls]
 Homepage = "https://github.com/fastapi/fastapi-cli"

fastapi_cli-0.0.19/src/fastapi_cli/__init__.py

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

{fastapi_cli-0.0.17 → fastapi_cli-0.0.19}/src/fastapi_cli/cli.py

@@ -1,12 +1,11 @@
 import logging
 from pathlib import Path
-from typing import Any, List, Union
+from typing import Annotated, Any, Union
 
 import typer
 from pydantic import ValidationError
 from rich import print
 from rich.tree import Tree
-from typing_extensions import Annotated
 
 from fastapi_cli.config import FastAPIConfig
 from fastapi_cli.discover import get_import_data, get_import_data_from_import_string
@@ -39,6 +38,16 @@ except ImportError:  # pragma: no cover
     pass
 
 
+try:
+    from fastapi_new.cli import (  # type: ignore[import-not-found]
+        app as fastapi_new_cli,
+    )
+
+    app.add_typer(fastapi_new_cli)  # pragma: no cover
+except ImportError:  # pragma: no cover
+    pass
+
+
 def version_callback(value: bool) -> None:
     if value:
         print(f"FastAPI CLI version: [green]{__version__}[/green]")
@@ -68,7 +77,7 @@ def callback(
     setup_logging(level=log_level)
 
 
-def _get_module_tree(module_paths: List[Path]) -> Tree:
+def _get_module_tree(module_paths: list[Path]) -> Tree:
     root = module_paths[0]
     name = f"🐍 {root.name}" if root.is_file() else f"📁 {root.name}"
 

{fastapi_cli-0.0.17 → fastapi_cli-0.0.19}/src/fastapi_cli/config.py

@@ -1,6 +1,6 @@
 import logging
 from pathlib import Path
-from typing import Any, Dict, Optional
+from typing import Any, Optional
 
 from pydantic import BaseModel, StrictStr
 
@@ -11,7 +11,7 @@ class FastAPIConfig(BaseModel):
     entrypoint: Optional[StrictStr] = None
 
     @classmethod
-    def _read_pyproject_toml(cls) -> Dict[str, Any]:
+    def _read_pyproject_toml(cls) -> dict[str, Any]:
         """Read FastAPI configuration from pyproject.toml in current directory."""
         pyproject_path = Path.cwd() / "pyproject.toml"
 

{fastapi_cli-0.0.17 → fastapi_cli-0.0.19}/src/fastapi_cli/discover.py

@@ -3,7 +3,7 @@ import sys
 from dataclasses import dataclass
 from logging import getLogger
 from pathlib import Path
-from typing import List, Union
+from typing import Union
 
 from fastapi_cli.exceptions import FastAPICLIException
 
@@ -39,7 +39,7 @@ def get_default_path() -> Path:
 class ModuleData:
     module_import_str: str
     extra_sys_path: Path
-    module_paths: List[Path]
+    module_paths: list[Path]
 
 
 def get_module_data_from_path(path: Path) -> ModuleData:

{fastapi_cli-0.0.17 → fastapi_cli-0.0.19}/src/fastapi_cli/utils/cli.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Any, Dict
+from typing import Any
 
 from rich_toolkit import RichToolkit, RichToolkitTheme
 from rich_toolkit.styles import TaggedStyle
@@ -12,10 +12,15 @@ class CustomFormatter(DefaultFormatter):
         self.toolkit = get_rich_toolkit()
 
     def formatMessage(self, record: logging.LogRecord) -> str:
-        return self.toolkit.print_as_string(record.getMessage(), tag=record.levelname)
+        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 get_uvicorn_log_config() -> Dict[str, Any]:
+def get_uvicorn_log_config() -> dict[str, Any]:
     return {
         "version": 1,
         "disable_existing_loggers": False,

{fastapi_cli-0.0.17 → fastapi_cli-0.0.19}/tests/conftest.py

@@ -1,5 +1,5 @@
 import sys
-from typing import Generator
+from collections.abc import Generator
 
 import pytest
 from typer import rich_utils

{fastapi_cli-0.0.17 → fastapi_cli-0.0.19}/tests/test_cli_pyproject.py

@@ -13,9 +13,10 @@ assets_path = Path(__file__).parent / "assets"
 
 
 def test_dev_with_pyproject_app_config_uses() -> None:
-    with changing_dir(assets_path / "pyproject_config"), patch.object(
-        uvicorn, "run"
-    ) as mock_run:
+    with (
+        changing_dir(assets_path / "pyproject_config"),
+        patch.object(uvicorn, "run") as mock_run,
+    ):
         result = runner.invoke(app, ["dev"])
         assert result.exit_code == 0, result.output
 
@@ -28,9 +29,10 @@ def test_dev_with_pyproject_app_config_uses() -> None:
 
 
 def test_run_with_pyproject_app_config() -> None:
-    with changing_dir(assets_path / "pyproject_config"), patch.object(
-        uvicorn, "run"
-    ) as mock_run:
+    with (
+        changing_dir(assets_path / "pyproject_config"),
+        patch.object(uvicorn, "run") as mock_run,
+    ):
         result = runner.invoke(app, ["run"])
         assert result.exit_code == 0, result.output
 
@@ -43,9 +45,10 @@ def test_run_with_pyproject_app_config() -> None:
 
 
 def test_cli_arg_overrides_pyproject_config() -> None:
-    with changing_dir(assets_path / "pyproject_config"), patch.object(
-        uvicorn, "run"
-    ) as mock_run:
+    with (
+        changing_dir(assets_path / "pyproject_config"),
+        patch.object(uvicorn, "run") as mock_run,
+    ):
         result = runner.invoke(app, ["dev", "another_module.py"])
 
         assert result.exit_code == 0, result.output

{fastapi_cli-0.0.17 → fastapi_cli-0.0.19}/tests/test_utils_cli.py

@@ -37,6 +37,25 @@ def test_custom_formatter() -> None:
     assert "200" in formatted
 
 
+def test_custom_formatter_shutdown_prepends_newline() -> None:
+    formatter = CustomFormatter()
+
+    record = logging.LogRecord(
+        name="uvicorn.error",
+        level=logging.INFO,
+        pathname="",
+        lineno=0,
+        msg="Shutting down",
+        args=(),
+        exc_info=None,
+    )
+
+    formatted = formatter.formatMessage(record)
+
+    assert formatted.startswith("\n")
+    assert "Shutting down" in formatted
+
+
 def test_log_config_does_not_disable_existing_loggers(
     caplog: LogCaptureFixture,
 ) -> None:

{fastapi_cli-0.0.17 → fastapi_cli-0.0.19}/tests/utils.py

@@ -1,7 +1,8 @@
 import os
+from collections.abc import Generator
 from contextlib import contextmanager
 from pathlib import Path
-from typing import Generator, Union
+from typing import Union
 
 
 @contextmanager

fastapi_cli-0.0.17/src/fastapi_cli/__init__.py

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