Improvements

Author: patrick91

src/fastapi_cloud_cli/commands/deploy.py

@@ -1,3 +1,4 @@
+import json
 import logging
 import tarfile
 import tempfile
@@ -326,52 +327,34 @@ def _wait_for_deployment(
     toolkit.print_line()
 
     toolkit.print(
-        f"You can also check the status at [link]{check_deployment_url}[/link]",
+        f"You can also check the status at [link={check_deployment_url}]{check_deployment_url}[/link]",
     )
     toolkit.print_line()
 
     time_elapsed = 0
 
+    started_at = time.monotonic()
+
+    last_message_changed_at = time.monotonic()
+
     with toolkit.progress(
-        "Deploying...", inline_logs=True, lines_to_show=20
+        next(messages), inline_logs=True, lines_to_show=20
     ) as progress:
         for line in _stream_build_logs(deployment_id):
-            import json
+            time_elapsed = time.monotonic() - started_at
 
             data = json.loads(line)
 
             if "message" in data:
                 progress.log(Text.from_ansi(data["message"].rstrip()))
 
-    toolkit.print_line()
-
-    with toolkit.progress("Deploying...") as progress:
-        while True:
-            with handle_http_errors(progress):
-                deployment = _get_deployment(app_id, deployment_id)
-
-            if deployment.status == DeploymentStatus.success:
-                progress.log(
-                    f"🐔 Ready the chicken! Your app is ready at {deployment.url}"
-                )
-                break
-            elif deployment.status == DeploymentStatus.failed:
-                progress.set_error(
-                    f"Deployment failed. Please check the logs for more information.\n\n[link={check_deployment_url}]{check_deployment_url}[/link]"
-                )
-
-                raise typer.Exit(1)
-            else:
-                message = next(messages)
-                progress.log(
-                    f"{message} ({DeploymentStatus.to_human_readable(deployment.status)})"
-                )
+            if time_elapsed > 10:
+                messages = cycle(LONG_WAIT_MESSAGES)
 
-            time.sleep(4)
-            time_elapsed += 4
+            if (time.monotonic() - last_message_changed_at) > 2:
+                progress.title = next(messages)
 
-            if time_elapsed == len(WAITING_MESSAGES) * 4:
-                messages = cycle(LONG_WAIT_MESSAGES)
+                last_message_changed_at = time.monotonic()
 
 
 def _setup_environment_variables(toolkit: RichToolkit, app_id: str) -> None:
@@ -383,7 +366,9 @@ def _setup_environment_variables(toolkit: RichToolkit, app_id: str) -> None:
     env_vars = {}
 
     while True:
-        key = toolkit.input("Enter the environment variable name: [ENTER to skip]")
+        key = toolkit.input(
+            "Enter the environment variable name: [ENTER to skip]", required=False
+        )
 
         if key.strip() == "":
             break
@@ -487,5 +472,5 @@ def deploy(
             _wait_for_deployment(toolkit, app.id, deployment.id, check_deployment_url)
         else:
             toolkit.print(
-                f"Check the status of your deployment at [link]{check_deployment_url}[/link]"
+                f"Check the status of your deployment at [link={check_deployment_url}]{check_deployment_url}[/link]"
             )

src/fastapi_cloud_cli/utils/cli.py

@@ -1,18 +1,52 @@
 import contextlib
 import logging
-from typing import Generator, Optional
+from typing import Any, Dict, Generator, List, Optional, Tuple
 
 import typer
 from httpx import HTTPError, HTTPStatusError, ReadTimeout
+from rich.segment import Segment
 from rich_toolkit import RichToolkit, RichToolkitTheme
 from rich_toolkit.progress import Progress
 from rich_toolkit.styles import MinimalStyle, TaggedStyle
 
 logger = logging.getLogger(__name__)
 
 
+class FastAPIStyle(TaggedStyle):
+    def __init__(self, tag_width: int = 11):
+        super().__init__(tag_width=tag_width)
+
+    def _get_tag_segments(
+        self,
+        metadata: Dict[str, Any],
+        is_animated: bool = False,
+        done: bool = False,
+    ) -> Tuple[List[Segment], int]:
+        if not is_animated:
+            return super()._get_tag_segments(metadata, is_animated, done)
+
+        emojis = [
+            "🥚",
+            "🐣",
+            "🐤",
+            "🐥",
+            "🐓",
+            "🐔",
+        ]
+
+        tag = emojis[self.animation_counter % len(emojis)]
+
+        if done:
+            tag = emojis[-1]
+
+        left_padding = self.tag_width - 1
+        left_padding = max(0, left_padding)
+
+        return [Segment(tag)], left_padding
+
+
 def get_rich_toolkit(minimal: bool = False) -> RichToolkit:
-    style = MinimalStyle() if minimal else TaggedStyle(tag_width=11)
+    style = MinimalStyle() if minimal else FastAPIStyle(tag_width=11)
 
     theme = RichToolkitTheme(
         style=style,