janito 2.27.0__py3-none-any.whl → 2.28.0__py3-none-any.whl

janito/README.md

@@ -15,17 +15,17 @@ pip install janito
 1. **Get your API key**: Sign up at [Moonshot AI](https://platform.moonshot.cn/) and get your API key
 2. **Set your API key**:
    ```bash
-   janito --set-api-key YOUR_MOONSHOT_API_KEY -p moonshotai
+   janito --set-api-key YOUR_MOONSHOT_API_KEY -p moonshot
    ```
 
 ### Basic Usage
 
-**MoonshotAI (Recommended - Default Provider)**
+**Moonshot (Recommended - Default Provider)**
 ```bash
-# Using the default provider (moonshotai) and model
+# Using the default provider (moonshot) and model
 janito "Create a Python script that reads a CSV file"
 
-# Using a specific MoonshotAI model
+# Using a specific Moonshot model
 janito -m kimi-k1-8k "Explain quantum computing"
 ```
 
@@ -71,13 +71,13 @@ In chat mode, you can:
 
 Set default provider and model:
 ```bash
-janito --set provider=moonshotai
+janito --set provider=moonshot
 janito --set model=kimi-k1-8k
 ```
 
 ## Providers
 
-### MoonshotAI (Recommended)
+### Moonshot (Recommended)
 
 - **Models**: kimi-k1-8k, kimi-k1-32k, kimi-k1-128k, kimi-k2-turbo-preview
 - **Strengths**: Excellent Chinese/English support, competitive pricing, fast responses
@@ -126,10 +126,10 @@ janito --role python-expert "Optimize this algorithm"
 ### Environment Variables
 You can also configure via environment variables:
 
-**MoonshotAI:**
+**Moonshot:**
 ```bash
-export MOONSHOTAI_API_KEY=your_key_here
-export JANITO_PROVIDER=moonshotai
+export MOONSHOT_API_KEY=your_key_here
+export JANITO_PROVIDER=moonshot
 export JANITO_MODEL=kimi-k1-8k
 ```
 

janito/agent/setup_agent.py

@@ -53,38 +53,48 @@ def _load_template_content(profile, templates_dir):
             return file.read(), user_template_path
 
     # If nothing matched, list available profiles and raise an informative error
-    from janito.cli.cli_commands.list_profiles import _gather_default_profiles, _gather_user_profiles
-    
+    from janito.cli.cli_commands.list_profiles import (
+        _gather_default_profiles,
+        _gather_user_profiles,
+    )
+
     default_profiles = _gather_default_profiles()
     user_profiles = _gather_user_profiles()
-    
+
     available_profiles = []
     if default_profiles:
         available_profiles.extend([(p, "default") for p in default_profiles])
     if user_profiles:
         available_profiles.extend([(p, "user") for p in user_profiles])
-    
+
     # Normalize the input profile for better matching suggestions
     normalized_input = re.sub(r"\s+", " ", profile.strip().lower())
-    
+
     if available_profiles:
-        profile_list = "\n".join([f"  - {name} ({source})" for name, source in available_profiles])
-        
+        profile_list = "\n".join(
+            [f"  - {name} ({source})" for name, source in available_profiles]
+        )
+
         # Find close matches
         close_matches = []
         for name, source in available_profiles:
             normalized_name = name.lower()
-            if normalized_input in normalized_name or normalized_name in normalized_input:
+            if (
+                normalized_input in normalized_name
+                or normalized_name in normalized_input
+            ):
                 close_matches.append(name)
-        
+
         suggestion = ""
         if close_matches:
             suggestion = f"\nDid you mean: {', '.join(close_matches)}?"
-        
+
         error_msg = f"[janito] Could not find profile '{profile}'. Available profiles:\n{profile_list}{suggestion}"
     else:
-        error_msg = f"[janito] Could not find profile '{profile}'. No profiles available."
-    
+        error_msg = (
+            f"[janito] Could not find profile '{profile}'. No profiles available."
+        )
+
     raise FileNotFoundError(error_msg)
     # Replace spaces in profile name with underscores for filename resolution
     sanitized_profile = re.sub(r"\\s+", "_", profile.strip()) if profile else profile
@@ -144,20 +154,23 @@ def _prepare_template_context(role, profile, allowed_permissions):
         context["platform"] = pd.get_platform_name()
         context["python_version"] = pd.get_python_version()
         context["shell_info"] = pd.detect_shell()
-    
+
     # Add allowed sites for market analyst profile
     if profile == "market-analyst":
         from janito.tools.url_whitelist import get_url_whitelist_manager
+
         whitelist_manager = get_url_whitelist_manager()
         allowed_sites = whitelist_manager.get_allowed_sites()
         context["allowed_sites"] = allowed_sites
-        
+
         # Add market data sources documentation
         if not allowed_sites:
-            context["allowed_sites_info"] = "No whitelist restrictions - all sites allowed"
+            context["allowed_sites_info"] = (
+                "No whitelist restrictions - all sites allowed"
+            )
         else:
             context["allowed_sites_info"] = f"Restricted to: {', '.join(allowed_sites)}"
-    
+
     return context
 
 

janito/cli/chat_mode/script_runner.py

@@ -52,7 +52,7 @@ class ChatScriptRunner:
         inputs: List[str],
         *,
         console: Optional[Console] = None,
-        provider: str = "moonshotai",
+        provider: str = "moonshot",
         model: str = "kimi-k1-8k",
         use_real_agent: bool = True,
         **chat_session_kwargs,

janito/cli/chat_mode/session.py

@@ -116,7 +116,9 @@ class ChatSession:
     def _select_profile_and_role(self, args, role):
         profile = getattr(args, "profile", None) if args is not None else None
         role_arg = getattr(args, "role", None) if args is not None else None
-        python_profile = getattr(args, "developer", False) if args is not None else False
+        python_profile = (
+            getattr(args, "developer", False) if args is not None else False
+        )
         market_profile = getattr(args, "market", False) if args is not None else False
         profile_system_prompt = None
         no_tools_mode = False
@@ -129,26 +131,47 @@ class ChatSession:
         if market_profile and profile is None and role_arg is None:
             profile = "Market Analyst"
 
-        if profile is None and role_arg is None and not python_profile and not market_profile:
-            try:
-                from janito.cli.chat_mode.session_profile_select import select_profile
-
-                result = select_profile()
-                if isinstance(result, dict):
-                    profile = result.get("profile")
-                    profile_system_prompt = result.get("profile_system_prompt")
-                    no_tools_mode = result.get("no_tools_mode", False)
-                elif isinstance(result, str) and result.startswith("role:"):
-                    role = result[len("role:") :].strip()
-                    profile = "Developer with Python Tools"
-                else:
-                    profile = (
-                        "Developer with Python Tools"
-                        if result == "Developer"
-                        else result
+        if (
+            profile is None
+            and role_arg is None
+            and not python_profile
+            and not market_profile
+        ):
+            # Skip interactive profile selection for list commands
+            from janito.cli.core.getters import GETTER_KEYS
+
+            # Check if any getter command is active - these don't need interactive mode
+            skip_profile_selection = False
+            if args is not None:
+                for key in GETTER_KEYS:
+                    if getattr(args, key, False):
+                        skip_profile_selection = True
+                        break
+
+            if skip_profile_selection:
+                profile = "Developer with Python Tools"  # Default for non-interactive commands
+            else:
+                try:
+                    from janito.cli.chat_mode.session_profile_select import (
+                        select_profile,
                     )
-            except ImportError:
-                profile = "Raw Model Session (no tools, no context)"
+
+                    result = select_profile()
+                    if isinstance(result, dict):
+                        profile = result.get("profile")
+                        profile_system_prompt = result.get("profile_system_prompt")
+                        no_tools_mode = result.get("no_tools_mode", False)
+                    elif isinstance(result, str) and result.startswith("role:"):
+                        role = result[len("role:") :].strip()
+                        profile = "Developer with Python Tools"
+                    else:
+                        profile = (
+                            "Developer with Python Tools"
+                            if result == "Developer"
+                            else result
+                        )
+                except ImportError:
+                    profile = "Raw Model Session (no tools, no context)"
         if role_arg is not None:
             role = role_arg
             if profile is None:
@@ -209,9 +232,7 @@ class ChatSession:
 
         self.console.print(f"[bold green]Janito Chat Mode v{__version__}[/bold green]")
         self.console.print(f"[dim]Profile: {self.profile}[/dim]")
-        self.console.print(
-            "[green]/help for commands   /exit or Ctrl+C to quit[/green]"
-        )
+
         import os
 
         cwd = os.getcwd()
@@ -226,7 +247,7 @@ class ChatSession:
 
         priv_status = get_privilege_status_message()
         self.console.print(
-            f"[green]Working Dir:[/green] {cwd_display}  |  {priv_status}"
+            f"[green]Working Dir:[/green] [cyan]{cwd_display}[/cyan]  |  {priv_status}"
         )
 
         if self.multi_line_mode:
@@ -282,6 +303,8 @@ class ChatSession:
 
     def _process_prompt(self, cmd_input):
         try:
+            # Clear screen before processing new prompt
+            self.console.clear()
             import time
 
             final_event = (
@@ -324,6 +347,7 @@ class ChatSession:
             if top_base:
                 candidates.append(top_base)
             from urllib.parse import urlparse
+
             for candidate in candidates:
                 try:
                     if not candidate:
@@ -353,6 +377,8 @@ class ChatSession:
             print_token_message_summary(
                 self.console, self.msg_count, usage, elapsed=elapsed
             )
+            # Send terminal bell character to trigger TUI bell after printing token summary
+            print("\a", end="", flush=True)
             if final_event and hasattr(final_event, "metadata"):
                 exit_reason = (
                     final_event.metadata.get("exit_reason")

janito/cli/chat_mode/session_profile_select.py

@@ -149,7 +149,10 @@ def select_profile():
 
         # Get the absolute path relative to the current script location
         current_dir = Path(__file__).parent
-        template_path = current_dir / "../../agent/templates/profiles/system_prompt_template_developer.txt.j2"
+        template_path = (
+            current_dir
+            / "../../agent/templates/profiles/system_prompt_template_developer.txt.j2"
+        )
         with open(template_path, "r", encoding="utf-8") as f:
             template_content = f.read()
 
@@ -165,7 +168,10 @@ def select_profile():
 
         # Get the absolute path relative to the current script location
         current_dir = Path(__file__).parent
-        template_path = current_dir / "../../agent/templates/profiles/system_prompt_template_market_analyst.txt.j2"
+        template_path = (
+            current_dir
+            / "../../agent/templates/profiles/system_prompt_template_market_analyst.txt.j2"
+        )
         with open(template_path, "r", encoding="utf-8") as f:
             template_content = f.read()
 

janito/cli/chat_mode/shell/commands/__init__.py

@@ -1,6 +1,7 @@
 from .base import ShellCmdHandler
 from .history_view import ViewShellHandler
 from .lang import LangShellHandler
+from .provider import ProviderCmdHandler
 
 from .prompt import PromptShellHandler, RoleShellHandler
 from .multi import MultiShellHandler
@@ -43,6 +44,7 @@ COMMAND_HANDLERS = {
     "/multi": MultiShellHandler,
     "/help": HelpShellHandler,
     "/security": SecurityCommand,
+    "/provider": ProviderCmdHandler,
 }
 
 

janito/cli/chat_mode/shell/commands/execute.py

@@ -6,8 +6,10 @@ class ExecuteShellHandler(ShellCmdHandler):
     help_text = "/execute on|off: Enable or disable code and command execution tools. Usage: /execute on or /execute off."
 
     def run(self):
-        if self.shell_state and getattr(self.shell_state, 'no_tools_mode', False):
-            shared_console.print("[yellow]No tools are available in this mode (no tools, no context).[/yellow]")
+        if self.shell_state and getattr(self.shell_state, "no_tools_mode", False):
+            shared_console.print(
+                "[yellow]No tools are available in this mode (no tools, no context).[/yellow]"
+            )
             return
         if not self.shell_state:
             shared_console.print("[red]Shell state unavailable.[/red]")

janito/cli/chat_mode/shell/commands/help.py

@@ -7,7 +7,14 @@ class HelpShellHandler(ShellCmdHandler):
     help_text = "Show this help message"
 
     def run(self):
-        from . import COMMAND_HANDLERS
+        # Ensure /provider command is registered before showing help
+        from janito.cli.chat_mode.shell.commands import COMMAND_HANDLERS
+
+        if "/provider" not in COMMAND_HANDLERS:
+            from janito.cli.chat_mode.shell.commands.provider import ProviderCmdHandler
+
+            COMMAND_HANDLERS["/provider"] = ProviderCmdHandler
+
         from ._priv_check import user_has_any_privileges
 
         shared_console.print("[bold magenta]Available commands:[/bold magenta]")

janito/cli/chat_mode/shell/commands/privileges.py

@@ -1,16 +1,20 @@
 from janito.cli.console import shared_console
 from janito.cli.chat_mode.shell.commands.base import ShellCmdHandler
 
+
 class PrivilegesShellHandler(ShellCmdHandler):
     help_text = "Show current tool privileges or availability."
 
     def run(self):
         # Check for no_tools_mode in shell_state
-        if self.shell_state and getattr(self.shell_state, 'no_tools_mode', False):
-            shared_console.print("[yellow]No tools are available in this mode (no tools, no context).[/yellow]")
+        if self.shell_state and getattr(self.shell_state, "no_tools_mode", False):
+            shared_console.print(
+                "[yellow]No tools are available in this mode (no tools, no context).[/yellow]"
+            )
             return
         try:
             from janito.tools.permissions import get_global_allowed_permissions
+
             perms = get_global_allowed_permissions()
             lines = ["[bold]Current tool privileges:[/bold]"]
             lines.append(f"Read:     {'✅' if perms.read else '❌'}")

janito/cli/chat_mode/shell/commands/provider.py

@@ -0,0 +1,28 @@
+from janito.cli.core.getters import get_current_provider
+from janito.cli.core.setters import set_provider
+from janito.cli.chat_mode.shell.commands.base import ShellCmdHandler
+from janito.cli.console import shared_console as console
+
+
+class ProviderCmdHandler(ShellCmdHandler):
+    """Handler for the /provider command to view or change the current provider."""
+
+    help_text = "Manage the current LLM provider. Usage: /provider [provider_name]"
+
+    def run(self):
+        """Execute the provider command."""
+        if not self.after_cmd_line.strip():
+            # No argument provided, show current provider
+            current = get_current_provider()
+            console.print(f"[bold]Current provider:[/bold] {current}")
+            return
+
+        # Argument provided, attempt to change provider
+        new_provider = self.after_cmd_line.strip()
+        try:
+            set_provider(new_provider)
+            console.print(
+                f"[bold green]Provider changed to:[/bold green] {new_provider}"
+            )
+        except ValueError as e:
+            console.print(f"[bold red]Error:[/bold red] {str(e)}")

janito/cli/chat_mode/shell/commands/read.py

@@ -6,8 +6,10 @@ class ReadShellHandler(ShellCmdHandler):
     help_text = "/read on|off: Enable or disable read permissions for tools. Usage: /read on or /read off."
 
     def run(self):
-        if self.shell_state and getattr(self.shell_state, 'no_tools_mode', False):
-            shared_console.print("[yellow]No tools are available in this mode (no tools, no context).[/yellow]")
+        if self.shell_state and getattr(self.shell_state, "no_tools_mode", False):
+            shared_console.print(
+                "[yellow]No tools are available in this mode (no tools, no context).[/yellow]"
+            )
             return
         if not self.shell_state:
             shared_console.print("[red]Shell state unavailable.[/red]")

janito/cli/chat_mode/shell/commands/security/__init__.py

@@ -1 +1 @@
-"""Security management commands for chat mode."""
+"""Security management commands for chat mode."""

janito/cli/chat_mode/shell/commands/security/allowed_sites.py

@@ -6,15 +6,17 @@ from janito.tools.url_whitelist import get_url_whitelist_manager
 
 class SecurityAllowedSitesCommand(BaseCommand):
     """Manage allowed sites for fetch_url tool."""
-    
+
     def get_name(self) -> str:
         return "allowed-sites"
-    
+
     def get_description(self) -> str:
         return "Manage allowed sites for the fetch_url tool"
-    
+
     def get_usage(self):
-        return self.get_description() + """
+        return (
+            self.get_description()
+            + """
 Usage: /security allowed-sites [command] [site]
 
 Commands:
@@ -29,6 +31,7 @@ Examples:
   /security allowed-sites remove yahoo.com
   /security allowed-sites clear
 """
+        )
         return """
 Usage: /security allowed-sites [command] [site]
 
@@ -44,18 +47,18 @@ Examples:
   /security allowed-sites remove yahoo.com
   /security allowed-sites clear
 """
-    
+
     def run(self):
         """Execute the allowed-sites command."""
         args = self.after_cmd_line.strip().split()
-        
+
         if not args:
             print(self.get_usage())
             return
-            
+
         command = args[0].lower()
         whitelist_manager = get_url_whitelist_manager()
-        
+
         if command == "list":
             sites = whitelist_manager.get_allowed_sites()
             if sites:
@@ -64,7 +67,7 @@ Examples:
                     print(f"  • {site}")
             else:
                 print("No sites are whitelisted (all sites are allowed)")
-                
+
         elif command == "add":
             if len(args) < 2:
                 print("Error: Please specify a site to add")
@@ -74,7 +77,7 @@ Examples:
                 print(f"✅ Added '{site}' to allowed sites")
             else:
                 print(f"ℹ️ '{site}' is already in allowed sites")
-                
+
         elif command == "remove":
             if len(args) < 2:
                 print("Error: Please specify a site to remove")
@@ -84,11 +87,11 @@ Examples:
                 print(f"✅ Removed '{site}' from allowed sites")
             else:
                 print(f"ℹ️ '{site}' was not in allowed sites")
-                
+
         elif command == "clear":
             whitelist_manager.clear_whitelist()
             print("✅ Cleared all allowed sites (all sites are now allowed)")
-            
+
         else:
             print(f"Error: Unknown command '{command}'")
-            print(self.get_usage())
+            print(self.get_usage())

janito/cli/chat_mode/shell/commands/security_command.py

@@ -1,18 +1,20 @@
 """Security command group for chat mode."""
 
 from janito.cli.chat_mode.shell.commands.base import ShellCmdHandler as BaseCommand
-from janito.cli.chat_mode.shell.commands.security.allowed_sites import SecurityAllowedSitesCommand
+from janito.cli.chat_mode.shell.commands.security.allowed_sites import (
+    SecurityAllowedSitesCommand,
+)
 
 
 class SecurityCommand(BaseCommand):
     """Security management command group."""
-    
+
     def get_name(self) -> str:
         return "security"
-    
+
     def get_description(self) -> str:
         return "Security management commands"
-    
+
     def get_usage(self):
         return """
 Usage: /security <subcommand> [args...]
@@ -25,21 +27,23 @@ Examples:
   /security allowed-sites add tradingview.com
   /security allowed-sites remove yahoo.com
 """
-    
+
     def __init__(self, after_cmd_line=None, shell_state=None):
         super().__init__(after_cmd_line=after_cmd_line, shell_state=shell_state)
         self.subcommands = {
-            "allowed-sites": SecurityAllowedSitesCommand(after_cmd_line=after_cmd_line, shell_state=shell_state)
+            "allowed-sites": SecurityAllowedSitesCommand(
+                after_cmd_line=after_cmd_line, shell_state=shell_state
+            )
         }
-    
+
     def run(self):
         """Execute the security command."""
         args = self.after_cmd_line.strip().split()
-        
+
         if not args:
             print(self.get_usage())
             return
-            
+
         subcommand = args[0].lower()
         if subcommand in self.subcommands:
             # Pass the remaining args to the subcommand
@@ -48,4 +52,4 @@ Examples:
             self.subcommands[subcommand].run()
         else:
             print(f"Error: Unknown security subcommand '{subcommand}'")
-            print(self.get_usage())
+            print(self.get_usage())

janito/cli/chat_mode/shell/commands/tools.py

@@ -56,8 +56,10 @@ class ToolsShellHandler(ShellCmdHandler):
 
     def run(self):
         # Check for no_tools_mode in shell_state
-        if self.shell_state and getattr(self.shell_state, 'no_tools_mode', False):
-            shared_console.print("[yellow]No tools are available in this mode (no tools, no context).[/yellow]")
+        if self.shell_state and getattr(self.shell_state, "no_tools_mode", False):
+            shared_console.print(
+                "[yellow]No tools are available in this mode (no tools, no context).[/yellow]"
+            )
             return
         try:
             import janito.tools  # Ensure all tools are registered

janito/cli/chat_mode/shell/commands/unrestricted.py

@@ -6,7 +6,7 @@ from janito.cli.console import shared_console
 
 class UnrestrictedShellHandler(ShellCmdHandler):
     """Toggle unrestricted mode (equivalent to -u CLI flag)."""
-    
+
     help_text = "Toggle unrestricted mode (disable path security and URL whitelist)"
 
     def run(self):
@@ -14,27 +14,32 @@ class UnrestrictedShellHandler(ShellCmdHandler):
         if not self.shell_state:
             shared_console.print("[red]Error: Shell state not available[/red]")
             return
-            
+
         # Toggle unrestricted mode
-        current_unrestricted = getattr(self.shell_state, 'unrestricted_mode', False)
+        current_unrestricted = getattr(self.shell_state, "unrestricted_mode", False)
         new_unrestricted = not current_unrestricted
-        
+
         # Update shell state
         self.shell_state.unrestricted_mode = new_unrestricted
-        
+
         # Update tools adapter
-        if hasattr(self.shell_state, 'tools_adapter'):
-            setattr(self.shell_state.tools_adapter, 'unrestricted_paths', new_unrestricted)
-            
+        if hasattr(self.shell_state, "tools_adapter"):
+            setattr(
+                self.shell_state.tools_adapter, "unrestricted_paths", new_unrestricted
+            )
+
         # Update URL whitelist manager
         from janito.tools.url_whitelist import get_url_whitelist_manager
+
         whitelist_manager = get_url_whitelist_manager()
         whitelist_manager.set_unrestricted_mode(new_unrestricted)
-        
+
         status = "enabled" if new_unrestricted else "disabled"
-        warning = " (DANGEROUS - no path or URL restrictions)" if new_unrestricted else ""
-        
+        warning = (
+            " (DANGEROUS - no path or URL restrictions)" if new_unrestricted else ""
+        )
+
         shared_console.print(
             f"[bold {'red' if new_unrestricted else 'green'}]"
             f"Unrestricted mode {status}{warning}[/bold {'red' if new_unrestricted else 'green'}]"
-        )
+        )

janito/cli/chat_mode/shell/commands/write.py

@@ -6,8 +6,10 @@ class WriteShellHandler(ShellCmdHandler):
     help_text = "/write on|off: Enable or disable write permissions for tools. Usage: /write on or /write off."
 
     def run(self):
-        if self.shell_state and getattr(self.shell_state, 'no_tools_mode', False):
-            shared_console.print("[yellow]No tools are available in this mode (no tools, no context).[/yellow]")
+        if self.shell_state and getattr(self.shell_state, "no_tools_mode", False):
+            shared_console.print(
+                "[yellow]No tools are available in this mode (no tools, no context).[/yellow]"
+            )
             return
         if not self.shell_state:
             shared_console.print("[red]Shell state unavailable.[/red]")