✨ Show if there's a new fastapi-cloud-cli version available (#201)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Author: patrick91

pyproject.toml

@@ -38,6 +38,7 @@ dependencies = [
     "pydantic[email] >= 2.12.0; python_version >= '3.14'",
     "sentry-sdk >= 2.20.0",
     "fastar >= 0.10.0",
+    "detect-installer>=0.1.0",
 ]
 
 [project.optional-dependencies]

src/fastapi_cloud_cli/commands/login.py

@@ -77,48 +77,50 @@ def login() -> Any:
     Login to FastAPI Cloud. 🚀
     """
     identity = Identity()
+    is_logged_in = identity.is_logged_in()
 
-    if identity.is_logged_in():
-        with get_rich_toolkit(minimal=True) as toolkit:
+    with get_rich_toolkit(minimal=is_logged_in) as toolkit:
+        if is_logged_in:
             toolkit.print("You are already logged in.")
             toolkit.print(
                 "Run [bold]fastapi cloud logout[/bold] first if you want to switch accounts."
             )
 
-        return
+            return
 
-    if identity.has_deploy_token():
-        with get_rich_toolkit() as toolkit:
+        if identity.has_deploy_token():
             toolkit.print(
                 "You have [bold blue]FASTAPI_CLOUD_TOKEN[/] environment variable set.\n"
                 "This token will take precedence over the user token for "
                 "[blue]`fastapi deploy`[/] command.",
                 tag="Warning",
             )
 
-    with get_rich_toolkit() as toolkit, APIClient() as client:
-        toolkit.print_title("Login to FastAPI Cloud", tag="FastAPI")
+        with APIClient() as client:
+            toolkit.print_title("Login to FastAPI Cloud", tag="FastAPI")
 
-        toolkit.print_line()
+            toolkit.print_line()
 
-        with toolkit.progress("Starting authorization") as progress:
-            with client.handle_http_errors(progress):
-                authorization_data = _start_device_authorization(client)
+            with toolkit.progress("Starting authorization") as progress:
+                with client.handle_http_errors(progress):
+                    authorization_data = _start_device_authorization(client)
 
-            url = authorization_data.verification_uri_complete
+                url = authorization_data.verification_uri_complete
 
-            progress.log(f"Opening [link={url}]{url}[/link]")
+                progress.log(f"Opening [link={url}]{url}[/link]")
 
-        toolkit.print_line()
+            toolkit.print_line()
 
-        with toolkit.progress("Waiting for user to authorize...") as progress:
-            typer.launch(url)
+            with toolkit.progress("Waiting for user to authorize...") as progress:
+                typer.launch(url)
 
-            with client.handle_http_errors(progress):
-                access_token = _fetch_access_token(
-                    client, authorization_data.device_code, authorization_data.interval
-                )
+                with client.handle_http_errors(progress):
+                    access_token = _fetch_access_token(
+                        client,
+                        authorization_data.device_code,
+                        authorization_data.interval,
+                    )
 
-            write_auth_config(AuthConfig(access_token=access_token))
+                write_auth_config(AuthConfig(access_token=access_token))
 
-            progress.log("Now you are logged in! 🚀")
+                progress.log("Now you are logged in! 🚀")

src/fastapi_cloud_cli/commands/whoami.py

@@ -1,33 +1,37 @@
 import logging
 from typing import Any
 
-from rich import print
-from rich_toolkit.progress import Progress
-
 from fastapi_cloud_cli.utils.api import APIClient
 from fastapi_cloud_cli.utils.auth import Identity
+from fastapi_cloud_cli.utils.cli import get_rich_toolkit
 
 logger = logging.getLogger(__name__)
 
 
 def whoami() -> Any:
     identity = Identity()
 
-    if not identity.is_logged_in():
-        print("No credentials found. Use [blue]`fastapi login`[/] to login.")
-    else:
-        with APIClient() as client:
-            with Progress(title="⚡ Fetching profile", transient=True) as progress:
-                with client.handle_http_errors(progress, default_message=""):
-                    response = client.get("/users/me")
-                    response.raise_for_status()
-
-            data = response.json()
-
-            print(f"⚡ [bold]{data['email']}[/bold]")
-
-    if identity.has_deploy_token():
-        print(
-            "⚡ [bold]Using API token from environment variable for "
-            "[blue]`fastapi deploy`[/blue] command.[/bold]"
-        )
+    with get_rich_toolkit(minimal=True) as toolkit:
+        if not identity.is_logged_in():
+            toolkit.print(
+                "No credentials found. Use [blue]`fastapi login`[/] to login."
+            )
+        else:
+            with APIClient() as client:
+                with toolkit.progress(
+                    title="⚡ Fetching profile",
+                    transient=True,
+                ) as progress:
+                    with client.handle_http_errors(progress, default_message=""):
+                        response = client.get("/users/me")
+                        response.raise_for_status()
+
+                data = response.json()
+
+                toolkit.print(f"⚡ [bold]{data['email']}[/bold]")
+
+        if identity.has_deploy_token():
+            toolkit.print(
+                "⚡ [bold]Using API token from environment variable for "
+                "[blue]`fastapi deploy`[/blue] command.[/bold]"
+            )

src/fastapi_cloud_cli/utils/cli.py

@@ -1,9 +1,18 @@
 import logging
+import os
+from types import TracebackType
 from typing import Any, Literal
 
 from rich.segment import Segment
+from rich.style import Style
+from rich.text import Text
 from rich_toolkit import RichToolkit, RichToolkitTheme
-from rich_toolkit.styles import MinimalStyle, TaggedStyle
+from rich_toolkit.styles import BaseStyle, MinimalStyle, TaggedStyle
+
+from fastapi_cloud_cli.utils.version_check import (
+    DISABLE_VERSION_CHECK_ENV,
+    BackgroundVersionCheck,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -20,10 +29,20 @@ def _get_tag_segments(
         animation_status: Literal["started", "stopped", "error"] | None = None,
     ) -> tuple[list[Segment], int]:
         if not is_animated:
-            return super()._get_tag_segments(
+            tag_segments, left_padding = super()._get_tag_segments(
                 metadata, is_animated, done, animation_status=animation_status
             )
 
+            tag_style = metadata.get("tag_style")
+
+            if isinstance(tag_style, (str, Style)):
+                style = self.console.get_style(tag_style)
+                tag_segments = [
+                    Segment(segment.text, style=style) for segment in tag_segments
+                ]
+
+            return tag_segments, left_padding
+
         emojis = [
             "🥚",
             "🐣",
@@ -47,6 +66,46 @@ def _get_tag_segments(
         return [Segment(tag)], left_padding
 
 
+class FastAPIRichToolkit(RichToolkit):
+    def __init__(
+        self,
+        style: BaseStyle | None = None,
+        theme: RichToolkitTheme | None = None,
+    ) -> None:
+        super().__init__(style=style, theme=theme)
+        self._version_check = self._get_version_check()
+
+    def __exit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        traceback: TracebackType | None,
+    ) -> bool | None:
+        self._print_update_message()
+
+        return super().__exit__(
+            exc_type,
+            exc_value,
+            traceback,
+        )
+
+    def _get_version_check(self) -> BackgroundVersionCheck | None:
+        if os.environ.get(DISABLE_VERSION_CHECK_ENV) == "1":
+            return None
+
+        version_check = BackgroundVersionCheck()
+        version_check.start()
+
+        return version_check
+
+    def _print_update_message(self) -> None:
+        if self._version_check is None:
+            return
+
+        if message := self._version_check.get_update_message():
+            self.print(Text.from_markup(message), tag="update", tag_style="tag.update")
+
+
 def get_rich_toolkit(minimal: bool = False) -> RichToolkit:
     style = MinimalStyle() if minimal else FastAPIStyle(tag_width=11)
 
@@ -55,6 +114,7 @@ def get_rich_toolkit(minimal: bool = False) -> RichToolkit:
         theme={
             "tag.title": "white on #009485",
             "tag": "white on #007166",
+            "tag.update": "black on yellow",
             "placeholder": "grey62",
             "text": "white",
             "selected": "#007166",
@@ -65,4 +125,4 @@ def get_rich_toolkit(minimal: bool = False) -> RichToolkit:
         },
     )
 
-    return RichToolkit(theme=theme)
+    return FastAPIRichToolkit(theme=theme)

src/fastapi_cloud_cli/utils/config.py

@@ -25,3 +25,7 @@ def get_cli_config_path() -> Path:
     cli_config_path.parent.mkdir(parents=True, exist_ok=True)
 
     return cli_config_path
+
+
+def get_version_check_cache_path() -> Path:
+    return get_config_folder() / "version-check.json"