janito 0.10.1__py3-none-any.whl → 0.12.0__py3-none-any.whl

janito/__init__.py

@@ -2,4 +2,4 @@
 Janito package.
 """
 
-__version__ = "0.11.0"
+__version__ = "0.12.0"

janito/__main__.py

@@ -1,151 +1,7 @@
 """
-Main entry point for the janito CLI.
+Main entry point for Janito.
 """
-
-import typer
-import os
-import sys
-from pathlib import Path
-from typing import Optional, Dict, Any, List
-from rich.console import Console
-from rich import print as rprint
-from rich.markdown import Markdown
-import claudine
-from claudine.exceptions import MaxTokensExceededException, MaxRoundsExceededException
-import locale
-
-# Fix console encoding for Windows
-if sys.platform == 'win32':
-    # Try to set UTF-8 mode for Windows 10 version 1903 or newer
-    os.system('chcp 65001 > NUL')
-    # Ensure stdout and stderr are using UTF-8
-    sys.stdout.reconfigure(encoding='utf-8')
-    sys.stderr.reconfigure(encoding='utf-8')
-    # Set locale to UTF-8
-    locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
-
-from janito.tools.str_replace_editor.editor import str_replace_editor
-from janito.tools.find_files import find_files
-from janito.tools.delete_file import delete_file
-from janito.tools.search_text import search_text
-from janito.config import get_config
-from janito.callbacks import pre_tool_callback, post_tool_callback
-from janito.token_report import generate_token_report
-
-app = typer.Typer(help="Janito CLI tool")
-
-@app.command()
-def hello(name: str = typer.Argument("World", help="Name to greet")):
-    """
-    Say hello to someone.
-    """
-    rprint(f"[bold green]Hello {name}[/bold green]")
-    
-
-
-@app.callback(invoke_without_command=True)
-def main(ctx: typer.Context, 
-         query: Optional[str] = typer.Argument(None, help="Query to send to the claudine agent"),
-         debug: bool = typer.Option(False, "--debug", "-d", help="Enable debug mode"),
-         verbose: bool = typer.Option(False, "--verbose", "-v", help="Show detailed token usage and pricing information"),
-         workspace: Optional[str] = typer.Option(None, "--workspace", "-w", help="Set the workspace directory")):
-    """
-    Janito CLI tool. If a query is provided without a command, it will be sent to the claudine agent.
-    """    
-    console = Console()
-    
-    # Set debug mode in config
-    get_config().debug_mode = debug
-    
-    if workspace:
-        try:
-            print(f"Setting workspace directory to: {workspace}")
-            get_config().workspace_dir = workspace
-            print(f"Workspace directory set to: {get_config().workspace_dir}")
-        except ValueError as e:
-            console.print(f"[bold red]Error:[/bold red] {str(e)}")
-            sys.exit(1)
-            
-    if ctx.invoked_subcommand is None:
-        # If no query provided in command line, read from stdin
-        if not query:
-            console.print("[bold blue]No query provided in command line. Reading from stdin...[/bold blue]")
-            query = sys.stdin.read().strip()
-            
-        # Only proceed if we have a query (either from command line or stdin)
-        if query:
-            # Get API key from environment variable or ask the user
-            api_key = os.environ.get("ANTHROPIC_API_KEY")
-            if not api_key:
-                console.print("[bold yellow]Warning:[/bold yellow] ANTHROPIC_API_KEY environment variable not set.")
-                console.print("Please set it or provide your API key now:")
-                api_key = typer.prompt("Anthropic API Key", hide_input=True)
-        
-            # Load instructions from file
-            import importlib.resources as pkg_resources
-            try:
-                # For Python 3.9+
-                try:
-                    from importlib.resources import files
-                    instructions = files('janito.data').joinpath('instructions.txt').read_text()
-                # Fallback for older Python versions
-                except (ImportError, AttributeError):
-                    instructions = pkg_resources.read_text('janito.data', 'instructions.txt')
-                instructions = instructions.strip()
-            except Exception as e:
-                console.print(f"[bold yellow]Warning:[/bold yellow] Could not load instructions file: {str(e)}")
-                console.print("[dim]Using default instructions instead.[/dim]")
-                instructions = "You are a helpful AI assistant. Answer the user's questions to the best of your ability."
-                   
-            # Initialize the agent with the tools
-            agent = claudine.Agent(
-                api_key=api_key,
-                tools=[
-                    delete_file,
-                    find_files,
-                    search_text
-                ],
-                text_editor_tool=str_replace_editor,
-                tool_callbacks=(pre_tool_callback, post_tool_callback),
-                max_tokens=4096,
-                temperature=0.7,
-                instructions=instructions,
-                debug_mode=debug  # Enable debug mode
-            )
-        
-            # Process the query
-            console.print(f"[bold blue]Query:[/bold blue] {query}")
-            console.print("[bold blue]Generating response...[/bold blue]")
-            
-            try:
-                response = agent.process_prompt(query)
-                
-                console.print("\n[bold green]Janito:[/bold green]")
-                # Use rich's enhanced Markdown rendering for the response
-                console.print(Markdown(response, code_theme="monokai"))
-                
-            except MaxTokensExceededException as e:
-                # Display the partial response if available
-                if e.response_text:
-                    console.print("\n[bold green]Partial Janito:[/bold green]")
-                    console.print(Markdown(e.response_text, code_theme="monokai"))
-                
-                console.print("\n[bold red]Error:[/bold red] Response was truncated because it reached the maximum token limit.")
-                console.print("[dim]Consider increasing the max_tokens parameter or simplifying your query.[/dim]")
-                
-            except MaxRoundsExceededException as e:
-                # Display the final response if available
-                if e.response_text:
-                    console.print("\n[bold green]Janito:[/bold green]")
-                    console.print(Markdown(e.response_text, code_theme="monokai"))
-                
-                console.print(f"\n[bold red]Error:[/bold red] Maximum number of tool execution rounds ({e.rounds}) reached. Some tasks may be incomplete.")
-                console.print("[dim]Consider increasing the max_rounds parameter or breaking down your task into smaller steps.[/dim]")
-            
-            # Show token usage report
-            generate_token_report(agent, verbose)
-        else:
-            console.print("[bold yellow]No query provided. Exiting.[/bold yellow]")
+from janito.cli import app
 
 if __name__ == "__main__":
-    app()
+    app()

janito/callbacks.py

@@ -2,129 +2,33 @@
 Callback functions for tool execution in janito.
 """
 
