Initialize token in app callback

Author: YuriiMotov

src/fastapi_cloud_cli/cli.py

@@ -9,18 +9,40 @@
 from .commands.setup_ci import setup_ci
 from .commands.unlink import unlink
 from .commands.whoami import whoami
+from .context import ctx
 from .logging import setup_logging
 from .utils.sentry import init_sentry
 
 setup_logging()
 
+COMMANDS_USE_TOKEN = {"deploy", "whoami"}
+
 app = typer.Typer(rich_markup_mode="rich")
 
 cloud_app = typer.Typer(
     rich_markup_mode="rich",
     help="Manage [bold]FastAPI[/bold] Cloud deployments. 🚀",
 )
 
+
+@cloud_app.callback(invoke_without_command=True)
+def cloud_callback(typer_ctx: typer.Context) -> None:
+    if typer_ctx.invoked_subcommand in COMMANDS_USE_TOKEN:
+        ctx.initialize(prefer_auth_mode="token")
+    else:
+        ctx.initialize()
+
+
+@app.callback(invoke_without_command=True)
+def app_callback(typer_ctx: typer.Context) -> None:
+    if typer_ctx.invoked_subcommand == "cloud":
+        return
+    if typer_ctx.invoked_subcommand in COMMANDS_USE_TOKEN:
+        ctx.initialize(prefer_auth_mode="token")
+    else:
+        ctx.initialize()
+
+
 # TODO: use the app structure
 
 # Additional commands

src/fastapi_cloud_cli/commands/deploy.py

@@ -652,7 +652,6 @@ def deploy(
         "Deploy path: %s, skip_wait: %s, app_id: %s", path, skip_wait, provided_app_id
     )
 
-    ctx.initialize(prefer_auth_mode="token")
     identity = ctx.get_identity()
 
     with get_rich_toolkit() as toolkit:

src/fastapi_cloud_cli/commands/whoami.py

@@ -12,7 +12,6 @@
 
 
 def whoami() -> Any:
-    ctx.initialize(prefer_auth_mode="token")
     identity = ctx.get_identity()
 
     if identity.auth_mode == "token":

src/fastapi_cloud_cli/context.py

@@ -17,8 +17,7 @@ def initialize(self, prefer_auth_mode: Literal["token", "user"] = "user") -> Non
 
     def get_identity(self) -> Identity:
         if not self._is_initialized:
-            logger.debug("Context not initialized, initializing with default settings")
-            self.initialize()
+            raise RuntimeError("Context must be initialized before use")
         return Identity(prefer_auth_mode=self.prefer_auth_mode)
 
 

tests/test_api_client.py

@@ -7,6 +7,7 @@
 from httpx import Response
 from time_machine import TimeMachineFixture
 
+from fastapi_cloud_cli.context import ctx
 from fastapi_cloud_cli.utils.api import (
     STREAM_LOGS_MAX_RETRIES,
     APIClient,
@@ -34,6 +35,11 @@ def logs_route(respx_mock: respx.MockRouter, deployment_id: str) -> respx.Route:
     return respx_mock.get(f"/deployments/{deployment_id}/build-logs")
 
 
+@pytest.fixture(autouse=True)
+def init_context() -> None:
+    ctx.initialize()  # Initialize context with defaults
+
+
 def test_stream_build_logs_successful(
     logs_route: respx.Route,
     client: APIClient,