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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-cli
-Version: 0.0.19
+Version: 0.0.21
 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.21/pdm_build.py

@@ -0,0 +1,40 @@
+import os
+from typing import Any
+
+from pdm.backend.hooks import Context
+
+TIANGOLO_BUILD_PACKAGE = os.getenv("TIANGOLO_BUILD_PACKAGE")
+
+
+def pdm_build_initialize(context: Context) -> None:
+    metadata = context.config.metadata
+    # Get main version
+    version = metadata["version"]
+    # Get custom config for the current package, from the env var
+    all_configs_config: dict[str, Any] = context.config.data["tool"]["tiangolo"][
+        "_internal-slim-build"
+    ]["packages"]
+
+    if TIANGOLO_BUILD_PACKAGE not in all_configs_config:
+        return
+
+    config = all_configs_config[TIANGOLO_BUILD_PACKAGE]
+    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
+    # Get custom build config for the current package
+    build_config: dict[str, Any] = (
+        config.get("tool", {}).get("pdm", {}).get("build", {})
+    )
+    # Override PDM build config with custom build config for this package
+    for key, value in build_config.items():
+        context.config.build_config[key] = value
+    # Get main dependencies
+    dependencies: list[str] = metadata.get("dependencies", [])
+    # Sync versions in dependencies
+    new_dependencies = []
+    for dep in dependencies:
+        new_dep = f"{dep}>={version}"
+        new_dependencies.append(new_dep)
+    metadata["dependencies"] = new_dependencies

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

@@ -39,7 +39,7 @@ dependencies = [
     "rich-toolkit >= 0.14.8",
     "tomli >= 2.0.0; python_version < '3.11'",
 ]
