ai-cr 3.2.1__py3-none-any.whl → 3.3.0__py3-none-any.whl

gito/commands/fix.py

@@ -1,160 +1,160 @@
-"""
-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 ..cli_base 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 "
-         "(latest code review results will be used by default)"
-)
-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()
+"""
+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 ..cli_base 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 "
+         "(latest code review results will be used by default)"
+)
+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()

gito/commands/gh_post_review_comment.py

@@ -1,111 +1,111 @@
-import logging
-import os
-from time import sleep
-
-import typer
-from ghapi.core import GhApi
-
-from ..cli_base import app
-from ..constants import GITHUB_MD_REPORT_FILE_NAME, HTML_CR_COMMENT_MARKER
-from ..gh_api import (
-    post_gh_comment,
-    resolve_gh_token,
-    hide_gh_comment,
-)
-from ..project_config import ProjectConfig
-
-
-@app.command(name="github-comment", help="Leave a GitHub PR comment with the review.")
-def post_github_cr_comment(
-    md_report_file: str = typer.Option(default=None),
-    pr: int = typer.Option(default=None),
-    gh_repo: str = typer.Option(default=None, help="owner/repo"),
-    token: str = typer.Option(
-        "", help="GitHub token (or set GITHUB_TOKEN env var)"
-    ),
-):
-    """
-    Leaves a comment with the review on the current GitHub pull request.
-    """
-    file = md_report_file or GITHUB_MD_REPORT_FILE_NAME
-    if not os.path.exists(file):
-        logging.error(f"Review file not found: {file}, comment will not be posted.")
-        raise typer.Exit(4)
-
-    with open(file, "r", encoding="utf-8") as f:
-        body = f.read()
-
-    token = resolve_gh_token(token)
-    if not token:
-        print("GitHub token is required (--token or GITHUB_TOKEN env var).")
-        raise typer.Exit(1)
-    config = ProjectConfig.load()
-    gh_env = config.prompt_vars["github_env"]
-    gh_repo = gh_repo or gh_env.get("github_repo", "")
-    pr_env_val = gh_env.get("github_pr_number", "")
-    logging.info(f"github_pr_number = {pr_env_val}")
-
-    if not pr:
-        # 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:
-                pass
-        else:
-            try:
-                pr = int(pr_env_val)
-            except ValueError:
-                pass
-    if not pr:
-        if pr_str := os.getenv("PR_NUMBER_FROM_WORKFLOW_DISPATCH"):
-            try:
-                pr = int(pr_str)
-            except ValueError:
-                pass
-    if not pr:
-        logging.error("Could not resolve PR number from environment variables.")
-        raise typer.Exit(3)
-
-    if not post_gh_comment(gh_repo, pr, token, body):
-        raise typer.Exit(5)
-
-    if config.collapse_previous_code_review_comments:
-        sleep(1)
-        collapse_gh_outdated_cr_comments(gh_repo, pr, token)
-
-
-def collapse_gh_outdated_cr_comments(
-    gh_repository: str,
-    pr_or_issue_number: int,
-    token: str = None
-):
-    """
-    Collapse outdated code review comments in a GitHub pull request or issue.
-    """
-    logging.info(f"Collapsing outdated comments in {gh_repository} #{pr_or_issue_number}...")
-
-    token = resolve_gh_token(token)
-    owner, repo = gh_repository.split('/')
-    api = GhApi(owner, repo, token=token)
-
-    comments = api.issues.list_comments(pr_or_issue_number)
-    review_marker = HTML_CR_COMMENT_MARKER
-    collapsed_title = "🗑️ Outdated Code Review by Gito"
-    collapsed_marker = f"<summary>{collapsed_title}</summary>"
-    outdated_comments = [
-        c for c in comments
-        if c.body and review_marker in c.body and collapsed_marker not in c.body
-    ][:-1]
-    if not outdated_comments:
-        logging.info("No outdated comments found")
-        return
-    for comment in outdated_comments:
-        logging.info(f"Collapsing comment {comment.id}...")
-        new_body = f"<details>\n<summary>{collapsed_title}</summary>\n\n{comment.body}\n</details>"
-        api.issues.update_comment(comment.id, new_body)
-        hide_gh_comment(comment.node_id, token)
-    logging.info("All outdated comments collapsed successfully.")
+import logging
+import os
+from time import sleep
+
+import typer
+from ghapi.core import GhApi
+
+from ..cli_base import app
+from ..constants import GITHUB_MD_REPORT_FILE_NAME, HTML_CR_COMMENT_MARKER
+from ..gh_api import (
+    post_gh_comment,
+    resolve_gh_token,
+    hide_gh_comment,
+)
+from ..project_config import ProjectConfig
+
+
+@app.command(name="github-comment", help="Leave a GitHub PR comment with the review.")
+def post_github_cr_comment(
+    md_report_file: str = typer.Option(default=None),
+    pr: int = typer.Option(default=None),
+    gh_repo: str = typer.Option(default=None, help="owner/repo"),
+    token: str = typer.Option(
+        "", help="GitHub token (or set GITHUB_TOKEN env var)"
+    ),
+):
+    """
+    Leaves a comment with the review on the current GitHub pull request.
+    """
+    file = md_report_file or GITHUB_MD_REPORT_FILE_NAME
+    if not os.path.exists(file):
+        logging.error(f"Review file not found: {file}, comment will not be posted.")
+        raise typer.Exit(4)
+
+    with open(file, "r", encoding="utf-8") as f:
+        body = f.read()
+
+    token = resolve_gh_token(token)
+    if not token:
+        print("GitHub token is required (--token or GITHUB_TOKEN env var).")
+        raise typer.Exit(1)
+    config = ProjectConfig.load()
+    gh_env = config.prompt_vars["github_env"]
+    gh_repo = gh_repo or gh_env.get("github_repo", "")
+    pr_env_val = gh_env.get("github_pr_number", "")
+    logging.info(f"github_pr_number = {pr_env_val}")
+
+    if not pr:
+        # 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:
+                pass
+        else:
+            try:
+                pr = int(pr_env_val)
+            except ValueError:
+                pass
+    if not pr:
+        if pr_str := os.getenv("PR_NUMBER_FROM_WORKFLOW_DISPATCH"):
+            try:
+                pr = int(pr_str)
+            except ValueError:
+                pass
+    if not pr:
+        logging.error("Could not resolve PR number from environment variables.")
+        raise typer.Exit(3)
+
+    if not post_gh_comment(gh_repo, pr, token, body):
+        raise typer.Exit(5)
+
+    if config.collapse_previous_code_review_comments:
+        sleep(1)
+        collapse_gh_outdated_cr_comments(gh_repo, pr, token)
+
+
+def collapse_gh_outdated_cr_comments(
+    gh_repository: str,
+    pr_or_issue_number: int,
+    token: str = None
+):
+    """
+    Collapse outdated code review comments in a GitHub pull request or issue.
+    """
+    logging.info(f"Collapsing outdated comments in {gh_repository} #{pr_or_issue_number}...")
+
+    token = resolve_gh_token(token)
+    owner, repo = gh_repository.split('/')
+    api = GhApi(owner, repo, token=token)
+
+    comments = api.issues.list_comments(pr_or_issue_number)
+    review_marker = HTML_CR_COMMENT_MARKER
+    collapsed_title = "🗑️ Outdated Code Review by Gito"
+    collapsed_marker = f"<summary>{collapsed_title}</summary>"
+    outdated_comments = [
+        c for c in comments
+        if c.body and review_marker in c.body and collapsed_marker not in c.body
+    ][:-1]
+    if not outdated_comments:
+        logging.info("No outdated comments found")
+        return
+    for comment in outdated_comments:
+        logging.info(f"Collapsing comment {comment.id}...")
+        new_body = f"<details>\n<summary>{collapsed_title}</summary>\n\n{comment.body}\n</details>"
+        api.issues.update_comment(comment.id, new_body)
+        hide_gh_comment(comment.node_id, token)
+    logging.info("All outdated comments collapsed successfully.")