janito 0.10.0__py3-none-any.whl → 0.11.0__py3-none-any.whl

janito/__init__.py

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

janito/__main__.py

@@ -1,151 +1,205 @@
-"""
-Main entry point for the janito CLI.
-"""
-
-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]")
-
-if __name__ == "__main__":
-    app()
+"""
+Main entry point for Janito.
+"""
+import os
+import sys
+from typing import Optional
+import importlib.resources
+import typer
+from rich.console import Console
+import anthropic
+from janito.config import get_config
+from janito.chat_history import store_conversation, get_chat_history_context
+from janito.callbacks import pre_tool_callback, post_tool_callback, text_callback
+from janito.token_report import generate_token_report
+from janito.tools import str_replace_editor
+from janito.tools.bash import bash_tool
+import claudine
+
+app = typer.Typer()
+
+@app.command()
+def create_tool(name: str = typer.Argument(..., help="Name of the tool to create")):
+    """
+    Create a new tool with the given name.
+    """
+    console = Console()
+    
+    # Ensure workspace is set
+    workspace_dir = get_config().workspace_dir
+    
+    # Create the tools directory if it doesn't exist
+    tools_dir = os.path.join(workspace_dir, "tools")
+    os.makedirs(tools_dir, exist_ok=True)
+    
+    # Create the tool file
+    tool_file = os.path.join(tools_dir, f"{name}.py")
+    
+    # Check if the file already exists
+    if os.path.exists(tool_file):
+        console.print(f"[bold red]Error:[/bold red] Tool file already exists: {tool_file}")
+        return
+    
+    # Create the tool file with a template
+    template = f'''"""
+{name} tool for Janito.
+"""
+
+def {name}(param1: str) -> str:
+    """
+    Description of the {name} tool.
+    
+    Args:
+        param1: Description of param1
+        
+    Returns:
+        str: Description of return value
+    """
+    # TODO: Implement the tool
+    return f"Executed {name} with param1={{param1}}"
+'''
+    
+    with open(tool_file, "w") as f:
+        f.write(template)
+    
+    console.print(f"[bold green]Created tool:[/bold green] {tool_file}")
+
+@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., 'context=5' for number of history messages to include"),
+         show_config: bool = typer.Option(False, "--show-config", help="Show current configuration")):
+    """
+    Janito CLI tool. If a query is provided without a command, it will be sent to the claudine agent.
+    """    
+    console = Console()
+    
+    # Set verbose mode in config
+    get_config().verbose = verbose
+    
+    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)
+            
+    # Show current configuration if requested
+    if show_config:
+        config = get_config()
+        console.print("[bold blue]Current Configuration:[/bold blue]")
+        console.print(f"[bold]Workspace Directory:[/bold] {config.workspace_dir}")
+        console.print(f"[bold]Verbose Mode:[/bold] {'Enabled' if config.verbose else 'Disabled'}")
+        console.print(f"[bold]Chat History Context Count:[/bold] {config.history_context_count} messages")
+        # Exit if this was the only operation requested
+        if ctx.invoked_subcommand is None and not query:
+            sys.exit(0)
+            
+    # Handle the --set-config parameter
+    if config_str is not None:
+        try:
+            # Parse the config string
+            if "context=" in config_str:
+                context_value = config_str.split("context=")[1].strip()
+                # If there are other configs after context, extract just the number
+                if " " in context_value:
+                    context_value = context_value.split(" ")[0]
+                
+                try:
+                    context_value = int(context_value)
+                    if context_value < 0:
+                        console.print("[bold red]Error:[/bold red] History context count must be a non-negative integer")
+                        return
+                    
+                    get_config().history_context_count = context_value
+                    console.print(f"[bold green]Chat history context count set to {context_value} messages[/bold green]")
+                except ValueError:
+                    console.print(f"[bold red]Error:[/bold red] Invalid context value: {context_value}. Must be an integer.")
+            else:
+                console.print(f"[bold yellow]Warning:[/bold yellow] Unsupported configuration in: {config_str}")
+        except Exception as e:
+            console.print(f"[bold red]Error:[/bold red] {str(e)}")
+            
+    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(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 e:
+                console.print(f"[bold red]Error loading instructions:[/bold red] {str(e)}")
+                instructions = "You are Janito, an AI assistant."
+                
+            # Temporarily disable chat history
+            # Get chat history context
+            # chat_history = get_chat_history_context(get_config().history_context_count)
+            # if chat_history:
+            #     console.print("[dim]Loaded chat history from previous sessions.[/dim]")
+            #     # Append chat history to instructions
+            #     instructions = f"{instructions}\n\n{chat_history}"
+                   
+            # Get tools
+            from janito.tools import get_tools
+            tools_list = get_tools()
+            
+            # Initialize the agent with the tools
+            agent = claudine.Agent(
+                api_key=api_key,
+                system_prompt=instructions,
+                callbacks={"pre_tool": pre_tool_callback, "post_tool": post_tool_callback, "text": text_callback},
+                text_editor_tool=str_replace_editor,
+               #bash_tool=bash_tool,
+                tools=tools_list,
+                verbose=verbose
+            )
+            
+            # Send the query to the agent
+            try:
+                agent.query(query)
+                
+                # Temporarily disable storing conversation in chat history
+                # Store the conversation in chat history
+                # store_conversation(query, response, agent)
+                
+                # Print token usage report if show_tokens mode is enabled
+                if show_tokens:
+                    generate_token_report(agent, verbose=True)
+                else:
+                    # Show basic token usage
+                    generate_token_report(agent, verbose=False)
+                    
+            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())
+
+if __name__ == "__main__":
+    app()

