fastapi-cli 0.0.26__tar.gz → 0.0.28__tar.gz

{fastapi_cli-0.0.26 → fastapi_cli-0.0.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-cli
-Version: 0.0.26
+Version: 0.0.28
 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
@@ -48,9 +48,6 @@ Description-Content-Type: text/markdown
 <a href="https://github.com/fastapi/fastapi-cli/actions/workflows/test.yml" target="_blank">
     <img src="https://github.com/fastapi/fastapi-cli/actions/workflows/test.yml/badge.svg" alt="Test">
 </a>
-<a href="https://github.com/fastapi/fastapi-cli/actions/workflows/publish.yml" target="_blank">
-    <img src="https://github.com/fastapi/fastapi-cli/actions/workflows/publish.yml/badge.svg" alt="Publish">
-</a>
 <a href="https://coverage-badge.samuelcolvin.workers.dev/redirect/fastapi/fastapi-cli" target="_blank">
     <img src="https://coverage-badge.samuelcolvin.workers.dev/fastapi/fastapi-cli.svg" alt="Coverage">
 <a href="https://pypi.org/project/fastapi-cli" target="_blank">

{fastapi_cli-0.0.26 → fastapi_cli-0.0.28}/README.md

@@ -3,9 +3,6 @@
 <a href="https://github.com/fastapi/fastapi-cli/actions/workflows/test.yml" target="_blank">
     <img src="https://github.com/fastapi/fastapi-cli/actions/workflows/test.yml/badge.svg" alt="Test">
 </a>
-<a href="https://github.com/fastapi/fastapi-cli/actions/workflows/publish.yml" target="_blank">
-    <img src="https://github.com/fastapi/fastapi-cli/actions/workflows/publish.yml/badge.svg" alt="Publish">
-</a>
 <a href="https://coverage-badge.samuelcolvin.workers.dev/redirect/fastapi/fastapi-cli" target="_blank">
     <img src="https://coverage-badge.samuelcolvin.workers.dev/fastapi/fastapi-cli.svg" alt="Coverage">
 <a href="https://pypi.org/project/fastapi-cli" target="_blank">

{fastapi_cli-0.0.26 → fastapi_cli-0.0.28}/pyproject.toml

@@ -38,7 +38,7 @@ dependencies = [
     "rich-toolkit >= 0.14.8",
     "tomli >= 2.0.0; python_version < '3.11'",
 ]
-version = "0.0.26"
+version = "0.0.28"
 
 [project.optional-dependencies]
 standard = [
@@ -171,10 +171,14 @@ error-on-warning = true
 extend-exclude = [
     "coverage/",
     "dist/",
-    "release-notes.md",
     "htmlcov/",
     "uv.lock",
 ]
 
+[tool.typos.default]
+extend-ignore-re = [
+    "@[a-zA-Z0-9](?:-?[a-zA-Z0-9])*",
+]
+
 [tool.typos.default.extend-identifiers]
 alls = "alls"

fastapi_cli-0.0.28/src/fastapi_cli/__init__.py

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

{fastapi_cli-0.0.26 → fastapi_cli-0.0.28}/src/fastapi_cli/cli.py

@@ -1,4 +1,5 @@
 import logging
+import os
 from pathlib import Path
 from typing import Annotated, Any
 
@@ -136,6 +137,7 @@ def _run(
     entrypoint: str | None = None,
     proxy_headers: bool = False,
     forwarded_allow_ips: str | None = None,
+    public_url: str | None = None,
 ) -> None:
     with get_rich_toolkit() as toolkit:
         server_type = "development" if command == "dev" else "production"
@@ -243,7 +245,7 @@ def _run(
                 )
             )
 
-        url = f"http://{host}:{port}"
+        url = public_url.rstrip("/") if public_url else f"http://{host}:{port}"
         url_docs = f"{url}/docs"
 
         toolkit.print_line()
@@ -391,6 +393,7 @@ def dev(
         command="dev",
         proxy_headers=proxy_headers,
         forwarded_allow_ips=forwarded_allow_ips,
+        public_url=os.getenv("FASTAPI_PUBLIC_URL"),
     )
 
 
@@ -498,6 +501,7 @@ def run(
         command="run",
         proxy_headers=proxy_headers,
         forwarded_allow_ips=forwarded_allow_ips,
+        public_url=os.getenv("FASTAPI_PUBLIC_URL"),
     )
 
 

{fastapi_cli-0.0.26 → fastapi_cli-0.0.28}/src/fastapi_cli/utils/cli.py

@@ -48,7 +48,11 @@ def get_uvicorn_log_config() -> dict[str, Any]:
             },
         },
         "loggers": {
-            "uvicorn": {"handlers": ["default"], "level": "INFO"},
+            "uvicorn": {
+                "handlers": ["default"],
+                "level": "INFO",
+                "propagate": False,
+            },
             "uvicorn.error": {"level": "INFO"},
             "uvicorn.access": {
                 "handlers": ["access"],

{fastapi_cli-0.0.26 → fastapi_cli-0.0.28}/tests/test_cli.py

@@ -3,6 +3,7 @@ import sys
 from pathlib import Path
 from unittest.mock import patch
 
+import pytest
 import uvicorn
 from typer.testing import CliRunner
 
@@ -424,6 +425,54 @@ def test_run_env_vars_and_args() -> None:
         assert "Documentation at http://0.0.0.0:8080/docs" in result.output
 
 
+@pytest.mark.parametrize("command", ["dev", "run"])
+@pytest.mark.parametrize(
+    "public_url",
+    [
+        "https://myapp.example.com",
+        "https://myapp.example.com/",
+        "https://myapp.example.com/subpath/",
+    ],
+)
+def test_public_url_env_var(command: str, public_url: str) -> None:
+    with changing_dir(assets_path):
+        with patch.object(uvicorn, "run") as mock_run:
+            result = runner.invoke(
+                app,
+                [
+                    command,
+                    "single_file_app.py",
+                    "--host",
+                    "0.0.0.0",
+                ],
+                env={"FASTAPI_PUBLIC_URL": public_url},
+            )
+            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": 8000,
+                "reload": True if command == "dev" else False,
+                "reload_dirs": None,
+                "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 (
+            f"Starting {'development' if command == 'dev' else 'production'} server 🚀"
+            in result.output
+        )
+        expected_url_base = public_url.rstrip("/")
+        assert f"Server started at {expected_url_base}" in result.output
+        assert f"Documentation at {expected_url_base}/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.26 → fastapi_cli-0.0.28}/tests/test_utils_cli.py

@@ -11,6 +11,7 @@ def test_get_uvicorn_config_uses_custom_formatter() -> None:
 
     assert config["formatters"]["default"]["()"] is CustomFormatter
     assert config["formatters"]["access"]["()"] is CustomFormatter
+    assert config["loggers"]["uvicorn"]["propagate"] is False
 
 
 def test_custom_formatter() -> None:

fastapi_cli-0.0.26/src/fastapi_cli/__init__.py

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