janito 0.7.0__py3-none-any.whl → 0.8.0__py3-none-any.whl

janito/agents/openai.py

@@ -1,57 +0,0 @@
-import openai  # updated import
-import os
-from typing import Optional
-from threading import Event
-from .agent import Agent
-
-class OpenAIAgent(Agent):
-    """[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):
-        super().__init__(api_key, system_prompt)
-        if not system_prompt:
-            raise ValueError("system_prompt is required")
-        self.api_key = api_key or os.getenv('OPENAI_API_KEY')
-        if not self.api_key:
-            raise ValueError("OPENAI_API_KEY environment variable is required")
-        openai.api_key = self.api_key
-        openai.organization = os.getenv("OPENAI_ORG")
-        self.client = openai.Client()  # initialized client
-        self.model = os.getenv('OPENAI_MODEL', "o1-mini-2024-09-12")  # reverted to original default model
-
-    def send_message(self, message: str, stop_event: Event = None) -> str:
-        """Send message to OpenAI API and return response"""
-        self.messages_history.append(("user", message))
-        self.last_full_message = message
-        
-        try:
-            if stop_event and stop_event.is_set():
-                return ""
-            
-            #messages = [{"role": "system", "content": self.system_message}]
-            messages = [{"role": "user", "content": message}]
-            
-            response = self.client.chat.completions.create(
-                model=self.model,
-                messages=messages,
-                max_completion_tokens=4000,
-                temperature=1,
-            )
-            
-            response_text = response.choices[0].message.content
-            
-            if not (stop_event and stop_event.is_set()):
-                self.last_response = response_text
-                self.messages_history.append(("assistant", response_text))
-            
-            return response_text
-            
-        except KeyboardInterrupt:
-            if stop_event:
-                stop_event.set()
-            return ""

janito/agents/test.py

@@ -1,34 +0,0 @@
-import unittest
-import os
-from unittest.mock import patch, MagicMock
-from .openai import OpenAIAgent
-from .claudeai import AIAgent
-
-class TestAIAgents(unittest.TestCase):
-    def setUp(self):
-        self.system_prompt = "You are a helpful assistant."
-        self.test_message = "Hello, how are you?"
-        
-    def test_openai_agent_initialization(self):
-        with patch.dict(os.environ, {'OPENAI_API_KEY': 'test_key'}):
-            agent = OpenAIAgent(system_prompt=self.system_prompt)
-
-    def test_claudeai_agent_initialization(self):
-        with patch.dict(os.environ, {'ANTHROPIC_API_KEY': 'test_key'}):
-            agent = AIAgent(system_prompt=self.system_prompt)
-
-    def test_openai_agent_send_message(self):
-        with patch('openai.OpenAI.chat.completions.create') as mock_create:
-            mock_response = MagicMock()
-            mock_response.choices[0].message.content = "I'm good, thank you!"
-            mock_create.return_value = mock_response
-            response = self.openai_agent.send_message(self.test_message)
-            self.assertEqual(response, "I'm good, thank you!")
-
-    def test_claudeai_agent_send_message(self):
-        with patch('anthropic.Client.messages.create') as mock_create:
-            mock_response = MagicMock()
-            mock_response.content[0].text = "I'm Claude, how can I assist you?"
-            mock_create.return_value = mock_response
-            response = self.claudeai_agent.send_message(self.test_message)
-            self.assertEqual(response, "I'm Claude, how can I assist you?")

janito/change/__init__.py

@@ -1,32 +0,0 @@
-"""
-This package provides the following change flow steps:
-
-- Create a preview directory
-- Build change request prompt
-- Send change request to AI agent
-- Parse the response into changes
-- Save response to history file
-- Preview the changes (applying them to the preview directory)
-- Validate the changes
-- Run tests if specified
-- Show the change view (using janito.changeviewer)
-- Prompt the user to apply the changes to the working directory
-- Apply the changes
-"""
-
-from typing import Tuple
-from pathlib import Path
-from ..agents import agent  # Updated import to use singleton directly
-from .parser import build_change_request_prompt, parse_response
-from .preview import setup_workspace_dir_preview
-from .applier.main import ChangeApplier
-
-__all__ = [
-    'build_change_request_prompt',
-    'get_change_response',
-    'parse_response',
-    'setup_workspace_dir_preview',
-    'parse_change_response',
-    'save_change_response',
-    'ChangeApplier'
-]

janito/change/analysis/__init__.py

@@ -1,23 +0,0 @@
-"""Analysis module for Janito.
-
-This module provides functionality for analyzing and displaying code changes.
-"""
-
-from .options import AnalysisOption, parse_analysis_options
-from .view import format_analysis, prompt_user, get_option_selection
-from .prompts import (
-    build_request_analysis_prompt,
-    validate_option_letter
-)
-from .analyze import analyze_request
-
-__all__ = [
-    'AnalysisOption',
-    'parse_analysis_options',
-    'format_analysis',
-    'build_request_analysis_prompt',
-    'get_option_selection',
-    'prompt_user',
-    'validate_option_letter',
-    'analyze_request'
-]

janito/change/analysis/__main__.py

@@ -1,7 +0,0 @@
-"""Main entry point for the analysis module."""
-
-from .analyze import analyze_request
-from janito.config import config
-from janito.workspace import collect_files_content
-from pathlib import Path
-

janito/change/analysis/analyze.py

@@ -1,62 +0,0 @@
-"""Core analysis functionality."""
-
-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 (
-    build_request_analysis_prompt,
-    get_option_selection,
-    validate_option_letter
-)
-
-def analyze_request(
-    request: str,        
-    pre_select: str = ""
-) -> Optional[AnalysisOption]:
-    """
-    Analyze changes and get user selection.
-    
-    Args:
-        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
-    """
-    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 and handle options
-    options = parse_analysis_options(response)
-    if not options:
-        return None
-
-    if pre_select:
-        return options.get(pre_select.upper())
-
-    if config.tui:
-        from janito.tui import TuiApp
-        app = TuiApp(options=options)
-        app.run()
-        return app.selected_option
-        
-    # Display formatted analysis in terminal mode
-    format_analysis(response, config.raw)
-    
-    # Get user selection
-    while True:
-        selection = get_option_selection()
-        
-        if selection == 'M':
-            return None
-            
-        if validate_option_letter(selection, options):
-            return options[selection.upper()]

janito/change/analysis/formatting.py

@@ -1,78 +0,0 @@
-"""Centralized formatting utilities for analysis display."""
-
-from typing import Dict, List, Text
-from rich.text import Text
-from rich.columns import Columns
-from rich.padding import Padding
-from pathlib import Path
-
-# Layout constants
-COLUMN_SPACING = 6  # Increased spacing between columns
-MIN_PANEL_WIDTH = 45  # Wider minimum width for better readability
-SECTION_PADDING = (2, 0)  # More vertical padding
-
-# Color scheme constants
-STATUS_COLORS = {
-    'new': 'bright_green',
-    'modified': 'yellow',
-    'removed': 'red',
-    'default': 'white'
-}
-
-STRUCTURAL_COLORS = {
-    'directory': 'dim',
-    'separator': 'blue dim',
-    'repeat': 'bright_magenta bold'
-}
-
-def create_header(text: str, style: str = "bold cyan") -> Text:
-    """Create formatted header with separator."""
-    content = Text()
-    content.append(text, style=style)
-    content.append("\n")
-    content.append("═" * len(text), style="cyan")
-    return content
-
-def create_section_header(text: str, width: int = 20) -> Text:
-    """Create centered section header with separator."""
-    content = Text()
-    padding = (width - len(text)) // 2
-    content.append(" " * padding + text, style="bold cyan")
-    content.append("\n")
-    content.append("─" * width, style="cyan")
-    return content
-
-def format_file_path(path: str, status: str, max_dir_length: int = 0, is_repeated: bool = False) -> Text:
-    """Format file path with status indicators and consistent alignment.
-
-    Args:
-        path: File path to format
-        status: File status (Modified, New, Removed)
-        max_dir_length: Maximum directory name length for padding
-        is_repeated: Whether this directory was seen before
-    """
-    content = Text()
-    style = STATUS_COLORS.get(status.lower(), STATUS_COLORS['default'])
-
-    parts = Path(path).parts
-    parent_dir = str(Path(path).parent)
-
-    if parent_dir != '.':
-        # Add 4 spaces for consistent base padding
-        base_padding = 4
-        dir_padding = max_dir_length + base_padding
-
-        if is_repeated:
-            # Add arrow with consistent spacing
-            content.append(" " * base_padding)
-            content.append("↑ ", style="magenta")
-            content.append(" " * (dir_padding - base_padding - 2))
-        else:
-            # Left-align directory name with consistent padding
-            content.append(" " * base_padding)
-            content.append(parent_dir, style="dim")
-            content.append(" " * (dir_padding - len(parent_dir) - base_padding))
-
-    # Add filename with consistent spacing
-    content.append(parts[-1], style=style)
-    return content

janito/change/analysis/options.py

@@ -1,81 +0,0 @@
-from dataclasses import dataclass, field
-from typing import Dict, List
-from pathlib import Path
-
-@dataclass
-class AnalysisOption:
-    """Represents an analysis option with letter identifier and details"""
-    letter: str
-    summary: str
-    description_items: List[str] = field(default_factory=list)
-    affected_files: List[str] = field(default_factory=list)
-
-    def format_option_text(self) -> str:
-        """Format option details as text for change core"""
-        text = f"Option {self.letter} - {self.summary}\n"
-        text += "=" * len(f"Option {self.letter} - {self.summary}") + "\n\n"
-        
-        if self.description_items:
-            text += "Description:\n"
-            for item in self.description_items:
-                text += f"- {item}\n"
-            text += "\n"
-            
-        if self.affected_files:
-            text += "Affected files:\n"
-            for file in self.affected_files:
-                text += f"- {file}\n"
-                
-        return text
-
-    def is_new_directory(self, file_path: str) -> bool:
-        """Check if file path represents the first occurrence of a directory"""
-        parent = str(Path(file_path).parent)
-        return parent != '.' and not any(
-            parent in self.get_clean_path(file)
-            for file in self.affected_files
-            if self.get_clean_path(file) != file_path
-        )
-
-    def get_clean_path(self, file_path: str) -> str:
-        """Remove status markers from file path"""
-        return file_path.split(' (')[0].strip()
-
-def parse_analysis_options(content: str) -> Dict[str, AnalysisOption]:
-    """Parse analysis options from formatted text file"""
-    options = {}
-    current_option = None
-    current_section = None
-    
-    for line in content.splitlines():
-        line = line.strip()
-        
-        # Skip empty lines and section separators
-        if not line or line.startswith('---') or line == 'END_OF_OPTIONS':
-            continue
-            
-        # New option starts with a letter and period
-        if line[0].isalpha() and line[1:3] == '. ':
-            letter, summary = line.split('. ', 1)
-            current_option = AnalysisOption(letter=letter.upper(), summary=summary)
-            options[letter.upper()] = current_option
-            current_section = None
-            continue
-            
-        # Section headers
-        if line.lower() == 'description:':
-            current_section = 'description'
-            continue
-        elif line.lower() == 'affected files:':
-            current_section = 'files'
-            continue
-            
-        # Add items to current section
-        if current_option and line.startswith('- '):
-            content = line[2:].strip()
-            if current_section == 'description':
-                current_option.description_items.append(content)
-            elif current_section == 'files':
-                current_option.affected_files.append(content)
-    
-    return options

janito/change/analysis/prompts.py

@@ -1,90 +0,0 @@
-"""User prompts and input handling for analysis."""
-
-from typing import List, Dict
-from rich.console import Console
-from rich.panel import Panel
-from rich.rule import Rule
-from rich.prompt import Prompt
-from rich import box
-
-
-from .options import AnalysisOption
-
-# Keep only prompt-related functionality
-CHANGE_ANALYSIS_PROMPT = """
-
-
-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.
-
-Use the following format:
-
-A. Keyword summary of the change
------------------
-Description:
-- Concise description of the change
-
-Affected files:
-- path/file1.py (new)
-- path/file2.py (modified)
-- path/file3.py (removed)
-
-END_OF_OPTIONS (mandatory marker)
-
-RULES:
-- do NOT provide the content of the files
-- do NOT offer to implement the changes
-- description items should be 80 chars or less
-
-Request:
-{request}
-"""
-
-def prompt_user(message: str, choices: List[str] = None) -> str:
-    """Display a prominent user prompt with optional choices"""
-    console = Console()
-    term_width = console.width or 80
-    console.print()
-    console.print(Rule(" User Input Required ", style="bold cyan", align="center"))
-    
-    if choices:
-        choice_text = f"[cyan]Options: {', '.join(choices)}[/cyan]"
-        console.print(Panel(choice_text, box=box.ROUNDED, justify="center"))
-    
-    # Center the prompt with padding
-    padding = (term_width - len(message)) // 2
-    padded_message = " " * padding + message
-    return Prompt.ask(f"[bold cyan]{padded_message}[/bold cyan]")
-
-def validate_option_letter(letter: str, options: Dict[str, AnalysisOption]) -> bool:
-    """Validate if the given letter is a valid option or 'M' for modify"""
-    if letter.upper() == 'M':
-        return True
-    return letter.upper() in options
-
-def get_option_selection() -> str:
-    """Get user input for option selection with modify option"""
-    console = Console()
-    term_width = console.width or 80
-    message = "Enter option letter or 'M' to modify request"
-    padding = (term_width - len(message)) // 2
-    padded_message = " " * padding + message
-    
-    console.print(f"\n[cyan]{padded_message}[/cyan]")
-    while True:
-        letter = prompt_user("Select option").strip().upper()
-        if letter == 'M' or (letter.isalpha() and len(letter) == 1):
-            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]")
-
-def build_request_analysis_prompt(request: str) -> str:
-    """Build prompt for information requests"""
-    return CHANGE_ANALYSIS_PROMPT.format(
-        request=request
-    )

janito/change/analysis/view/__init__.py

@@ -1,9 +0,0 @@
-"""View package for analysis UI components."""
-
-from .terminal import format_analysis, prompt_user, get_option_selection
-
-__all__ = [
-    'format_analysis',
-    'prompt_user',
-    'get_option_selection'
-]

janito/change/analysis/view/terminal.py

@@ -1,181 +0,0 @@
-"""Terminal UI components for analysis display."""
-
-from typing import Dict, List, Optional
-from rich.console import Console
-from rich.columns import Columns
-from rich.text import Text
-from rich.panel import Panel
-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
-from ..formatting import (
-    COLUMN_SPACING,
-    MIN_PANEL_WIDTH,
-    SECTION_PADDING,
-    STATUS_COLORS,
-    STRUCTURAL_COLORS,
-    create_header,
-    create_section_header,
-    format_file_path
-)
-
-def prompt_user(message: str, choices: List[str] = None) -> str:
-    """Display a prominent user prompt with optional choices"""
-    console = Console()
-    term_width = console.width or 80
-    console.print()
-    console.print(Rule(" User Input Required ", style="bold cyan", align="center"))
-
-    if choices:
-        choice_text = f"[cyan]Options: {', '.join(choices)}[/cyan]"
-        console.print(Panel(choice_text, box=box.ROUNDED, justify="center"))
-
-    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"""
-    console = Console()
-    term_width = console.width or 80
-    message = "Enter option letter or 'M' to modify request"
-    padding = (term_width - len(message)) // 2
-    padded_message = " " * padding + message
-
-    console.print(f"\n[cyan]{padded_message}[/cyan]")
-    while True:
-        letter = prompt_user("Select option").strip().upper()
-        if letter == 'M' or (letter.isalpha() and len(letter) == 1):
-            return letter
-
-        error_msg = "Please enter a valid letter or 'M'"
-        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."""
-    content = Text()
-    content.append("\n")
-
-    header = create_header(f"Option {option.letter} - {option.summary}")
-    content.append(header)
-    content.append("\n")
-
-    if option.description_items:
-        for item in option.description_items:
-            content.append("• ", style="cyan")
-            content.append(f"{item}\n")
-        content.append("\n")
-
-    # Add consistent padding before file list
-    content.append("\n" * 2)
-
-    if option.affected_files:
-        files = {status: [] for status in ['New', 'Modified', 'Removed']}
-        for file in option.affected_files:
-            if '(new)' in file.lower():
-                files['New'].append(file)
-            elif '(removed)' in file.lower():
-                files['Removed'].append(file)
-            else:
-                files['Modified'].append(file)
-
-        for status, status_files in files.items():
-            if status_files:
-                content.append(create_section_header(f"{status} Files"))
-                content.append("\n")
-                sorted_files = sorted(status_files)
-                prev_path = None
-                seen_dirs = {}
-                for file in sorted_files:
-                    path = option.get_clean_path(file)
-                    current_parts = Path(path).parts
-                    parent_dir = str(Path(path).parent)
-
-                    if parent_dir != '.':
-                        is_repeated = parent_dir in seen_dirs
-                        if not is_repeated:
-                            content.append(parent_dir, style=STRUCTURAL_COLORS['directory'])
-                            content.append("/", style=STRUCTURAL_COLORS['separator'])
-                            seen_dirs[parent_dir] = True
-                        else:
-                            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:
-                        content.append(current_parts[-1], style=STATUS_COLORS[status.lower()])
-                    content.append("\n")
-            content.append("\n")
-
-        content.append("\n")
-
-    return content
-
-def create_columns_layout(options_content: List[Text], term_width: int) -> Columns:
-    """Create a columns layout with consistent spacing."""
-    num_columns = len(options_content)
-    spacing = COLUMN_SPACING * (num_columns - 1)
-    safety_margin = 4 + 2
-
-    usable_width = term_width - spacing - safety_margin
-    column_width = max((usable_width // num_columns), MIN_PANEL_WIDTH)
-
-    # Create padded content items
-    rendered_items: List[Renderables] = [
-        Padding(content, (0, COLUMN_SPACING // 2))
-        for content in options_content
-    ]
-
-    return Columns(
-        rendered_items,
-        equal=True,
-        expand=True,
-        width=column_width,
-        align="left",
-        padding=(0, 0),
-    )
-
-def format_analysis(analysis: str, raw: bool = False) -> None:
-    """Format and display the analysis output."""
-    from ..options import parse_analysis_options
-
-    console = Console()
-    term_width = console.width or 100
-
-    if raw:
-        console.print(analysis)
-        return
-
-    options = parse_analysis_options(analysis)
-    if not options:
-        console.print("\n[yellow]Warning: No valid options found in response.[/yellow]\n")
-        console.print(analysis)
-        return
-
-    columns_content = [_create_option_content(options[letter])
-                      for letter in sorted(options.keys())]
-
-    columns = create_columns_layout(columns_content, term_width)
-
-    console.print("\n")
-    console.print(Text("Analysis Options", style="bold cyan"))
-    console.print(Text("─" * term_width, style="cyan dim"))
-    console.print(columns)
-    console.print(Text("─" * term_width, style="cyan dim"))
-    console.print("\n")

janito/change/applier/__init__.py

@@ -1,5 +0,0 @@
-from .file import FileChangeApplier
-from .text import TextChangeApplier
-from .workspace_dir import apply_changes
-
-__all__ = ['FileChangeApplier', 'TextChangeApplier', 'apply_changes']