mirror of
https://github.com/HKUDS/nanobot.git
synced 2026-04-09 04:33:38 +00:00
f86f226c17
Fixes #2591 The "nanobot is thinking..." spinner was printing ANSI escape codes literally in some terminals, causing garbled output like: ?[2K?[32m⠧?[0m ?[2mnanobot is thinking...?[0m Root causes: 1. Console created without force_terminal=True, so Rich couldn't reliably detect terminal capabilities 2. Spinner continued running during user input prompt, conflicting with prompt_toolkit Changes: - Set force_terminal=True in _make_console() for proper ANSI handling - Add stop_for_input() method to StreamRenderer - Call stop_for_input() before reading user input in interactive mode - Add tests for the new functionality
133 lines
3.8 KiB
Python
133 lines
3.8 KiB
Python
"""Streaming renderer for CLI output.
|
|
|
|
Uses Rich Live with auto_refresh=False for stable, flicker-free
|
|
markdown rendering during streaming. Ellipsis mode handles overflow.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import sys
|
|
import time
|
|
|
|
from rich.console import Console
|
|
from rich.live import Live
|
|
from rich.markdown import Markdown
|
|
from rich.text import Text
|
|
|
|
from nanobot import __logo__
|
|
|
|
|
|
def _make_console() -> Console:
|
|
return Console(file=sys.stdout, force_terminal=True)
|
|
|
|
|
|
class ThinkingSpinner:
|
|
"""Spinner that shows 'nanobot is thinking...' with pause support."""
|
|
|
|
def __init__(self, console: Console | None = None):
|
|
c = console or _make_console()
|
|
self._spinner = c.status("[dim]nanobot is thinking...[/dim]", spinner="dots")
|
|
self._active = False
|
|
|
|
def __enter__(self):
|
|
self._spinner.start()
|
|
self._active = True
|
|
return self
|
|
|
|
def __exit__(self, *exc):
|
|
self._active = False
|
|
self._spinner.stop()
|
|
return False
|
|
|
|
def pause(self):
|
|
"""Context manager: temporarily stop spinner for clean output."""
|
|
from contextlib import contextmanager
|
|
|
|
@contextmanager
|
|
def _ctx():
|
|
if self._spinner and self._active:
|
|
self._spinner.stop()
|
|
try:
|
|
yield
|
|
finally:
|
|
if self._spinner and self._active:
|
|
self._spinner.start()
|
|
|
|
return _ctx()
|
|
|
|
|
|
class StreamRenderer:
|
|
"""Rich Live streaming with markdown. auto_refresh=False avoids render races.
|
|
|
|
Deltas arrive pre-filtered (no <think> tags) from the agent loop.
|
|
|
|
Flow per round:
|
|
spinner -> first visible delta -> header + Live renders ->
|
|
on_end -> Live stops (content stays on screen)
|
|
"""
|
|
|
|
def __init__(self, render_markdown: bool = True, show_spinner: bool = True):
|
|
self._md = render_markdown
|
|
self._show_spinner = show_spinner
|
|
self._buf = ""
|
|
self._live: Live | None = None
|
|
self._t = 0.0
|
|
self.streamed = False
|
|
self._spinner: ThinkingSpinner | None = None
|
|
self._start_spinner()
|
|
|
|
def _render(self):
|
|
return Markdown(self._buf) if self._md and self._buf else Text(self._buf or "")
|
|
|
|
def _start_spinner(self) -> None:
|
|
if self._show_spinner:
|
|
self._spinner = ThinkingSpinner()
|
|
self._spinner.__enter__()
|
|
|
|
def _stop_spinner(self) -> None:
|
|
if self._spinner:
|
|
self._spinner.__exit__(None, None, None)
|
|
self._spinner = None
|
|
|
|
async def on_delta(self, delta: str) -> None:
|
|
self.streamed = True
|
|
self._buf += delta
|
|
if self._live is None:
|
|
if not self._buf.strip():
|
|
return
|
|
self._stop_spinner()
|
|
c = _make_console()
|
|
c.print()
|
|
c.print(f"[cyan]{__logo__} nanobot[/cyan]")
|
|
self._live = Live(self._render(), console=c, auto_refresh=False)
|
|
self._live.start()
|
|
now = time.monotonic()
|
|
if "\n" in delta or (now - self._t) > 0.05:
|
|
self._live.update(self._render())
|
|
self._live.refresh()
|
|
self._t = now
|
|
|
|
async def on_end(self, *, resuming: bool = False) -> None:
|
|
if self._live:
|
|
self._live.update(self._render())
|
|
self._live.refresh()
|
|
self._live.stop()
|
|
self._live = None
|
|
self._stop_spinner()
|
|
if resuming:
|
|
self._buf = ""
|
|
self._start_spinner()
|
|
else:
|
|
_make_console().print()
|
|
|
|
def stop_for_input(self) -> None:
|
|
"""Stop spinner before user input to avoid prompt_toolkit conflicts."""
|
|
self._stop_spinner()
|
|
|
|
async def close(self) -> None:
|
|
"""Stop spinner/live without rendering a final streamed round."""
|
|
if self._live:
|
|
self._live.stop()
|
|
self._live = None
|
|
self._stop_spinner()
|