Merge remote-tracking branch 'upstream/main' into prek

Author: YuriiMotov

.github/workflows/smokeshow.yml

@@ -13,7 +13,6 @@ env:
 
 jobs:
   smokeshow:
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
     steps:
       - name: Dump GitHub context
@@ -23,12 +22,10 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
-          python-version: '3.9'
+          python-version: '3.13'
       - name: Setup uv
         uses: astral-sh/setup-uv@v7
         with:
-          version: "0.4.15"
-          enable-cache: true
           cache-dependency-glob: |
             requirements**.txt
             pyproject.toml

.github/workflows/test.yml

@@ -30,28 +30,18 @@ jobs:
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         python-version: ["3.14"]
-        pydantic-version: ["v2"]
         include:
-          - python-version: "3.8"
-            pydantic-version: "v1"
-            os: windows-latest
           - python-version: "3.9"
-            pydantic-version: "v2"
             os: macos-latest
           - python-version: "3.10"
-            pydantic-version: "v1"
             os: ubuntu-latest
           - python-version: "3.11"
-            pydantic-version: "v2"
             os: windows-latest
           - python-version: "3.12"
-            pydantic-version: "v1"
             os: macos-latest
           - python-version: "3.13"
-            pydantic-version: "v1"
             os: ubuntu-latest
           - python-version: "3.13"
-            pydantic-version: "v2"
             os: windows-latest
       fail-fast: false
     runs-on: ${{ matrix.os }}
@@ -81,21 +71,18 @@ jobs:
           limit-access-to-actor: true
       - name: Install Dependencies
         run: uv pip install -r requirements-tests.txt
-      - name: Install Pydantic v1
-        if: matrix.pydantic-version == 'v1'
-        run: uv pip install "pydantic<2.0.0"
       - name: Lint
         run: bash scripts/lint.sh
       - run: mkdir coverage
       - name: Test
         run: bash scripts/test.sh
         env:
-          COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}-pydantic-${{ matrix.pydantic-version }}
-          CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}-pydantic-${{ matrix.pydantic-version }}
+          COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}
+          CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}
       - name: Store coverage files
         uses: actions/upload-artifact@v5
         with:
-          name: coverage-${{ runner.os }}-${{  matrix.python-version }}-pydantic-${{ matrix.pydantic-version }}
+          name: coverage-${{ runner.os }}-${{ matrix.python-version }}
           path: coverage
           include-hidden-files: true
 
@@ -110,7 +97,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
-          python-version: '3.8'
+          python-version: '3.9'
       - name: Setup uv
         uses: astral-sh/setup-uv@v7
         with:
@@ -128,14 +115,14 @@ jobs:
       - run: uv pip install -r requirements-tests.txt
       - run: ls -la coverage
       - run: coverage combine coverage
-      - run: coverage report
       - run: coverage html --title "Coverage for ${{ github.sha }}"
       - name: Store coverage HTML
         uses: actions/upload-artifact@v5
         with:
           name: coverage-html
           path: htmlcov
           include-hidden-files: true
+      - run: coverage report --fail-under=100
 
   # https://github.com/marketplace/actions/alls-green#why
   check:  # This job does nothing and is only used for the branch protection

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 @@
 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

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 = ["LICENSE"]
@@ -24,7 +24,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",
@@ -47,6 +46,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"

release-notes.md

@@ -2,8 +2,38 @@
 
 ## Latest Changes
 
