janito 2.27.1__py3-none-any.whl → 2.29.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

@@ -63,6 +63,7 @@ class ChatSession:
         allowed_permissions=None,
     ):
         self.console = console
+        self.session_start_time = time.time()
         self.user_input_history = UserInputHistory()
         self.input_dicts = self.user_input_history.load()
         self.mem_history = InMemoryHistory()
@@ -114,38 +115,31 @@ class ChatSession:
         self.multi_line_mode = getattr(args, "multi", False) if args else False
 
     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
-        market_profile = getattr(args, "market", False) if args is not None else False
+        profile, role_arg, python_profile, market_profile = self._extract_args(args)
         profile_system_prompt = None
         no_tools_mode = False
 
-        # Handle --developer flag
-        if python_profile and profile is None and role_arg is None:
-            profile = "Developer with Python Tools"
-
-        # Handle --market flag
-        if market_profile and profile is None and role_arg is None:
-            profile = "Market Analyst"
+        profile = self._determine_profile(
+            profile, role_arg, python_profile, market_profile
+        )
 
-        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
+        if (
+            profile is None
+            and role_arg is None
+            and not python_profile
+            and not market_profile
+        ):
+            skip_profile_selection = self._should_skip_profile_selection(args)
+        else:
             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
+                    from janito.cli.chat_mode.session_profile_select import (
+                        select_profile,
+                    )
 
                     result = select_profile()
                     if isinstance(result, dict):
@@ -305,39 +299,15 @@ class ChatSession:
             )
             start_time = time.time()
 
