janito 0.10.0__tar.gz → 0.11.0__tar.gz

janito-0.11.0/.gitignore

@@ -0,0 +1,111 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+
+# IDE specific files
+.idea/
+.vscode/
+*.swp
+*.swo
+
+# Janito
+.janito/
+janito-env/

{janito-0.10.0/janito.egg-info → janito-0.11.0}/PKG-INFO

@@ -1,88 +1,86 @@
-Metadata-Version: 2.2
-Name: janito
-Version: 0.10.0
-Summary: Janito CLI tool
-Author-email: João Pinto <lamego.pinto@gmail.com>
-Project-URL: Homepage, https://github.com/joaompinto/janito
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: typer>=0.9.0
-Requires-Dist: rich>=13.0.0
-Requires-Dist: claudine>=0.1.0
-
-# 🤖 Janito
-
-Janito is a powerful AI-assisted command-line interface (CLI) tool built with Python, leveraging Anthropic's Claude for intelligent code and file management.
-
-## ✨ Features
-
-- 🧠 Intelligent AI assistant powered by Claude
-- 📁 File management capabilities 
-- 🔍 Smart code search and editing
-- 💻 Interactive terminal interface with rich formatting
-- 📊 Token usage tracking and cost reporting
-
-## 🛠️ Installation
-
-```bash
-# Clone the repository
-git clone https://github.com/joaompinto/janito.git
-cd janito
-
-# Install the package
-pip install -e .
-```
-
-## 🚀 Usage
-
-After installation, you can use the `janito` command in your terminal:
-
-```bash
-# Get help
-janito --help
-
-
-# Ask the AI assistant a question
-janito "Suggest improvements to this project"
-
-janito "Add a --version to the cli to report he version"
-
-```
-
-## 🔧 Available Tools
-
-Janito comes with several built-in tools:
-- 📄 `str_replace_editor` - View, create, and edit files
-- 🔎 `find_files` - Find files matching patterns
-- 🗑️ `delete_file` - Delete files
-- 🔍 `search_text` - Search for text patterns in files
-
-## ⚙️ Requirements
-
-- Python 3.8 or higher
-- Dependencies:
-  - typer (>=0.9.0)
-  - rich (>=13.0.0)
-  - claudine (for Claude AI integration)
-
-## 🔑 API Key
-
-Janito requires an Anthropic API key to function. You can:
-1. Set it as an environment variable: `export ANTHROPIC_API_KEY=your_api_key`
-2. Or enter it when prompted
-
-## 💻 Development
-
-```bash
-# Create a virtual environment
-python -m venv .venv
-source .venv/bin/activate  # On Windows: .venv\Scripts\activate
-
-# Install development dependencies
-pip install -e ".[dev]"
-```
-
-## 📜 License
-
-[Add your license information here]
+Metadata-Version: 2.4
+Name: janito
+Version: 0.11.0
+Summary: Janito CLI tool
+Project-URL: Homepage, https://github.com/joaompinto/janito
+Author-email: João Pinto <lamego.pinto@gmail.com>
+License-File: LICENSE
+Requires-Python: >=3.8
+Requires-Dist: claudine>=0.1.0
+Requires-Dist: rich>=13.0.0
+Requires-Dist: typer>=0.9.0
+Description-Content-Type: text/markdown
+
+# 🤖 Janito
+
+Janito is a powerful AI-assisted command-line interface (CLI) tool built with Python, leveraging Anthropic's Claude for intelligent code and file management.
+
+## ✨ Features
+
+- 🧠 Intelligent AI assistant powered by Claude
+- 📁 File management capabilities 
+- 🔍 Smart code search and editing
+- 💻 Interactive terminal interface with rich formatting
+- 📊 Token usage tracking and cost reporting
+
+## 🛠️ Installation
+
+```bash
+# Install directly from PyPI
+pip install janito
+```
+
+For development or installation from source, please see [README_DEV.md](README_DEV.md).
+
+## 🚀 Usage
+
+After installation, you can use the `janito` command in your terminal:
+
+```bash
+# Get help
+janito --help
+
+
+# Ask the AI assistant a question
+janito "Suggest improvements to this project"
+
+janito "Add a --version to the cli to report he version"
+
+```
+
+## 🔧 Available Tools
+
+Janito comes with several built-in tools:
+- 📄 `str_replace_editor` - View, create, and edit files
+- 🔎 `find_files` - Find files matching patterns
+- 🗑️ `delete_file` - Delete files
+- 🔍 `search_text` - Search for text patterns in files
+
+## ⚙️ Requirements
+
+- Python 3.8 or higher
+- Dependencies:
+  - typer (>=0.9.0)
+  - rich (>=13.0.0)
+  - claudine (for Claude AI integration)
+
+## 🔑 API Key
+
+Janito requires an Anthropic API key to function. You can:
+1. Set it as an environment variable: `export ANTHROPIC_API_KEY=your_api_key`
+2. Or enter it when prompted
+
+## 💻 Development
+
+```bash
+# Create a virtual environment
+python -m venv .venv
+source .venv/bin/activate  # On Windows: .venv\Scripts\activate
+
+# Install development dependencies
+pip install -e ".[dev]"
+```
+
+## 📜 License
+
+This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.

{janito-0.10.0 → janito-0.11.0}/README.md

@@ -13,14 +13,12 @@ Janito is a powerful AI-assisted command-line interface (CLI) tool built with Py
 ## 🛠️ Installation
 
 ```bash
-# Clone the repository
-git clone https://github.com/joaompinto/janito.git
-cd janito
-
-# Install the package
-pip install -e .
+# Install directly from PyPI
+pip install janito
 ```
 
+For development or installation from source, please see [README_DEV.md](README_DEV.md).
+
 ## 🚀 Usage
 
 After installation, you can use the `janito` command in your terminal:
@@ -72,4 +70,4 @@ pip install -e ".[dev]"
 
 ## 📜 License
 
-[Add your license information here]
+This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.

janito-0.11.0/janito/__init__.py

@@ -0,0 +1,5 @@
+"""
+Janito package.
+"""
+
+__version__ = "0.11.0"

janito-0.11.0/janito/__main__.py

@@ -0,0 +1,205 @@
+"""
+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-0.11.0/janito/callbacks.py

@@ -0,0 +1,132 @@
+"""
+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="")