refactor github functionality, avoid env reliance for local use

src/pearbot.py

@@ -1,123 +1,16 @@
 import argparse
 import json
 import re
-import subprocess
 import sys
-import traceback
 
 from colorama import Fore, Style
-
-from flask import Flask, request, abort
 from dotenv import load_dotenv
-from github import Github, GithubException
 
 load_dotenv()
 
-try:
-    from auth import verify_webhook_signature, get_installation_access_token
-    from storage import get_or_create_session
-    from agents import Agent
-except EnvironmentError as e:
-    print(f"Error: {e}")
-    print("Please ensure all required environment variables are set in your .env file.")
-    sys.exit(1)
-
-app = Flask(__name__)
-code_review_agent = Agent(role="code_reviewer", use_post_request=True)
-feedback_improver_agent = Agent(role="feedback_improver", use_post_request=True)
-
-@app.route('/webhook', methods=['POST'])
-def webhook():
-    print("Webhook received")
-
-    if not verify_webhook_signature(request):
-        print("Webhook signature verification failed")
-        abort(401)
-
-    event = request.headers.get("X-GitHub-Event")
-    payload = request.json
-
-    print(f"Received event: {event}")
-
-    if event == "issue_comment":
-        handle_issue_comment(payload)
-    else:
-        print(f"Event {event} is not supported")
-
-    return 'Webhook received', 200
-
-def handle_issue_comment(payload):
-    action = payload["action"]
-    comment = payload["comment"]
-    issue = payload["issue"]
-    repo = payload["repository"]
-
-    print(f"\n\nReceived comment:\n   action: {action},\n   comment body: {comment['body']}")
-
-    if "pull_request" in issue and action == "created" and "@pearbot review" in comment["body"].lower():
-        print(f"\nReview requested with `@pearbot review` for Pull Request #{issue['number']}")
-        perform_review(issue["number"], repo["full_name"], payload["installation"]["id"])
-    else:
-        print(f"Review condition not found")
-
-def perform_review(pr_number, repo_full_name, installation_id):
-    access_token = get_installation_access_token(installation_id)
-    g = Github(access_token)
-    repo_obj = g.get_repo(repo_full_name)
-    pull_request = repo_obj.get_pull(pr_number)
-
-    changes = file_changes_as_string(pull_request.get_files())
-    pr_data = {
-        "title": pull_request.title,
-        "description": pull_request.body,
-        "changes": changes,
-        "context": ""
-    }
-
-    initial_reviews = []
-
-    for model in app.config['INITIAL_REVIEW_MODELS']:
-        print(Fore.GREEN + f"\n\n >>> Requesting initial review with {model}...")
-        print(Style.RESET_ALL)
-        _, initial_review = code_review_agent.analyze(pr_data, model)
-        initial_reviews.append(initial_review)
-
-    improvement_data = {
-        "pr_data": pr_data,
-        "initial_reviews": initial_reviews
-    }
-    print(Fore.GREEN + f"\n\n >>> Requesting improved review (with {app.config['FINAL_REVIEW_MODEL']})...\n\n")
-    print(Style.RESET_ALL)
-    improver_prompt, improved_feedback = feedback_improver_agent.analyze(improvement_data, app.config['FINAL_REVIEW_MODEL'])
-
-    try:
-        print(f"\n\nPosting improved feedback:\n{improved_feedback}\n\n")
-        # pull_request.create_issue_comment(f"Code Review Feedback:\n\n{improved_feedback}")
-    except GithubException as e:
-        print(f"GitHub API error: {e.status} - {e.data}")
-    except Exception as e:
-        print(f"Error posting review: {e}")
-        print(f"Full exception: {traceback.format_exc()}")
-
-    session = get_or_create_session(pr_number, repo_full_name)
-    session.add_message("assistant", json.dumps({
-        "initial_reviews": initial_reviews,
-        "improved_feedback": improved_feedback
-    }))
-
-def file_changes_as_string(files):
-    file_changes = []
-    for file in files:
-        file_changes.append(f"""
-    Filename: {file.filename}
-    Status: {file.status}
-    Additions: {file.additions}
-    Deletions: {file.deletions}
-    Changes: {file.changes}
-    Patch:
-{file.patch}
-""")
-    return "\n---\n".join(file_changes)
+from storage import get_or_create_session
+from agents import Agent
+from review_github import GitHubReviewer
 
 def extract_commit_info(diff_content):
     commit_range = None
