janito 0.13.0__py3-none-any.whl → 0.14.0__py3-none-any.whl

janito/__init__.py

@@ -2,4 +2,4 @@
 Janito package.
 """
 
-__version__ = "0.13.0"
+__version__ = "0.14.0"

janito/cli/agent/__init__.py

@@ -0,0 +1,7 @@
+"""
+Agent initialization and query handling for Janito CLI.
+"""
+from janito.cli.agent.query import handle_query
+from janito.cli.agent.conversation import load_messages, save_messages
+
+__all__ = ["handle_query", "load_messages", "save_messages"]

janito/cli/agent/conversation.py

@@ -0,0 +1,149 @@
+"""
+Conversation management functionality for Janito CLI.
+"""
+import json
+import datetime
+import sys
+from typing import Optional, List, Dict, Any
+from rich.console import Console
+from pathlib import Path
+import claudine
+
+from janito.config import get_config
+
+console = Console()
+
+def generate_message_id() -> str:
+    """
+    Generate a message ID based on timestamp with seconds granularity
+    
+    Returns:
+        str: A timestamp-based message ID
+    """
+    timestamp = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+    return timestamp
+
+def save_messages(agent: claudine.Agent) -> Optional[str]:
+    """
+    Save agent messages to .janito/last_messages/{message_id}.json
+    
+    Args:
+        agent: The claudine agent instance
+        
+    Returns:
+        str: The message ID used for saving, or None if saving failed
+    """
+    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)
+        
+        # Create last_messages directory if it doesn't exist
+        messages_dir = janito_dir / "last_messages"
+        messages_dir.mkdir(exist_ok=True)
+        
+        # Generate a unique message ID
+        message_id = generate_message_id()
+        
+        # Get messages from the agent
+        messages = agent.get_messages()
+        
+        # Create a message object with metadata
+        message_object = {
+            "id": message_id,
+            "timestamp": datetime.datetime.now().isoformat(),
+            "messages": messages
+        }
+        
+        # Save messages to file
+        message_file = messages_dir / f"{message_id}.json"
+        with open(message_file, "w", encoding="utf-8") as f:
+            json.dump(message_object, f, ensure_ascii=False, indent=2)
+            
+        if get_config().verbose:
+            console.print(f"[bold green]✅ Conversation saved to {message_file}[/bold green]")
+            
+        return message_id
+    except Exception as e:
+        console.print(f"[bold red]❌ Error saving conversation:[/bold red] {str(e)}")
+        return None
+
+def load_messages(message_id: Optional[str] = None) -> Optional[List[Dict[str, Any]]]:
+    """
+    Load messages from .janito/last_messages/{message_id}.json or the latest message file
+    
+    Args:
+        message_id: Optional message ID to load specific conversation
+        
+    Returns:
+        List of message dictionaries or None if file doesn't exist
+    """
+    try:
+        # Get the workspace directory
+        workspace_dir = Path(get_config().workspace_dir)
+        janito_dir = workspace_dir / ".janito"
+        messages_dir = janito_dir / "last_messages"
+        
+        # If message_id is provided, try to load that specific conversation
+        if message_id:
+            # Check if the message ID is a file name or just the ID
+            if message_id.endswith('.json'):
+                message_file = messages_dir / message_id
+            else:
+                message_file = messages_dir / f"{message_id}.json"
+                
+            if not message_file.exists():
+                console.print(f"[bold yellow]⚠️ No conversation found with ID {message_id}[/bold yellow]")
+                return None
+                
+            # Load messages from file
+            with open(message_file, "r", encoding="utf-8") as f:
+                message_object = json.load(f)
+                
+            # Extract messages from the message object
+            if isinstance(message_object, dict) and "messages" in message_object:
+                messages = message_object["messages"]
+            else:
+                # Handle legacy format
+                messages = message_object
+                
+            if get_config().verbose:
+                console.print(f"[bold green]✅ Loaded conversation from {message_file}[/bold green]")
+                console.print(f"[dim]📝 Conversation has {len(messages)} messages[/dim]")
+                
+            return messages
+        
+        # If no message_id is provided, try to load the latest message from last_messages directory
+        if not messages_dir.exists() or not any(messages_dir.iterdir()):
+            console.print("[bold yellow]⚠️ No previous conversation found[/bold yellow]")
+            return None
+        
+        # Find the latest message file (based on filename which is a timestamp)
+        latest_file = max(
+            [f for f in messages_dir.iterdir() if f.is_file() and f.suffix == '.json'],
+            key=lambda x: x.stem
+        )
+        
+        # Load messages from the latest file
+        with open(latest_file, "r", encoding="utf-8") as f:
+            message_object = json.load(f)
+            
+        # Extract messages from the message object
+        if isinstance(message_object, dict) and "messages" in message_object:
+            messages = message_object["messages"]
+        else:
+            # Handle legacy format
+            messages = message_object
+            
+        if get_config().verbose:
+            console.print(f"[bold green]✅ Loaded latest conversation from {latest_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 conversation:[/bold red] {str(e)}")
+        return None
+

janito/cli/agent/initialization.py

@@ -0,0 +1,172 @@
+"""
+Agent initialization functionality for Janito CLI.
+"""
+import os
+import platform
+import typer
+from typing import Optional, Dict, Any
+from rich.console import Console
+from jinja2 import Template
+import importlib.resources as pkg_resources
+import claudine
+
+from janito.config import get_config, Config
+from janito.callbacks import text_callback
+from janito.tools import str_replace_editor, get_tools, reset_tracker
+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
+    """
+    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, system_instructions: Optional[str] = None) -> claudine.Agent:
+    """
+    Initialize the Claude agent with tools and configuration.
+    
+    Args:
+        temperature: Temperature value for model generation
+        verbose: Whether to enable verbose mode
+        system_instructions: Optional custom system instructions to use instead of loading from file
+        
+    Returns:
+        claudine.Agent: The initialized agent
+    """
+    # Get API key
+    api_key = get_api_key()
+    
+    # Load instructions or use provided system instructions
+    if system_instructions:
+        instructions = system_instructions
+        if verbose:
+            console.print("[bold blue]🔄 Using custom system instructions provided via --system parameter[/bold blue]")
+            # Print the first 50 characters of the instructions for verification
+            preview = system_instructions[:50] + "..." if len(system_instructions) > 50 else system_instructions
+            console.print(f"[dim]System instructions preview: {preview}[/dim]")
+    else:
+        instructions = load_instructions()
+    
+    # Get tools
+    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
+    if get_config().no_tools:
+        # If no_tools mode is enabled, don't pass any tools to the agent
+        agent = claudine.Agent(
+            api_key=api_key,
+            system_prompt=instructions,
+            callbacks={"text": text_callback},
+            verbose=verbose,
+            max_tokens=8126,
+            max_tool_rounds=100,
+            config_params=config_params,
+            # Don't pass any tools, including text_editor_tool and bash_tool
+        )
+    else:
+        # Normal mode with tools
+        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

