🐛 Always load settings lazily

Author: patrick91

src/fastapi_cloud_cli/commands/login.py

@@ -6,7 +6,7 @@
 import typer
 from pydantic import BaseModel
 
-from fastapi_cloud_cli.config import settings
+from fastapi_cloud_cli.config import Settings
 from fastapi_cloud_cli.utils.api import APIClient
 from fastapi_cloud_cli.utils.auth import AuthConfig, write_auth_config
 from fastapi_cloud_cli.utils.cli import get_rich_toolkit, handle_http_errors
@@ -29,6 +29,8 @@ class TokenResponse(BaseModel):
 def _start_device_authorization(
     client: httpx.Client,
 ) -> AuthorizationData:
+    settings = Settings.get()
+
     response = client.post(
         "/login/device/authorization", data={"client_id": settings.client_id}
     )
@@ -39,6 +41,8 @@ def _start_device_authorization(
 
 
 def _fetch_access_token(client: httpx.Client, device_code: str, interval: int) -> str:
+    settings = Settings.get()
+
     while True:
         response = client.post(
             "/login/device/token",

src/fastapi_cloud_cli/config.py

@@ -21,5 +21,6 @@ def from_user_settings(cls, config_path: Path) -> "Settings":
 
         return cls(**user_settings)
 
-
-settings = Settings.from_user_settings(get_cli_config_path())
+    @classmethod
+    def get(cls) -> "Settings":
+        return cls.from_user_settings(get_cli_config_path())

src/fastapi_cloud_cli/utils/api.py

@@ -1,12 +1,14 @@
 import httpx
 
 from fastapi_cloud_cli import __version__
-from fastapi_cloud_cli.config import settings
+from fastapi_cloud_cli.config import Settings
 from fastapi_cloud_cli.utils.auth import get_auth_token
 
 
 class APIClient(httpx.Client):
     def __init__(self) -> None:
+        settings = Settings.get()
+
         token = get_auth_token()
 
         super().__init__(

tests/test_cli_deploy.py

@@ -11,7 +11,7 @@
 from typer.testing import CliRunner
 
 from fastapi_cloud_cli.cli import app
-from fastapi_cloud_cli.config import settings
+from fastapi_cloud_cli.config import Settings
 from tests.conftest import ConfiguredApp
 from tests.utils import Keys, changing_dir
 
@@ -58,7 +58,7 @@ def _get_random_deployment(
     }
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_shows_waitlist_form_when_not_logged_in(
     logged_out_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
@@ -90,7 +90,7 @@ def test_shows_waitlist_form_when_not_logged_in(
     assert "Let's go! Thanks for your interest in FastAPI Cloud! 🚀" in result.output
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_shows_waitlist_form_when_not_logged_in_longer_flow(
     logged_out_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
@@ -162,7 +162,7 @@ def test_asks_to_setup_the_app(logged_in_cli: None, tmp_path: Path) -> None:
         assert "Setup and deploy" in result.output
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_shows_error_when_trying_to_get_teams(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
@@ -180,7 +180,7 @@ def test_shows_error_when_trying_to_get_teams(
         assert "Error fetching teams. Please try again later" in result.output
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_handles_invalid_auth(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
@@ -198,7 +198,7 @@ def test_handles_invalid_auth(
         assert "The specified token is not valid" in result.output
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_shows_teams(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
@@ -225,7 +225,7 @@ def test_shows_teams(
         assert team_2["name"] in result.output
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_asks_for_app_name_after_team(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
@@ -248,7 +248,7 @@ def test_asks_for_app_name_after_team(
         assert "What's your app name?" in result.output
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_creates_app_on_backend(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
@@ -277,7 +277,7 @@ def test_creates_app_on_backend(
         assert "App created successfully" in result.output
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_uses_existing_app(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
@@ -304,7 +304,7 @@ def test_uses_existing_app(
         assert app_data["slug"] in result.output
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_exits_successfully_when_deployment_is_done(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
@@ -376,7 +376,7 @@ def test_exits_successfully_when_deployment_is_done(
         # TODO: show a message when the deployment is done (based on the status)
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_exits_successfully_when_deployment_is_done_when_app_is_configured(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
@@ -438,7 +438,7 @@ def test_exits_successfully_when_deployment_is_done_when_app_is_configured(
         assert deployment_data["url"] in result.output
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_exits_with_error_when_deployment_fails_to_build(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
@@ -493,7 +493,7 @@ def test_exits_with_error_when_deployment_fails_to_build(
         assert deployment_data["dashboard_url"] in result.output
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_shows_error_when_deployment_build_fails(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
@@ -547,7 +547,7 @@ def test_shows_error_when_deployment_build_fails(
         assert result.exit_code == 1
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_shows_error_when_app_does_not_exist(
     logged_in_cli: None, configured_app: ConfiguredApp, respx_mock: respx.MockRouter
 ) -> None:
@@ -620,7 +620,7 @@ def _deploy_without_waiting(respx_mock: respx.MockRouter, tmp_path: Path) -> Res
         return runner.invoke(app, ["deploy", "--no-wait"])
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_can_skip_waiting(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
@@ -631,7 +631,7 @@ def test_can_skip_waiting(
     assert "Check the status of your deployment at" in result.output
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_creates_config_folder_and_creates_git_ignore(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
@@ -642,7 +642,7 @@ def test_creates_config_folder_and_creates_git_ignore(
     assert (tmp_path / ".fastapicloud" / ".gitignore").read_text() == "*"
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_does_not_duplicate_entry_in_git_ignore(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
@@ -654,7 +654,7 @@ def test_does_not_duplicate_entry_in_git_ignore(
     assert git_ignore_path.read_text() == ".fastapicloud\n"
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_creates_environment_variables_during_app_setup(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
@@ -696,7 +696,7 @@ def test_creates_environment_variables_during_app_setup(
         assert "Environment variables set up successfully!" in result.output
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_rejects_invalid_environment_variable_names(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
@@ -741,7 +741,7 @@ def test_rejects_invalid_environment_variable_names(
         assert "Environment variables set up successfully!" in result.output
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_shows_error_for_invalid_waitlist_form_data(
     logged_out_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:
@@ -768,7 +768,7 @@ def test_shows_error_for_invalid_waitlist_form_data(
         assert "Invalid form data. Please try again." in result.output
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_shows_no_apps_found_message_when_team_has_no_apps(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
 ) -> None:

tests/test_cli_login.py

@@ -8,18 +8,18 @@
 from typer.testing import CliRunner
 
 from fastapi_cloud_cli.cli import app
-from fastapi_cloud_cli.config import settings
+from fastapi_cloud_cli.config import Settings
 
 runner = CliRunner()
 
 assets_path = Path(__file__).parent / "assets"
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_shows_a_message_if_something_is_wrong(respx_mock: respx.MockRouter) -> None:
     with patch("fastapi_cloud_cli.commands.login.typer.launch") as mock_open:
         respx_mock.post(
-            "/login/device/authorization", data={"client_id": settings.client_id}
+            "/login/device/authorization", data={"client_id": Settings.client_id}
         ).mock(return_value=Response(500))
 
         result = runner.invoke(app, ["login"])
@@ -33,11 +33,11 @@ def test_shows_a_message_if_something_is_wrong(respx_mock: respx.MockRouter) ->
         assert not mock_open.called
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_full_login(respx_mock: respx.MockRouter, temp_auth_config: Path) -> None:
     with patch("fastapi_cloud_cli.commands.login.typer.launch") as mock_open:
         respx_mock.post(
-            "/login/device/authorization", data={"client_id": settings.client_id}
+            "/login/device/authorization", data={"client_id": Settings.client_id}
         ).mock(
             return_value=Response(
                 200,
@@ -53,7 +53,7 @@ def test_full_login(respx_mock: respx.MockRouter, temp_auth_config: Path) -> Non
             "/login/device/token",
             data={
                 "device_code": "5678",
-                "client_id": settings.client_id,
+                "client_id": Settings.client_id,
                 "grant_type": "urn:ietf:params:oauth:grant-type:device_code",
             },
         ).mock(return_value=Response(200, json={"access_token": "test_token_1234"}))
@@ -73,7 +73,7 @@ def test_full_login(respx_mock: respx.MockRouter, temp_auth_config: Path) -> Non
         assert '"access_token":"test_token_1234"' in temp_auth_config.read_text()
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_fetch_access_token_success_immediately(respx_mock: respx.MockRouter) -> None:
     from fastapi_cloud_cli.commands.login import _fetch_access_token
     from fastapi_cloud_cli.utils.api import APIClient
@@ -82,7 +82,7 @@ def test_fetch_access_token_success_immediately(respx_mock: respx.MockRouter) ->
         "/login/device/token",
         data={
             "device_code": "test_device_code",
-            "client_id": settings.client_id,
+            "client_id": Settings.client_id,
             "grant_type": "urn:ietf:params:oauth:grant-type:device_code",
         },
     ).mock(return_value=Response(200, json={"access_token": "test_token_success"}))
@@ -93,7 +93,7 @@ def test_fetch_access_token_success_immediately(respx_mock: respx.MockRouter) ->
     assert access_token == "test_token_success"
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_fetch_access_token_authorization_pending_then_success(
     respx_mock: respx.MockRouter,
 ) -> None:
@@ -105,7 +105,7 @@ def test_fetch_access_token_authorization_pending_then_success(
         "/login/device/token",
         data={
             "device_code": "test_device_code",
-            "client_id": settings.client_id,
+            "client_id": Settings.client_id,
             "grant_type": "urn:ietf:params:oauth:grant-type:device_code",
         },
     ).mock(
@@ -123,7 +123,7 @@ def test_fetch_access_token_authorization_pending_then_success(
         mock_sleep.assert_called_once_with(3)
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_fetch_access_token_handles_400_error_not_authorization_pending(
     respx_mock: respx.MockRouter,
 ) -> None:
@@ -134,7 +134,7 @@ def test_fetch_access_token_handles_400_error_not_authorization_pending(
         "/login/device/token",
         data={
             "device_code": "test_device_code",
-            "client_id": settings.client_id,
+            "client_id": Settings.client_id,
             "grant_type": "urn:ietf:params:oauth:grant-type:device_code",
         },
     ).mock(return_value=Response(400, json={"error": "access_denied"}))
@@ -144,7 +144,7 @@ def test_fetch_access_token_handles_400_error_not_authorization_pending(
             _fetch_access_token(client, "test_device_code", 5)
 
 
-@pytest.mark.respx(base_url=settings.base_api_url)
+@pytest.mark.respx(base_url=Settings.base_api_url)
 def test_fetch_access_token_handles_500_error(respx_mock: respx.MockRouter) -> None:
     from fastapi_cloud_cli.commands.login import _fetch_access_token
     from fastapi_cloud_cli.utils.api import APIClient
@@ -153,7 +153,7 @@ def test_fetch_access_token_handles_500_error(respx_mock: respx.MockRouter) -> N
         "/login/device/token",
         data={
             "device_code": "test_device_code",
-            "client_id": settings.client_id,
+            "client_id": Settings.client_id,
             "grant_type": "urn:ietf:params:oauth:grant-type:device_code",
         },
     ).mock(return_value=Response(500))