Merge pull request #74 from GGHansome/main

让AI CodeReview支持GitHub的Push和Pull Request事件

Author: sunmh207

api.py

@@ -11,7 +11,7 @@
 from flask import Flask, request, jsonify
 
 from biz.gitlab.webhook_handler import slugify_url
-from biz.queue.worker import handle_merge_request_event, handle_push_event
+from biz.queue.worker import handle_merge_request_event, handle_push_event, handle_github_pull_request_event, handle_github_push_event
 from biz.service.review_service import ReviewService
 from biz.utils.im import notifier
 from biz.utils.log import logger
@@ -108,56 +108,92 @@ def handle_webhook():
         if not data:
             return jsonify({"error": "Invalid JSON"}), 400
 
-        object_kind = data.get("object_kind")
-
-        # 优先从请求头获取，如果没有，则从环境变量获取，如果没有，则从推送事件中获取
-        gitlab_url = os.getenv('GITLAB_URL') or request.headers.get('X-Gitlab-Instance')
-        if not gitlab_url:
-            repository = data.get('repository')
-            if not repository:
-                return jsonify({'message': 'Missing GitLab URL'}), 400
-            homepage = repository.get("homepage")
-            if not homepage:
-                return jsonify({'message': 'Missing GitLab URL'}), 400
-            try:
-                parsed_url = urlparse(homepage)
-                gitlab_url = f"{parsed_url.scheme}://{parsed_url.netloc}/"
-            except Exception as e:
-                return jsonify({"error": f"Failed to parse homepage URL: {str(e)}"}), 400
-
-        # 优先从环境变量获取，如果没有，则从请求头获取
-        gitlab_token = os.getenv('GITLAB_ACCESS_TOKEN') or request.headers.get('X-Gitlab-Token')
-        # 如果gitlab_token为空，返回错误
-        if not gitlab_token:
-            return jsonify({'message': 'Missing GitLab access token'}), 400
-
-        gitlab_url_slug = slugify_url(gitlab_url)
-
-        # 打印整个payload数据，或根据需求进行处理
-        logger.info(f'Received event: {object_kind}')
-        logger.info(f'Payload: {json.dumps(data)}')
-
-        # 处理Merge Request Hook
-        if object_kind == "merge_request":
-            # 创建一个新进程进行异步处理
-            handle_queue(handle_merge_request_event, data, gitlab_token, gitlab_url, gitlab_url_slug)
-            # 立马返回响应
-            return jsonify(
-                {'message': f'Request received(object_kind={object_kind}), will process asynchronously.'}), 200
-        elif object_kind == "push":
-            # 创建一个新进程进行异步处理
-            # TODO check if PUSH_REVIEW_ENABLED is needed here
-            handle_queue(handle_push_event, data, gitlab_token, gitlab_url, gitlab_url_slug)
-            # 立马返回响应
-            return jsonify(
-                {'message': f'Request received(object_kind={object_kind}), will process asynchronously.'}), 200
-        else:
-            error_message = f'Only merge_request and push events are supported (both Webhook and System Hook), but received: {object_kind}.'
-            logger.error(error_message)
-            return jsonify(error_message), 400
+        # 判断是GitLab还是GitHub的webhook
+        webhook_source = request.headers.get('X-GitHub-Event')
+        
+        if webhook_source:  # GitHub webhook
+            return handle_github_webhook(webhook_source, data)
+        else:  # GitLab webhook
+            return handle_gitlab_webhook(data)
     else:
         return jsonify({'message': 'Invalid data format'}), 400
 
+def handle_github_webhook(event_type, data):
+    # 获取GitHub配置
+    github_token = os.getenv('GITHUB_ACCESS_TOKEN') or request.headers.get('X-GitHub-Token')
+    if not github_token:
+        return jsonify({'message': 'Missing GitHub access token'}), 400
+        
+    github_url = os.getenv('GITHUB_URL') or 'https://github.com'
+    github_url_slug = slugify_url(github_url)
+    
+    # 打印整个payload数据
+    logger.info(f'Received GitHub event: {event_type}')
+    logger.info(f'Payload: {json.dumps(data)}')
+    
+    if event_type == "pull_request":
+        # 使用handle_queue进行异步处理
+        handle_queue(handle_github_pull_request_event, data, github_token, github_url, github_url_slug)
+        # 立马返回响应
+        return jsonify({'message': f'GitHub request received(event_type={event_type}), will process asynchronously.'}), 200
+    elif event_type == "push":
+        # 使用handle_queue进行异步处理
+        handle_queue(handle_github_push_event, data, github_token, github_url, github_url_slug)
+        # 立马返回响应
+        return jsonify({'message': f'GitHub request received(event_type={event_type}), will process asynchronously.'}), 200
+    else:
+        error_message = f'Only pull_request and push events are supported for GitHub webhook, but received: {event_type}.'
+        logger.error(error_message)
+        return jsonify(error_message), 400
+
+def handle_gitlab_webhook(data):
+    object_kind = data.get("object_kind")
+
+    # 优先从请求头获取，如果没有，则从环境变量获取，如果没有，则从推送事件中获取
+    gitlab_url = os.getenv('GITLAB_URL') or request.headers.get('X-Gitlab-Instance')
+    if not gitlab_url:
+        repository = data.get('repository')
+        if not repository:
+            return jsonify({'message': 'Missing GitLab URL'}), 400
+        homepage = repository.get("homepage")
+        if not homepage:
+            return jsonify({'message': 'Missing GitLab URL'}), 400
+        try:
+            parsed_url = urlparse(homepage)
+            gitlab_url = f"{parsed_url.scheme}://{parsed_url.netloc}/"
+        except Exception as e:
+            return jsonify({"error": f"Failed to parse homepage URL: {str(e)}"}), 400
+
+    # 优先从环境变量获取，如果没有，则从请求头获取
+    gitlab_token = os.getenv('GITLAB_ACCESS_TOKEN') or request.headers.get('X-Gitlab-Token')
+    # 如果gitlab_token为空，返回错误
+    if not gitlab_token:
+        return jsonify({'message': 'Missing GitLab access token'}), 400
+
+    gitlab_url_slug = slugify_url(gitlab_url)
+
+    # 打印整个payload数据，或根据需求进行处理
+    logger.info(f'Received event: {object_kind}')
+    logger.info(f'Payload: {json.dumps(data)}')
+
+    # 处理Merge Request Hook
+    if object_kind == "merge_request":
+        # 创建一个新进程进行异步处理
+        handle_queue(handle_merge_request_event, data, gitlab_token, gitlab_url, gitlab_url_slug)
+        # 立马返回响应
+        return jsonify(
+            {'message': f'Request received(object_kind={object_kind}), will process asynchronously.'}), 200
+    elif object_kind == "push":
+        # 创建一个新进程进行异步处理
+        # TODO check if PUSH_REVIEW_ENABLED is needed here
+        handle_queue(handle_push_event, data, gitlab_token, gitlab_url, gitlab_url_slug)
+        # 立马返回响应
+        return jsonify(
+            {'message': f'Request received(object_kind={object_kind}), will process asynchronously.'}), 200
+    else:
+        error_message = f'Only merge_request and push events are supported (both Webhook and System Hook), but received: {object_kind}.'
+        logger.error(error_message)
+        return jsonify(error_message), 400
 
 if __name__ == '__main__':
     # 启动定时任务调度器