janito/cli/agent/query.py

@@ -0,0 +1,108 @@
+"""
+Query handling functionality for Janito CLI.
+"""
+import sys
+import traceback
+from typing import Optional
+from rich.console import Console
+import anthropic
+
+from janito.token_report import generate_token_report
+from janito.tools import print_usage_stats
+from janito.cli.agent.initialization import initialize_agent
+from janito.cli.agent.conversation import load_messages, save_messages
+
+console = Console()
+
+def handle_query(query: str, temperature: float, verbose: bool, show_tokens: bool, continue_conversation: Optional[str] = None, system_instructions: Optional[str] = None) -> 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: Optional message ID to continue a specific conversation
+        system_instructions: Optional custom system instructions to use instead of loading from file
+    """
+    # Initialize the agent
+    agent = initialize_agent(temperature, verbose, system_instructions)
+    
+    # Load previous messages if continuing conversation
+    if continue_conversation is not None:
+        # If continue_conversation is an empty string (from flag with no value), use default behavior
+        message_id = None if continue_conversation == "" else continue_conversation
+        messages = load_messages(message_id)
+        if messages:
+            agent.set_messages(messages)
+            if message_id:
+                console.print(f"[bold blue]🔄 Continuing conversation with ID: {message_id}[/bold blue]")
+            else:
+                console.print("[bold blue]🔄 Continuing most recent conversation[/bold blue]")
+                
+            # Provide information about the conversation being continued
+            if verbose and len(messages) > 0:
+                # Get the number of messages
+                num_messages = len(messages)
+                # Get the last user message if available
+                last_user_message = next((msg.get("content", "") for msg in reversed(messages) 
+                                         if msg.get("role") == "user"), "")
+                if last_user_message:
+                    console.print(f"[dim]📝 Last query: \"{last_user_message[:60]}{'...' if len(last_user_message) > 60 else ''}\"[/dim]")
+        else:
+            console.print("[bold yellow]⚠️ No previous conversation found to continue[/bold yellow]")
+    
+    # Send the query to the agent
+    try:
+        agent.query(query)
+        
+        # Save messages after successful query and get the message ID
+        message_id = 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
+        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
+        message_id = 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
+            print_usage_stats()
+            
+
+        except Exception as e:
+            console.print(f"[bold red]❌ Error generating usage report:[/bold red] {str(e)}")
+            if verbose:
+                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:
+            console.print(traceback.format_exc())