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

janito/fileparser.py

@@ -0,0 +1,125 @@
+from pathlib import Path
+from typing import Dict, Tuple, List, Optional
+from dataclasses import dataclass
+import re
+import ast
+import sys  # Add this import
+from rich.console import Console
+from rich.panel import Panel  # Add this import
+from janito.config import config  # Add this import
+
+@dataclass
+class FileChange:
+    """Represents a file change with search/replace, search/delete or create instructions"""
+    description: str
+    is_new_file: bool
+    content: str = ""  # For new files
+    search_blocks: List[Tuple[str, Optional[str], Optional[str]]] = None  # (search, replace, description)
+
+    def add_search_block(self, search: str, replace: Optional[str], description: Optional[str] = None) -> None:
+        """Add a search/replace or search/delete block with optional description"""
+        if self.search_blocks is None:
+            self.search_blocks = []
+        self.search_blocks.append((search, replace, description))
+
+def validate_python_syntax(content: str, filepath: Path) -> Tuple[bool, str]:
+    """Validate Python syntax and return (is_valid, error_message)"""
+    try:
+        ast.parse(content)
+        console = Console()
+        console.print(f"[green]✓ Python syntax validation passed:[/green] {filepath.absolute()}")
+        return True, ""
+    except SyntaxError as e:
+        error_msg = f"Line {e.lineno}: {e.msg}"
+        console = Console()
+        console.print(f"[red]✗ Python syntax validation failed:[/red] {filepath.absolute()}")
+        console.print(f"[red]  {error_msg}[/red]")
+        return False, error_msg
+
+
+def parse_block_changes(response_text: str) -> Dict[Path, FileChange]:
+    """Parse file changes from response blocks"""
+    changes = {}
+    console = Console()
+    # Match file blocks with UUID
+    file_pattern = r'## ([a-f0-9]{8}) file (.*?) (modify|create) "(.*?)" ##\n?(.*?)## \1 file end ##'
+    
+    for match in re.finditer(file_pattern, response_text, re.DOTALL):
+        uuid, filepath, action, description, content = match.groups()
+        path = Path(filepath.strip())
+        
+        if action == 'create':
+            changes[path] = FileChange(
+                description=description,
+                is_new_file=True,
+                content=content[1:] if content.startswith('\n') else content,
+                search_blocks=[]
+            )
+            continue
+            
+        # For modifications, find all search/replace and search/delete blocks
+        search_blocks = []
+        block_patterns = [
+            # Match search/replace blocks with description - updated pattern
+            (r'## ' + re.escape(uuid) + r' search/replace "(.*?)" ##\n?(.*?)## ' + 
+             re.escape(uuid) + r' replace with ##\n?(.*?)(?=## ' + re.escape(uuid) + r'|$)', False),
+            # Match search/delete blocks with description
+            (r'## ' + re.escape(uuid) + r' search/delete "(.*?)" ##\n?(.*?)(?=## ' + re.escape(uuid) + r'|$)', True)
+        ]
+        
+        if config.debug:
+            console.print("\n[blue]Updated regex patterns:[/blue]")
+            for pattern, is_delete in block_patterns:
+                console.print(Panel(pattern, title="Search/Replace Pattern" if not is_delete else "Search/Delete Pattern", border_style="blue"))
+                
+        for pattern, is_delete in block_patterns:
+            if config.debug:
+                console.print(f"\n[blue]Looking for pattern:[/blue]")
+                console.print(Panel(pattern, title="Pattern", border_style="blue"))
+                console.print(f"\n[blue]In content:[/blue]")
+                console.print(Panel(content, title="Content", border_style="blue"))
+                
+            for block_match in re.finditer(pattern, content, re.DOTALL):
+                if is_delete:
+                    description, search = block_match.groups()
+                    search = search.rstrip('\n') + '\n'  # Ensure single trailing newline
+                    replace = None
+                else:
+                    description, search, replace = block_match.groups()
+                    search = search.rstrip('\n') + '\n'  # Ensure single trailing newline
+                    replace = (replace.rstrip('\n') + '\n') if replace else None
+                    
+                    # Abort parsing if replace content is empty
+                    if not is_delete and (replace is None or replace.strip() == ''):
+                        console.print(f"\n[red]Error: Empty replace content found![/red]")
+                        console.print(f"[red]File:[/red] {filepath}")
+                        console.print(f"[red]Description:[/red] {description}")
+                        console.print("[yellow]Search block:[/yellow]")
+                        console.print(Panel(search, title="Search Content", border_style="yellow"))
+                        console.print("[red]Replace block is empty or contains only whitespace![/red]")
+                        console.print("[red]Aborting due to empty replace content.[/red]")
+                        sys.exit(1)
+                    
+                    # Enhanced debug info
+                    if config.debug or (not is_delete and (replace is None or replace.strip() == '')):
+                        console.print(f"\n[yellow]Search/Replace block analysis:[/yellow]")
+                        console.print(f"[yellow]File:[/yellow] {filepath}")
+                        console.print(f"[yellow]Description:[/yellow] {description}")
+                        console.print("[yellow]Search block:[/yellow]")
+                        console.print(Panel(search, title="Search Content", border_style="yellow"))
+                        console.print("[yellow]Replace block:[/yellow]")
+                        console.print(Panel(replace if replace else "<empty>", title="Replace Content", border_style="yellow"))
+                        console.print("\n[blue]Match groups:[/blue]")
+                        for i, group in enumerate(block_match.groups()):
+                            console.print(Panel(str(group), title=f"Group {i}", border_style="blue"))
+                    
+                search_blocks.append((search, replace, description))
+        
+        # Add debug info if no blocks were found
+        if config.debug and not search_blocks:
+            console.print(f"\n[red]No search/replace blocks found for file:[/red] {filepath}")
+            console.print("[red]Check if the content format matches the expected patterns[/red]")
+        
+        changes[path] = FileChange(description=description, is_new_file=False, search_blocks=search_blocks)
+    
+    return changes

