janito 0.4.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

janito/changeviewer.py

@@ -1,350 +0,0 @@
-from pathlib import Path
-from rich.console import Console
-from rich.text import Text
-from rich.panel import Panel
-from rich.table import Table
-from rich.rule import Rule  # Add this import
-from typing import List, Optional, Dict
-from rich import box
-from janito.fileparser import FileChange
-from janito.analysis import AnalysisOption  # Add this import
-from rich.columns import Columns  # Add this import at the top with other imports
-
-MIN_PANEL_WIDTH = 40   # Minimum width for each panel
-
-
-def format_sequence_preview(lines: List[str]) -> Text:
-    """Format a sequence of prefixed lines into rich text with colors"""
-    text = Text()
-    last_was_empty = False
-    
-    for line in lines:
-        if not line:
-            # Preserve empty lines but don't duplicate them
-            if not last_was_empty:
-                text.append("\n")
-            last_was_empty = True
-            continue
-        
-        last_was_empty = False
-        prefix = line[0] if line[0] in ('=', '>', '<') else ' '
-        content = line[1:] if line[0] in ('=', '>', '<') else line
-        
-        if prefix == '=':
-            text.append(f" {content}\n", style="dim")
-        elif prefix == '>':
-            text.append(f"+{content}\n", style="green")
-        elif prefix == '<':
-            text.append(f"-{content}\n", style="red")
-        else:
-            text.append(f" {content}\n", style="yellow dim")
-    
-    return text
-
-
-
-
-
-
-def show_changes_legend(console: Console) -> None:
-    """Display a legend explaining the colors and symbols used in change previews in a horizontal layout"""
-    # Create a list of colored text objects
-    legend_items = [
-        Text("Unchanged", style="#98C379"),
-        Text(" • ", style="dim"),
-        Text("Removed", style="#E06C75"),
-        Text(" • ", style="dim"),
-        Text("Relocated", style="#61AFEF"),
-        Text(" • ", style="dim"),
-        Text("New", style="#C678DD")
-    ]
-    
-    # Combine all items into a single text object
-    legend_text = Text()
-    for item in legend_items:
-        legend_text.append_text(item)
-    
-    # Create a simple panel with the horizontal legend
-    legend_panel = Panel(
-        legend_text,
-        title="Changes Legend",
-        title_align="left",
-        border_style="white",
-        box=box.ROUNDED,
-        padding=(0, 1)
-    )
-    
-    # Center the legend panel horizontally
-    console.print(Columns([legend_panel], align="center"))
-    console.print()  # Add extra line for spacing
-
-
-def show_change_preview(console: Console, filepath: Path, change: FileChange) -> None:
-    """Display a preview of changes for a single file with side-by-side comparison"""
-    # Show changes legend first
-    show_changes_legend(console)
-      
-    # Create main file panel content
-    main_content = []
-
-    # Handle new file preview
-    if change.is_new_file:
-        new_file_panel = Panel(
-            Text(change.content),
-            title="New File Content",
-            title_align="left",
-            border_style="green",
-            box=box.ROUNDED
-        )
-        main_content.append(new_file_panel)
-        
-        # Create and display main file panel
-        file_panel = Panel(
-            Columns(main_content),
-            title=str(filepath),
-            title_align="left",
-            border_style="white",
-            box=box.ROUNDED        )
-        return
-
-    
-
-    # For modifications, create side-by-side comparison for each change
-    for i, (search, replace, description) in enumerate(change.search_blocks, 1):
-        # Show change header with description
-        header = f"Change {i}"
-        if description:
-            header += f": {description}"
-        
-        if replace is None:
-            # For deletions, show single panel with content to be deleted
-            change_panel = Panel(
-                Text(search, style="red"),
-                title=f"Content to Delete{' - ' + description if description else ''}",
-                title_align="left",
-                border_style="#E06C75",  # Brighter red
-                box=box.ROUNDED
-            )
-            main_content.append(change_panel)
-        else:
-            # For replacements, show side-by-side panels
-
-            
-            # Find common content between search and replace
-            search_lines = search.splitlines()
-            replace_lines = replace.splitlines()
-            
-            # Find common lines from top
-            common_top = []
-            for s, r in zip(search_lines, replace_lines):
-                if s == r:
-                    common_top.append(s)
-                else:
-                    break
-                    
-            # Find common lines from bottom
-            search_remaining = search_lines[len(common_top):]
-            replace_remaining = replace_lines[len(common_top):]
-            
-            common_bottom = []
-            for s, r in zip(reversed(search_remaining), reversed(replace_remaining)):
-                if s == r:
-                    common_bottom.insert(0, s)
-                else:
-                    break
-                    
-            # Get the unique middle sections
-            search_middle = search_remaining[:-len(common_bottom)] if common_bottom else search_remaining
-            replace_middle = replace_remaining[:-len(common_bottom)] if common_bottom else replace_remaining
-            
-
-
-
-            # Format content with highlighting using consistent colors and line numbers
-
-
-            def format_content(lines: List[str], is_search: bool) -> Text:
-                text = Text()
-                
-                COLORS = {
-                    'unchanged': '#98C379',  # Brighter green for unchanged lines
-                    'removed': '#E06C75',    # Clearer red for removed lines
-                    'added': '#61AFEF',      # Bright blue for added lines
-                    'new': '#C678DD',        # Purple for completely new lines
-                    'relocated': '#61AFEF'    # Use same blue for relocated lines
-                }
-                
-                # Create sets of lines for comparison
-                search_set = set(search_lines)
-                replace_set = set(replace_lines)
-                common_lines = search_set & replace_set
-                new_lines = replace_set - search_set
-                relocated_lines = common_lines - set(common_top) - set(common_bottom)
-
-                def add_line(line: str, style: str, prefix: str = " "):
-                    # Special handling for icons
-                    if style == COLORS['relocated']:
-                        prefix = "⇄"
-                    elif style == COLORS['removed'] and prefix == "-":
-                        prefix = "✕"
-                    elif style == COLORS['new'] or (style == COLORS['added'] and prefix == "+"):
-                        prefix = "✚"
-                    text.append(prefix, style=style)
-                    text.append(f" {line}\n", style=style)
-                
-                # Format common top section
-                for line in common_top:
-                    add_line(line, COLORS['unchanged'], "=")
-                
-                # Format changed middle section
-                for line in (search_middle if is_search else replace_middle):
-                    if line in relocated_lines:
-                        add_line(line, COLORS['relocated'], "⇄")
-                    elif not is_search and line in new_lines:
-                        add_line(line, COLORS['new'], "+")
-                    else:
-                        style = COLORS['removed'] if is_search else COLORS['added']
-                        prefix = "✕" if is_search else "+"
-                        add_line(line, style, prefix)
-                
-                # Format common bottom section
-                for line in common_bottom:
-                    add_line(line, COLORS['unchanged'], "=")
-                
-                return text
-            
-
-
-            # Create panels for old and new content without width constraints
-            old_panel = Panel(
-                format_content(search_lines, True),
-                title="Current Content",
-                title_align="left",
-                border_style="#E06C75",
-                box=box.ROUNDED
-            )
-            
-            new_panel = Panel(
-                format_content(replace_lines, False),
-                title="New Content",
-                title_align="left",
-                border_style="#61AFEF",
-                box=box.ROUNDED
-            )
-
-            # Add change panels to main content with auto-fitting columns
-            change_columns = Columns([old_panel, new_panel], equal=True, align="center")
-            change_panel = Panel(
-                change_columns,
-                title=header,
-                title_align="left",
-                border_style="cyan",
-                box=box.ROUNDED
-            )
-            main_content.append(change_panel)
-    
-    # Create and display main file panel
-    file_panel = Panel(
-        Columns(main_content, align="center"),
-        title=f"Modifying {filepath}",
-        title_align="left",
-        border_style="white",
-        box=box.ROUNDED
-    )
-    console.print(file_panel)
-    console.print()
-
-# Remove or comment out the unused unified panel code since we're using direct column display
-
-def preview_all_changes(console: Console, changes: Dict[Path, FileChange]) -> None:
-    """Show preview for all file changes"""
-    console.print("\n[bold blue]Change Preview[/bold blue]")
-    
-    for filepath, change in changes.items():
-        show_change_preview(console, filepath, change)
-
-
-def _display_options(options: Dict[str, AnalysisOption]) -> None:
-    """Display available options in a centered, responsive layout with consistent spacing."""
-    console = Console()
-    
-    # Display centered header with decorative rule
-    console.print()
-    console.print(Rule(" Available Options ", style="bold cyan", align="center"))
-    console.print()
-    
-    # Safety check for empty options
-    if not options:
-        console.print(Panel("[yellow]No options available[/yellow]", border_style="yellow"))
-        return
-    
-    # Calculate optimal layout dimensions based on terminal width
-    terminal_width = console.width or 100
-    panel_padding = (1, 2)  # Consistent padding for all panels
-    available_width = terminal_width - 4  # Account for margins
-    
-    # Determine optimal panel width and number of columns
-    min_panels_per_row = 1
-    max_panels_per_row = 3
-    optimal_panel_width = min(
-        available_width // max_panels_per_row,
-        available_width // min_panels_per_row
-    )
-    
-    if optimal_panel_width < MIN_PANEL_WIDTH:
-        optimal_panel_width = MIN_PANEL_WIDTH
-    
-    # Create panels with consistent styling and spacing
-    panels = []
-    for letter, option in options.items():
-        # Build content with consistent formatting
-        content = Text()
-        
-        # Add description section
-        content.append("Description:\n", style="bold cyan")
-        for item in option.description_items:
-            content.append(f"• {item}\n", style="white")
-        content.append("\n")
-        
-        # Add affected files section if present
-        if option.affected_files:
-            content.append("Affected files:\n", style="bold cyan")
-            for file in option.affected_files:
-                content.append(f"• {file}\n", style="yellow")
-        
-        # Create panel with consistent styling
-        panel = Panel(
-            content,
-            box=box.ROUNDED,
-            border_style="cyan",
-            title=f"Option {letter}: {option.summary}",
-            title_align="center",
-            padding=panel_padding,
-            width=optimal_panel_width
-        )
-        panels.append(panel)
-    
-    # Calculate optimal number of columns based on available width
-    num_columns = max(1, min(
-        len(panels),  # Don't exceed number of panels
-        available_width // optimal_panel_width,  # Width-based limit
-        max_panels_per_row  # Maximum columns limit
-    ))
-    
-    # Create a centered container panel for all options
-    container = Panel(
-        Columns(
-            panels,
-            num_columns=num_columns,
-            equal=True,
-            align="center",
-            padding=(0, 2)  # Consistent spacing between columns
-        ),
-        box=box.SIMPLE,
-        padding=(1, 4),  # Add padding around the columns for better centering
-        width=min(terminal_width - 4, num_columns * optimal_panel_width + (num_columns - 1) * 4)
-    )
-
-    # Display the centered container
-    console.print(Columns([container], align="center"))
-    console.print()