janito/callbacks.py

@@ -1,130 +1,132 @@
-"""
-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
-
-def post_tool_callback(tool_name: str, tool_input: Dict[str, Any], result: Any) -> Any:
-    """
-    Callback function that runs after a tool is executed.
-    
-    Args:
-        tool_name: Name of the tool that was called
-        tool_input: Input parameters for the tool
-        result: Result of the tool call
-        
-    Returns:
-        Modified result
-    """
-    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
-    
-    # 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
+"""
+Callback functions for tool execution in janito.
+"""
+
+from typing import Dict, Any, Tuple, Optional, List
+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
+
+# Note: ConsoleCallback has been removed as we're using pre_tool and post_tool callbacks directly
+
+def pre_tool_callback(tool_name: str, tool_input: Dict[str, Any]) -> 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
+        
+    Returns:
+        Tuple of (modified tool input, whether to cancel the tool call)
+    """
+    console = Console()
+    
+    # Add debug counter only when verbose mode is enabled
+    if get_config().verbose:
+        if not hasattr(pre_tool_callback, "counter"):
+            pre_tool_callback.counter = 1
+        console.print(f"[bold green]DEBUG: Starting tool call #{pre_tool_callback.counter}[/bold green]")
+        
+        # Print the tool name and input
+        console.print(f"[bold green]Tool:[/bold green] {tool_name}")
+        console.print(f"[bold green]Input:[/bold green] {tool_input}")
+    else:
+        # For non-debug mode, just print a simple message
+        # Find the tool function
+        tool_func = None
+        if tool_name == "find_files":
+            tool_func = find_files
+        elif tool_name == "str_replace_editor":
+            tool_func = str_replace_editor
+        elif tool_name == "delete_file":
+            tool_func = delete_file
+        elif tool_name == "search_text":
+            tool_func = search_text
+            
+        # Format the input for display
+        display_input = ""
+        if "path" in tool_input:
+            display_input = tool_input["path"]
+        elif "file_path" in tool_input:
+            display_input = tool_input["file_path"]
+        
+        # Print formatted tool label if available
+        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
+
+def post_tool_callback(tool_name: str, tool_input: Dict[str, Any], result: Any) -> Any:
+    """
+    Callback function that runs after a tool is executed.
+    
+    Args:
+        tool_name: Name of the tool that was called
+        tool_input: Input parameters for the tool
+        result: Result of the tool call
+        
+    Returns:
+        Modified result
+    """
+    console = Console()
+    
+    # Add debug counter only when verbose mode is enabled
+    if get_config().verbose:
+        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
+    
+    # Show the number of lines in the result content
+    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):
+            # Count the number of lines in the content
+            line_count = content.count('\n') + 1 if content else 0
+            console.print(f"{icon_prefix}{line_count} items")
+        else:
+            console.print(f"{icon_prefix}{content}")
+    else:
+        # If result is not a tuple, convert to string and count lines
+        result_str = str(result)
+        # Default to success icon when no error status is available
+        icon_prefix = "✅ "
+        line_count = result_str.count('\n') + 1 if result_str else 0
+        console.print(f"{icon_prefix}{line_count} lines")
+    
+    return result
+
+def text_callback(text: str) -> None:
+    """
+    Callback function that handles text output from the agent.
+    
+    Args:
+        text: Text output from the agent
+        
+    Returns:
+        None
+    """
+    console = Console()
+    
+    # Add debug counter only when debug mode is enabled
+    if get_config().debug_mode:
+        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
+    
+    # Print the text with markdown formatting
+    console.print("[bold magenta]Janito:[/bold magenta] ", Markdown(text, code_theme="monokai"), end="")