janito/prompts.py

@@ -1,25 +1,12 @@
 import re
+import uuid
+from typing import List, Union
+from dataclasses import dataclass
+from .analysis import parse_analysis_options, AnalysisOption
 
 # Core system prompt focused on role and purpose
-SYSTEM_PROMPT = """You are Janito, an AI assistant for software development tasks. Be concise.
-"""
-
+SYSTEM_PROMPT = """I am Janito, your friendly software development buddy. I help you with coding tasks while being clear and concise in my responses."""
 
-CHANGE_ANALISYS_PROMPT = """
-Current files:
-<files>
-{files_content}
-</files>
-
-Considering the current files content, provide a table of options for the requested change.
-Always provide options using a header label "=== **Option 1** : ...", "=== **Option 2**: ...", etc.
-Provide the header with a short description followed by the file changes on the next line
-What files should be modified and what should they contain? (one line description)
-Do not provide the content of any of the file suggested to be created or modified.
-
-Request:
-{request}
-"""
 
 SELECTED_OPTION_PROMPT = """
 Original request: {request}
@@ -32,66 +19,48 @@ Current files:
 {files_content}
 </files>
 
-After checking the above files and the provided implementation, please provide the following:
-
-## <uuid4> filename begin "short description of the change" ##
-<entire file content>
-## <uuid4> filename end ##
-
-ALWAYS provide the entire file content, not just the changes.
-If no changes are needed answer to any worksppace just reply <
+RULES:
+- When revmoing constants, ensure they are not used elsewhere
+- When adding new features to python files, add the necessary imports
+- Python imports should be inserted at the top of the file
+
+Please provide the changes in this format:
+
+## {uuid} file <filepath> modify "short file change description" ##
+## {uuid} search/replace "short change description" ##
+<search_content>
+## {uuid} replace with ##
+<replace_content>
+## {uuid} file end ##
+
+Or to delete content:
+## {uuid} file <filepath> modify ##
+## {uuid} search/delete "short change description" ##
+<content_to_delete>
+## {uuid} file end ##
+
+For new files:
+## {uuid} file <filepath> create "short description" ##
+<full_file_content>
+## {uuid} file end ##
+
+RULES:
+1. search_content MUST preserve the original identation/whitespace 
 """
 
