Do not use rich in tiny-agents CLI (#3573)

Author: Wauplin

src/huggingface_hub/inference/_mcp/cli.py

@@ -5,8 +5,8 @@
 from typing import Optional
 
 import typer
-from rich import print
 
+from ...utils import ANSI
 from ._cli_hacks import _async_prompt, _patch_anyio_open_process
 from .agent import Agent
 from .utils import _load_agent_config
@@ -55,10 +55,10 @@ def _sigint_handler() -> None:
         if first_sigint:
             first_sigint = False
             abort_event.set()
-            print("\n[red]Interrupted. Press Ctrl+C again to quit.[/red]", flush=True)
+            print(ANSI.red("\nInterrupted. Press Ctrl+C again to quit."), flush=True)
             return
 
-        print("\n[red]Exiting...[/red]", flush=True)
+        print(ANSI.red("\nExiting..."), flush=True)
         exit_event.set()
 
     try:
@@ -75,8 +75,12 @@ def _sigint_handler() -> None:
 
         if len(inputs) > 0:
             print(
-                "[bold blue]Some initial inputs are required by the agent. "
-                "Please provide a value or leave empty to load from env.[/bold blue]"
+                ANSI.bold(
+                    ANSI.blue(
+                        "Some initial inputs are required by the agent. "
+                        "Please provide a value or leave empty to load from env."
+                    )
+                )
             )
             for input_item in inputs:
                 input_id = input_item["id"]
@@ -98,15 +102,17 @@ def _sigint_handler() -> None:
 
                 if not input_usages:
                     print(
-                        f"[yellow]Input '{input_id}' defined in config but not used by any server or as an API key."
-                        " Skipping.[/yellow]"
+                        ANSI.yellow(
+                            f"Input '{input_id}' defined in config but not used by any server or as an API key."
+                            " Skipping."
+                        )
                     )
                     continue
 
                 # Prompt user for input
                 env_variable_key = input_id.replace("-", "_").upper()
                 print(
-                    f"[blue] • {input_id}[/blue]: {description}. (default: load from {env_variable_key}).",
+                    ANSI.blue(f" • {input_id}") + f": {description}. (default: load from {env_variable_key}).",
                     end=" ",
                 )
                 user_input = (await _async_prompt(exit_event=exit_event)).strip()
@@ -118,10 +124,12 @@ def _sigint_handler() -> None:
                 if not final_value:
                     final_value = os.getenv(env_variable_key, "")
                     if final_value:
-                        print(f"[green]Value successfully loaded from '{env_variable_key}'[/green]")
+                        print(ANSI.green(f"Value successfully loaded from '{env_variable_key}'"))
                     else:
                         print(
-                            f"[yellow]No value found for '{env_variable_key}' in environment variables. Continuing.[/yellow]"
+                            ANSI.yellow(
+                                f"No value found for '{env_variable_key}' in environment variables. Continuing."
+                            )
                         )
                 resolved_inputs[input_id] = final_value
 
@@ -150,9 +158,9 @@ def _sigint_handler() -> None:
             prompt=prompt,
         ) as agent:
             await agent.load_tools()
-            print(f"[bold blue]Agent loaded with {len(agent.available_tools)} tools:[/bold blue]")
+            print(ANSI.bold(ANSI.blue("Agent loaded with {} tools:".format(len(agent.available_tools)))))
             for t in agent.available_tools:
-                print(f"[blue] • {t.function.name}[/blue]")
+                print(ANSI.blue(f" • {t.function.name}"))
 
             while True:
                 abort_event.clear()
@@ -165,13 +173,13 @@ def _sigint_handler() -> None:
                     user_input = await _async_prompt(exit_event=exit_event)
                     first_sigint = True
                 except EOFError:
-                    print("\n[red]EOF received, exiting.[/red]", flush=True)
+                    print(ANSI.red("\nEOF received, exiting."), flush=True)
                     break
                 except KeyboardInterrupt:
                     if not first_sigint and abort_event.is_set():
                         continue
                     else:
-                        print("\n[red]Keyboard interrupt during input processing.[/red]", flush=True)
+                        print(ANSI.red("\nKeyboard interrupt during input processing."), flush=True)
                         break
 
                 try:
@@ -195,20 +203,20 @@ def _sigint_handler() -> None:
                                         print(f"{call.function.arguments}", end="")
                         else:
                             print(
-                                f"\n\n[green]Tool[{chunk.name}] {chunk.tool_call_id}\n{chunk.content}[/green]\n",
+                                ANSI.green(f"\n\nTool[{chunk.name}] {chunk.tool_call_id}\n{chunk.content}\n"),
                                 flush=True,
                             )
 
                     print()
 
                 except Exception as e:
                     tb_str = traceback.format_exc()
-                    print(f"\n[bold red]Error during agent run: {e}\n{tb_str}[/bold red]", flush=True)
+                    print(ANSI.red(f"\nError during agent run: {e}\n{tb_str}"), flush=True)
                     first_sigint = True  # Allow graceful interrupt for the next command
 
     except Exception as e:
         tb_str = traceback.format_exc()
-        print(f"\n[bold red]An unexpected error occurred: {e}\n{tb_str}[/bold red]", flush=True)
+        print(ANSI.red(f"\nAn unexpected error occurred: {e}\n{tb_str}"), flush=True)
         raise e
 
     finally:
@@ -236,10 +244,10 @@ def run(
     try:
         asyncio.run(run_agent(path))
     except KeyboardInterrupt:
-        print("\n[red]Application terminated by KeyboardInterrupt.[/red]", flush=True)
+        print(ANSI.red("\nApplication terminated by KeyboardInterrupt."), flush=True)
         raise typer.Exit(code=130)
     except Exception as e:
-        print(f"\n[bold red]An unexpected error occurred: {e}[/bold red]", flush=True)
+        print(ANSI.red(f"\nAn unexpected error occurred: {e}"), flush=True)
         raise e
 
 

src/huggingface_hub/utils/_terminal.py

@@ -22,12 +22,18 @@ class ANSI:
     Helper for en.wikipedia.org/wiki/ANSI_escape_code
     """
 
+    _blue = "\u001b[34m"
     _bold = "\u001b[1m"
     _gray = "\u001b[90m"
+    _green = "\u001b[32m"
     _red = "\u001b[31m"
     _reset = "\u001b[0m"
     _yellow = "\u001b[33m"
 
+    @classmethod
+    def blue(cls, s: str) -> str:
+        return cls._format(s, cls._blue)
+
     @classmethod
     def bold(cls, s: str) -> str:
         return cls._format(s, cls._bold)
@@ -36,6 +42,10 @@ def bold(cls, s: str) -> str:
     def gray(cls, s: str) -> str:
         return cls._format(s, cls._gray)
 
+    @classmethod
+    def green(cls, s: str) -> str:
+        return cls._format(s, cls._green)
+
     @classmethod
     def red(cls, s: str) -> str:
         return cls._format(s, cls._bold + cls._red)