fastapi-cli 0.0.16__tar.gz → 0.0.18__tar.gz

{fastapi_cli-0.0.16 → fastapi_cli-0.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-cli
-Version: 0.0.16
+Version: 0.0.18
 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
@@ -41,6 +41,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.16 → fastapi_cli-0.0.18}/pyproject.toml

@@ -40,7 +40,7 @@ dependencies = [
     "rich-toolkit >= 0.14.8",
     "tomli >= 2.0.0; python_version < '3.11'",
 ]
-version = "0.0.16"
+version = "0.0.18"
 
 [project.optional-dependencies]
 standard = [
@@ -50,6 +50,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"
@@ -96,6 +99,7 @@ source = [
     "src",
     "tests",
 ]
+relative_files = true
 context = "${CONTEXT}"
 dynamic_context = "test_function"
 omit = [

{fastapi_cli-0.0.16 → fastapi_cli-0.0.18}/requirements-tests.txt

@@ -3,7 +3,7 @@
 pytest >=4.4.0,<9.0.0
 coverage[toml] >=6.2,<8.0
 mypy ==1.14.1
-ruff ==0.14.2
+ruff ==0.14.6
 # Needed explicitly by fastapi-cli-slim
 fastapi-slim
 uvicorn

fastapi_cli-0.0.18/src/fastapi_cli/__init__.py

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

{fastapi_cli-0.0.16 → fastapi_cli-0.0.18}/src/fastapi_cli/cli.py

@@ -39,6 +39,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]")

{fastapi_cli-0.0.16 → fastapi_cli-0.0.18}/src/fastapi_cli/config.py

@@ -3,13 +3,9 @@ from pathlib import Path
 from typing import Any, Dict, 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
@@ -43,8 +39,4 @@ class FastAPIConfig(BaseModel):
         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)

{fastapi_cli-0.0.16 → fastapi_cli-0.0.18}/src/fastapi_cli/utils/cli.py

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

{fastapi_cli-0.0.16 → fastapi_cli-0.0.18}/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.16/src/fastapi_cli/__init__.py

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