-def build_selected_option_prompt(option_number: int, request: str, initial_response: str, files_content: str = "") -> str:
-    """Build prompt for selected option details"""
-    options = parse_options(initial_response)
-    if option_number not in options:
-        raise ValueError(f"Option {option_number} not found in response")
+def build_selected_option_prompt(option_text: str, request: str, files_content: str = "") -> str:
+    """Build prompt for selected option details
+    
+    Args:
+        option_text: Formatted text describing the selected option
+        request: The original user request
+        files_content: Content of relevant files
+    """
+    short_uuid = str(uuid.uuid4())[:8]
     
     return SELECTED_OPTION_PROMPT.format(
-        option_text=options[option_number],
+        option_text=option_text,
         request=request,
-        files_content=files_content
-    )
-
-def parse_options(response: str) -> dict[int, str]:
-    """Parse options from the response text, including any list items after the option label"""
-    options = {}
-    pattern = r"===\s*\*\*Option (\d+)\*\*\s*:\s*(.+?)(?====\s*\*\*Option|\Z)"
-    matches = re.finditer(pattern, response, re.DOTALL)
-    
-    for match in matches:
-        option_num = int(match.group(1))
-        option_text = match.group(2).strip()
-        
-        # Split into description and list items
-        lines = option_text.splitlines()
-        description = lines[0]
-        list_items = []
-        
-        # Collect list items that follow
-        for line in lines[1:]:
-            line = line.strip()
-            if line.startswith(('- ', '* ', '• ')):
-                list_items.append(line)
-            elif not line:
-                continue
-            else:
-                break
-                
-        # Combine description with list items if any exist
-        if list_items:
-            option_text = description + '\n' + '\n'.join(list_items)
-        
-        options[option_num] = option_text
-        
-    return options
-
-
-def build_request_analisys_prompt(files_content: str, request: str) -> str:
-    """Build prompt for information requests"""
-
-    return CHANGE_ANALISYS_PROMPT.format(
         files_content=files_content,
-        request=request
+        uuid=short_uuid
     )

janito/qa.py

@@ -1,6 +1,13 @@
 from rich.console import Console
 from rich.markdown import Markdown
+from rich.panel import Panel
+from rich.syntax import Syntax
+from rich.table import Table
+from rich.rule import Rule
 from janito.claude import ClaudeAPIAgent
+from janito.common import progress_send_message
+from typing import Dict, List
+import re
 
 QA_PROMPT = """Please provide a clear and concise answer to the following question about the codebase:
 
@@ -12,6 +19,7 @@ Current files:
 </files>
 
 Focus on providing factual information and explanations. Do not suggest code changes.
+Format your response using markdown with appropriate headers and code blocks.
 """
 
 def ask_question(question: str, files_content: str, claude: ClaudeAPIAgent) -> str:
@@ -20,13 +28,36 @@ def ask_question(question: str, files_content: str, claude: ClaudeAPIAgent) -> s
         question=question,
         files_content=files_content
     )
-    return claude.send_message(prompt)
+    return progress_send_message(claude, prompt)
+
 
 def display_answer(answer: str, raw: bool = False) -> None:
-    """Display the answer in markdown or raw format"""
+    """Display the answer as markdown with consistent colors"""
     console = Console()
+    
+    # Define consistent colors
+    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
+    }
+    
     if raw:
         console.print(answer)
-    else:
-        md = Markdown(answer)
-        console.print(md)
+        return
+    
+    # Display markdown answer in a panel with consistent styling
+    answer_panel = Panel(
+        Markdown(answer),
+        title="[bold]Answer[/bold]",
+        title_align="center",
+        border_style=COLORS['primary'],
+        padding=(1, 2)
+    )
+    
+    console.print("\n")
+    console.print(Rule(style=COLORS['accent']))
+    console.print(answer_panel)
+    console.print(Rule(style=COLORS['accent']))
+    console.print("\n")

janito/scan.py