@@ -141,7 +34,7 @@ def extract_commit_info(diff_content):
 
     return commit_messages
 
-def analyze_diff(diff_content):
+def analyze_diff(diff_content, initial_review_models, final_review_model):
     extracted_messages = extract_commit_info(diff_content)
 
     if not extracted_messages:
@@ -158,8 +51,11 @@ def analyze_diff(diff_content):
 
     print(json.dumps(pr_data, indent=4))
 
+    code_review_agent = Agent(role="code_reviewer", use_post_request=True)
+    feedback_improver_agent = Agent(role="feedback_improver", use_post_request=True)
+
     initial_reviews = []
-    for model in app.config['INITIAL_REVIEW_MODELS']:
+    for model in initial_review_models:
         print(Fore.GREEN + f"\n\n >>> Requesting initial review with {model}...")
         print(Style.RESET_ALL)
         _, initial_review = code_review_agent.analyze(pr_data, model)
@@ -170,9 +66,9 @@ def analyze_diff(diff_content):
         "initial_reviews": initial_reviews
     }
 
-    print(Fore.GREEN + f"\n\n >>> Requesting improved review (with {app.config['FINAL_REVIEW_MODEL']})...\n\n")
+    print(Fore.GREEN + f"\n\n >>> Requesting improved review (with {final_review_model})...\n\n")
     print(Style.RESET_ALL)
-    _, improved_feedback = feedback_improver_agent.analyze(improvement_data, app.config['FINAL_REVIEW_MODEL'])
+    _, improved_feedback = feedback_improver_agent.analyze(improvement_data, final_review_model)
 
     print(f"\n\nImproved feedback:\n{improved_feedback}\n\n")
 
@@ -181,16 +77,21 @@ def main():
     parser.add_argument("--server", action="store_true", help="Run as a server")
     parser.add_argument("--diff", type=str, nargs='?', const='-', help="Path to the diff file or '-' for stdin")
     parser.add_argument("--model", type=str, default="llama3.1", help="Model for the final review step")
-    parser.add_argument("--initial-review-models", type=str, default="llama3.1,codellama,codestral", help="Comma-separated list of model names for the initial review (default: llama3.1,codellama,codestral)")
+    parser.add_argument("--initial-review-models", type=str, default="llama3.1,llama3.1,llama3.1", help="Comma-separated list of model names for the initial review (default: llama3.1,llama3.1,llama3.1)")
 
     args = parser.parse_args()
 
-    app.config['INITIAL_REVIEW_MODELS'] = args.initial_review_models.split(',')
-    app.config['FINAL_REVIEW_MODEL'] = args.model
+    initial_review_models = args.initial_review_models.split(',')
+    final_review_model = args.model
 
     if args.server:
         print("Running as a server...")
-        app.run(host="localhost", port=3000)
+        code_review_agent = Agent(role="code_reviewer", use_post_request=True)
+        feedback_improver_agent = Agent(role="feedback_improver", use_post_request=True)
+        github_reviewer = GitHubReviewer(code_review_agent, feedback_improver_agent)
+        github_reviewer.app.config['INITIAL_REVIEW_MODELS'] = initial_review_models
+        github_reviewer.app.config['FINAL_REVIEW_MODEL'] = final_review_model
+        github_reviewer.run_server()
     elif args.diff or not sys.stdin.isatty():
         if args.diff == '-' or not sys.stdin.isatty():
             print("Reading diff from stdin...")
@@ -203,9 +104,9 @@ def main():
             parser.print_help()
             return
 
-        analyze_diff(diff_content)
+        analyze_diff(diff_content, initial_review_models, final_review_model)
     else:
         parser.print_help()
 
 if __name__ == "__main__":
-    main()
+    main()