🐛 Always load settings lazily (#64)

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,11 +11,12 @@
 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
 
 runner = CliRunner()
+settings = Settings.get()
 
 assets_path = Path(__file__).parent / "assets"
 

tests/test_cli_login.py

@@ -8,9 +8,10 @@
 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()
+settings = Settings.get()
 
 assets_path = Path(__file__).parent / "assets"
 

tests/test_cli_whoami.py

@@ -6,9 +6,10 @@
 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()
+settings = Settings.get()
 
 assets_path = Path(__file__).parent / "assets"
 

tests/test_env_delete.py

@@ -7,10 +7,11 @@
 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.utils import Keys, changing_dir
 
 runner = CliRunner()
+settings = Settings.get()
 
 assets_path = Path(__file__).parent / "assets"
 

tests/test_env_list.py

@@ -6,11 +6,12 @@
 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 changing_dir
 
 runner = CliRunner()
+settings = Settings.get()
 
 assets_path = Path(__file__).parent / "assets"
 

tests/test_env_set.py

@@ -7,10 +7,11 @@
 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.utils import Keys, changing_dir
 
 runner = CliRunner()
+settings = Settings.get()
 
 assets_path = Path(__file__).parent / "assets"