-from typing import Dict, Any, Tuple
 from rich.console import Console
 from rich.markdown import Markdown
 
 from janito.config import get_config
-from janito.tools import find_files
-from janito.tools.str_replace_editor.editor import str_replace_editor
-from janito.tools.delete_file import delete_file
-from janito.tools.search_text import search_text
-from janito.tools.decorators import format_tool_label
 
-def pre_tool_callback(tool_name: str, tool_input: Dict[str, Any], preamble_text: str = "") -> Tuple[Dict[str, Any], bool]:
-    """
-    Callback function that runs before a tool is executed.
-    
-    Args:
-        tool_name: Name of the tool being called
-        tool_input: Input parameters for the tool
-        preamble_text: Any text generated before the tool call
-        
-    Returns:
-        Tuple of (modified tool input, whether to cancel the tool call)
-    """
-    console = Console()
-    
-    # Add debug counter only when debug mode is enabled
-    if get_config().debug_mode:
-        if not hasattr(pre_tool_callback, "counter"):
-            pre_tool_callback.counter = 1
-        console.print(f"[bold yellow]DEBUG: Starting tool call #{pre_tool_callback.counter}[/bold yellow]")
-        pre_tool_callback.counter += 1
-    
-    # Print preamble text with enhanced markdown support if provided
-    if preamble_text:
-        # Use a single print statement to avoid extra newlines
-        console.print("[bold magenta]Janito:[/bold magenta] ", Markdown(preamble_text, code_theme="monokai"), end="")
-    
-    # Try to find the tool function
-    tool_func = None
-    for tool in [find_files, str_replace_editor, delete_file, search_text]:
-        if tool.__name__ == tool_name:
-            tool_func = tool
-            break
-    
-    # Create a copy of tool_input to modify for display
-    display_input = {}
-    
-    # Maximum length for string values
-    max_length = 50
-    
-    # Trim long string values for display
-    for key, value in tool_input.items():
-        if isinstance(value, str) and len(value) > max_length:
-            # For long strings, show first and last part with ellipsis in between
-            display_input[key] = f"{value[:20]}...{value[-20:]}" if len(value) > 45 else value[:max_length] + "..."
-        else:
-            display_input[key] = value
-    
-    # If we found the tool and it has a tool_meta label, use that for display
-    if tool_func:
-        formatted_label = format_tool_label(tool_func, tool_input)
-        if formatted_label:
-            console.print("[bold cyan]  Tool:[/bold cyan]", formatted_label, end=" → ")
-        else:
-            console.print("[bold cyan]  Tool:[/bold cyan]", f"{tool_name} {display_input}", end=" → ")
-    
-    return tool_input, True  # Continue with the tool call
+# Counter for pre-tool callbacks
+pre_tool_callbacks = 0
 
