Enhance code review functionality in CLI and Coder 🛠️

This commit introduces the ability to specify files for the code review command in the CLI. If no files are specified, the command will consider all staged and unstaged changes. The `git_diff_context` method in the Coder class has also been updated to accommodate this change.

In addition, the test cases have been updated to reflect these changes. This enhancement should provide more flexibility when performing code reviews. 🚀

Author: TechNickAI

aicodebot/cli.py

@@ -352,11 +352,19 @@ def fun_fact(verbose, response_token_size):
 @click.option("-v", "--verbose", count=True)
 @click.option("--output-format", default="text", type=click.Choice(["text", "json"], case_sensitive=False))
 @click.option("-t", "--response-token-size", type=int, default=DEFAULT_MAX_TOKENS * 2)
+@click.argument("files", nargs=-1)
 def review(commit, verbose, output_format, response_token_size, files):
     """Do a code review, with [un]staged changes, or a specified commit."""
     setup_config()
 
-    diff_context = Coder.git_diff_context(commit)
+    # If files are specified, only consider those files
+    # Otherwise, use git to get the list of files
+    if not files:
+        files = Coder.git_staged_files()
+        if not files:
+            files = Coder.git_unstaged_files()
+
+    diff_context = Coder.git_diff_context(commit, files)
     if not diff_context:
         console.print("No changes detected for review. 🤷")
         return
@@ -388,6 +396,7 @@ def review(commit, verbose, output_format, response_token_size, files):
 
     else:
         # Stream live
+        console.print("Examining the diff and generating the review for the following files:\n\t" + "\n\t".join(files))
         with Live(Markdown(""), auto_refresh=True) as live:
             llm.streaming = True
             llm.callbacks = [RichLiveCallbackHandler(live, bot_style)]

aicodebot/coder.py

@@ -118,7 +118,7 @@ def get_token_length(text, model="gpt-3.5-turbo"):
         return token_length
 
     @staticmethod
-    def git_diff_context(commit=None):
+    def git_diff_context(commit=None, files=None):
         """Get a text representation of the git diff for the current commit or staged files, including new files"""
         base_git_diff = ["git", "diff", "-U10"]  # Tell diff to provide 10 lines of context
 
@@ -136,10 +136,11 @@ def git_diff_context(commit=None):
                 logger.debug(f"Getting diff for staged files: {staged_files}")
                 diff_type = "--cached"
             else:
-                logger.debug(f"Getting diff for unstaged files: {staged_files}")
                 diff_type = "HEAD"
 
-            file_status = exec_and_get_output(["git", "diff", diff_type, "--name-status"]).splitlines()
+            file_status = exec_and_get_output(
+                ["git", "diff", diff_type, "--name-status"] + list(files or [])
+            ).splitlines()
 
             diffs = []
             for status in file_status:

tests/test_cli.py

@@ -33,7 +33,7 @@ def test_commit(cli_runner, temp_git_repo):
         repo = Repo(temp_git_repo.working_dir)
         repo.git.add("test2.txt")  # stage the new file
         create_and_write_file("test3.txt", "This is yet another test file.")  # unstaged file
-        result = cli_runner.invoke(cli, ["commit", "-y", "-t", response_token_size, "test2.txt"])
+        result = cli_runner.invoke(cli, ["commit", "-y", "-t", response_token_size])
         assert result.exit_code == 0
         assert "✅ 1 file(s) committed" in result.output
 
@@ -119,19 +119,19 @@ def test_review(cli_runner, temp_git_repo):
         repo.git.add("test.txt")
 
         # Run the review command
-        result = cli_runner.invoke(cli, ["review", "-t", "100"])
+        result = cli_runner.invoke(cli, ["review", "-t", "100", "test.txt"])
 
         # Check that the review command ran successfully
         assert result.exit_code == 0
         assert len(result.output) > 20
 
         # Again with json output
-        result = cli_runner.invoke(cli, ["review", "-t", "100", "--output-format", "json"])
+        result = cli_runner.invoke(cli, ["review", "-t", "100", "--output-format", "json", "test.txt"])
 
         assert result.exit_code == 0
         # Check if it's valid json
         parsed = json.loads(result.output)
-        assert parsed["review_status"] in ["PASSED", "COMMENTS"]
+        assert parsed["review_status"] in ["PASSED"]
 
 
 @pytest.mark.skipif(not os.getenv("OPENAI_API_KEY"), reason="Skipping live tests without an API key.")