🎨 Auto format

Author: github-actions[bot]

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

@@ -13,7 +13,9 @@ def whoami() -> Any:
 
     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.")
+            toolkit.print(
+                "No credentials found. Use [blue]`fastapi login`[/] to login."
+            )
         else:
             with APIClient() as client:
                 with toolkit.progress(

src/fastapi_cloud_cli/utils/cli.py

@@ -3,7 +3,6 @@
 from types import TracebackType
 from typing import Any, Literal
 
-import click
 from rich.segment import Segment
 from rich.style import Style
 from rich.text import Text
@@ -16,7 +15,6 @@
 )
 
 logger = logging.getLogger(__name__)
-VERSION_CHECK_CONTEXT_KEY = "fastapi_cloud_cli.version_check"
 
 
 class FastAPIStyle(TaggedStyle):
@@ -34,7 +32,9 @@ def _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 = [
@@ -71,83 +71,42 @@ def __init__(
         self,
         style: BaseStyle | None = None,
         theme: RichToolkitTheme | None = None,
-        handle_keyboard_interrupts: bool = True,
-        print_spacing: bool = True,
     ) -> None:
-        super().__init__(
-            style=style,
-            theme=theme,
-            handle_keyboard_interrupts=handle_keyboard_interrupts,
-        )
-        self._print_spacing = print_spacing
-        self._version_check: BackgroundVersionCheck | None = None
-        self._print_update_on_exit = False
-
-    def __enter__(self) -> "FastAPIRichToolkit":
+        super().__init__(style=style, theme=theme)
         self._version_check = self._get_version_check()
 
-        if self._print_spacing:
-            self.console.print()
-        return self
-
     def __exit__(
         self,
         exc_type: type[BaseException] | None,
         exc_value: BaseException | None,
         traceback: TracebackType | None,
     ) -> bool | None:
-        is_keyboard_interrupt = exc_type is KeyboardInterrupt
-
-        if is_keyboard_interrupt and self._version_check is not None:
-            self._version_check.suppress()
-        elif self._print_update_on_exit:
-            self._print_update_message()
+        self._print_update_message()
 
-        if self._print_spacing and not is_keyboard_interrupt:
-            self.console.print()
-
-        if self.handle_keyboard_interrupts and is_keyboard_interrupt:
-            return True
-
-        return None
+        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
 
-        context = click.get_current_context(silent=True)
-        if context is None:
-            version_check = BackgroundVersionCheck()
-            version_check.start()
-            self._print_update_on_exit = True
-            return version_check
-
-        stored_version_check = context.meta.get(VERSION_CHECK_CONTEXT_KEY)
-        if isinstance(stored_version_check, BackgroundVersionCheck):
-            return stored_version_check
-
         version_check = BackgroundVersionCheck()
         version_check.start()
-        context.meta[VERSION_CHECK_CONTEXT_KEY] = version_check
-        context.call_on_close(self._print_update_message)
 
         return version_check
 
     def _print_update_message(self) -> None:
         if self._version_check is None:
             return
 
-        message = self._version_check.get_update_message()
-        if message:
+        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,
-    *,
-    print_spacing: bool = True,
-    handle_keyboard_interrupts: bool = True,
-) -> RichToolkit:
+def get_rich_toolkit(minimal: bool = False) -> RichToolkit:
     style = MinimalStyle() if minimal else FastAPIStyle(tag_width=11)
 
     theme = RichToolkitTheme(
@@ -166,8 +125,4 @@ def get_rich_toolkit(
         },
     )
 
-    return FastAPIRichToolkit(
-        theme=theme,
-        handle_keyboard_interrupts=handle_keyboard_interrupts,
-        print_spacing=print_spacing,
-    )
+    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"