+## 0.0.20
+
+### Features
+
+* ✨ Add --reload-dir option to dev command. PR [#267](https://github.com/fastapi/fastapi-cli/pull/267) by [@patrick91](https://github.com/patrick91).
+
+## 0.0.19
+
+### Breaking Changes
+
+* 🔧 Drop support for Python 3.8. PR [#269](https://github.com/fastapi/fastapi-cli/pull/269) by [@patrick91](https://github.com/patrick91).
+
+## 0.0.18
+
+### Features
+
+* ➕  Add `fastapi-new` in `new` optional dependency group. PR [#241](https://github.com/fastapi/fastapi-cli/pull/241) by [@savannahostrowski](https://github.com/savannahostrowski).
+
+### Fixes
+
+* 🐛 Fix log alignment when pressing Ctrl+C to stop server. PR [#253](https://github.com/fastapi/fastapi-cli/pull/253) by [@savannahostrowski](https://github.com/savannahostrowski).
+
+## 0.0.17
+
+### Upgrades
+
+* ➖ Drop support for Pydantic v1. PR [#268](https://github.com/fastapi/fastapi-cli/pull/268) by [@patrick91](https://github.com/patrick91).
+
 ### Internal
 
+* 👷 Configure coverage, error on main tests, don't wait for Smokeshow. PR [#265](https://github.com/fastapi/fastapi-cli/pull/265) by [@YuriiMotov](https://github.com/YuriiMotov).
+* 👷 Run Smokeshow always, even on test failures. PR [#264](https://github.com/fastapi/fastapi-cli/pull/264) by [@YuriiMotov](https://github.com/YuriiMotov).
 * ⬆ [pre-commit.ci] pre-commit autoupdate. PR [#247](https://github.com/fastapi/fastapi-cli/pull/247) by [@pre-commit-ci[bot]](https://github.com/apps/pre-commit-ci).
 * ⬆ Bump ruff from 0.14.5 to 0.14.6. PR [#245](https://github.com/fastapi/fastapi-cli/pull/245) by [@dependabot[bot]](https://github.com/apps/dependabot).
 * ⬆ Bump actions/checkout from 5 to 6. PR [#248](https://github.com/fastapi/fastapi-cli/pull/248) by [@dependabot[bot]](https://github.com/apps/dependabot).

src/fastapi_cli/__init__.py

@@ -1 +1 @@
-__version__ = "0.0.16"
+__version__ = "0.0.20"

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 @@
     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}"
 
@@ -95,6 +104,7 @@ def _run(
     host: str = "127.0.0.1",
     port: int = 8000,
     reload: bool = True,
+    reload_dirs: Union[list[Path], None] = None,
     workers: Union[int, None] = None,
     root_path: str = "",
     command: str,
@@ -210,6 +220,11 @@ def _run(
             host=host,
             port=port,
             reload=reload,
+            reload_dirs=(
+                [str(directory.resolve()) for directory in reload_dirs]
+                if reload_dirs
+                else None
+            ),
             workers=workers,
             root_path=root_path,
             proxy_headers=proxy_headers,
@@ -246,6 +261,12 @@ def dev(
             help="Enable auto-reload of the server when (code) files change. This is [bold]resource intensive[/bold], use it only during development."
         ),
     ] = True,
+    reload_dir: Annotated[
+        Union[list[Path], None],
+        typer.Option(
+            help="Set reload directories explicitly, instead of using the current working directory."
+        ),
+    ] = None,
     root_path: Annotated[
         str,
         typer.Option(
@@ -309,6 +330,7 @@ def dev(
         host=host,
         port=port,
         reload=reload,
+        reload_dirs=reload_dir,
         root_path=root_path,
         app=app,
         entrypoint=entrypoint,

src/fastapi_cli/config.py

@@ -1,21 +1,17 @@
 import logging
 from pathlib import Path
-from typing import Any, Dict, Optional
+from typing import Any, Optional
 
 from pydantic import BaseModel, StrictStr
-from pydantic.version import VERSION as PYDANTIC_VERSION
 
 logger = logging.getLogger(__name__)
 
-PYDANTIC_VERSION_MINOR_TUPLE = tuple(int(x) for x in PYDANTIC_VERSION.split(".")[:2])
-PYDANTIC_V2 = PYDANTIC_VERSION_MINOR_TUPLE[0] == 2
-
 
 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"
 
@@ -43,8 +39,4 @@ def resolve(cls, entrypoint: Optional[str] = None) -> "FastAPIConfig":
         if entrypoint is not None:
             config["entrypoint"] = entrypoint
 
-        # Pydantic v2 uses model_validate, v1 uses parse_obj
-        if not PYDANTIC_V2:
-            return cls.parse_obj(config)  # type: ignore[no-any-return, unused-ignore]
-
-        return cls.model_validate(config)  # type: ignore[no-any-return, unused-ignore, attr-defined]
+        return cls.model_validate(config)

src/fastapi_cli/discover.py

@@ -3,7 +3,7 @@
 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:

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 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         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,