feat: change review module interface name for enhance review module's flexibility.

Author: Robbings

review_engine/abstract_handler.py

@@ -7,5 +7,5 @@ class ReviewHandle(object):
     def __init__(self):
         pass
 
-    def merge_handle(self, changes, merge_info, hook_info, reply, model):
+    def merge_handle(self, gitlabMergeRequestFetcher, gitlabRepoManager, hook_info, reply, model):
         pass

review_engine/handler/default_handler.py

@@ -9,14 +9,14 @@
 from utils.logger import log
 
 
-def chat_review(changes, model):
+def chat_review(changes, generate_review, *args, **kwargs):
     log.info('开始code review')
     with concurrent.futures.ThreadPoolExecutor() as executor:
         review_results = []
         result_lock = threading.Lock()
 
         def process_change(change):
-            result = generate_review_note(change, model)
+            result = generate_review(change,  *args, **kwargs)
             with result_lock:
                 review_results.append(result)
 
@@ -68,14 +68,16 @@ def generate_review_note(change, model):
 
 
 class MainReviewHandle(ReviewHandle):
-    def merge_handle(self, changes, merge_info, hook_info, reply, model):
+    def merge_handle(self, gitlabMergeRequestFetcher, gitlabRepoManager, hook_info, reply, model):
+        changes = gitlabMergeRequestFetcher.get_changes()
+        merge_info = gitlabMergeRequestFetcher.get_info()
         self.default_handle(changes, merge_info, hook_info, reply, model)
 
     def default_handle(self, changes, merge_info, hook_info, reply, model):
         maximum_files = 50
         if changes and len(changes) <= maximum_files:
             # Code Review 信息