biz/entity/review_entity.py

@@ -1,6 +1,6 @@
 class MergeRequestReviewEntity:
     def __init__(self, project_name: str, author: str, source_branch: str, target_branch: str, updated_at: int,
-                 commits: list, score: float, url: str, review_result: str, gitlab_url_slug: str):
+                 commits: list, score: float, url: str, review_result: str, url_slug: str):
         self.project_name = project_name
         self.author = author
         self.source_branch = source_branch
@@ -10,7 +10,7 @@ def __init__(self, project_name: str, author: str, source_branch: str, target_br
         self.score = score
         self.url = url
         self.review_result = review_result
-        self.gitlab_url_slug = gitlab_url_slug
+        self.url_slug = url_slug
 
     @property
     def commit_messages(self):
@@ -20,15 +20,15 @@ def commit_messages(self):
 
 class PushReviewEntity:
     def __init__(self, project_name: str, author: str, branch: str, updated_at: int, commits: list, score: float,
-                 review_result: str, gitlab_url_slug: str):
+                 review_result: str, url_slug: str):
         self.project_name = project_name
         self.author = author
         self.branch = branch
         self.updated_at = updated_at
         self.commits = commits
         self.score = score
         self.review_result = review_result
-        self.gitlab_url_slug = gitlab_url_slug
+        self.url_slug = url_slug
 
     @property
     def commit_messages(self):

biz/event/event_manager.py

@@ -33,7 +33,7 @@ def on_merge_request_reviewed(mr_review_entity: MergeRequestReviewEntity):
     """
     notifier.send_notification(content=im_msg, msg_type='markdown', title='Merge Request Review',
                                   project_name=mr_review_entity.project_name,
-                                  gitlab_url_slug=mr_review_entity.gitlab_url_slug)
+                                  url_slug=mr_review_entity.url_slug)
 
     # 记录到数据库
     ReviewService().insert_mr_review_log(mr_review_entity)
@@ -60,7 +60,7 @@ def on_push_reviewed(entity: PushReviewEntity):
         im_msg += f"#### AI Review 结果: \n {entity.review_result}\n\n"
     notifier.send_notification(content=im_msg, msg_type='markdown',
                                   title=f"{entity.project_name} Push Event", project_name=entity.project_name,
-                                  gitlab_url_slug=entity.gitlab_url_slug)
+                                  url_slug=entity.url_slug)
 
     # 记录到数据库
     ReviewService().insert_push_review_log(entity)

biz/github/__init__.py

@@ -0,0 +1 @@
+ 

biz/github/test_webhook_handler.py

@@ -0,0 +1,49 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# @Time    : 2025/3/18 17:58
+# @Author  : Arrow
+import os
+from unittest import TestCase, main
+
+from biz.github.webhook_handler import PushHandler
+
+
+# @Describe:
+class TestPushHandler(TestCase):
+    def setUp(self):
+        """设置测试环境"""
+        self.sample_webhook_data = {
+            'repository': {
+                'full_name': 'owner/repo'
+            },
+            'ref': 'refs/heads/main',
+            'commits': [
+                {
+                    'id': 'sample_commit_id',
+                    'message': 'Sample commit message',
+                    'author': {
+                        'name': 'Test Author'
+                    },
+                    'timestamp': '2023-01-01T12:00:00Z',
+                    'url': 'https://github.com/owner/repo/commit/sample_commit_id'
+                }
+            ]
+        }
+        self.github_token = ''
+        self.github_url = 'https://github.com'
+
+        # 创建PushHandler实例
+        self.handler = PushHandler(self.sample_webhook_data, self.github_token, self.github_url)
+
+    def test_get_parent_commit_id(self):
+        """测试获取父提交ID"""
+        commit_id = 'sample_commit_id'
+        # 调用测试方法
+        parent_id = self.handler.get_parent_commit_id(commit_id)
+
+        # 由于我们没有真正的GitHub令牌，此测试将失败，但确保方法存在
+        self.assertIsInstance(parent_id, str)
+
+
+if __name__ == '__main__':
+    main()