Merge pull request #44 from Nayjest/0.5

v0.5

Author: Nayjest

.gitignore

@@ -64,4 +64,5 @@ venv.bak/
 .aico/*
 !.aico/project.json
 storage
-code-review-report.*
+code-review-report.*
+*.zip

README.md

@@ -42,7 +42,7 @@ jobs:
       uses: actions/setup-python@v5
       with: { python-version: "3.13" }
     - name: Install AI Code Review tool
-      run: pip install ai-code-review==0.4.7
+      run: pip install ai-code-review==0.5.0
     - name: Run AI code analysis
       env:
         LLM_API_KEY: ${{ secrets.LLM_API_KEY }}

ai_code_review/__main__.py

@@ -0,0 +1,4 @@
+from .cli import main
+
+if __name__ == "__main__":
+    main()

ai_code_review/cli.py

@@ -3,34 +3,79 @@
 import sys
 import os
 import shutil
+import requests
 
 import microcore as mc
 import async_typer
 import typer
-from .core import review
-from .report_struct import Report
+from ai_code_review.utils import parse_refs_pair
 from git import Repo
-import requests
 
+from .core import review
+from .report_struct import Report
 from .constants import ENV_CONFIG_FILE
 from .bootstrap import bootstrap
 from .project_config import ProjectConfig
-
-app = async_typer.AsyncTyper(
-    pretty_exceptions_show_locals=False,
-)
+from .utils import is_app_command_invocation
 
 
+app = async_typer.AsyncTyper(pretty_exceptions_show_locals=False)
+default_command_app = async_typer.AsyncTyper(pretty_exceptions_show_locals=False)
 if sys.platform == "win32":
     asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
 
 
+def main():
+    if is_app_command_invocation(app):
+        app()
+    else:
+        bootstrap()
+        default_command_app()
+
+
 @app.callback(invoke_without_command=True)
-def cli(ctx: typer.Context, filters=typer.Option("", "--filter", "-f", "--filters")):
+def cli(ctx: typer.Context):
     if ctx.invoked_subcommand != "setup":
         bootstrap()
-    if not ctx.invoked_subcommand:
-        asyncio.run(review(filters=filters))
+
+
+@default_command_app.async_command(name="review", help="Perform code review")
+@app.async_command(name="review", help="Perform code review")
+async def cmd_review(
+    refs: str = typer.Argument(
+        default=None,
+        help="Git refs to review, [what]..[against] e.g. 'HEAD..HEAD~1'"
+    ),
+    what: str = typer.Option(None, "--what", "-w", help="Git ref to review"),
+    against: str = typer.Option(
+        None,
+        "--against", "-vs", "--vs",
+        help="Git ref to compare against"
+    ),
+    filters: str = typer.Option(
+        "", "--filter", "-f", "--filters",
+        help="""
+        filter reviewed files by glob / fnmatch pattern(s),
+        e.g. 'src/**/*.py', may be comma-separated
+        """,
+    )
+):
+    _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
+    await review(what=_what, against=_against, filters=filters)
 
 
 @app.async_command(help="Configure LLM for local usage interactively")

ai_code_review/core.py

@@ -11,11 +11,18 @@
 from .report_struct import Report
 
 
-def get_diff(repo: Repo = None, against: str = "HEAD") -> PatchSet | list[PatchedFile]:
+def get_diff(
+    repo: Repo = None,
+    what: str = None,
+    against: str = None
+) -> PatchSet | list[PatchedFile]:
     repo = repo or Repo(".")
-    base = repo.remotes.origin.refs.HEAD.reference.name
-    logging.info(f"{base}...{against}")
-    diff_content = repo.git.diff(base, against)
+    if not against:
+        against = repo.remotes.origin.refs.HEAD.reference.name  # origin/main
+    if not what:
+        what = None  # working copy
+    logging.info(f"Reviewing {mc.ui.green(what or 'working copy')} vs {mc.ui.yellow(against)}")
+    diff_content = repo.git.diff(against, what)
     diff = PatchSet.from_string(diff_content)
     return diff
 
@@ -62,10 +69,14 @@ def make_cr_summary(cfg: ProjectConfig, report: Report, diff):
     ).to_llm() if cfg.summary_prompt else ""
 
 
-async def review(filters: str | list[str] = ""):
+async def review(
+    what: str = None,
+    against: str = None,
+    filters: str | list[str] = ""
+):
     cfg = ProjectConfig.load()
     repo = Repo(".")
-    diff = get_diff(repo=repo, against="HEAD")
+    diff = get_diff(repo=repo, what=what, against=against)
     diff = filter_diff(diff, filters)
     if not diff:
         logging.error("Nothing to review")
@@ -78,7 +89,7 @@ async def review(filters: str | list[str] = ""):
                 cfg.max_code_tokens
                 - mc.tokenizing.num_tokens_from_string(str(file_diff)),
             )
-            if file_diff.target_file != DEV_NULL
+            if file_diff.target_file != DEV_NULL and not file_diff.is_added_file
             else ""
         )
         for file_diff in diff

ai_code_review/utils.py

@@ -1,5 +1,8 @@
+import sys
 import os
 from pathlib import Path
+import typer
+
 
 _EXT_TO_HINT: dict[str, str] = {
     # scripting & languages
@@ -87,3 +90,27 @@ def syntax_hint(file_path: str | Path) -> str:
 
 def is_running_in_github_action():
     return os.getenv("GITHUB_ACTIONS") == "true"
+
+
+def is_app_command_invocation(app: typer.Typer) -> bool:
+    """
+    Checks if the current script is being invoked as a command in a target Typer application.
+    """
+    return (
+        (first_arg := next((a for a in sys.argv[1:] if not a.startswith('-')), None))
+        and first_arg in (
+            cmd.name or cmd.callback.__name__.replace('_', '-')
+            for cmd in app.registered_commands
+        )
+        or '--help' in sys.argv
+    )
+
+
+def parse_refs_pair(refs: str):
+    SEPARATOR = '..'
+    if not refs:
+        return None, None
+    if SEPARATOR not in refs:
+        return refs, None
+    what, against = refs.split(SEPARATOR)
+    return what or None, against or None

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ai-code-review"
-version = "0.4.8"
+version = "0.5.0"
 description = "LLM-agnostic GitHub AI Code Review Tool with integration to GitHub actions"
 authors = ["Nayjest <mail@vitaliy.in>"]
 readme = "README.md"
@@ -21,11 +21,11 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "^3.11"
-ai-microcore = "4.0.0.dev16"
+ai-microcore = "4.0.0.dev18"
 GitPython = "3.1.44"
 unidiff = "0.7.5"
 google-generativeai = "0.8.5"
-anthropic = "0.49.0"
+anthropic = "0.52.2"
 typer = "0.9.4"
 async-typer = "0.1.8"
 
@@ -49,7 +49,7 @@ requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.scripts]
-ai-code-review = "ai_code_review.cli:app"
+ai-code-review = "ai_code_review.cli:main"
 
 [tool.pytest.ini_options]
 minversion = "6.0"