-version = "0.0.19"
+version = "0.0.21"
 
 [project.optional-dependencies]
 standard = [
@@ -60,6 +60,23 @@ Repository = "https://github.com/fastapi/fastapi-cli"
 Issues = "https://github.com/fastapi/fastapi-cli/issues"
 Changelog = "https://github.com/fastapi/fastapi-cli/blob/main/release-notes.md"
 
+[dependency-groups]
+dev = [
+    { include-group = "tests" },
+    "prek>=0.2.24,<1.0.0",
+]
+github-actions = [
+    "smokeshow>=0.5.0",
+]
+tests = [
+    "coverage[toml]>=6.2,<8.0",
+    "fastapi-slim>=0.128.0",
+    "mypy==1.19.1",
+    "pytest>=4.4.0,<10.0.0",
+    "ruff==0.15.0",
+    "uvicorn>=0.39.0",
+]
+
 [build-system]
 requires = [
     "pdm-backend",
@@ -76,12 +93,29 @@ path = "src/fastapi_cli/__init__.py"
 [tool.pdm.build]
 source-includes = [
     "tests/",
-    "requirements*.txt",
     "scripts/",
 ]
 
 [tool.tiangolo._internal-slim-build.packages.fastapi-cli-slim.project]
 name = "fastapi-cli-slim"
+readme = "fastapi-cli-slim/README.md"
+dependencies = [
+    "fastapi-cli",
+]
+
+[tool.tiangolo._internal-slim-build.packages.fastapi-cli-slim.project.optional-dependencies]
+
+[tool.tiangolo._internal-slim-build.packages.fastapi-cli-slim.project.scripts]
+
+[tool.tiangolo._internal-slim-build.packages.fastapi-cli-slim.tool.pdm.build]
+excludes = [
+    "src",
+    "tests",
+    "pdm_build.py",
+]
+source-includes = [
+    "",
+]
 
 [tool.pytest.ini_options]
 addopts = [

fastapi_cli-0.0.21/src/fastapi_cli/__init__.py

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

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

@@ -104,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,
@@ -219,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,
@@ -255,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(
@@ -318,6 +330,7 @@ def dev(
         host=host,
         port=port,
         reload=reload,
+        reload_dirs=reload_dir,
         root_path=root_path,
         app=app,
         entrypoint=entrypoint,

{fastapi_cli-0.0.19 → fastapi_cli-0.0.21}/tests/test_cli.py

@@ -27,6 +27,7 @@ def test_dev() -> None:
                 "host": "127.0.0.1",
                 "port": 8000,
                 "reload": True,
+                "reload_dirs": None,
                 "workers": None,
                 "root_path": "",
                 "proxy_headers": True,
@@ -72,6 +73,7 @@ def test_dev_package() -> None:
                 "host": "127.0.0.1",
                 "port": 8000,
                 "reload": True,
+                "reload_dirs": None,
                 "workers": None,
                 "root_path": "",
                 "proxy_headers": True,
@@ -121,6 +123,7 @@ def test_dev_args() -> None:
                 "host": "192.168.0.2",
                 "port": 8080,
                 "reload": False,
+                "reload_dirs": None,
                 "workers": None,
                 "root_path": "/api",
                 "proxy_headers": False,
@@ -151,6 +154,7 @@ def test_dev_env_vars() -> None:
                 "host": "127.0.0.1",
                 "port": 8111,
                 "reload": True,
+                "reload_dirs": None,
                 "workers": None,
                 "root_path": "",
                 "proxy_headers": True,
@@ -188,6 +192,7 @@ def test_dev_env_vars_and_args() -> None:
                 "host": "127.0.0.1",
                 "port": 8080,
                 "reload": True,
+                "reload_dirs": None,
                 "workers": None,
                 "root_path": "",
                 "proxy_headers": True,
@@ -233,6 +238,7 @@ def test_run() -> None:
                 "host": "0.0.0.0",
                 "port": 8000,
                 "reload": False,
+                "reload_dirs": None,
                 "workers": None,
                 "root_path": "",
                 "proxy_headers": True,
@@ -259,6 +265,7 @@ def test_run_trust_proxy() -> None:
                 "host": "0.0.0.0",
                 "port": 8000,
                 "reload": False,
+                "reload_dirs": None,
                 "workers": None,
                 "root_path": "",
                 "proxy_headers": True,
@@ -305,6 +312,7 @@ def test_run_args() -> None:
                 "host": "192.168.0.2",
                 "port": 8080,
                 "reload": False,
+                "reload_dirs": None,
                 "workers": 2,
                 "root_path": "/api",
                 "proxy_headers": False,
@@ -336,6 +344,7 @@ def test_run_env_vars() -> None:
                 "host": "0.0.0.0",
                 "port": 8111,
                 "reload": False,
+                "reload_dirs": None,
                 "workers": None,
                 "root_path": "",
                 "proxy_headers": True,
@@ -369,6 +378,7 @@ def test_run_env_vars_and_args() -> None:
                 "host": "0.0.0.0",
                 "port": 8080,
                 "reload": False,
+                "reload_dirs": None,
                 "workers": None,
                 "root_path": "",
                 "proxy_headers": True,
@@ -404,6 +414,7 @@ def test_dev_help() -> None:
     assert "The host to serve on." in result.output
     assert "The port to serve on." in result.output
     assert "Enable auto-reload of the server when (code) files change." in result.output
+    assert "Set reload directories explicitly" in result.output
     assert "The root path is used to tell your app" in result.output
     assert "The name of the variable that contains the FastAPI app" in result.output
     assert "Use multiple worker processes." not in result.output
@@ -443,6 +454,30 @@ def test_version() -> None:
     assert "FastAPI CLI version:" in result.output
 
 
+def test_dev_reload_dir() -> None:
+    with changing_dir(assets_path):
+        with patch.object(uvicorn, "run") as mock_run:
+            result = runner.invoke(
+                app,
+                [
+                    "dev",
+                    "single_file_app.py",
+                    "--reload-dir",
+                    "src",
+                    "--reload-dir",
+                    "lib",
+                ],
+            )
+            assert result.exit_code == 0, result.output
+            assert mock_run.called
+            assert mock_run.call_args
+            # Paths are resolved to absolute paths
+            reload_dirs = mock_run.call_args.kwargs["reload_dirs"]
+            assert len(reload_dirs) == 2
+            assert reload_dirs[0] == str((assets_path / "src").resolve())
+            assert reload_dirs[1] == str((assets_path / "lib").resolve())
+
+
 def test_dev_with_import_string() -> None:
     with changing_dir(assets_path):
         with patch.object(uvicorn, "run") as mock_run:
@@ -456,6 +491,7 @@ def test_dev_with_import_string() -> None:
                 "host": "127.0.0.1",
                 "port": 8000,
                 "reload": True,
+                "reload_dirs": None,
                 "workers": None,
                 "root_path": "",
                 "proxy_headers": True,
@@ -477,6 +513,7 @@ def test_run_with_import_string() -> None:
                 "host": "0.0.0.0",
                 "port": 8000,
                 "reload": False,
+                "reload_dirs": None,
                 "workers": None,
                 "root_path": "",
                 "proxy_headers": True,

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

@@ -1,4 +1,5 @@
 import logging
+from logging.config import dictConfig
 
 from pytest import LogCaptureFixture
 
@@ -63,7 +64,7 @@ def test_log_config_does_not_disable_existing_loggers(
     logger1.setLevel(logging.INFO)
     logger1.info("Message before configuration")
 
-    logging.config.dictConfig(get_uvicorn_log_config())
+    dictConfig(get_uvicorn_log_config())
 
     logger2 = logging.getLogger(__name__)
 

fastapi_cli-0.0.19/pdm_build.py

@@ -1,20 +0,0 @@
-import os
-from typing import Any
-
-from pdm.backend.hooks import Context
-
-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"][
-        "_internal-slim-build"
-    ]["packages"].get(TIANGOLO_BUILD_PACKAGE)
-    if not config:
-        return
-    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.19/requirements-github-actions.txt

@@ -1 +0,0 @@
-smokeshow

fastapi_cli-0.0.19/requirements-tests.txt

@@ -1,9 +0,0 @@
--e .[standard]
-
-pytest >=4.4.0,<9.0.0
-coverage[toml] >=6.2,<8.0
-mypy ==1.14.1
-ruff ==0.14.6
-# Needed explicitly by fastapi-cli-slim
-fastapi-slim
-uvicorn

fastapi_cli-0.0.19/requirements.txt

@@ -1,5 +0,0 @@
--e .
-
--r requirements-tests.txt
-
-pre-commit >=2.17.0,<5.0.0

fastapi_cli-0.0.19/src/fastapi_cli/__init__.py

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