janito 1.9.0__py3-none-any.whl → 1.10.0__py3-none-any.whl

janito/cli/_print_config.py

@@ -1,5 +1,7 @@
 import os
-from janito.rich_utils import print_info, print_warning, print_magenta
+from janito.rich_utils import RichPrinter
+
+_rich_printer = RichPrinter()
 from ._utils import home_shorten
 
 
@@ -7,17 +9,65 @@ def print_config_items(items, color_label=None):
     if not items:
         return
     if color_label:
-        print_info(color_label)
+        _rich_printer.print_info(color_label)
     home = os.path.expanduser("~")
     for key, value in items.items():
         if key == "system_prompt_template" and isinstance(value, str):
             if value.startswith(home):
                 print(f"{key} = {home_shorten(value)}")
             else:
-                print_info(f"{key} = {value}")
+                _rich_printer.print_info(f"{key} = {value}")
+        else:
+            _rich_printer.print_info(f"{key} = {value}")
+    _rich_printer.print_info("")
+
+
+def _mask_api_key(value):
+    if value and len(value) > 8:
+        return value[:4] + "..." + value[-4:]
+    elif value:
+        return "***"
+    return None
+
+
+def _collect_config_items(config, unified_config, keys):
+    items = {}
+    for key in sorted(keys):
+        if key == "api_key":
+            value = config.get("api_key")
+            value = _mask_api_key(value)
         else:
