Merge branch 'feature/queue-driver-rq'

# Conflicts:
#	biz/event/event_manager.py
#	biz/queue/worker.py

Author: mashb1t

api.py

@@ -133,7 +133,7 @@ def handle_webhook():
         if not gitlab_token:
             return jsonify({'message': _('Missing GitLab access token')}), 400
 
-        gitlab_domain_slug = slugify_url(gitlab_url)
+        gitlab_url_slug = slugify_url(gitlab_url)
 
         # 打印整个payload数据，或根据需求进行处理
         logger.info(_('Received event: {}').format(object_kind))
@@ -142,14 +142,14 @@ def handle_webhook():
         # 处理Merge Request Hook
         if object_kind == "merge_request":
             # 创建一个新进程进行异步处理
-            handle_queue(handle_merge_request_event, data, gitlab_token, gitlab_url, gitlab_domain_slug)
+            handle_queue(handle_merge_request_event, data, gitlab_token, gitlab_url, gitlab_url_slug)
             # 立马返回响应
             return jsonify({'message': _('Request received(object_kind={}), will process asynchronously.').format(
                 object_kind)}), 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_domain_slug)
+            handle_queue(handle_push_event, data, gitlab_token, gitlab_url, gitlab_url_slug)
             # 立马返回响应
             return jsonify({'message': _('Request received(object_kind={}), will process asynchronously.').format(
                 object_kind)}), 200

biz/gitlab/webhook_handler.py

@@ -34,19 +34,25 @@ def filter_changes(changes: list):
     return filtered_changes
 
 
-def slugify_url(original: str) -> str:
+def slugify_url(original_url: str) -> str:
+    """
+    将原始URL转换为适合作为文件名的字符串，其中非字母或数字的字符会被替换为下划线，举例：
+    slugify_url("http://example.com/path/to/repo/") => example_com_path_to_repo
+    slugify_url("https://gitlab.com/user/repo.git") => gitlab_com_user_repo_git
+    """
     # Remove URL scheme (http, https, etc.) if present
-    original = re.sub(r'^https?://', '', original)
+    original_url = re.sub(r'^https?://', '', original_url)
 
     # Replace non-alphanumeric characters (except underscore) with underscores
-    target = re.sub(r'[^a-zA-Z0-9]', '_', original)
+    target = re.sub(r'[^a-zA-Z0-9]', '_', original_url)
 
     # Remove trailing underscore if present
     target = target.rstrip('_')
 
     return target
 
 
+
 class MergeRequestHandler:
     def __init__(self, webhook_data: dict, gitlab_token: str, gitlab_url: str):
         self.merge_request_iid = None

biz/queue/worker.py

@@ -6,7 +6,7 @@
 
 from biz.entity.review_entity import MergeRequestReviewEntity, PushReviewEntity
 from biz.event.event_manager import event_manager
-from biz.gitlab.webhook_handler import filter_changes, MergeRequestHandler, PushHandler, slugify_url
+from biz.gitlab.webhook_handler import filter_changes, MergeRequestHandler, PushHandler
 from biz.utils.code_reviewer import CodeReviewer
 from biz.utils.im import im_notifier
 from biz.utils.log import logger
@@ -53,7 +53,7 @@ def handle_push_event(webhook_data: dict, gitlab_token: str, gitlab_url: str, gi
             commits=commits,
             score=score,
             review_result=review_result,
-            gitlab_url_slug=gitlab_url_slug
+            gitlab_url_slug=gitlab_url_slug,
         ))
 
     except Exception as e:
@@ -112,7 +112,7 @@ def handle_merge_request_event(webhook_data: dict, gitlab_token: str, gitlab_url
                     score=CodeReviewer.parse_review_score(review_text=review_result),
                     url=webhook_data['object_attributes']['url'],
                     review_result=review_result,
-                    gitlab_url_slug= gitlab_url_slug,
+                    gitlab_url_slug=gitlab_url_slug,
                 )
             )
 

biz/utils/queue.py

@@ -11,12 +11,12 @@
 if queue_driver == 'rq':
     queues = {}
 
-def handle_queue(function: callable, data: any, gitlab_token: str, gitlab_url: str, gitlab_domain_slug: str):
+def handle_queue(function: callable, data: any, gitlab_token: str, gitlab_url: str, gitlab_url_slug: str):
     if queue_driver == 'rq':
-        if gitlab_domain_slug not in queues:
-            queues[gitlab_domain_slug] = Queue(gitlab_domain_slug, connection=Redis(os.getenv('REDIS_HOST', '127.0.0.1'), os.getenv('REDIS_PORT', 6379)))
+        if gitlab_url_slug not in queues:
+            queues[gitlab_url_slug] = Queue(gitlab_url_slug, connection=Redis(os.getenv('REDIS_HOST', '127.0.0.1'), os.getenv('REDIS_PORT', 6379)))
 
-        queues[gitlab_domain_slug].enqueue(function, data, gitlab_token, gitlab_url, gitlab_domain_slug)
+        queues[gitlab_url_slug].enqueue(function, data, gitlab_token, gitlab_url, gitlab_url_slug)
     else:
-        process = Process(target=function, args=(data, gitlab_token, gitlab_url, gitlab_domain_slug))
+        process = Process(target=function, args=(data, gitlab_token, gitlab_url, gitlab_url_slug))
         process.start()