janito 0.6.0__tar.gz → 0.7.0__tar.gz

janito-0.7.0/PKG-INFO

@@ -0,0 +1,167 @@
+Metadata-Version: 2.4
+Name: janito
+Version: 0.7.0
+Summary: A CLI tool for software development tasks powered by AI
+Project-URL: Homepage, https://github.com/joaompinto/janito
+Project-URL: Repository, https://github.com/joaompinto/janito.git
+Author-email: João Pinto <lamego.pinto@gmail.com>
+License: MIT
+License-File: LICENSE
+Classifier: Development Status :: 4 - Beta
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Topic :: Software Development
+Requires-Python: >=3.8
+Requires-Dist: anthropic
+Requires-Dist: pathspec
+Requires-Dist: rich
+Requires-Dist: tomli
+Requires-Dist: typer
+Description-Content-Type: text/markdown
+
+# Janito
+
+[![PyPI version](https://badge.fury.io/py/janito.svg)](https://badge.fury.io/py/janito)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+
+AI-powered CLI tool for code modifications and analysis. Janito helps you modify, analyze, and understand your codebase using natural language commands.
+
+## Table of Contents
+
+- [Features](#features)
+- [Installation](#installation)
+- [Usage](#usage)
+  - [Basic Commands](#basic-commands)
+  - [Examples](#examples)
+- [Configuration](#configuration)
+- [Development](#development)
+- [License](#license)
+
+## Features
+
+- 🤖 AI-powered code analysis and modifications
+- 🔄 Incremental code changes with search/replace operations
+- 🎯 Precise text modifications with context matching
+- 💬 Natural language interface for code operations
+- 🔍 Interactive code exploration
+- 📝 Automatic documentation generation
+- ⚡ Fast and efficient codebase navigation
+- 💾 Smart Claude AI prompt caching for faster responses
+
+## Installation
+
+### Prerequisites
+
+- Python 3.8 or higher
+- Anthropic API key (with smart caching to reduce API costs)
+
+### Install via pip
+
+```bash
+pip install janito
+```
+
+### Set up API key
+
+```bash
+export ANTHROPIC_API_KEY=your_api_key_here
+```
+
+## Usage
+
+### Basic Commands
+
+Janito supports incremental code changes through precise text operations:
+- Search and replace with context matching
+- Delete specific code blocks
+- File operations (create, replace, rename, move, remove)
+
+```bash
+# Start interactive shell
+janito
+
+# Modify code with natural language
+janito "add docstrings to this file"
+
+# Ask questions about the codebase
+janito --ask "explain the main function in this file"
+
+# Preview files that would be analyzed
+janito --scan
+```
+
+### Examples
+
+1. Add documentation to a file:
+```bash
+janito "add docstrings to all functions in src/main.py"
+```
+
+2. Analyze code structure:
+```bash
+janito --ask "what are the main classes in this project?"
+```
+
+3. Refactor code:
+```bash
+janito "convert this function to use async/await"
+```
+
+4. Generate tests:
+```bash
+janito "create unit tests for the User class"
+```
+
+## Configuration
+
+### Environment Variables
+
+- `ANTHROPIC_API_KEY`: Anthropic API key for Claude AI
+- `JANITO_TEST_CMD`: Default test command to run after changes
+
+### Command Line Options
+
+- `-w, --workspace_dir`: Set working directory
+- `-i, --include`: Additional paths to include
+- `--debug`: Show debug information
+- `--verbose`: Show verbose output
+- `--auto-apply`: Apply changes without confirmation
+
+## Development
+
+### Setting up Development Environment
+
+```bash
+# Clone the repository
+git clone https://github.com/joaompinto/janito.git
+cd janito
+
+# Create and activate virtual environment
+python -m venv venv
+source venv/bin/activate  # On Windows: venv\Scripts\activate
+
+# Install development dependencies
+pip install -e ".[dev]"
+```
+
+### Running Tests
+
+```bash
+pytest
+```
+
+### Contributing
+
+1. Fork the repository
+2. Create a feature branch
+3. Commit your changes
+4. Push to the branch
+5. Create a Pull Request
+
+## License
+
+MIT License - see [LICENSE](LICENSE)

janito-0.7.0/README.md

@@ -0,0 +1,142 @@
+# Janito
+
+[![PyPI version](https://badge.fury.io/py/janito.svg)](https://badge.fury.io/py/janito)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+
+AI-powered CLI tool for code modifications and analysis. Janito helps you modify, analyze, and understand your codebase using natural language commands.
+
+## Table of Contents
+
+- [Features](#features)
+- [Installation](#installation)
+- [Usage](#usage)
+  - [Basic Commands](#basic-commands)
+  - [Examples](#examples)
+- [Configuration](#configuration)
+- [Development](#development)
+- [License](#license)
+
+## Features
+
+- 🤖 AI-powered code analysis and modifications
+- 🔄 Incremental code changes with search/replace operations
+- 🎯 Precise text modifications with context matching
+- 💬 Natural language interface for code operations
+- 🔍 Interactive code exploration
+- 📝 Automatic documentation generation
+- ⚡ Fast and efficient codebase navigation
+- 💾 Smart Claude AI prompt caching for faster responses
+
+## Installation
+
+### Prerequisites
+
+- Python 3.8 or higher
+- Anthropic API key (with smart caching to reduce API costs)
+
+### Install via pip
+
+```bash
+pip install janito
+```
+
+### Set up API key
+
+```bash
+export ANTHROPIC_API_KEY=your_api_key_here
+```
+
+## Usage
+
+### Basic Commands
+
+Janito supports incremental code changes through precise text operations:
+- Search and replace with context matching
+- Delete specific code blocks
+- File operations (create, replace, rename, move, remove)
+
+```bash
+# Start interactive shell
+janito
+
+# Modify code with natural language
+janito "add docstrings to this file"
+
+# Ask questions about the codebase
+janito --ask "explain the main function in this file"
+
+# Preview files that would be analyzed
+janito --scan
+```
+
+### Examples
+
+1. Add documentation to a file:
+```bash
+janito "add docstrings to all functions in src/main.py"
+```
+
+2. Analyze code structure:
+```bash
+janito --ask "what are the main classes in this project?"
+```
+
+3. Refactor code:
+```bash
+janito "convert this function to use async/await"
+```
+
+4. Generate tests:
+```bash
+janito "create unit tests for the User class"
+```
+
+## Configuration
+
+### Environment Variables
+
+- `ANTHROPIC_API_KEY`: Anthropic API key for Claude AI
+- `JANITO_TEST_CMD`: Default test command to run after changes
+
+### Command Line Options
+
+- `-w, --workspace_dir`: Set working directory
+- `-i, --include`: Additional paths to include
+- `--debug`: Show debug information
+- `--verbose`: Show verbose output
+- `--auto-apply`: Apply changes without confirmation
+
+## Development
+
+### Setting up Development Environment
+
+```bash
+# Clone the repository
+git clone https://github.com/joaompinto/janito.git
+cd janito
+
+# Create and activate virtual environment
+python -m venv venv
+source venv/bin/activate  # On Windows: venv\Scripts\activate
+
+# Install development dependencies
+pip install -e ".[dev]"
+```
+
+### Running Tests
+
+```bash
+pytest
+```
+
+### Contributing
+
+1. Fork the repository
+2. Create a feature branch
+3. Commit your changes
+4. Push to the branch
+5. Create a Pull Request
+
+## License
+
+MIT License - see [LICENSE](LICENSE)

{janito-0.6.0 → janito-0.7.0}/janito/__main__.py

@@ -7,12 +7,15 @@ from rich.console import Console
 from rich.text import Text
 from .version import get_version
 
-from janito.agents import agent
 from janito.config import config
+from janito.workspace import workset
+from janito.workspace.types import ScanType  # Add this import
+from .cli.commands import (
+    handle_request, handle_ask, handle_play, 
+    handle_scan, handle_demo
+)
 
-from .cli.commands import handle_request, handle_ask, handle_play, handle_scan
-
-app = typer.Typer(add_completion=False)
+app = typer.Typer(pretty_exceptions_enable=False)
 
 def validate_paths(paths: Optional[List[Path]]) -> Optional[List[Path]]:
     """Validate include paths for duplicates.
@@ -57,7 +60,7 @@ def typer_main(
     history: bool = typer.Option(False, "--history", help="Display history of requests"),
     recursive: Optional[List[Path]] = typer.Option(None, "-r", "--recursive", help="Paths to scan recursively (directories only)"),
     demo: bool = typer.Option(False, "--demo", help="Run demo scenarios"),
-    skipwork: bool = typer.Option(False, "--skipwork", help="Skip scanning workspace_dir when using include paths"),
+    skip_work: bool = typer.Option(False, "--skip-work", help="Skip scanning workspace_dir when using include paths"),
 ):
     """Janito - AI-powered code modification assistant"""
     if version:
@@ -66,9 +69,7 @@ def typer_main(
         return
 
     if demo:
-        from janito.cli.handlers.demo import DemoHandler
-        handler = DemoHandler()
-        handler.handle()
+        handle_demo()
         return
 
     if history:
@@ -76,52 +77,58 @@ def typer_main(
         display_history()
         return
 
+    # Configure workspace
     config.set_workspace_dir(workspace_dir)
     config.set_debug(debug)
     config.set_verbose(verbose)
     config.set_auto_apply(auto_apply)
-    config.set_include(include)
     config.set_tui(tui)
-    config.set_skipwork(skipwork)
-
-    # Validate skipwork usage
-    if skipwork and not include and not recursive:
-        error_text = Text("\nError: --skipwork requires at least one include path (-i or -r)", style="red")
-        rich_print(error_text)
-        raise typer.Exit(1)
 
+    # Configure workset with scan paths
     if include:
-        resolved_paths = []
+        if config.debug:
+            Console(stderr=True).print("[cyan]Debug: Processing include paths...[/cyan]")
         for path in include:
-            path = config.workspace_dir / path
-            resolved_paths.append(path.resolve())
-        config.set_include(resolved_paths)
+            full_path = config.workspace_dir / path
+            if not full_path.resolve().is_relative_to(config.workspace_dir):
+                error_text = Text(f"\nError: Path must be within workspace: {path}", style="red")
+                rich_print(error_text)
+                raise typer.Exit(1)
+            workset.add_scan_path(path, ScanType.PLAIN)
 
-    # Validate recursive paths
     if recursive:
-        resolved_paths = []
+        if config.debug:
+            Console(stderr=True).print("[cyan]Debug: Processing recursive paths...[/cyan]")
         for path in recursive:
-            final_path = config.workspace_dir / path
+            full_path = config.workspace_dir / path
             if not path.is_dir():
                 error_text = Text(f"\nError: Recursive path must be a directory: {path} ", style="red")
                 rich_print(error_text)
                 raise typer.Exit(1)
-            resolved_paths.append(final_path.resolve())
-        config.set_recursive(resolved_paths)
-        include = include or []
-        include.extend(resolved_paths)
-        config.set_include(include)
+            if not full_path.resolve().is_relative_to(config.workspace_dir):
+                error_text = Text(f"\nError: Path must be within workspace: {path}", style="red")
+                rich_print(error_text)
+                raise typer.Exit(1)
+            workset.add_scan_path(path, ScanType.RECURSIVE)
+
+    # Validate skip_work usage
+    if skip_work and not workset.paths:
+        error_text = Text("\nError: --skip-work requires at least one include path (-i or -r)", style="red")
+        rich_print(error_text)
+        raise typer.Exit(1)
 
     if test_cmd:
         config.set_test_cmd(test_cmd)
 
+    # Refresh workset content before handling commands
+    workset.refresh()
+
     if ask:
         handle_ask(ask)
     elif play:
         handle_play(play)
     elif scan:
-        paths_to_scan = include or [config.workspace_dir]
-        handle_scan(paths_to_scan)
+        handle_scan()
     elif change_request:
         handle_request(change_request)
     else:

{janito-0.6.0 → janito-0.7.0}/janito/agents/__init__.py

@@ -5,6 +5,13 @@ SYSTEM_PROMPT = """I am Janito, your friendly software development buddy. I help
 ai_backend = os.getenv('AI_BACKEND', 'claudeai').lower()
 
 if ai_backend == 'openai':
+    import warnings
+    warnings.warn(
+        "Using deprecated OpenAI backend. Please switch to Claude AI backend by removing AI_BACKEND=openai "
+        "from your environment variables.",
+        DeprecationWarning,
+        stacklevel=2
+    )
     from .openai import OpenAIAgent as AIAgent
 elif ai_backend == 'claudeai':
     from .claudeai import ClaudeAIAgent as AIAgent
@@ -12,5 +19,4 @@ else:
     raise ValueError(f"Unsupported AI_BACKEND: {ai_backend}")
 
 # Create a singleton instance
-agent = AIAgent(SYSTEM_PROMPT)
-
+agent = AIAgent(SYSTEM_PROMPT)

{janito-0.6.0 → janito-0.7.0}/janito/agents/agent.py

@@ -1,4 +1,3 @@
-
 from abc import ABC, abstractmethod
 from threading import Event
 from typing import Optional, List, Tuple
@@ -16,6 +15,14 @@ class Agent(ABC):
             self.messages_history.append(("system", system_prompt))
 
     @abstractmethod
-    def send_message(self, message: str, stop_event: Event = None) -> str:
-        """Send message to AI service and return response"""
+    def send_message(self, message: str, system: str) -> str:
+        """Send message to the AI agent
+        
+        Args:
+            message: The message to send
+            stop_event: Optional event to signal cancellation
+            
+        Returns:
+            The response from the AI agent
+        """
         pass

{janito-0.6.0 → janito-0.7.0}/janito/agents/claudeai.py

@@ -24,32 +24,22 @@ class ClaudeAIAgent(Agent):
         self.last_response = None
 
 
-    def send_message(self, message: str, stop_event: Event = None) -> str:
+    def send_message(self, message: str, system_message: str = None) -> str:
         """Send message to Claude API and return response"""
         self.messages_history.append(("user", message))
         # Store the full message
         self.last_full_message = message
         
-        try:
-            # Check if already cancelled
-            if stop_event and stop_event.is_set():
-                return ""
-            
-            response = self.client.messages.create(
-                model=self.model,  # Use discovered model
-                system=self.system_message,
-                max_tokens=8192,
-                messages=[
-                    {"role": "user", "content": message}
-                ],
-                temperature=0,
-            )
-            
+        response = self.client.messages.create(
+            model=self.model,  # Use discovered model
+            system=system_message or self.system_message,
+            max_tokens=8192,
+            messages=[
+                {"role": "user", "content": message}
+            ],
+            temperature=0,
+        )
+        
 
-            # Always return the response, let caller handle cancellation
-            return response
-            
-        except KeyboardInterrupt:
-            if stop_event:
-                stop_event.set()
-            return ""
+        # Always return the response, let caller handle cancellation
+        return response

{janito-0.6.0 → janito-0.7.0}/janito/agents/openai.py

@@ -5,7 +5,11 @@ from threading import Event
 from .agent import Agent
 
 class OpenAIAgent(Agent):
-    """Handles interaction with OpenAI API, including message handling"""
+    """[DEPRECATED] Handles interaction with OpenAI API, including message handling.
+
+    This backend is no longer actively maintained. Please use the Claude AI backend instead.
+    The code is kept for backward compatibility but may be removed in future versions.
+    """
     DEFAULT_MODEL = "o1-mini-2024-09-12"
     
     def __init__(self, api_key: Optional[str] = None, system_prompt: str = None):

{janito-0.6.0 → janito-0.7.0}/janito/change/analysis/analyze.py

@@ -1,10 +1,10 @@
 """Core analysis functionality."""
 
-from typing import Optional, Dict
-
+from typing import Optional
 from janito.agents import agent
 from janito.common import progress_send_message
 from janito.config import config
+from janito.workspace.workset import Workset
 from .view import format_analysis
 from .options import AnalysisOption, parse_analysis_options
 from .prompts import (
@@ -15,25 +15,26 @@ from .prompts import (
 
 def analyze_request(
     request: str,        
-    files_content_xml: str,
     pre_select: str = ""
 ) -> Optional[AnalysisOption]:
     """
     Analyze changes and get user selection.
     
     Args:
-        files_content: Content of files to analyze
         request: User's change request
+        files_content_xml: Optional content of files to analyze
         pre_select: Optional pre-selected option letter
         
     Returns:
         Selected AnalysisOption or None if modified
     """
-    # Build and send prompt
-    prompt = build_request_analysis_prompt(request, files_content_xml)
+    workset = Workset()  # Create workset instance
+       
+    # Build and send prompt using workset content directly
+    prompt = build_request_analysis_prompt(request)
     response = progress_send_message(prompt)
     
-    # Parse options
+    # Parse and handle options
     options = parse_analysis_options(response)
     if not options:
         return None

{janito-0.6.0 → janito-0.7.0}/janito/change/analysis/prompts.py

@@ -12,12 +12,9 @@ from .options import AnalysisOption
 
 # Keep only prompt-related functionality
 CHANGE_ANALYSIS_PROMPT = """
-Current files:
-<files>
-{files_content}
-</files>
 
-Considering the above current files content, provide 3 sections, each identified by a keyword and representing an option.
+
+Considering the above workset content, provide 3 sections, each identified by a keyword and representing an option.
 Each option should include a concise description and a list of affected files.
 1st option should be basic style change, 2nd organized style, 3rd exntensible style.
 Do not use style as keyword, instead focus on the changes summary.
@@ -86,13 +83,8 @@ def get_option_selection() -> str:
         padded_error = " " * error_padding + error_msg
         console.print(f"[red]{padded_error}[/red]")
 
-def build_request_analysis_prompt(request: str, files_content_xml: str) -> str:
+def build_request_analysis_prompt(request: str) -> str:
     """Build prompt for information requests"""
     return CHANGE_ANALYSIS_PROMPT.format(
-        files_content=files_content_xml,
         request=request
-    )
-
-    def build_request_analysis_prompt(request: str, files_content_xml: str) -> str:
-        """Build analysis prompt with minimal formatting."""
-        return f"Current files:\n{files_content_xml}\n\nRequest:\n{request}"
+    )

{janito-0.6.0 → janito-0.7.0}/janito/change/analysis/view/terminal.py

@@ -9,6 +9,9 @@ from rich.rule import Rule
 from rich.padding import Padding
 from rich.prompt import Prompt
 from rich import box
+from rich.style import Style
+from rich.segment import Segment
+from rich.containers import Renderables
 from pathlib import Path
 
 from ..options import AnalysisOption
@@ -34,9 +37,10 @@ def prompt_user(message: str, choices: List[str] = None) -> str:
         choice_text = f"[cyan]Options: {', '.join(choices)}[/cyan]"
         console.print(Panel(choice_text, box=box.ROUNDED, justify="center"))
 
-    padding = (term_width - len(message)) // 2
-    padded_message = " " * padding + message
-    return Prompt.ask(f"[bold cyan]{padded_message}[/bold cyan]")
+    message_text = Text(message, style="bold cyan")
+    padded_message = Padding(message_text, pad=(0, "center"))
+    console.print(padded_message)
+    return Prompt.ask("")
 
 def get_option_selection() -> str:
     """Get user input for option selection with modify option"""
@@ -53,9 +57,9 @@ def get_option_selection() -> str:
             return letter
 
         error_msg = "Please enter a valid letter or 'M'"
-        error_padding = (term_width - len(error_msg)) // 2
-        padded_error = " " * error_padding + error_msg
-        console.print(f"[red]{padded_error}[/red]")
+        error_text = Text(error_msg, style="red")
+        padded_error = Padding(error_text, pad=(0, "center"))
+        console.print(padded_error)
 
 def _create_option_content(option: AnalysisOption) -> Text:
     """Create rich formatted content for a single option."""
@@ -104,9 +108,14 @@ def _create_option_content(option: AnalysisOption) -> Text:
                             content.append("/", style=STRUCTURAL_COLORS['separator'])
                             seen_dirs[parent_dir] = True
                         else:
-                            padding = " " * (len(parent_dir) - 1)
-                            content.append(padding)
-                            content.append("↑ ", style=STRUCTURAL_COLORS['repeat'])
+                            dir_width = len(parent_dir)
+                            # Calculate padding to match full directory width
+                            arrow = "↑"
+                            total_padding = dir_width - len(arrow)
+                            left_padding = total_padding // 2
+                            right_padding = total_padding - left_padding
+                            content.append(" " * left_padding + arrow + " " * right_padding, 
+                                         style=STRUCTURAL_COLORS['repeat'])
                             content.append("/", style=STRUCTURAL_COLORS['separator'])
                         content.append(current_parts[-1], style=STATUS_COLORS[status.lower()])
                     else:
@@ -127,13 +136,14 @@ def create_columns_layout(options_content: List[Text], term_width: int) -> Colum
     usable_width = term_width - spacing - safety_margin
     column_width = max((usable_width // num_columns), MIN_PANEL_WIDTH)
 
-    rendered_columns = [
+    # Create padded content items
+    rendered_items: List[Renderables] = [
         Padding(content, (0, COLUMN_SPACING // 2))
         for content in options_content
     ]
 
     return Columns(
-        rendered_columns,
+        rendered_items,
         equal=True,
         expand=True,
         width=column_width,