fastapi-cli 0.0.11__tar.gz → 0.0.13__tar.gz

{fastapi_cli-0.0.11 → fastapi_cli-0.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastapi-cli
-Version: 0.0.11
+Version: 0.0.13
 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: MIT

{fastapi_cli-0.0.11 → fastapi_cli-0.0.13}/pyproject.toml

@@ -35,7 +35,7 @@ dependencies = [
     "uvicorn[standard] >= 0.15.0",
     "rich-toolkit >= 0.14.8",
 ]
-version = "0.0.11"
+version = "0.0.13"
 
 [project.license]
 text = "MIT"

{fastapi_cli-0.0.11 → fastapi_cli-0.0.13}/requirements-tests.txt

@@ -2,8 +2,8 @@
 
 pytest >=4.4.0,<9.0.0
 coverage[toml] >=6.2,<8.0
-mypy ==1.14.0
-ruff ==0.12.12
+mypy ==1.14.1
+ruff ==0.13.0
 # Needed explicitly by fastapi-cli-slim
 fastapi-slim
 uvicorn

fastapi_cli-0.0.13/src/fastapi_cli/__init__.py

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

{fastapi_cli-0.0.11 → fastapi_cli-0.0.13}/src/fastapi_cli/cli.py

@@ -14,7 +14,9 @@ from . import __version__
 from .logging import setup_logging
 from .utils.cli import get_rich_toolkit, get_uvicorn_log_config
 
-app = typer.Typer(rich_markup_mode="rich")
+app = typer.Typer(
+    rich_markup_mode="rich", context_settings={"help_option_names": ["-h", "--help"]}
+)
 
 logger = logging.getLogger(__name__)
 
@@ -206,7 +208,8 @@ def dev(
     port: Annotated[
         int,
         typer.Option(
-            help="The port to serve on. You would normally have a termination proxy on top (another program) handling HTTPS on port [blue]443[/blue] and HTTP on port [blue]80[/blue], transferring the communication to your app."
+            help="The port to serve on. You would normally have a termination proxy on top (another program) handling HTTPS on port [blue]443[/blue] and HTTP on port [blue]80[/blue], transferring the communication to your app.",
+            envvar="PORT",
         ),
     ] = 8000,
     reload: Annotated[
@@ -305,7 +308,8 @@ def run(
     port: Annotated[
         int,
         typer.Option(
-            help="The port to serve on. You would normally have a termination proxy on top (another program) handling HTTPS on port [blue]443[/blue] and HTTP on port [blue]80[/blue], transferring the communication to your app."
+            help="The port to serve on. You would normally have a termination proxy on top (another program) handling HTTPS on port [blue]443[/blue] and HTTP on port [blue]80[/blue], transferring the communication to your app.",
+            envvar="PORT",
         ),
     ] = 8000,
     reload: Annotated[

{fastapi_cli-0.0.11 → fastapi_cli-0.0.13}/tests/test_cli.py

@@ -122,6 +122,73 @@ def test_dev_args() -> None:
         )
 
 
+def test_dev_env_vars() -> None:
+    with changing_dir(assets_path):
+        with patch.object(uvicorn, "run") as mock_run:
+            result = runner.invoke(
+                app, ["dev", "single_file_app.py"], env={"PORT": "8111"}
+            )
+            assert result.exit_code == 0, result.output
+            assert mock_run.called
+            assert mock_run.call_args
+            assert mock_run.call_args.kwargs == {
+                "app": "single_file_app:app",
+                "host": "127.0.0.1",
+                "port": 8111,
+                "reload": True,
+                "workers": None,
+                "root_path": "",
+                "proxy_headers": True,
+                "forwarded_allow_ips": None,
+                "log_config": get_uvicorn_log_config(),
+            }
+        assert "Using import string: single_file_app:app" in result.output
+        assert "Starting development server 🚀" in result.output
+        assert "Server started at http://127.0.0.1:8111" in result.output
+        assert "Documentation at http://127.0.0.1:8111/docs" in result.output
+        assert (
+            "Running in development mode, for production use: fastapi run"
+            in result.output
+        )
+
+
+def test_dev_env_vars_and_args() -> None:
+    with changing_dir(assets_path):
+        with patch.object(uvicorn, "run") as mock_run:
+            result = runner.invoke(
+                app,
+                [
+                    "dev",
+                    "single_file_app.py",
+                    "--port",
+                    "8080",
+                ],
+                env={"PORT": "8111"},
+            )
+            assert result.exit_code == 0, result.output
+            assert mock_run.called
+            assert mock_run.call_args
+            assert mock_run.call_args.kwargs == {
+                "app": "single_file_app:app",
+                "host": "127.0.0.1",
+                "port": 8080,
+                "reload": True,
+                "workers": None,
+                "root_path": "",
+                "proxy_headers": True,
+                "forwarded_allow_ips": None,
+                "log_config": get_uvicorn_log_config(),
+            }
+        assert "Using import string: single_file_app:app" in result.output
+        assert "Starting development server 🚀" in result.output
+        assert "Server started at http://127.0.0.1:8080" in result.output
+        assert "Documentation at http://127.0.0.1:8080/docs" in result.output
+        assert (
+            "Running in development mode, for production use: fastapi run"
+            in result.output
+        )
+
+
 def test_run() -> None:
     with changing_dir(assets_path):
         with patch.object(uvicorn, "run") as mock_run:
@@ -223,6 +290,65 @@ def test_run_args() -> None:
         )
 
 
+def test_run_env_vars() -> None:
+    with changing_dir(assets_path):
+        with patch.object(uvicorn, "run") as mock_run:
+            result = runner.invoke(
+                app, ["run", "single_file_app.py"], env={"PORT": "8111"}
+            )
+            assert result.exit_code == 0, result.output
+            assert mock_run.called
+            assert mock_run.call_args
+            assert mock_run.call_args.kwargs == {
+                "app": "single_file_app:app",
+                "host": "0.0.0.0",
+                "port": 8111,
+                "reload": False,
+                "workers": None,
+                "root_path": "",
+                "proxy_headers": True,
+                "forwarded_allow_ips": None,
+                "log_config": get_uvicorn_log_config(),
+            }
+        assert "Using import string: single_file_app:app" in result.output
+        assert "Starting production server 🚀" in result.output
+        assert "Server started at http://0.0.0.0:8111" in result.output
+        assert "Documentation at http://0.0.0.0:8111/docs" in result.output
+
+
+def test_run_env_vars_and_args() -> None:
+    with changing_dir(assets_path):
+        with patch.object(uvicorn, "run") as mock_run:
+            result = runner.invoke(
+                app,
+                [
+                    "run",
+                    "single_file_app.py",
+                    "--port",
+                    "8080",
+                ],
+                env={"PORT": "8111"},
+            )
+            assert result.exit_code == 0, result.output
+            assert mock_run.called
+            assert mock_run.call_args
+            assert mock_run.call_args.kwargs == {
+                "app": "single_file_app:app",
+                "host": "0.0.0.0",
+                "port": 8080,
+                "reload": False,
+                "workers": None,
+                "root_path": "",
+                "proxy_headers": True,
+                "forwarded_allow_ips": None,
+                "log_config": get_uvicorn_log_config(),
+            }
+        assert "Using import string: single_file_app:app" in result.output
+        assert "Starting production server 🚀" in result.output
+        assert "Server started at http://0.0.0.0:8080" in result.output
+        assert "Documentation at http://0.0.0.0:8080/docs" in result.output
+
+
 def test_run_error() -> None:
     with changing_dir(assets_path):
         result = runner.invoke(app, ["run", "non_existing_file.py"])

fastapi_cli-0.0.11/src/fastapi_cli/__init__.py

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