@@ -19,7 +19,7 @@ def _scan_paths(paths: List[Path], workdir: Path = None) -> Tuple[List[str], Lis
     # Load gitignore if it exists
     gitignore_path = workdir / '.gitignore' if workdir else None
     gitignore_spec = None
-    if gitignore_path and gitignore_path.exists():
+    if (gitignore_path and gitignore_path.exists()):
         with open(gitignore_path) as f:
             gitignore = f.read()
         gitignore_spec = PathSpec.from_lines(GitWildMatchPattern, gitignore.splitlines())
@@ -100,21 +100,36 @@ def collect_files_content(paths: List[Path], workdir: Path = None) -> str:
     
     return "\n".join(content_parts)
 
+
 def preview_scan(paths: List[Path], workdir: Path = None) -> None:
     """Preview what files and directories would be scanned"""
     console = Console()
     _, file_items = _scan_paths(paths, workdir)
     
-    # Change message based on whether we're scanning included paths or workdir
-    if len(paths) == 1 and paths[0] == workdir:
-        console.print(f"\n[bold blue]Scanning working directory:[/bold blue] {workdir.absolute()}")
+    # Display working directory status
+    console.print("\n[bold blue]Analysis Paths:[/bold blue]")
+    console.print(f"[cyan]Working Directory:[/cyan] {workdir.absolute()}")
+    
+    # Show if working directory is being scanned
+    is_workdir_scanned = any(p.resolve() == workdir.resolve() for p in paths)
+    if is_workdir_scanned:
+        console.print("[green]✓ Working directory will be scanned[/green]")
     else:
-        console.print(f"\n[bold blue]Working directory:[/bold blue] {workdir.absolute()}")
-        console.print("\n[bold blue]Scanning included paths:[/bold blue]")
+        console.print("[yellow]! Working directory will not be scanned[/yellow]")
+    
+    # Show included paths relative to working directory
+    if len(paths) > (1 if is_workdir_scanned else 0):
+        console.print("\n[cyan]Additional Included Paths:[/cyan]")
         for path in paths:
-            console.print(f"  • {path.absolute()}")
-            
-    console.print("\n[bold blue]Files that would be analyzed:[/bold blue]")
+            if path.resolve() != workdir.resolve():
+                try:
+                    rel_path = path.relative_to(workdir)
+                    console.print(f"  • ./{rel_path}")
+                except ValueError:
+                    # Path is outside working directory
+                    console.print(f"  • {path.absolute()}")
+    
+    console.print("\n[bold blue]Files that will be analyzed:[/bold blue]")
     console.print(Columns(file_items, padding=(0, 4), expand=True))
 
 def is_dir_empty(path: Path) -> bool:

janito/version.py

@@ -0,0 +1,23 @@
+"""Version management module for Janito."""
+from pathlib import Path
+from typing import Optional
+import tomli
+from importlib.metadata import version as pkg_version
+
+def get_version() -> str:
+    """
+    Get Janito version from package metadata or pyproject.toml.
+    
+    Returns:
+        str: The version string
+    """
+    try:
+        return pkg_version("janito")
+    except Exception:
+        # Fallback to pyproject.toml
+        pyproject_path = Path(__file__).parent.parent / "pyproject.toml"
+        if pyproject_path.exists():
+            with open(pyproject_path, "rb") as f:
+                pyproject_data = tomli.load(f)
+                return pyproject_data.get("project", {}).get("version", "unknown")
+        return "unknown"

{janito-0.3.0.dist-info → janito-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: janito
-Version: 0.3.0
+Version: 0.4.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
@@ -18,6 +18,7 @@ Requires-Python: >=3.8
 Requires-Dist: anthropic
 Requires-Dist: pathspec
 Requires-Dist: rich
+Requires-Dist: tomli
 Requires-Dist: typer
 Description-Content-Type: text/markdown
 
@@ -25,7 +26,7 @@ Description-Content-Type: text/markdown
 
 A CLI tool for software development tasks powered by AI.
 
-Janito is an AI-powered assistant that helps automate common software development tasks like refactoring, documentation updates, and code optimization.
+Meet Janito, your friendly AI-powered software development buddy! Janito helps you with coding tasks like refactoring, documentation updates, and code optimization while being clear and concise in its responses.
 
 ## 📥 Installation
 
@@ -59,6 +60,15 @@ export ANTHROPIC_API_KEY='your-api-key-here'
 
 You can also add this to your shell profile (~/.bashrc, ~/.zshrc, etc.) for persistence.
 
+### ⚙️ Test Command Setup
+You can configure a test command to run before applying changes:
+
+```bash
+export JANITO_TEST_CMD='your-test-command'
+```
+
+This command will be executed in the preview directory before applying changes to verify they don't break anything.
+
 ## 📖 Usage
 
 Janito can be used in two modes: Command Line or Interactive Console.
@@ -70,17 +80,26 @@ janito REQUEST [OPTIONS]
 ```
 
 #### Arguments
-- `REQUEST`: The modification request
+- `REQUEST`: The modification request to process (optional)
 
 #### Options
+##### General Options
+- `--version`: Show version and exit
 - `-w, --workdir PATH`: Working directory (defaults to current directory)
-- `--raw`: Print raw response instead of markdown format
+- `-i, --include PATH`: Additional paths to include in analysis (can be used multiple times)
+
+##### Operation Modes
+- `--ask TEXT`: Ask a question about the codebase instead of making changes
+- `--scan`: Preview files that would be analyzed without making changes
 - `--play PATH`: Replay a saved prompt file
-- `-i, --include PATH`: Additional paths to include in analysis
-- `--debug`: Show debug information
+
+##### Output Control
+- `--raw`: Print raw response instead of markdown format
 - `-v, --verbose`: Show verbose output
-- `--ask`: Ask a question about the codebase
-- `--scan`: Preview files that would be analyzed
+- `--debug`: Show debug information
+
+##### Testing
+- `-t, --test COMMAND`: Test command to run before applying changes (overrides JANITO_TEST_CMD)
 
 ### 🖥️ Interactive Console Mode
 
@@ -105,6 +124,12 @@ janito "update tests" -i ./tests -i ./lib
 janito --ask "explain the authentication flow"
 janito --scan  # Preview files to be analyzed
 
+# Test Command Examples
+janito "update code" --test "pytest"  # Run pytest before applying changes
+janito "refactor module" -t "make test"  # Run make test before applying
+export JANITO_TEST_CMD="python -m unittest"  # Set default test command
+janito "optimize function"  # Will use JANITO_TEST_CMD
+
 # Console Mode
 janito  # Starts interactive session
 ```
@@ -120,6 +145,7 @@ janito  # Starts interactive session
 - 🐛 Debug and verbose output modes
 - ❓ Question-answering about codebase
 - 🔍 File scanning preview
+- 🧪 Test command execution before applying changes
 
 ## 📚 History and Debugging
 

janito-0.4.0.dist-info/RECORD

@@ -0,0 +1,21 @@
+janito/__init__.py,sha256=CLeVFqpY9Ki3R3MgLAiTjNsJjsj1BD3_9CzP2kgCj-k,52
+janito/__main__.py,sha256=DqbMlHNWCX-XwiZz1qEYP3qAADKtfmlDhhbTgpXB5_M,14158
+janito/analysis.py,sha256=dAzMARAcDZ1LN6KC2-Xb0bIB0p5VsaT2lhurtPLLIKk,9368
+janito/changeapplier.py,sha256=fDP87Hh3uY8qoSv3-SSnafLCRJHLPQZ5U8GIMkdVZ9Y,17697
+janito/changeviewer.py,sha256=51J0pvGe1rfYpiYo0mhZMonsYJmyAN44mg1TfKRxdM4,12716
+janito/claude.py,sha256=N7ZX6WCrLKcj9na3o2MMPqH8tlobHYtIG1HnhgMVUKw,2272
+janito/common.py,sha256=1blM7rY55-mLPXD4L3xwS-RaJ2tBZx8xHhaLYQku3Rk,801
+janito/config.py,sha256=ocg0lyab9ysgczKaqJTAtv0ZRa2VDMwclTJBgps7Vxw,1171
+janito/console.py,sha256=E2mLPoBw7Gh1K1hPuCoRDBEFE-klIERt5KFgE3fHqUg,11100
+janito/contentchange.py,sha256=2HkNhqA_ZIXDHfiv3xRcwfoxMzFUNMuFfbMtf-4jhRM,3282
+janito/contextparser.py,sha256=iDX6nlqUQr-lj7lkEI4B6jHLci_Kxl-XWOaEiAQtVxA,4531
+janito/fileparser.py,sha256=8nngFmR9s6NVv2YuMcNKO4udNh-ZcKN4_Jo11vKzLhI,6586
+janito/prompts.py,sha256=aUDDx16L2ygPJZwrWn4FmrXt1KGNfLeYRcDSPD9BzIA,1879
+janito/qa.py,sha256=qrAXbsGPCRSW378V88w8e19uU3hfbDnx6lsiRYhq324,1927
+janito/scan.py,sha256=c_IKSuWx1_525RlIgPtP-tFoH7lManVGGNFMxVg1hMk,6014
+janito/version.py,sha256=ylfPwGtdY8dEOFJ-DB9gKUQLggqRCvoLxhpnwjzCM94,739
+janito-0.4.0.dist-info/METADATA,sha256=uUCven38ndkbyLrrLw3B42P7AGyijqTGICKRzLJkDDE,4705
+janito-0.4.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+janito-0.4.0.dist-info/entry_points.txt,sha256=wIo5zZxbmu4fC-ZMrsKD0T0vq7IqkOOLYhrqRGypkx4,48
+janito-0.4.0.dist-info/licenses/LICENSE,sha256=xLIUXRPjtsgQml2zD1Pn4LpgiyZ49raw6jZDlO_gZdo,1062
+janito-0.4.0.dist-info/RECORD,,

janito-0.3.0.dist-info/RECORD

@@ -1,15 +0,0 @@
-janito/__init__.py,sha256=CLeVFqpY9Ki3R3MgLAiTjNsJjsj1BD3_9CzP2kgCj-k,52
-janito/__main__.py,sha256=bGp3nWUZC5omneyE3hn78D_J5PkBfk19qKfMV1kIThI,9892
-janito/changeviewer.py,sha256=C_CRdeD6dE4AIpOM_kryTn_HyD5XC-glaZO8n8zrQPE,2487
-janito/claude.py,sha256=tj0lNNVE0CW0bBkbhVDFgBl0AFoMHicWaHnYuYOk3_E,2911
-janito/config.py,sha256=YsS0bNVkjl7cIboP9nSDy0NXsJaVHYAIpPkc6bbErpo,967
-janito/console.py,sha256=ieKZ7IRbvJO_KW8A3CU4FCoO4YFEjJQT8BN98YotAnM,2770
-janito/contentchange.py,sha256=BxFmW8JtRjzX5lnfGfzo0JPRnGRw1RQEtqZCK1wVArw,6404
-janito/prompts.py,sha256=XonVVbfIg3YY1Dpbkx9m0ZSRE4bgDP3MYHO3D-5FcIE,3080
-janito/qa.py,sha256=F9bd18CBaZDpbJwwvwFL18gXPBA0cq8kRY0nA3_AKPY,916
-janito/scan.py,sha256=5JV0crOepVUqCZ3LAUqCJL2yerLFvjZ6RYdOwIGHvX0,5450
-janito-0.3.0.dist-info/METADATA,sha256=fq7zvCHx_PV8RND5SVfOMnM082BEptZQ2G2qWPOVisQ,3681
-janito-0.3.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-janito-0.3.0.dist-info/entry_points.txt,sha256=wIo5zZxbmu4fC-ZMrsKD0T0vq7IqkOOLYhrqRGypkx4,48
-janito-0.3.0.dist-info/licenses/LICENSE,sha256=xLIUXRPjtsgQml2zD1Pn4LpgiyZ49raw6jZDlO_gZdo,1062
-janito-0.3.0.dist-info/RECORD,,