-            # Print rule line with model info before processing prompt
-            model_name = (
-                self.agent.get_model_name()
-                if hasattr(self.agent, "get_model_name")
-                else "Unknown"
-            )
-            provider_name = (
-                self.agent.get_provider_name()
-                if hasattr(self.agent, "get_provider_name")
-                else "Unknown"
+            model_name, provider_name = self._get_model_info()
+            backend_hostname = self._get_backend_hostname()
+
+            self.console.print(
+                Rule(
+                    f"[bold blue]Model: {model_name} ({provider_name}) | Backend: {backend_hostname}[/bold blue]"
+                )
             )
 
-            backend_hostname = "Unknown"
-            candidates = []
-            drv = getattr(self.agent, "driver", None)
-            if drv is not None:
-                cfg = getattr(drv, "config", None)
-                if cfg is not None:
-                    b = getattr(cfg, "base_url", None)
-                    if b:
-                        candidates.append(b)
-                direct_base = getattr(drv, "base_url", None)
-                if direct_base:
-                    candidates.append(direct_base)
-            cfg2 = getattr(self.agent, "config", None)
-            if cfg2 is not None:
-                b2 = getattr(cfg2, "base_url", None)
-                if b2:
-                    candidates.append(b2)
-            top_base = getattr(self.agent, "base_url", None)
-            if top_base:
-                candidates.append(top_base)
-            from urllib.parse import urlparse
             for candidate in candidates:
                 try:
                     if not candidate:
@@ -383,6 +353,102 @@ class ChatSession:
 
             self.console.print(traceback.format_exc())
 
+    def _extract_args(self, args):
+        """Extract profile and role arguments from args."""
+        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
+        )
+        market_profile = getattr(args, "market", False) if args is not None else False
+        return profile, role_arg, python_profile, market_profile
+
+    def _determine_profile(self, profile, role_arg, python_profile, market_profile):
+        """Determine the profile based on flags and arguments."""
+        if python_profile and profile is None and role_arg is None:
+            return "Developer with Python Tools"
+        if market_profile and profile is None and role_arg is None:
+            return "Market Analyst"
+        return profile
+
+    def _should_skip_profile_selection(self, args):
+        """Check if profile selection should be skipped for getter commands."""
+        from janito.cli.core.getters import GETTER_KEYS
+
+        if args is None:
+            return False
+
+        for key in GETTER_KEYS:
+            if getattr(args, key, False):
+                return True
+        return False
+
+    def _get_model_info(self):
+        """Get model and provider information."""
+        model_name = (
+            self.agent.get_model_name()
+            if hasattr(self.agent, "get_model_name")
+            else "Unknown"
+        )
+        provider_name = (
+            self.agent.get_provider_name()
+            if hasattr(self.agent, "get_provider_name")
+            else "Unknown"
+        )
+        return model_name, provider_name
+
+    def _get_backend_hostname(self):
+        """Extract backend hostname from agent configuration."""
+        candidates = self._collect_base_urls()
+        return self._parse_hostname_from_urls(candidates)
+
+    def _collect_base_urls(self):
+        """Collect all possible base URLs from agent configuration."""
+        candidates = []
+
+        # Collect from driver
+        drv = getattr(self.agent, "driver", None)
+        if drv is not None:
+            cfg = getattr(drv, "config", None)
+            if cfg is not None:
+                b = getattr(cfg, "base_url", None)
+                if b:
+                    candidates.append(b)
+            direct_base = getattr(drv, "base_url", None)
+            if direct_base:
+                candidates.append(direct_base)
+
+        # Collect from agent config
+        cfg2 = getattr(self.agent, "config", None)
+        if cfg2 is not None:
+            b2 = getattr(cfg2, "base_url", None)
+            if b2:
+                candidates.append(b2)
+
+        # Collect from agent directly
+        top_base = getattr(self.agent, "base_url", None)
+        if top_base:
+            candidates.append(top_base)
+
+        return candidates
+
+    def _parse_hostname_from_urls(self, candidates):
+        """Parse hostname from a list of URL candidates."""
+        from urllib.parse import urlparse
+
+        for candidate in candidates:
+            try:
+                if not candidate:
+                    continue
+                parsed = urlparse(str(candidate))
+                host = parsed.netloc or parsed.path
+                if host:
+                    return host
+            except Exception:
+                return str(candidate)
+
+        return "Unknown"
+
     def _create_prompt_session(self):
         return PromptSession(
             style=chat_shell_style,
@@ -404,7 +470,25 @@ class ChatSession:
         else:
             try:
                 cmd_input = session.prompt(HTML("<inputline>💬 </inputline>"))
-            except (KeyboardInterrupt, EOFError):
+            except KeyboardInterrupt:
+                # Ask for confirmation on Ctrl+C
+                from prompt_toolkit import prompt
+
+                try:
+                    confirm = prompt(
+                        "Are you sure you want to exit? (y/n): ",
+                        style=self._create_prompt_session().style,
+                    )
+                    if confirm.lower() == "y":
+                        self._handle_exit()
+                        return None
+                    else:
+                        return ""  # Return empty string to continue
+                except (KeyboardInterrupt, EOFError):
+                    # Handle second Ctrl+C or Ctrl+D as immediate exit
+                    self._handle_exit()
+                    return None
+            except EOFError:
                 self._handle_exit()
                 return None
         sanitized = cmd_input.strip()
@@ -418,7 +502,27 @@ class ChatSession:
         return sanitized
 
     def _handle_exit(self):
-        self.console.print("[bold yellow]Exiting chat. Goodbye![/bold yellow]")
+        session_duration = time.time() - self.session_start_time
+
+        # Get total token usage from performance collector
+        from janito.perf_singleton import performance_collector
+
+        total_tokens = performance_collector.get_token_usage().get("total_tokens", 0)
+
+        # Format session duration
+        if session_duration < 60:
+            duration_str = f"{session_duration:.1f}s"
+        elif session_duration < 3600:
+            duration_str = f"{session_duration/60:.1f}m"
+        else:
+            duration_str = f"{session_duration/3600:.1f}h"
+
+        self.console.print(f"[bold yellow]Session completed![/bold yellow]")
+        self.console.print(
+            f"[dim]Session time: {duration_str} | Total tokens: {total_tokens:,}[/dim]"
+        )
+        self.console.print("[bold yellow]Goodbye![/bold yellow]")
+
         if hasattr(self, "agent") and hasattr(self.agent, "join_driver"):
             if (
                 hasattr(self.agent, "input_queue")

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/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

@@ -9,8 +9,10 @@ class HelpShellHandler(ShellCmdHandler):
     def run(self):
         # 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

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

@@ -3,11 +3,12 @@ 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():
@@ -15,11 +16,13 @@ class ProviderCmdHandler(ShellCmdHandler):
             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}")
+            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())