-def post_tool_callback(tool_name: str, tool_input: Dict[str, Any], result: Any) -> Any:
+def text_callback(text: str) -> None:
     """
-    Callback function that runs after a tool is executed.
+    Callback function that handles text output from the agent.
     
     Args:
-        tool_name: Name of the tool that was called
-        tool_input: Input parameters for the tool
-        result: Result of the tool call
+        text: Text output from the agent
         
     Returns:
-        Modified result
+        None
     """
     console = Console()
     
     # Add debug counter only when debug mode is enabled
     if get_config().debug_mode:
-        if not hasattr(post_tool_callback, "counter"):
-            post_tool_callback.counter = 1
-        console.print(f"[bold green]DEBUG: Completed tool call #{post_tool_callback.counter}[/bold green]")
-        post_tool_callback.counter += 1
+        if not hasattr(text_callback, "counter"):
+            text_callback.counter = 1
+        console.print(f"[bold blue]DEBUG: Text callback #{text_callback.counter}[/bold blue]")
+        text_callback.counter += 1
     
-    # Extract the last line of the result
-    if isinstance(result, tuple) and len(result) >= 1:
-        content, is_error = result
-        # Define prefix icon based on is_error
-        icon_prefix = "❌ " if is_error else "✅ "
-        
-        if isinstance(content, str):
-            # For find_files, extract just the count from the last line
-            if tool_name == "find_files" and content.count("\n") > 0:
-                lines = content.strip().split('\n')
-                if lines and lines[-1].isdigit():
-                    console.print(f"{icon_prefix}{lines[-1]}")
-                else:
-                    # Get the last line
-                    last_line = content.strip().split('\n')[-1]
-                    console.print(f"{icon_prefix}{last_line}")
-            else:
-                # For other tools, just get the last line
-                if '\n' in content:
-                    last_line = content.strip().split('\n')[-1]
-                    console.print(f"{icon_prefix}{last_line}")
-                else:
-                    console.print(f"{icon_prefix}{content}")
-        else:
-            console.print(f"{icon_prefix}{content}")
-    else:
-        # If result is not a tuple, convert to string and get the last line
-        result_str = str(result)
-        # Default to success icon when no error status is available
-        icon_prefix = "✅ "
-        if '\n' in result_str:
-            last_line = result_str.strip().split('\n')[-1]
-            console.print(f"{icon_prefix}{last_line}")
-        else:
-            console.print(f"{icon_prefix}{result_str}")
-    
-    return result
+    # Print the text with markdown formatting
+    console.print(Markdown(text, code_theme="monokai"), end="")
+

janito/cli/__init__.py

@@ -0,0 +1,6 @@
+"""
+CLI module for Janito.
+"""
+from janito.cli.app import app
+
+__all__ = ["app"]

janito/cli/agent.py

