From 11ee54eff2a53bccb408fc3366e830f5fb40ff12 Mon Sep 17 00:00:00 2001 From: Savannah Ostrowski Date: Mon, 10 Nov 2025 14:31:39 -0800 Subject: [PATCH 1/7] Add fastapi-new in new optional dependency group --- pyproject.toml | 3 +++ src/fastapi_cli/cli.py | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 17638059..dcc533b6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,6 +47,9 @@ standard = [ standard-no-fastapi-cloud-cli = [ "uvicorn[standard] >= 0.15.0", ] +new = [ + "fastapi-new >= 0.0.2", +] [project.urls] Homepage = "https://github.com/fastapi/fastapi-cli" diff --git a/src/fastapi_cli/cli.py b/src/fastapi_cli/cli.py index 28afa297..bfd2cf20 100644 --- a/src/fastapi_cli/cli.py +++ b/src/fastapi_cli/cli.py @@ -37,6 +37,16 @@ pass +try: + from fastapi_new.cli import ( + app as fastapi_new_cli, + ) + + app.add_typer(fastapi_new_cli) +except ImportError: # pragma: no cover + pass + + def version_callback(value: bool) -> None: if value: print(f"FastAPI CLI version: [green]{__version__}[/green]") From 0b4b5301a36c5217e5d736b64fa08300e7c2364e Mon Sep 17 00:00:00 2001 From: Savannah Ostrowski Date: Mon, 10 Nov 2025 14:56:51 -0800 Subject: [PATCH 2/7] Add 3.10 constraint for now --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index dcc533b6..d7ae19f7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,7 +48,7 @@ standard-no-fastapi-cloud-cli = [ "uvicorn[standard] >= 0.15.0", ] new = [ - "fastapi-new >= 0.0.2", + "fastapi-new >= 0.0.2 ; python_version >= '3.10'", ] [project.urls] From ab1af3659dcedfa85650f2feaa41abaed9ac0b18 Mon Sep 17 00:00:00 2001 From: Savannah Ostrowski Date: Mon, 10 Nov 2025 15:06:30 -0800 Subject: [PATCH 3/7] Add ignore for lint --- src/fastapi_cli/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fastapi_cli/cli.py b/src/fastapi_cli/cli.py index bfd2cf20..aa8e51c8 100644 --- a/src/fastapi_cli/cli.py +++ b/src/fastapi_cli/cli.py @@ -38,7 +38,7 @@ try: - from fastapi_new.cli import ( + from fastapi_new.cli import ( # type: ignore[import-not-found] app as fastapi_new_cli, ) From 3162d106bbc4127a5c93aa55b2d7c8eb4c3537d5 Mon Sep 17 00:00:00 2001 From: Savannah Ostrowski Date: Mon, 10 Nov 2025 15:11:03 -0800 Subject: [PATCH 4/7] Add pragma no cover --- src/fastapi_cli/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fastapi_cli/cli.py b/src/fastapi_cli/cli.py index aa8e51c8..f6532dc1 100644 --- a/src/fastapi_cli/cli.py +++ b/src/fastapi_cli/cli.py @@ -32,7 +32,7 @@ app as fastapi_cloud_cli, ) - app.add_typer(fastapi_cloud_cli) + app.add_typer(fastapi_cloud_cli) # pragma: no cover except ImportError: # pragma: no cover pass From 86fb3df37f7cd4324f468daf1f24a818a7aa36a1 Mon Sep 17 00:00:00 2001 From: Savannah Ostrowski Date: Mon, 10 Nov 2025 15:11:30 -0800 Subject: [PATCH 5/7] Run pre-commit --- src/fastapi_cli/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fastapi_cli/cli.py b/src/fastapi_cli/cli.py index f6532dc1..474a28f1 100644 --- a/src/fastapi_cli/cli.py +++ b/src/fastapi_cli/cli.py @@ -32,7 +32,7 @@ app as fastapi_cloud_cli, ) - app.add_typer(fastapi_cloud_cli) # pragma: no cover + app.add_typer(fastapi_cloud_cli) # pragma: no cover except ImportError: # pragma: no cover pass From 9bdce62fc371278e00e165f000fd671c11ca1d40 Mon Sep 17 00:00:00 2001 From: Savannah Ostrowski Date: Mon, 10 Nov 2025 15:12:36 -0800 Subject: [PATCH 6/7] Lol wrong line --- src/fastapi_cli/cli.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fastapi_cli/cli.py b/src/fastapi_cli/cli.py index 474a28f1..15d27f2b 100644 --- a/src/fastapi_cli/cli.py +++ b/src/fastapi_cli/cli.py @@ -32,7 +32,7 @@ app as fastapi_cloud_cli, ) - app.add_typer(fastapi_cloud_cli) # pragma: no cover + app.add_typer(fastapi_cloud_cli) except ImportError: # pragma: no cover pass @@ -42,7 +42,7 @@ app as fastapi_new_cli, ) - app.add_typer(fastapi_new_cli) + app.add_typer(fastapi_new_cli) # pragma: no cover except ImportError: # pragma: no cover pass From d62b32849ba3e8ef35486104aedf9db2abd7db78 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 10 Nov 2025 23:12:47 +0000 Subject: [PATCH 7/7] =?UTF-8?q?=F0=9F=8E=A8=20[pre-commit.ci]=20Auto=20for?= =?UTF-8?q?mat=20from=20pre-commit.com=20hooks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/fastapi_cli/cli.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fastapi_cli/cli.py b/src/fastapi_cli/cli.py index 15d27f2b..f3950e59 100644 --- a/src/fastapi_cli/cli.py +++ b/src/fastapi_cli/cli.py @@ -32,7 +32,7 @@ app as fastapi_cloud_cli, ) - app.add_typer(fastapi_cloud_cli) + app.add_typer(fastapi_cloud_cli) except ImportError: # pragma: no cover pass @@ -42,7 +42,7 @@ app as fastapi_new_cli, ) - app.add_typer(fastapi_new_cli) # pragma: no cover + app.add_typer(fastapi_new_cli) # pragma: no cover except ImportError: # pragma: no cover pass