janito/console.py

@@ -1,330 +0,0 @@
-from prompt_toolkit import PromptSession
-from prompt_toolkit.history import FileHistory
-from prompt_toolkit.completion import WordCompleter, PathCompleter
-from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
-from prompt_toolkit.formatted_text import HTML
-from pathlib import Path
-from rich.console import Console
-from janito.claude import ClaudeAPIAgent
-from janito.prompts import SYSTEM_PROMPT
-from janito.analysis import build_request_analysis_prompt
-from janito.scan import collect_files_content
-from janito.__main__ import handle_option_selection
-from rich.panel import Panel
-from rich.align import Align
-from janito.common import progress_send_message
-from rich.table import Table
-from rich.layout import Layout
-from rich.live import Live
-from typing import List, Optional
-import shutil
-
-def create_completer(workdir: Path) -> WordCompleter:
-    """Create command completer with common commands and paths"""
-    commands = [
-        'ask', 'request', 'help', 'exit', 'quit',
-        '--raw', '--verbose', '--debug', '--test'
-    ]
-    return WordCompleter(commands, ignore_case=True)
-
-def format_prompt(workdir: Path) -> HTML:
-    """Format the prompt with current directory"""
-    cwd = workdir.name
-    return HTML(f'<ansigreen>janito</ansigreen> <ansiblue>{cwd}</ansiblue>> ')
-
-def display_help() -> None:
-    """Display available commands, options and their descriptions"""
-    console = Console()
-    
-    layout = Layout()
-    layout.split_column(
-        Layout(name="header"),
-        Layout(name="commands"),
-        Layout(name="options"),
-        Layout(name="examples")
-    )
-    
-    # Header
-    header_table = Table(box=None, show_header=False)
-    header_table.add_row("[bold cyan]Janito Console Help[/bold cyan]")
-    header_table.add_row("[dim]Your AI-powered software development buddy[/dim]")
-    
-    # Commands table
-    commands_table = Table(title="Available Commands", box=None)
-    commands_table.add_column("Command", style="cyan", width=20)
-    commands_table.add_column("Description", style="white")
-    
-
-    commands_table.add_row(
-        "/ask <text> (/a)",
-        "Ask a question about the codebase without making changes"
-    )
-    commands_table.add_row(
-        "<text> or /request <text> (/r)",
-        "Request code modifications or improvements"
-    )
-    commands_table.add_row(
-        "/help (/h)",
-        "Display this help message"
-    )
-    commands_table.add_row(
-        "/quit or /exit (/q)",
-        "Exit the console session"
-    )
-
-    # Options table
-    options_table = Table(title="Common Options", box=None)
-    options_table.add_column("Option", style="cyan", width=20)
-    options_table.add_column("Description", style="white")
-
-    options_table.add_row(
-        "--raw",
-        "Display raw response without formatting"
-    )
-    options_table.add_row(
-        "--verbose",
-        "Show additional information during execution"
-    )
-    options_table.add_row(
-        "--debug",
-        "Display detailed debug information"
-    )
-    options_table.add_row(
-        "--test <cmd>",
-        "Run specified test command before applying changes"
-    )
-    
-    # Examples panel
-    examples = Panel(
-        "\n".join([
-            "[dim]Basic Commands:[/dim]",
-            "  ask how does the error handling work?",
-            "  request add input validation to user functions",
-            "",
-            "[dim]Using Options:[/dim]",
-            "  request update tests --verbose",
-            "  ask explain auth flow --raw",
-            "  request optimize code --test 'pytest'",
-            "",
-            "[dim]Complex Examples:[/dim]",
-            "  request refactor login function --verbose --test 'python -m unittest'",
-            "  ask code structure --raw --debug"
-        ]),
-        title="Examples",
-        border_style="blue"
-    )
-    
-    # Update layout
-    layout["header"].update(header_table)
-    layout["commands"].update(commands_table)
-    layout["options"].update(options_table)
-    layout["examples"].update(examples)
-    
-    console.print(layout)
-
-
-
-def process_command(command: str, args: str, workdir: Path, include: List[Path], claude: ClaudeAPIAgent) -> None:
-    """Process console commands using CLI functions for consistent behavior"""
-    console = Console()
-    
-    # Parse command options
-    raw = False
-    verbose = False
-    debug = False
-    test_cmd = None
-    
-    # Extract options from args
-    words = args.split()
-    filtered_args = []
-    i = 0
-    while i < len(words):
-        if words[i] == '--raw':
-            raw = True
-        elif words[i] == '--verbose':
-            verbose = True
-        elif words[i] == '--debug':
-            debug = True
-        elif words[i] == '--test' and i + 1 < len(words):
-            test_cmd = words[i + 1]
-            i += 1
-        else:
-            filtered_args.append(words[i])
-        i += 1
-    
-    args = ' '.join(filtered_args)
-    
-    # Update config with command options
-    from janito.config import config
-    config.set_debug(debug)
-    config.set_verbose(verbose)
-    config.set_test_cmd(test_cmd)
-    
-    # Remove leading slash if present
-    command = command.lstrip('/')
-    
-    # Handle command aliases
-    command_aliases = {
-        'h': 'help',
-        'a': 'ask',
-        'r': 'request',
-        'q': 'quit',
-        'exit': 'quit'
-    }
-    command = command_aliases.get(command, command)
-    
-    if command == "help":
-        display_help()
-        return
-        
-    if command == "quit":
-        raise EOFError()
-        
-    if command == "ask":
-        if not args:
-            console.print(Panel(
-                "[red]Ask command requires a question[/red]",
-                title="Error",
-                border_style="red"
-            ))
-            return
-            
-        # Use CLI question processing function
-        from janito.__main__ import process_question
-        process_question(args, workdir, include, raw, claude)
-        return
-        
-    if command == "request":
-        if not args:
-            console.print(Panel(
-                "[red]Request command requires a description[/red]",
-                title="Error",
-                border_style="red"
-            ))
-            return
-            
-        paths_to_scan = [workdir] if workdir else []
-        if include:
-            paths_to_scan.extend(include)
-        files_content = collect_files_content(paths_to_scan, workdir)
-
-        # Use CLI request processing functions
-        initial_prompt = build_request_analysis_prompt(files_content, args)
-        initial_response = progress_send_message(claude, initial_prompt)
-        
-        from janito.__main__ import save_to_file
-        save_to_file(initial_response, 'analysis', workdir)
-        
-        from janito.analysis import format_analysis
-        format_analysis(initial_response, raw, claude)
-        handle_option_selection(claude, initial_response, args, raw, workdir, include)
-        return
-        
-    console.print(Panel(
-        f"[red]Unknown command: /{command}[/red]\nType '/help' for available commands",
-        title="Error",
-        border_style="red"
-    ))
-
-def start_console_session(workdir: Path, include: Optional[List[Path]] = None) -> None:
-    """Start an enhanced interactive console session"""
-    console = Console()
-    claude = ClaudeAPIAgent(system_prompt=SYSTEM_PROMPT)
-
-    # Setup history with persistence
-    history_file = workdir / '.janito' / 'console_history'
-    history_file.parent.mkdir(parents=True, exist_ok=True)
-    
-    # Create session with history and completions
-    session = PromptSession(
-        history=FileHistory(str(history_file)),
-        completer=create_completer(workdir),
-        auto_suggest=AutoSuggestFromHistory(),
-        complete_while_typing=True
-    )
-
-    # Get version and terminal info
-    from importlib.metadata import version
-    try:
-        ver = version("janito")
-    except:
-        ver = "dev"
-    
-    term_width = shutil.get_terminal_size().columns
-    
-
-
-    # Create welcome message with consistent colors and enhanced information
-    COLORS = {
-        'primary': '#729FCF',    # Soft blue for primary elements
-        'secondary': '#8AE234',  # Bright green for actions/success
-        'accent': '#AD7FA8',     # Purple for accents
-        'muted': '#7F9F7F',      # Muted green for less important text
-    }
-    
-    welcome_text = (
-        f"[bold {COLORS['primary']}]Welcome to Janito v{ver}[/bold {COLORS['primary']}]\n"
-        f"[{COLORS['muted']}]Your AI-Powered Software Development Buddy[/{COLORS['muted']}]\n\n"
-        f"[{COLORS['accent']}]Keyboard Shortcuts:[/{COLORS['accent']}]\n"
-        "• ↑↓ : Navigate command history\n"
-        "• Tab : Complete commands and paths\n"
-        "• Ctrl+D : Exit console\n"
-        "• Ctrl+C : Cancel current operation\n\n"
-        f"[{COLORS['accent']}]Available Commands:[/{COLORS['accent']}]\n"
-        "• /ask (or /a) : Ask questions about code\n"
-        "• /request (or /r) : Request code changes\n"
-        "• /help (or /h) : Show detailed help\n"
-        "• /quit (or /q) : Exit console\n\n"
-        f"[{COLORS['accent']}]Quick Tips:[/{COLORS['accent']}]\n"
-        "• Start typing and press Tab for suggestions\n"
-        "• Use --test to run tests before changes\n"
-        "• Add --verbose for detailed output\n"
-        "• Type a request directly without /request\n\n"
-        f"[{COLORS['secondary']}]Current Version:[/{COLORS['secondary']}] v{ver}\n"
-        f"[{COLORS['muted']}]Working Directory:[/{COLORS['muted']}] {workdir.absolute()}"
-    )
-    
-    welcome_panel = Panel(
-        welcome_text,
-        width=min(80, term_width - 4),
-        border_style="blue",
-        title="Janito Console",
-        subtitle="Press Tab for completions"
-    )
-    
-    console.print("\n")
-    console.print(welcome_panel)
-    console.print("\n[cyan]How can I help you with your code today?[/cyan]\n")
-
-    while True:
-        try:
-            # Get input with formatted prompt
-            user_input = session.prompt(
-                lambda: format_prompt(workdir),
-                complete_while_typing=True
-            ).strip()
-            
-            if not user_input:
-                continue
-                
-            if user_input.lower() in ('exit', 'quit'):
-                console.print("\n[cyan]Goodbye! Have a great day![/cyan]\n")
-                break
-
-            # Split input into command and args
-            parts = user_input.split(maxsplit=1)
-            if parts[0].startswith('/'):  # Handle /command format
-                command = parts[0][1:]  # Remove the / prefix
-            else:
-                command = "request"  # Default to request if no command specified
-                
-            args = parts[1] if len(parts) > 1 else ""
-            
-            # Process command with separated args
-            process_command(command, args, workdir, include, claude)
-
-        except KeyboardInterrupt:
-            continue
-        except EOFError:
-            console.print("\n[cyan]Goodbye! Have a great day![/cyan]\n")
-            break