@@ -0,0 +1,287 @@
+"""
+Agent initialization and query handling for Janito CLI.
+"""
+import os
+import sys
+import json
+import anthropic
+import claudine
+import typer
+from rich.console import Console
+from pathlib import Path
+from jinja2 import Template
+import importlib.resources as pkg_resources
+
+from janito.config import get_config, Config
+from janito.callbacks import text_callback
+from janito.token_report import generate_token_report
+from janito.tools import str_replace_editor
+from janito.tools.bash.bash import bash_tool
+from janito.cli.output import display_generation_params
+
+console = Console()
+
+def get_api_key() -> str:
+    """
+    Get the API key from global config, environment variable, or user input.
+    
+    Returns:
+        str: The API key
+    """
+    # Get API key from global config, environment variable, or ask the user
+    api_key = Config.get_api_key()
+    
+    # If not found in global config, try environment variable
+    if not api_key:
+        api_key = os.environ.get("ANTHROPIC_API_KEY")
+        
+    # If still not found, prompt the user
+    if not api_key:
+        console.print("[bold yellow]⚠️ Warning:[/bold yellow] API key not found in global config or ANTHROPIC_API_KEY environment variable.")
+        console.print("🔑 Please set it using --set-api-key or provide your API key now:")
+        api_key = typer.prompt("Anthropic API Key", hide_input=True)
+    
+    return api_key
+
+def load_instructions() -> str:
+    """
+    Load instructions template and render it with variables.
+    
+    Returns:
+        str: The rendered instructions
+    """
+    import platform
+    
+    try:
+        # For Python 3.9+
+        try:
+            from importlib.resources import files
+            template_content = files('janito.data').joinpath('instructions_template.txt').read_text(encoding='utf-8')
+        # Fallback for older Python versions
+        except (ImportError, AttributeError):
+            template_content = pkg_resources.read_text('janito.data', 'instructions_template.txt', encoding='utf-8')
+        
+        # Create template variables
+        template_variables = {
+            'platform': platform.system(),
+            'role': get_config().role,
+            # Add any other variables you want to pass to the template here
+        }
+        
+        # Create template and render
+        template = Template(template_content)
+        instructions = template.render(**template_variables)
+        
+    except Exception as e:
+        console.print(f"[bold red]❌ Error loading instructions template:[/bold red] {str(e)}")
+        # Try to fall back to regular instructions.txt
+        try:
+            # For Python 3.9+
+            try:
+                from importlib.resources import files
+                instructions = files('janito.data').joinpath('instructions.txt').read_text(encoding='utf-8')
+            # Fallback for older Python versions
+            except (ImportError, AttributeError):
+                instructions = pkg_resources.read_text('janito.data', 'instructions.txt', encoding='utf-8')
+        except Exception as e2:
+            console.print(f"[bold red]❌ Error loading fallback instructions:[/bold red] {str(e2)}")
+            instructions = "You are Janito, an AI assistant."
+    
+    return instructions
+
+def initialize_agent(temperature: float, verbose: bool) -> claudine.Agent:
+    """
+    Initialize the Claude agent with tools and configuration.
+    
+    Args:
+        temperature: Temperature value for model generation
+        verbose: Whether to enable verbose mode
+        
+    Returns:
+        claudine.Agent: The initialized agent
+    """
+    # Get API key
+    api_key = get_api_key()
+    
+    # Load instructions
+    instructions = load_instructions()
+    
+    # Get tools
+    from janito.tools import get_tools, reset_tracker
+    tools_list = get_tools()
+    
+    # Reset usage tracker before each query
+    reset_tracker()
+    
+    # Use command line parameters if provided (not default values), otherwise use config
+    temp_to_use = temperature if temperature != 0.0 else get_config().temperature
+    
+    # Get profile parameters if a profile is set
+    config = get_config()
+    profile_data = None
+    if config.profile:
+        profile_data = config.get_available_profiles()[config.profile]
+    
+    # Display generation parameters if verbose mode is enabled
+    if verbose:
+        display_generation_params(temp_to_use, profile_data, temperature)
+    
+    # Create config_params dictionary with generation parameters
+    config_params = {
+        "temperature": temp_to_use
+    }
+    
+    # Add top_k and top_p from profile if available
+    if profile_data:
+        if "top_k" in profile_data and profile_data["top_k"] != 0:
+            config_params["top_k"] = profile_data["top_k"]
+        if "top_p" in profile_data and profile_data["top_p"] != 0.0:
+            config_params["top_p"] = profile_data["top_p"]
+    
+    # Initialize the agent
+    agent = claudine.Agent(
+        api_key=api_key,
+        system_prompt=instructions,
+        callbacks={"text": text_callback},
+        text_editor_tool=str_replace_editor,
+        bash_tool=bash_tool,
+        tools=tools_list,
+        verbose=verbose,
+        max_tokens=8126,
+        max_tool_rounds=100,
+        config_params=config_params,
+    )
+    
+    return agent
+
+def save_messages(agent):
+    """
+    Save agent messages to .janito/last_message.json
+    
+    Args:
+        agent: The claudine agent instance
+    """
+    try:
+        # Get the workspace directory
+        workspace_dir = Path(get_config().workspace_dir)
+        
+        # Create .janito directory if it doesn't exist
+        janito_dir = workspace_dir / ".janito"
+        janito_dir.mkdir(exist_ok=True)
+        
+        # Get messages from the agent
+        messages = agent.get_messages()
+        
+        # Save messages to file
+        with open(janito_dir / "last_message.json", "w", encoding="utf-8") as f:
+            json.dump(messages, f, ensure_ascii=False, indent=2)
+            
+        if get_config().verbose:
+            console.print(f"[bold green]✅ Conversation saved to {janito_dir / 'last_message.json'}[/bold green]")
+    except Exception as e:
+        console.print(f"[bold red]❌ Error saving conversation:[/bold red] {str(e)}")
+
+def load_messages():
+    """
+    Load messages from .janito/last_message.json
+    
+    Returns:
+        List of message dictionaries or None if file doesn't exist
+    """
+    try:
+        # Get the workspace directory
+        workspace_dir = Path(get_config().workspace_dir)
+        
+        # Check if file exists
+        messages_file = workspace_dir / ".janito" / "last_message.json"
+        if not messages_file.exists():
+            console.print("[bold yellow]⚠️ No previous conversation found[/bold yellow]")
+            return None
+        
+        # Load messages from file
+        with open(messages_file, "r", encoding="utf-8") as f:
+            messages = json.load(f)
+            
+        if get_config().verbose:
+            console.print(f"[bold green]✅ Loaded previous conversation from {messages_file}[/bold green]")
+            console.print(f"[dim]📝 Conversation has {len(messages)} messages[/dim]")
+            
+        return messages
+    except Exception as e:
+        console.print(f"[bold red]❌ Error loading previous conversation:[/bold red] {str(e)}")
+        return None
+
+def handle_query(query: str, temperature: float, verbose: bool, show_tokens: bool, continue_conversation: bool = False) -> None:
+    """
+    Handle a query by initializing the agent and sending the query.
+    
+    Args:
+        query: The query to send to the agent
+        temperature: Temperature value for model generation
+        verbose: Whether to enable verbose mode
+        show_tokens: Whether to show detailed token usage
+        continue_conversation: Whether to continue the previous conversation
+    """
+    # Initialize the agent
+    agent = initialize_agent(temperature, verbose)
+    
+    # Load previous messages if continuing conversation
+    if continue_conversation:
+        messages = load_messages()
+        if messages:
+            agent.set_messages(messages)
+            console.print("[bold blue]🔄 Continuing previous conversation[/bold blue]")
+    
+    # Send the query to the agent
+    try:
+        agent.query(query)
+        
+        # Save messages after successful query
+        save_messages(agent)
+        
+        # Print token usage report
+        if show_tokens:
+            generate_token_report(agent, verbose=True, interrupted=False)
+        else:
+            # Show basic token usage
+            generate_token_report(agent, verbose=False, interrupted=False)
+        
+        # Print tool usage statistics
+        from janito.tools import print_usage_stats
+        print_usage_stats()
+            
+    except KeyboardInterrupt:
+        # Handle Ctrl+C by printing token and tool usage information
+        console.print("\n[bold yellow]⚠️ Query interrupted by user (Ctrl+C)[/bold yellow]")
+        
+        # Save messages even if interrupted
+        save_messages(agent)
+        
+        # Print token usage report (even if interrupted)
+        try:
+            if show_tokens:
+                generate_token_report(agent, verbose=True, interrupted=True)
+            else:
+                # Show basic token usage
+                generate_token_report(agent, verbose=False, interrupted=True)
+            
+            # Print tool usage statistics
+            from janito.tools import print_usage_stats
+            print_usage_stats()
+        except Exception as e:
+            console.print(f"[bold red]❌ Error generating usage report:[/bold red] {str(e)}")
+            if verbose:
+                import traceback
+                console.print(traceback.format_exc())
+        
+        # Exit with non-zero status to indicate interruption
+        sys.exit(130)  # 130 is the standard exit code for SIGINT
+            
+    except anthropic.APIError as e:
+        console.print(f"[bold red]❌ Anthropic API Error:[/bold red] {str(e)}")
+        
+    except Exception as e:
+        console.print(f"[bold red]❌ Error:[/bold red] {str(e)}")
+        if verbose:
+            import traceback
+            console.print(traceback.format_exc())