-            review_info = chat_review(changes, model)
+            review_info = chat_review(changes, generate_review_note, model)
             if review_info:
                 reply.add_reply({
                     'content': review_info,
@@ -136,64 +138,4 @@ def default_handle(self, changes, merge_info, hook_info, reply, model):
             log.error(f"获取merge_request信息失败，project_id: {hook_info['project']['id']} |"
                       f" merge_iid: {hook_info['object_attributes']['iid']}")
 
-if __name__ == '__main__':
-    main_handle = MainReviewHandle()
-    from gitlab_integration.gitlab_fetcher import GitlabMergeRequestFetcher
-    from reply_module.reply import Reply
-    fetcher = GitlabMergeRequestFetcher(9885, 18)
-    changes = fetcher.get_changes()
-    info = fetcher.get_info()
-    reply = Reply({'type': 'merge_request',
-                     'project_id': 9885,
-                     'merge_request_iid': 18})
-    from large_model.llm_generator import LLMGenerator
-    model = LLMGenerator.new_model()
-    hook_info = {
-        "object_kind": "merge_request",
-        "event_type": "merge_request",
-        "user": {
-            "id": 1,
-            "name": "John Doe",
-            "username": "johndoe",
-            "avatar_url": "https://example.com/uploads/user/avatar/1/index.jpg"
-        },
-        "project": {
-            "id": 15,
-            "name": "Example Project",
-            "description": "An example project",
-            "web_url": "https://example.com/example/project",
-            "avatar_url": None,
-            "git_ssh_url": "[email protected]:example/project.git",
-            "git_http_url": "https://example.com/example/project.git",
-            "namespace": "Example",
-            "visibility_level": 20,
-            "path_with_namespace": "example/project",
-            "default_branch": "main",
-            "homepage": "https://example.com/example/project",
-            "url": "https://example.com/example/project.git",
-            "ssh_url": "[email protected]:example/project.git",
-            "http_url": "https://example.com/example/project.git"
-        },
-        "object_attributes": {
-            "id": 99,
-            "iid": 1,
-            "target_branch": "main",
-            "source_branch": "feature-branch",
-            "source_project_id": 15,
-            "target_project_id": 15,
-            "title": "Merge feature-branch into main",
-            "state": "opened",
-            "merge_status": "can_be_merged",
-            "url": "https://example.com/example/project/-/merge_requests/1",
-            "created_at": "2025-02-10T12:34:56Z",
-            "updated_at": "2025-02-10T12:34:56Z"
-        },
-        "changes": {
-            "total_changes": 51,
-            "files": [
-                {"old_path": "file1.txt", "new_path": "file1.txt", "a_mode": "100644", "b_mode": "100644", "diff": "diff content"},
-                # ... 50 more file changes ...
-            ]
-        }
-    }
-    main_handle.merge_handle(changes, info, hook_info, reply, model)
+

review_engine/review_engine.py

@@ -14,13 +14,14 @@ def __init__(self, reply):
         for handle in ReviewHandle.__subclasses__():
             self.handles.append(handle())
 
-    def handle_merge(self, changes, merge_info, webhook_info):
+    def handle_merge(self, gitlabMergeRequestFetcher, gitlabRepoManager, webhook_info):
         # 多线程处理
-        threads = [threading.Thread(target=handle.merge_handle, args=(changes, merge_info, webhook_info,
-                                                                      self.reply, LLMGenerator.new_model()))
-                   for handle in self.handles]
+        threads = [threading.Thread(target=handle.merge_handle,
+                                    args=(gitlabMergeRequestFetcher, gitlabRepoManager, webhook_info, self.reply,
+                                          LLMGenerator.new_model())) for handle in self.handles]
         for thread in threads:
             thread.start()
         for thread in threads:
             thread.join()
+        gitlabRepoManager.delete_repo()
         self.reply.send()

utils/gitlab_parser.py

@@ -6,4 +6,27 @@ def filter_diff_content(diff_content):
     filtered_content = re.sub(r'(^-.*\n)|(^@@.*\n)', '', diff_content, flags=re.MULTILINE)
     # 处理代码，去掉以 + 开头的行的第一个字符
     processed_code = '\n'.join([line[1:] if line.startswith('+') else line for line in filtered_content.split('\n')])
-    return processed_code
+    return processed_code
+
+def filter_diff_new_line(diff_content):
+    # 获取diff中的行号
+    line_numbers = []
+    current_line_num = None
+
+    for line in diff_content.split('\n'):
+        if line.startswith('@@'):
+            # 提取新的行号
+            match = re.match(r'@@ -\d+(,\d+)? \+(\d+)(,\d+)? @@', line)
+            if match:
+                current_line_num = int(match.group(2))
+                line_numbers.append(current_line_num)
+                if match.group(3):
+                    # 去除match.group(3)的,然后转成int
+                    current_line_num += int(match.group(3)[1:]) - 1
+                line_numbers.append(current_line_num)
+
+    return line_numbers
+
+if __name__ == "__main__":
+    diff_content = "@@ -3 +1,5 @@\n-hello\n+hello world\n"
+    print(filter_diff_new_line(diff_content))

utils/tools.py

@@ -1,8 +1,11 @@
 import importlib
 import os
 import pkgutil
+import subprocess
 import sys
 
+from utils.logger import log
+
 
 def import_submodules(package_name):
     # 确保正确的工作目录
@@ -14,9 +17,60 @@ def import_submodules(package_name):
     for _, module_name, _ in pkgutil.iter_modules(package.__path__):
         importlib.import_module(f"{package_name}.{module_name}")
 
+def run_command(command):
+    process = subprocess.Popen(
+        command,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        text=True
+    )
+
+    while True:
+        output = process.stdout.readline()
+        if output == '' and process.poll() is not None:
+            break
+        if output:
+            log.info(output.strip())
+
+    process.wait()
+    out = process.communicate()
+    out_len = len(out)
+    # 获取是否有[1]
+    if out_len > 1:
+        stdout_output = out[1]
+        if stdout_output:
+            log.info(stdout_output.strip())
+    if out_len > 2:
+        stderr_output = out[2]
+        if stderr_output:
+            log.error(stderr_output.strip())
+    return process.returncode
 
 if __name__ == "__main__":
-    from review_engine.review_engine import ReviewEngine
-    from reply_module.reply import Reply
-    re = ReviewEngine(Reply(9885, 18))
-    re.handle_merge("changes", "info")
+    from config.config import *
+    def _build_authenticated_url(repo_url):
+        # 如果 URL 使用 https
+        token = gitlab_private_token
+        if repo_url.startswith("https://"):
+            return f"https://oauth2:{token}@{repo_url[8:]}"
+        # 如果 URL 使用 http
+        elif repo_url.startswith("http://"):
+            return f"http://oauth2:{token}@{repo_url[7:]}"
+        else:
+            raise ValueError("Unsupported URL scheme")
+    authenticated_url = _build_authenticated_url(gitlab_server_url)
+
+    # Build the Git command
+    branch_name = "test3"
+    repo_path = "./repo"
+    command = ["git", "clone", "--depth", "1"]
+    if branch_name:
+        command.extend(["--branch", branch_name])
+        command.extend([authenticated_url, repo_path + "/" + str(branch_name)])
+    else:
+        command.extend([authenticated_url, repo_path + "/default"])
+    # command 打印为字符串
+    print(" ".join(command))
+    # command 添加clone到的位置：
+    if run_command(command) != 0:
+        log.error("Failed to clone the repository")