Use monkey patching

Author: savannahostrowski

src/fastapi_cli/cli.py

@@ -424,6 +424,5 @@ def run(
         forwarded_allow_ips=forwarded_allow_ips,
     )
 
-
 def main() -> None:
     app()

src/fastapi_cli/utils/cli.py

@@ -4,15 +4,35 @@
 from rich_toolkit import RichToolkit, RichToolkitTheme
 from rich_toolkit.styles import TaggedStyle
 from uvicorn.logging import DefaultFormatter
+from uvicorn.server import Server
+
+# Patch uvicorn's Server.handle_exit to set a flag when SIGINT is received
+_original_handle_exit = Server.handle_exit
+_sigint_received = False
+
+
+def _patched_handle_exit(self: Server, sig: int, frame: Any) -> None:
+    global _sigint_received
+    _sigint_received = True
+    _original_handle_exit(self, sig, frame)
+
+
+Server.handle_exit = _patched_handle_exit  # type: ignore[method-assign]
 
 
 class CustomFormatter(DefaultFormatter):
     def __init__(self, *args: Any, **kwargs: Any) -> None:
         super().__init__(*args, **kwargs)
         self.toolkit = get_rich_toolkit()
 
-    def formatMessage(self, record: logging.LogRecord) -> str:
-        return self.toolkit.print_as_string(record.getMessage(), tag=record.levelname)
+    def format(self, record: logging.LogRecord) -> str:
+        global _sigint_received
+        result = self.toolkit.print_as_string(record.getMessage(), tag=record.levelname)
+        # Prepend newline after ^C to fix alignment
+        if _sigint_received:
+            _sigint_received = False
+            result = "\n" + result
+        return result
 
 
 def get_uvicorn_log_config() -> Dict[str, Any]: