ai-cr 1.0.0__py3-none-any.whl → 2.0.0__py3-none-any.whl

{ai_code_review → gito}/cli.py

@@ -1,238 +1,217 @@
-import asyncio
-import logging
-import sys
-import os
-import textwrap
-import tempfile
-import requests
-
-import microcore as mc
-import typer
-from git import Repo
-
-from .core import review, get_diff, filter_diff
-from .report_struct import Report
-from .constants import ENV_CONFIG_FILE
-from .bootstrap import bootstrap
-from .project_config import ProjectConfig
-from .utils import no_subcommand, parse_refs_pair
-
-app = typer.Typer(pretty_exceptions_show_locals=False)
-app_no_subcommand = typer.Typer(pretty_exceptions_show_locals=False)
-
-
-def main():
-    if sys.platform == "win32":
-        asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
-    if no_subcommand(app):
-        bootstrap()
-        app_no_subcommand()
-    else:
-        app()
-
-
-@app.callback(invoke_without_command=True)
-def cli(ctx: typer.Context, verbose: bool = typer.Option(default=False)):
-    if verbose:
-        mc.logging.LoggingConfig.STRIP_REQUEST_LINES = None
-    if ctx.invoked_subcommand != "setup":
-        bootstrap()
-
-
-def args_to_target(refs, what, against) -> tuple[str | None, str | None]:
-    _what, _against = parse_refs_pair(refs)
-    if _what:
-        if what:
-            raise typer.BadParameter(
-                "You cannot specify both 'refs' <WHAT>..<AGAINST> and '--what'. Use one of them."
-            )
-    else:
-        _what = what
-    if _against:
-        if against:
-            raise typer.BadParameter(
-                "You cannot specify both 'refs' <WHAT>..<AGAINST> and '--against'. Use one of them."
-            )
-    else:
-        _against = against
-    return _what, _against
-
-
-def arg_refs() -> typer.Argument:
-    return typer.Argument(
-        default=None,
-        help="Git refs to review, [what]..[against] e.g. 'HEAD..HEAD~1'"
-    )
-
-
-def arg_what() -> typer.Option:
-    return typer.Option(None, "--what", "-w", help="Git ref to review")
-
-
-def arg_filters() -> typer.Option:
-    return typer.Option(
-        "", "--filter", "-f", "--filters",
-        help="""
-            filter reviewed files by glob / fnmatch pattern(s),
-            e.g. 'src/**/*.py', may be comma-separated
-            """,
-    )
-
-
-def arg_out() -> typer.Option:
-    return typer.Option(
-        None,
-        "--out", "-o", "--output",
-        help="Output folder for the code review report"
-    )
-
-
-def arg_against() -> typer.Option:
-    return typer.Option(
-        None,
-        "--against", "-vs", "--vs",
-        help="Git ref to compare against"
-    )
-
-
-@app_no_subcommand.command(name="review", help="Perform code review")
-@app.command(name="review", help="Perform code review")
-def cmd_review(
-    refs: str = arg_refs(),
-    what: str = arg_what(),
-    against: str = arg_against(),
-    filters: str = arg_filters(),
-    merge_base: bool = typer.Option(default=True, help="Use merge base for comparison"),
-    out: str = arg_out()
-):
-    _what, _against = args_to_target(refs, what, against)
-    asyncio.run(review(
-        what=_what,
-        against=_against,
-        filters=filters,
-        use_merge_base=merge_base,
-        out_folder=out,
-    ))
-
-
-@app.command(help="Configure LLM for local usage interactively")
-def setup():
-    mc.interactive_setup(ENV_CONFIG_FILE)
-
-
-@app.command()
-def render(format: str = Report.Format.MARKDOWN):
-    print(Report.load().render(format=format))
-
-
-@app.command(help="Review remote code")
-def remote(
-    url: str = typer.Argument(..., help="Git repository URL"),
-    refs: str = arg_refs(),
-    what: str = arg_what(),
-    against: str = arg_against(),
-    filters: str = arg_filters(),
-    merge_base: bool = typer.Option(default=True, help="Use merge base for comparison"),
-    out: str = arg_out()
-):
-    _what, _against = args_to_target(refs, what, against)
-    with tempfile.TemporaryDirectory() as temp_dir:
-        logging.info(f"Cloning [{mc.ui.green(url)}] to {mc.utils.file_link(temp_dir)} ...")
-        repo = Repo.clone_from(url, branch=_what, to_path=temp_dir)
-        asyncio.run(review(
-            repo=repo,
-            what=_what,
-            against=_against,
-            filters=filters,
-            use_merge_base=merge_base,
-            out_folder=out or '.',
-        ))
-        repo.close()
-
-
-@app.command(help="Leave a GitHub PR comment with the review.")
-def github_comment(
-    token: str = typer.Option(
-        os.environ.get("GITHUB_TOKEN", ""), help="GitHub token (or set GITHUB_TOKEN env var)"
-    ),
-):
-    """
-    Leaves a comment with the review on the current GitHub pull request.
-    """
-    file = "code-review-report.md"
-    if not os.path.exists(file):
-        print(f"Review file not found: {file}")
-        raise typer.Exit(4)
-
-    with open(file, "r", encoding="utf-8") as f:
-        body = f.read()
-
-    if not token:
-        print("GitHub token is required (--token or GITHUB_TOKEN env var).")
-        raise typer.Exit(1)
-
-    github_env = ProjectConfig.load().prompt_vars["github_env"]
-    repo = github_env.get("github_repo", "")
-    pr_env_val = github_env.get("github_pr_number", "")
-    logging.info(f"github_pr_number = {pr_env_val}")
-
-    # e.g. could be "refs/pull/123/merge" or a direct number
-    if "/" in pr_env_val and "pull" in pr_env_val:
-        # refs/pull/123/merge
-        try:
-            pr_num_candidate = pr_env_val.strip("/").split("/")
-            idx = pr_num_candidate.index("pull")
-            pr = int(pr_num_candidate[idx + 1])
-        except Exception:
-            pr = 0
-    else:
-        try:
-            pr = int(pr_env_val)
-        except Exception:
-            pr = 0
-
-    api_url = f"https://api.github.com/repos/{repo}/issues/{pr}/comments"
-    headers = {
-        "Authorization": f"token {token}",
-        "Accept": "application/vnd.github+json",
-    }
-    data = {"body": body}
-
-    resp = requests.post(api_url, headers=headers, json=data)
-    if 200 <= resp.status_code < 300:
-        logging.info(f"Posted review comment to PR #{pr} in {repo}")
-    else:
-        logging.error(f"Failed to post comment: {resp.status_code} {resp.reason}\n{resp.text}")
-        raise typer.Exit(5)
-
-
-@app.command(help="List files in the diff. Might be useful to check what will be reviewed.")
-def files(
-    refs: str = arg_refs(),
-    what: str = arg_what(),
-    against: str = arg_against(),
-    filters: str = arg_filters(),
-    merge_base: bool = typer.Option(default=True, help="Use merge base for comparison"),
-    diff: bool = typer.Option(default=False, help="Show diff content")
-):
-    _what, _against = args_to_target(refs, what, against)
-    repo = Repo(".")
-    patch_set = get_diff(repo=repo, what=_what, against=_against, use_merge_base=merge_base)
-    patch_set = filter_diff(patch_set, filters)
-    print(
-        f"Changed files: "
-        f"{mc.ui.green(_what or 'INDEX')} vs "
-        f"{mc.ui.yellow(_against or repo.remotes.origin.refs.HEAD.reference.name)}"
-        f"{' filtered by '+mc.ui.cyan(filters) if filters else ''}"
-    )
-
-    for patch in patch_set:
-        if patch.is_added_file:
-            color = mc.ui.green
-        elif patch.is_removed_file:
-            color = mc.ui.red
-        else:
-            color = mc.ui.blue
-        print(f"- {color(patch.path)}")
-        if diff:
-            print(mc.ui.gray(textwrap.indent(str(patch), "  ")))
+import asyncio
+import logging
+import sys
+import textwrap
+import tempfile
+
+import microcore as mc
+import typer
+from git import Repo
+
+from .core import review, get_diff, filter_diff, answer
+from .report_struct import Report
+from .constants import HOME_ENV_PATH
+from .bootstrap import bootstrap, app
+from .utils import no_subcommand, parse_refs_pair
+
+# Import fix command to register it
+from .commands import fix, gh_post_review_comment, gh_react_to_comment, repl  # noqa
+
+
+app_no_subcommand = typer.Typer(pretty_exceptions_show_locals=False)
+
+
+def main():
+    if sys.platform == "win32":
+        asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
+    # Help subcommand alias: if 'help' appears as first non-option arg, replace it with '--help'
+    if len(sys.argv) > 1 and sys.argv[1] == "help":
+        sys.argv = [sys.argv[0]] + sys.argv[2:] + ["--help"]
+
+    if no_subcommand(app):
+        bootstrap()
+        app_no_subcommand()
+    else:
+        app()
+
+
+@app.callback(invoke_without_command=True)
+def cli(ctx: typer.Context, verbose: bool = typer.Option(default=False)):
+    if ctx.invoked_subcommand != "setup":
+        bootstrap()
+    if verbose:
+        mc.logging.LoggingConfig.STRIP_REQUEST_LINES = None
+
+
+def args_to_target(refs, what, against) -> tuple[str | None, str | None]:
+    _what, _against = parse_refs_pair(refs)
+    if _what:
+        if what:
+            raise typer.BadParameter(
+                "You cannot specify both 'refs' <WHAT>..<AGAINST> and '--what'. Use one of them."
+            )
+    else:
+        _what = what
+    if _against:
+        if against:
+            raise typer.BadParameter(
+                "You cannot specify both 'refs' <WHAT>..<AGAINST> and '--against'. Use one of them."
+            )
+    else:
+        _against = against
+    return _what, _against
+
+
+def arg_refs() -> typer.Argument:
+    return typer.Argument(
+        default=None,
+        help="Git refs to review, [what]..[against] e.g. 'HEAD..HEAD~1'"
+    )
+
+
+def arg_what() -> typer.Option:
+    return typer.Option(None, "--what", "-w", help="Git ref to review")
+
+
+def arg_filters() -> typer.Option:
+    return typer.Option(
+        "", "--filter", "-f", "--filters",
+        help="""
+            filter reviewed files by glob / fnmatch pattern(s),
+            e.g. 'src/**/*.py', may be comma-separated
+            """,
+    )
+
+
+def arg_out() -> typer.Option:
+    return typer.Option(
+        None,
+        "--out", "-o", "--output",
+        help="Output folder for the code review report"
+    )
+
+
+def arg_against() -> typer.Option:
+    return typer.Option(
+        None,
+        "--against", "-vs", "--vs",
+        help="Git ref to compare against"
+    )
+
+
+@app_no_subcommand.command(name="review", help="Perform code review")
+@app.command(name="review", help="Perform code review")
+@app.command(name="run", hidden=True)
+def cmd_review(
+    refs: str = arg_refs(),
+    what: str = arg_what(),
+    against: str = arg_against(),
+    filters: str = arg_filters(),
+    merge_base: bool = typer.Option(default=True, help="Use merge base for comparison"),
+    out: str = arg_out()
+):
+    _what, _against = args_to_target(refs, what, against)
+    asyncio.run(review(
+        what=_what,
+        against=_against,
+        filters=filters,
+        use_merge_base=merge_base,
+        out_folder=out,
+    ))
+
+
+@app.command(name="ask", help="Answer questions about codebase changes")
+@app.command(name="answer", hidden=True)
+@app.command(name="talk", hidden=True)
+def cmd_answer(
+    question: str = typer.Argument(help="Question to ask about the codebase changes"),
+    refs: str = arg_refs(),
+    what: str = arg_what(),
+    against: str = arg_against(),
+    filters: str = arg_filters(),
+    merge_base: bool = typer.Option(default=True, help="Use merge base for comparison"),
+):
+    _what, _against = args_to_target(refs, what, against)
+    return answer(
+        question=question,
+        what=_what,
+        against=_against,
+        filters=filters,
+        use_merge_base=merge_base,
+    )
+
+
+@app.command(help="Configure LLM for local usage interactively")
+def setup():
+    mc.interactive_setup(HOME_ENV_PATH)
+
+
+@app.command(name="render")
+@app.command(name="report", hidden=True)
+def render(
+    format: str = typer.Argument(default=Report.Format.CLI),
+    source: str = typer.Option(
+        "",
+        "--src",
+        "--source",
+        help="Source file (json) to load the report from"
+    )
+):
+    Report.load(file_name=source).to_cli(report_format=format)
+
+
+@app.command(help="Review remote code")
+def remote(
+    url: str = typer.Argument(..., help="Git repository URL"),
+    refs: str = arg_refs(),
+    what: str = arg_what(),
+    against: str = arg_against(),
+    filters: str = arg_filters(),
+    merge_base: bool = typer.Option(default=True, help="Use merge base for comparison"),
+    out: str = arg_out()
+):
+    _what, _against = args_to_target(refs, what, against)
+    with tempfile.TemporaryDirectory() as temp_dir:
+        logging.info(f"Cloning [{mc.ui.green(url)}] to {mc.utils.file_link(temp_dir)} ...")
+        repo = Repo.clone_from(url, branch=_what, to_path=temp_dir)
+        asyncio.run(review(
+            repo=repo,
+            what=_what,
+            against=_against,
+            filters=filters,
+            use_merge_base=merge_base,
+            out_folder=out or '.',
+        ))
+        repo.close()
+
+
+@app.command(help="List files in the diff. Might be useful to check what will be reviewed.")
+def files(
+    refs: str = arg_refs(),
+    what: str = arg_what(),
+    against: str = arg_against(),
+    filters: str = arg_filters(),
+    merge_base: bool = typer.Option(default=True, help="Use merge base for comparison"),
+    diff: bool = typer.Option(default=False, help="Show diff content")
+):
+    _what, _against = args_to_target(refs, what, against)
+    repo = Repo(".")
+    patch_set = get_diff(repo=repo, what=_what, against=_against, use_merge_base=merge_base)
+    patch_set = filter_diff(patch_set, filters)
+    print(
+        f"Changed files: "
+        f"{mc.ui.green(_what or 'INDEX')} vs "
+        f"{mc.ui.yellow(_against or repo.remotes.origin.refs.HEAD.reference.name)}"
+        f"{' filtered by '+mc.ui.cyan(filters) if filters else ''}"
+    )
+    repo.close()
+    for patch in patch_set:
+        if patch.is_added_file:
+            color = mc.ui.green
+        elif patch.is_removed_file:
+            color = mc.ui.red
+        else:
+            color = mc.ui.blue
+        print(f"- {color(patch.path)}")
+        if diff:
+            print(mc.ui.gray(textwrap.indent(str(patch), "  ")))

gito/commands/__init__.py

@@ -0,0 +1 @@
+# Command modules register themselves with the CLI app

gito/commands/fix.py

@@ -0,0 +1,157 @@
+"""
+Fix issues from code review report
+"""
+import json
+import logging
+from pathlib import Path
+from typing import Optional
+
+import git
+import typer
+from microcore import ui
+
+from ..bootstrap import app
+from ..constants import JSON_REPORT_FILE_NAME
+from ..report_struct import Report, Issue
+
+
+@app.command(help="Fix an issue from the code review report")
+def fix(
+    issue_number: int = typer.Argument(..., help="Issue number to fix"),
+    report_path: Optional[str] = typer.Option(
+        None,
+        "--report",
+        "-r",
+        help="Path to the code review report (default: code-review-report.json)"
+    ),
+    dry_run: bool = typer.Option(
+        False, "--dry-run", "-d", help="Only print changes without applying them"
+    ),
+    commit: bool = typer.Option(default=False, help="Commit changes after applying them"),
+    push: bool = typer.Option(default=False, help="Push changes to the remote repository"),
+) -> list[str]:
+    """
+    Applies the proposed change for the specified issue number from the code review report.
+    """
+    # Load the report
+    report_path = report_path or JSON_REPORT_FILE_NAME
+    try:
+        report = Report.load(report_path)
+    except (FileNotFoundError, json.JSONDecodeError) as e:
+        logging.error(f"Failed to load report from {report_path}: {e}")
+        raise typer.Exit(code=1)
+
+    # Find the issue by number
+    issue: Optional[Issue] = None
+    for file_issues in report.issues.values():
+        for i in file_issues:
+            if i.id == issue_number:
+                issue = i
+                break
+        if issue:
+            break
+
+    if not issue:
+        logging.error(f"Issue #{issue_number} not found in the report")
+        raise typer.Exit(code=1)
+
+    if not issue.affected_lines:
+        logging.error(f"Issue #{issue_number} has no affected lines specified")
+        raise typer.Exit(code=1)
+
+    if not any(affected_line.proposal for affected_line in issue.affected_lines):
+        logging.error(f"Issue #{issue_number} has no proposal for fixing")
+        raise typer.Exit(code=1)
+
+    # Apply the fix
+    logging.info(f"Fixing issue #{issue_number}: {ui.cyan(issue.title)}")
+
+    for affected_line in issue.affected_lines:
+        if not affected_line.proposal:
+            continue
+
+        file_path = Path(issue.file)
+        if not file_path.exists():
+            logging.error(f"File {file_path} not found")
+            continue
+
+        try:
+            with open(file_path, "r", encoding="utf-8") as f:
+                lines = f.readlines()
+        except Exception as e:
+            logging.error(f"Failed to read file {file_path}: {e}")
+            continue
+
+        # Check if line numbers are valid
+        if affected_line.start_line < 1 or affected_line.end_line > len(lines):
+            logging.error(
+                f"Invalid line range: {affected_line.start_line}-{affected_line.end_line} "
+                f"(file has {len(lines)} lines)"
+            )
+            continue
+
+        # Get the affected line content for display
+        affected_content = "".join(lines[affected_line.start_line - 1:affected_line.end_line])
+        print(f"\nFile: {ui.blue(issue.file)}")
+        print(f"Lines: {affected_line.start_line}-{affected_line.end_line}")
+        print(f"Current content:\n{ui.red(affected_content)}")
+        print(f"Proposed change:\n{ui.green(affected_line.proposal)}")
+
+        if dry_run:
+            print(f"{ui.yellow('Dry run')}: Changes not applied")
+            continue
+
+        # Apply the change
+        proposal_lines = affected_line.proposal.splitlines(keepends=True)
+        if not proposal_lines:
+            proposal_lines = [""]
+        elif not proposal_lines[-1].endswith(("\n", "\r")):
+            # Ensure the last line has a newline if the original does
+            if (
+                affected_line.end_line < len(lines)
+                and lines[affected_line.end_line - 1].endswith(("\n", "\r"))
+            ):
+                proposal_lines[-1] += "\n"
+
+        lines[affected_line.start_line - 1:affected_line.end_line] = proposal_lines
+
+        # Write changes back to the file
+        try:
+            with open(file_path, "w", encoding="utf-8") as f:
+                f.writelines(lines)
+            print(f"{ui.green('Success')}: Changes applied to {file_path}")
+        except Exception as e:
+            logging.error(f"Failed to write changes to {file_path}: {e}")
+            raise typer.Exit(code=1)
+
+    print(f"\n{ui.green('✓')} Issue #{issue_number} fixed successfully")
+
+    changed_files = [file_path.as_posix()]
+    if commit:
+        commit_changes(
+            changed_files,
+            commit_message=f"[AI] Fix issue {issue_number}:{issue.title}",
+            push=push
+        )
+    return changed_files
+
+
+def commit_changes(
+    files: list[str],
+    repo: git.Repo = None,
+    commit_message: str = "fix by AI",
+    push: bool = True
+) -> None:
+    if opened_repo := not repo:
+        repo = git.Repo(".")
+    for i in files:
+        repo.index.add(i)
+    repo.index.commit(commit_message)
+    if push:
+        origin = repo.remotes.origin
+        origin.push()
+        logging.info(f"Changes pushed to {origin.name}")
+    else:
+        logging.info("Changes committed but not pushed to remote")
+    if opened_repo:
+        repo.close()