♻️ Let backend handle new lines

pyproject.toml

@@ -32,7 +32,7 @@ dependencies = [
     "uvicorn[standard] >= 0.17.6",
     "rignore >= 0.5.1",
     "httpx >= 0.27.0",
-    "rich-toolkit >= 0.19.7",
+    "rich-toolkit>=0.19.9",
     "pydantic[email] >= 2.7.4; python_version < '3.13'",
     "pydantic[email] >= 2.8.0; python_version == '3.13'",
     "pydantic[email] >= 2.12.0; python_version >= '3.14'",

src/fastapi_cloud_cli/commands/deploy.py

@@ -14,7 +14,6 @@
 import typer
 from httpx import Client
 from pydantic import AfterValidator, BaseModel, EmailStr, TypeAdapter, ValidationError
-from rich.text import Text
 from rich_toolkit import RichToolkit
 from rich_toolkit.menu import Option
 from rich_toolkit.progress import Progress
@@ -31,6 +30,7 @@
 from fastapi_cloud_cli.utils.auth import Identity
 from fastapi_cloud_cli.utils.cli import get_rich_toolkit
 from fastapi_cloud_cli.utils.progress_file import ProgressFile
+from fastapi_cloud_cli.utils.rich_ansi import text_from_ansi
 
 logger = logging.getLogger(__name__)
 
@@ -518,7 +518,7 @@ def _wait_for_deployment(
                 time_elapsed = time.monotonic() - started_at
 
                 if log.type == "message":
-                    progress.log(Text.from_ansi(log.message.rstrip()))  # ty: ignore[unresolved-attribute]
+                    progress.log(text_from_ansi(log.message))  # ty: ignore[unresolved-attribute]
 
                 if log.type == "complete":
                     build_complete = True

src/fastapi_cloud_cli/utils/rich_ansi.py

@@ -0,0 +1,19 @@
+import re
+
+from rich.ansi import AnsiDecoder
+from rich.text import Text
+
+ANSI_NEWLINE_SPLIT_RE = re.compile(r"(?<=\n)")
+
+
+def text_from_ansi(text: str) -> Text:
+    # Text.from_ansi only preserves newlines in Rich 15, in order to
+    # avoid forcing everyone to use Rich 15 we handle this ourselves by splitting the text on newlines,
+    # decoding each line separately, then join them back together with newlines.
+    joiner = Text("\n")
+    decoder = AnsiDecoder()
+
+    return joiner.join(
+        decoder.decode_line(line.rstrip("\n"))
+        for line in ANSI_NEWLINE_SPLIT_RE.split(text)
+    )

tests/test_rich_ansi.py

@@ -0,0 +1,20 @@
+from fastapi_cloud_cli.utils.rich_ansi import text_from_ansi
+
+
+def test_text_from_ansi_preserves_newlines() -> None:
+    assert text_from_ansi("").plain == ""
+    assert text_from_ansi("\n").plain == "\n"
+    assert text_from_ansi("\n\n").plain == "\n\n"
+    assert text_from_ansi("Hello").plain == "Hello"
+    assert text_from_ansi("Hello\n").plain == "Hello\n"
+    assert text_from_ansi("Hello\n\n").plain == "Hello\n\n"
+    assert text_from_ansi("Hello\n World").plain == "Hello\n World"
+    assert text_from_ansi("Hello\n\n World").plain == "Hello\n\n World"
+    assert text_from_ansi("Hello\n World\n").plain == "Hello\n World\n"
+
+
+def test_text_from_ansi_handles_carriage_returns_per_line() -> None:
+    assert text_from_ansi("start\rend").plain == "end"
+    assert text_from_ansi("start\rend\n").plain == "end\n"
+    assert text_from_ansi("one\rtwo\nthree").plain == "two\nthree"
+    assert text_from_ansi("one\ntwo\rthree\n").plain == "one\nthree\n"