janito/cli/app.py

@@ -0,0 +1,86 @@
+"""
+Main CLI application for Janito.
+"""
+import sys
+from typing import Optional
+import typer
+from rich.console import Console
+import importlib.metadata
+
+from janito.config import get_config
+from janito.cli.commands import handle_config_commands, validate_parameters
+from janito.cli.agent import handle_query
+from janito.cli.utils import get_stdin_termination_hint
+
+app = typer.Typer()
+console = Console()
+
+@app.callback(invoke_without_command=True)
+def main(ctx: typer.Context, 
+         query: Optional[str] = typer.Argument(None, help="Query to send to the claudine agent"),
+         verbose: bool = typer.Option(False, "--verbose", "-v", help="Enable verbose mode with detailed output"),
+         show_tokens: bool = typer.Option(False, "--show-tokens", "-t", help="Show detailed token usage and pricing information"),
+         workspace: Optional[str] = typer.Option(None, "--workspace", "-w", help="Set the workspace directory"),
+         config_str: Optional[str] = typer.Option(None, "--set-config", help="Configuration string in format 'key=value', e.g., 'temperature=0.7' or 'profile=technical'"),
+         show_config: bool = typer.Option(False, "--show-config", help="Show current configuration"),
+         reset_config: bool = typer.Option(False, "--reset-config", help="Reset configuration by removing the config file"),
+         set_api_key: Optional[str] = typer.Option(None, "--set-api-key", help="Set the Anthropic API key globally in the user's home directory"),
+         ask: bool = typer.Option(False, "--ask", help="Enable ask mode which disables tools that perform changes"),
+         temperature: float = typer.Option(0.0, "--temperature", help="Set the temperature for model generation (0.0 to 1.0)"),
+         profile: Optional[str] = typer.Option(None, "--profile", help="Use a predefined parameter profile (precise, balanced, conversational, creative, technical)"),
+         role: Optional[str] = typer.Option(None, "--role", help="Set the assistant's role (default: 'software engineer')"),
+         version: bool = typer.Option(False, "--version", help="Show the version and exit"),
+         continue_conversation: bool = typer.Option(False, "--continue", "-c", help="Continue the previous conversation")):
+    """
+    Janito CLI tool. If a query is provided without a command, it will be sent to the claudine agent.
+    """    
+    # Set verbose mode in config
+    get_config().verbose = verbose
+    
+    # Set ask mode in config
+    get_config().ask_mode = ask
+    
+    # Show a message if ask mode is enabled
+    if ask:
+        console.print("[bold yellow]⚠️ Ask Mode enabled:[/bold yellow] 🔒 Tools that perform changes are disabled")
+    
+    # Show version and exit if requested
+    if version:
+        try:
+            version_str = importlib.metadata.version("janito")
+            console.print(f"🚀 Janito version: {version_str}")
+        except importlib.metadata.PackageNotFoundError:
+            console.print("🚀 Janito version: [italic]development[/italic]")
+        sys.exit(0)
+    
+    # Validate temperature
+    validate_parameters(temperature)
+    
+    # Handle configuration-related commands
+    exit_after_config = handle_config_commands(
+        ctx, 
+        reset_config, 
+        workspace, 
+        show_config, 
+        profile, 
+        role, 
+        set_api_key, 
+        config_str, 
+        query,
+        continue_conversation
+    )
+    
+    if exit_after_config:
+        sys.exit(0)
+    
+    # Handle query if no subcommand was invoked
+    if ctx.invoked_subcommand is None:
+        # If no query provided in command line, read from stdin
+        if not query:
+            console.print("[bold blue]📝 No query provided in command line. Reading from stdin...[/bold blue]")
+            console.print(get_stdin_termination_hint())
+            query = sys.stdin.read().strip()
+            
+        # Only proceed if we have a query (either from command line or stdin)
+        if query:
+            handle_query(query, temperature, verbose, show_tokens, continue_conversation)