-            print_info(f"{key} = {value}")
-    print_info("")
+            value = unified_config.get(key)
+        items[key] = value
+    return items
+
+
+def _print_defaults(config_defaults, shown_keys):
+    default_items = {
+        k: v
+        for k, v in config_defaults.items()
+        if k not in shown_keys and k != "api_key"
+    }
+    if default_items:
+        _rich_printer.print_magenta(
+            "[green]\U0001f7e2 Defaults (not set in config files)[/green]"
+        )
+        from pathlib import Path
+
+        template_path = (
+            Path(__file__).parent
+            / "agent"
+            / "templates"
+            / "system_prompt_template_default.j2"
+        )
+        for key, value in default_items.items():
+            if key == "system_prompt_template" and value is None:
+                _rich_printer.print_info(
+                    f"{key} = (default template path: {home_shorten(str(template_path))})"
+                )
+            else:
+                _rich_printer.print_info(f"{key} = {value}")
+        _rich_printer.print_info("")
 
 
 def print_full_config(
@@ -27,68 +77,20 @@ def print_full_config(
     Print local, global, and default config values in a unified way.
     Handles masking API keys and showing the template file for system_prompt_template if not set.
     """
-    local_items = {}
-    global_items = {}
     local_keys = set(local_config.all().keys())
     global_keys = set(global_config.all().keys())
     if not (local_keys or global_keys):
-        print_warning("No configuration found.")
+        _rich_printer.print_warning("No configuration found.")
     else:
-        for key in sorted(local_keys):
-            if key == "api_key":
-                value = local_config.get("api_key")
-                value = (
-                    value[:4] + "..." + value[-4:]
-                    if value and len(value) > 8
-                    else ("***" if value else None)
-                )
-            else:
-                value = unified_config.get(key)
-            local_items[key] = value
-        for key in sorted(global_keys - local_keys):
-            if key == "api_key":
-                value = global_config.get("api_key")
-                value = (
-                    value[:4] + "..." + value[-4:]
-                    if value and len(value) > 8
-                    else ("***" if value else None)
-                )
-            else:
-                value = unified_config.get(key)
-            global_items[key] = value
-        # Mask API key
-        for cfg in (local_items, global_items):
-            if "api_key" in cfg and cfg["api_key"]:
-                val = cfg["api_key"]
-                cfg["api_key"] = val[:4] + "..." + val[-4:] if len(val) > 8 else "***"
+        local_items = _collect_config_items(local_config, unified_config, local_keys)
+        global_items = _collect_config_items(
+            global_config, unified_config, global_keys - local_keys
+        )
         print_config_items(
-            local_items, color_label="[cyan]🏠 Local Configuration[/cyan]"
+            local_items, color_label="[cyan]\U0001f3e0 Local Configuration[/cyan]"
         )
         print_config_items(
-            global_items, color_label="[yellow]🌐 Global Configuration[/yellow]"
+            global_items, color_label="[yellow]\U0001f310 Global Configuration[/yellow]"
         )
-        # Show defaults for unset keys
         shown_keys = set(local_items.keys()) | set(global_items.keys())
-        default_items = {
-            k: v
-            for k, v in config_defaults.items()
-            if k not in shown_keys and k != "api_key"
-        }
-        if default_items:
-            print_magenta("[green]🟢 Defaults (not set in config files)[/green]")
-            from pathlib import Path
-
-            template_path = (
-                Path(__file__).parent
-                / "agent"
-                / "templates"
-                / "system_prompt_template_default.j2"
-            )
-            for key, value in default_items.items():
-                if key == "system_prompt_template" and value is None:
-                    print_info(
-                        f"{key} = (default template path: {home_shorten(str(template_path))})"
-                    )
-                else:
-                    print_info(f"{key} = {value}")
-            print_info("")
+        _print_defaults(config_defaults, shown_keys)

janito/cli/arg_parser.py

@@ -34,7 +34,7 @@ def create_parser():
         "--set-provider-config",
         nargs=3,
         metavar=("NAME", "KEY", "VALUE"),
-        help="Set a provider config parameter (e.g., --set-provider-config openrouter.ai api_key sk-xxx).",
+        help="Set a provider config parameter (e.g., --set-provider-config openai api_key sk-xxx).",
     )
     parser.add_argument(
         "--lang",
@@ -52,7 +52,7 @@ def create_parser():
         "--max-tokens",
         type=int,
         default=None,
-        help="Maximum tokens for model response (overrides config, default: 200000)",
+        help="Maximum tokens for model response (overrides config, default: 32000)",
     )
     parser.add_argument(
         "--max-tools",
@@ -212,6 +212,11 @@ def create_parser():
         action="store_true",
         help="Print all agent events before dispatching to the message handler (for debugging)",
     )
+    parser.add_argument(
+        "--verbose-messages",
+        action="store_true",
+        help="Print every new message added to the conversation history with a colored background.",
+    )
     parser.add_argument(
         "-V",
         "--vanilla",
@@ -231,16 +236,6 @@ def create_parser():
         default=None,
         help="Agent Profile name (only 'base' is supported)",
     )
-    parser.add_argument(
-        "--stream",
-        action="store_true",
-        help="Enable OpenAI streaming mode (yields tokens as they arrive)",
-    )
-    parser.add_argument(
-        "--verbose-stream",
-        action="store_true",
-        help="Print raw chunks as they are fetched from OpenAI (for debugging)",
-    )
     parser.add_argument(
         "--no-termweb",
         action="store_true",
@@ -263,4 +258,10 @@ def create_parser():
         action="store_true",
         help="Disable tool call reason tracking (no tools tracking)",
     )
+    parser.add_argument(
+        "--tool-user",
+        action="store_true",
+        default=False,
+        help="When set, tool responses will use role 'user' instead of 'tool' in the conversation history.",
+    )
     return parser

janito/cli/cli_main.py

@@ -1,4 +1,5 @@
 import sys
+from janito.agent.llm_conversation_history import LLMConversationHistory
 import socket
 from janito.agent.profile_manager import AgentProfileManager
 from janito.agent.runtime_config import unified_config, runtime_config
@@ -17,19 +18,11 @@ def is_port_free(port):
         return s.connect_ex(("localhost", port)) != 0
 
 
-def run_cli(args):
-    if args.version:
-        print(f"janito version {__version__}")
-        sys.exit(0)
-
-    # Set vanilla mode if -V/--vanilla is passed
+def normalize_args(args):
     if getattr(args, "vanilla", False):
         runtime_config.set("vanilla_mode", True)
-
-    # Set no_tools_tracking if --ntt is passed
     if getattr(args, "ntt", False):
         runtime_config.set("no_tools_tracking", True)
-    # Normalize all verbose flags into runtime_config
     for flag in [
         "verbose_http",
         "verbose_http_raw",
@@ -37,58 +30,49 @@ def run_cli(args):
         "verbose_reason",
         "verbose_tools",
         "verbose_events",
-        "verbose_stream",
+        "verbose_messages",
     ]:
         if hasattr(args, flag):
             runtime_config.set(flag, getattr(args, flag, False))
-
-    role = args.role or unified_config.get("role", "software engineer")
-    if args.role:
-        runtime_config.set("role", args.role)
+    if getattr(args, "trust_tools", False):
+        runtime_config.set("trust_tools", True)
     if getattr(args, "model", None):
         runtime_config.set("model", args.model)
     if getattr(args, "max_tools", None) is not None:
         runtime_config.set("max_tools", args.max_tools)
-    if getattr(args, "trust_tools", False):
-        runtime_config.set("trust_tools", True)
-    if not getattr(args, "prompt", None):
-        interaction_mode = "chat"
-    else:
-        interaction_mode = "prompt"
-    profile = "base"
-    # PATCH: Pass lang from args or runtime_config to AgentProfileManager
-    lang = getattr(args, "lang", None) or runtime_config.get("lang", "en")
-    profile_manager = AgentProfileManager(
+    if getattr(args, "verbose_reason", False):
+        runtime_config.set("verbose_reason", True)
+    if getattr(args, "max_tokens", None) is not None:
+        runtime_config.set("max_tokens", args.max_tokens)
+
+
+def setup_profile_manager(args, role, interaction_mode, profile, lang):
+    return AgentProfileManager(
         api_key=get_api_key(),
         model=unified_config.get("model"),
         role=role,
         profile_name=profile,
         interaction_mode=interaction_mode,
         verbose_tools=args.verbose_tools,
-        base_url=unified_config.get("base_url", "https://openrouter.ai/api/v1"),
+        base_url=unified_config.get("base_url", ""),
         azure_openai_api_version=unified_config.get(
             "azure_openai_api_version", "2023-05-15"
         ),
         use_azure_openai=unified_config.get("use_azure_openai", False),
         lang=lang,
     )
-    profile_manager.refresh_prompt()
-    if getattr(args, "show_system", False):
-        print(profile_manager.render_prompt())
-        sys.exit(0)
-    if args.max_tokens is not None:
-        runtime_config.set("max_tokens", args.max_tokens)
-    if getattr(args, "verbose_reason", False):
-        runtime_config.set("verbose_reason", True)
 
-    # --- termweb integration ---
+
+def handle_termweb(args, interaction_mode):
     termweb_proc = None
     selected_port = None
+    termweb_stdout_path = None
+    termweb_stderr_path = None
     if (
         not getattr(args, "no_termweb", False)
         and interaction_mode == "chat"
         and not runtime_config.get("vanilla_mode", False)
-        and not getattr(args, "input_arg", None)  # Prevent termweb in one-shot mode
+        and not getattr(args, "input_arg", None)
     ):
         default_port = 8088
         max_port = 8100
@@ -122,54 +106,131 @@ def run_cli(args):
         termweb_proc, started, termweb_stdout_path, termweb_stderr_path = start_termweb(
             selected_port
         )
-        # Store last running port in .janito/config.json if started
         if started:
             from janito.agent.config import local_config
 
             local_config.set("termweb_last_running_port", selected_port)
             local_config.save()
+    return termweb_proc, termweb_stdout_path, termweb_stderr_path
+
+
+def handle_continue_session(args):
+    continue_session = False
+    session_id = None
+    if getattr(args, "input_arg", None) or getattr(args, "continue_session", False):
+        _cont = getattr(args, "continue_session", False)
+        if _cont:
+            continue_session = True
+            session_id = getattr(args, "input_arg", None)
+            if session_id is None:
+                import os
+                import glob
+
+                chat_hist_dir = (
+                    os.path.join(os.path.expanduser("~"), ".janito", "chat_history")
+                    if not os.path.isabs(".janito")
+                    else os.path.join(".janito", "chat_history")
+                )
+                if not os.path.exists(chat_hist_dir):
+                    session_id = None
+                else:
+                    files = glob.glob(os.path.join(chat_hist_dir, "*.json"))
+                    if files:
+                        latest = max(files, key=os.path.getmtime)
+                        session_id = os.path.splitext(os.path.basename(latest))[0]
+                    else:
+                        session_id = None
+        else:
+            continue_session = False
+            session_id = None
+    return continue_session, session_id
+
+
+def handle_prompt_mode(args, profile_manager):
+    prompt = getattr(args, "input_arg", None)
+    from rich.console import Console
+    from janito.agent.rich_message_handler import RichMessageHandler
+
+    console = Console()
+    message_handler = RichMessageHandler()
+    messages = []
+    system_prompt_override = runtime_config.get("system_prompt_template")
+    if system_prompt_override:
+        if not runtime_config.get("vanilla_mode", False) or getattr(
+            args, "system", None
+        ):
+            messages.append({"role": "system", "content": system_prompt_override})
+    elif profile_manager.system_prompt_template and not runtime_config.get(
+        "vanilla_mode", False
+    ):
+        messages.append(
+            {"role": "system", "content": profile_manager.system_prompt_template}
+        )
+    messages.append({"role": "user", "content": prompt})
+    import time
+
+    info_start_time = None
+    if getattr(args, "info", False):
+        info_start_time = time.time()
+    try:
+        max_rounds = 100
+        result = profile_manager.agent.chat(
+            LLMConversationHistory(messages),
+            message_handler=message_handler,
+            spinner=True,
+            max_rounds=max_rounds,
+            tool_user=getattr(args, "tool_user", False),
+        )
+        if (
+            getattr(args, "info", False)
+            and info_start_time is not None
+            and result is not None
+        ):
+            usage_info = result.get("usage")
+            total_tokens = usage_info.get("total_tokens") if usage_info else None
+            prompt_tokens = usage_info.get("prompt_tokens") if usage_info else None
+            completion_tokens = (
+                usage_info.get("completion_tokens") if usage_info else None
+            )
+            elapsed = time.time() - info_start_time
+            console.print(
+                f"[bold green]Total tokens:[/] [yellow]{total_tokens}[/yellow] [bold green]| Input:[/] [cyan]{prompt_tokens}[/cyan] [bold green]| Output:[/] [magenta]{completion_tokens}[/magenta] [bold green]| Elapsed:[/] [yellow]{elapsed:.2f}s[/yellow]",
+                style="dim",
+            )
+    except MaxRoundsExceededError:
+        console.print("[red]Max conversation rounds exceeded.[/red]")
+    except ProviderError as e:
+        console.print(f"[red]Provider error:[/red] {e}")
+    except EmptyResponseError as e:
+        console.print(f"[red]Error:[/red] {e}")
+
 
-    # --- End termweb integration ---
+def run_cli(args):
+    if args.version:
+        print(f"janito version {__version__}")
+        sys.exit(0)
+    normalize_args(args)
+    role = args.role or unified_config.get("role", "software engineer")
+    if args.role:
+        runtime_config.set("role", args.role)
+    interaction_mode = "chat" if not getattr(args, "prompt", None) else "prompt"
+    profile = "base"
+    lang = getattr(args, "lang", None) or runtime_config.get("lang", "en")
+    profile_manager = setup_profile_manager(args, role, interaction_mode, profile, lang)
+    profile_manager.refresh_prompt()
+    if getattr(args, "show_system", False):
+        print(profile_manager.render_prompt())
+        sys.exit(0)
+    termweb_proc, termweb_stdout_path, termweb_stderr_path = handle_termweb(
+        args, interaction_mode
+    )
     try:
-        livereload_stdout_path = None
-        livereload_stderr_path = None
-        continue_session = False
-        session_id = None
+        continue_session, session_id = handle_continue_session(args)
         if getattr(args, "input_arg", None):
             from janito.cli.one_shot import run_oneshot_mode
 
             run_oneshot_mode(args, profile_manager, runtime_config)
             return
-        if not getattr(args, "input_arg", None) or getattr(
-            args, "continue_session", False
-        ):
-            # Determine continue_session and session_id
-            _cont = getattr(args, "continue_session", False)
-            if _cont:
-                continue_session = True
-                session_id = getattr(args, "input_arg", None)
-                if session_id is None:
-                    # Find the most recent session id from .janito/chat_history/*.json
-                    import os
-                    import glob
-
-                    chat_hist_dir = (
-                        os.path.join(os.path.expanduser("~"), ".janito", "chat_history")
-                        if not os.path.isabs(".janito")
-                        else os.path.join(".janito", "chat_history")
-                    )
-                    if not os.path.exists(chat_hist_dir):
-                        session_id = None
-                    else:
-                        files = glob.glob(os.path.join(chat_hist_dir, "*.json"))
-                        if files:
-                            latest = max(files, key=os.path.getmtime)
-                            session_id = os.path.splitext(os.path.basename(latest))[0]
-                        else:
-                            session_id = None
-            else:
-                continue_session = False
-                session_id = None
         import time
 
         info_start_time = None
@@ -179,18 +240,10 @@ def run_cli(args):
             profile_manager,
             continue_session=continue_session,
             session_id=session_id,
-            termweb_stdout_path=(
-                termweb_stdout_path if "termweb_stdout_path" in locals() else None
-            ),
-            termweb_stderr_path=(
-                termweb_stderr_path if "termweb_stderr_path" in locals() else None
-            ),
-            livereload_stdout_path=(
-                livereload_stdout_path if "livereload_stdout_path" in locals() else None
-            ),
-            livereload_stderr_path=(
-                livereload_stderr_path if "livereload_stderr_path" in locals() else None
-            ),
+            termweb_stdout_path=termweb_stdout_path,
+            termweb_stderr_path=termweb_stderr_path,
+            livereload_stdout_path=None,
+            livereload_stderr_path=None,
         )
         if (
             getattr(args, "info", False)
@@ -200,75 +253,12 @@ def run_cli(args):
             elapsed = time.time() - info_start_time
             from rich.console import Console
 
-            console = Console()
             total_tokens = usage_info.get("total_tokens")
+            console = Console()
             console.print(
                 f"[bold green]Total tokens used:[/] [yellow]{total_tokens}[/yellow] [bold green]| Elapsed time:[/] [yellow]{elapsed:.2f}s[/yellow]"
             )
         sys.exit(0)
-        # --- Prompt mode ---
-        prompt = getattr(args, "input_arg", None)
-        from rich.console import Console
-        from janito.agent.rich_message_handler import RichMessageHandler
-
-        console = Console()
-        message_handler = RichMessageHandler()
-        messages = []
-        system_prompt_override = runtime_config.get("system_prompt_template")
-        if system_prompt_override:
-            # Só adiciona system prompt se NÃO for vanilla, ou se foi explicitamente passado via --system
-            if not runtime_config.get("vanilla_mode", False) or getattr(
-                args, "system", None
-            ):
-                messages.append({"role": "system", "content": system_prompt_override})
-        elif profile_manager.system_prompt_template and not runtime_config.get(
-            "vanilla_mode", False
-        ):
-            messages.append(
-                {"role": "system", "content": profile_manager.system_prompt_template}
-            )
-        messages.append({"role": "user", "content": prompt})
-        import time
-
-        info_start_time = None
-        if getattr(args, "info", False):
-            info_start_time = time.time()
-        try:
-            max_rounds = 100
-            from janito.agent.conversation_history import ConversationHistory
-
-            result = profile_manager.agent.chat(
-                ConversationHistory(messages),
-                message_handler=message_handler,
-                spinner=True,
-                max_rounds=max_rounds,
-                stream=getattr(args, "stream", False),
-            )
-            if (
-                getattr(args, "info", False)
-                and info_start_time is not None
-                and result is not None
-            ):
-                usage_info = result.get("usage")
-                total_tokens = usage_info.get("total_tokens") if usage_info else None
-                prompt_tokens = usage_info.get("prompt_tokens") if usage_info else None
-                completion_tokens = (
-                    usage_info.get("completion_tokens") if usage_info else None
-                )
-                elapsed = time.time() - info_start_time
-                from rich.console import Console
-
-                console = Console()
-                console.print(
-                    f"[bold green]Total tokens:[/] [yellow]{total_tokens}[/yellow] [bold green]| Input:[/] [cyan]{prompt_tokens}[/cyan] [bold green]| Output:[/] [magenta]{completion_tokens}[/magenta] [bold green]| Elapsed:[/] [yellow]{elapsed:.2f}s[/yellow]",
-                    style="dim",
-                )
-        except MaxRoundsExceededError:
-            console.print("[red]Max conversation rounds exceeded.[/red]")
-        except ProviderError as e:
-            console.print(f"[red]Provider error:[/red] {e}")
-        except EmptyResponseError as e:
-            console.print(f"[red]Error:[/red] {e}")
     except KeyboardInterrupt:
         from rich.console import Console