feat: handle both FASTAPI_PORT and PORT, with FASTAPI_PORT taking precedence

Signed-off-by: Damien Degois <damien@degois.info>

Author: babs

src/fastapi_cli/cli.py

@@ -211,7 +211,7 @@ def dev(
         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.",
-            envvar="FASTAPI_PORT",
+            envvar=["FASTAPI_PORT", "PORT"],
         ),
     ] = 8000,
     reload: Annotated[
@@ -319,7 +319,7 @@ def run(
         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.",
-            envvar="FASTAPI_PORT",
+            envvar=["FASTAPI_PORT", "PORT"],
         ),
     ] = 8000,
     reload: Annotated[

tests/test_cli.py

@@ -162,6 +162,33 @@ def test_dev_env_vars() -> None:
         )
 
 
+def test_dev_env_vars_port() -> 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.call_args.kwargs["port"] == 8111
+
+
+def test_dev_env_vars_port_precedence() -> 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",
+                    "FASTAPI_PORT": "8112",
+                },
+            )
+            assert result.exit_code == 0, result.output
+            assert mock_run.call_args.kwargs["port"] == 8112
+
+
 def test_dev_env_vars_and_args() -> None:
     with changing_dir(assets_path):
         with patch.object(uvicorn, "run") as mock_run:
@@ -337,6 +364,33 @@ def test_run_env_vars() -> None:
         assert "Documentation at http://192.168.1.1:8111/docs" in result.output
 
 
+def test_run_env_vars_port() -> 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.call_args.kwargs["port"] == 8111
+
+
+def test_run_env_vars_port_precedence() -> 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",
+                    "FASTAPI_PORT": "8112",
+                },
+            )
+            assert result.exit_code == 0, result.output
+            assert mock_run.call_args.kwargs["port"] == 8112
+
+
 def test_run_env_vars_and_args() -> None:
     with changing_dir(assets_path):
         with patch.object(uvicorn, "run") as mock_run: