fix(reply): handle non-MR requests without error

Author: Robbings

gitlab_integration/webhook_listener.py

@@ -28,12 +28,28 @@ def handle_webhook(self):
         return self.call_handle(gitlab_payload, event_type)
 
     def call_handle(self, gitlab_payload, event_type):
-        reply = Reply(gitlab_payload.get('project')['id'], gitlab_payload.get("object_attributes")["iid"])
         if event_type == 'merge_request':
+            config = {
+                'type': 'merge_request',
+                'project_id': gitlab_payload.get('project')['id'],
+                'merge_request_iid': gitlab_payload.get('object_attributes')['iid']
+            }
+            reply = Reply(config)
             return self.handle_merge_request(gitlab_payload, reply)
         elif event_type == 'push':
+            config = {
+                'type': 'push',
+                'project_id': gitlab_payload.get('project')['id']
+            }
+            reply = Reply(config)
+
             return self.handle_push(gitlab_payload, reply)
         else:
+            config = {
+                'type': 'other',
+                'project_id': gitlab_payload.get('project')['id']
+            }
+            reply = Reply(config)
             return self.handle_other(gitlab_payload, reply)
 
     def handle_merge_request(self, gitlab_payload, reply):

reply_module/reply.py

@@ -4,11 +4,14 @@
 
 
 class Reply:
-    def __init__(self, project_id, merge_request_iid):
+    def __init__(self, config):
+        if not isinstance(config, dict):
+            raise Exception('Reply config should be a dict.')
+        if 'type' not in config:
+            raise Exception('Reply config should contain a type field.')
+        self.config = config
         self.replies = []
         self.lock = threading.Lock()
-        self.project_id = project_id
-        self.merge_request_iid = merge_request_iid
 
     def add_reply(self, reply_msg):
         # reply 格式检查：title, content 必选
@@ -40,7 +43,7 @@ def send(self):
             self.__parse_msg(main_msg, msg_list)
         ret = True
         for target, msg in msg_list.items():
-            reply_target = ReplyFactory.get_reply_instance(target, self.project_id, self.merge_request_iid)
+            reply_target = ReplyFactory.get_reply_instance(target, self.config)
             ret &= reply_target.send(msg)
         return ret
 
@@ -53,7 +56,7 @@ def send_single_message(self, reply):
             targets = ReplyFactory.get_all_targets()
         ret = True
         for target in targets:
-            reply_target = ReplyFactory.get_reply_instance(target, self.project_id, self.merge_request_iid)
+            reply_target = ReplyFactory.get_reply_instance(target, self.config)
             # 如果title不为__IGNORE__ or __MAIN_REVIEW__, 则发送带有标题的消息
             if 'title' not in reply or reply['title'] not in ['__IGNORE__', '__MAIN_REVIEW__']:
                 ret &= reply_target.send(f"## {reply['title']}\n\n{reply['content']}\n\n")
@@ -75,7 +78,9 @@ def __parse_msg(self, msg, msg_list):
 
 
 if __name__ == '__main__':
-    reply = Reply(9885, 18)
+    reply = Reply({'type': 'merge_request',
+                   'project_id': 9885,
+                   'merge_request_iid': 18})
     threads = []
     for i in range(10):
         threads.append(threading.Thread(target=reply.add_reply, args=(

reply_module/reply_target/abstract_reply.py

@@ -2,9 +2,8 @@
 
 class AbstractReply(ABC):
     @abstractmethod
-    def __init__(self, project_id, merge_request_id):
-        self.project_id = project_id
-        self.merge_request_id = merge_request_id
+    def __init__(self, config):
+        self.config = config
 
     @abstractmethod
     def send(self, message):

reply_module/reply_target/dingtalk_reply.py

@@ -11,11 +11,18 @@
 
 
 class DingtalkReply(AbstractReply):
-    def __init__(self, project_id, merge_request_id):
-        super().__init__(project_id, merge_request_id)
+    def __init__(self, config):
+        super().__init__(config)
+        self.type = config['type']
+        if self.type == 'merge_request':
+            self.project_id = config['project_id']
+            self.merge_request_id = config['merge_request_iid']
 
     def send(self, message):
-        return self.send_dingtalk_message_by_sign(message)
+        if self.type == 'merge_request':
+            return self.send_dingtalk_message_by_sign(message)
+        else:
+            return False
 
     def send_dingtalk_message_by_sign(self, message_text):
         """

reply_module/reply_target/gitlab_reply.py

@@ -6,11 +6,21 @@
 
 # 继承AbstractReply类，实现send方法
 class GitlabReply(AbstractReply):
-    def __init__(self, project_id, merge_request_id):
-        super().__init__(project_id, merge_request_id)
+    def __init__(self, config):
+        super().__init__(config)
+        self.type = config['type']
+        if self.type == 'merge_request':
+            self.project_id = config['project_id']
+            self.merge_request_id = config['merge_request_iid']
 
-    @retry(stop_max_attempt_number=3, wait_fixed=2000)
     def send(self, message):
+        if self.type == 'merge_request':
+            return self.send_merge(message)
+        else:
+            return False
+
+    @retry(stop_max_attempt_number=3, wait_fixed=2000)
+    def send_merge(self, message):
         headers = {
             "Private-Token": gitlab_private_token,
             "Content-Type": "application/json"
@@ -30,8 +40,4 @@ def send(self, message):
         else:
             log.error(
                 f"评论信息发送成功：project_id:{project_id}  merge_request_id:{merge_request_id} response:{response}")
-            return False
-
-if __name__ == '__main__':
-    gitlab_reply = GitlabReply(9885, 18)
-    gitlab_reply.send("test")
+            return False

reply_module/reply_target/reply_factory.py

@@ -9,14 +9,14 @@ def register_target(cls, target, target_class):
         cls._registry[target] = target_class
 
     @classmethod
-    def get_reply_instance(cls, target, project_id, merge_request_id):
+    def get_reply_instance(cls, target, config):
         if target not in cls._registry:
             raise ValueError(f"Unknown target: {target}")
-        return cls._registry[target](project_id, merge_request_id)
+        return cls._registry[target](config)
 
     @classmethod
-    def get_all_reply_instance(cls, project_id, merge_request_id):
-        return [target_class(project_id, merge_request_id) for target_class in cls._registry.values()]
+    def get_all_reply_instance(cls, config):
+        return [target_class(config) for target_class in cls._registry.values()]
 
     @classmethod
     def get_all_targets(cls):

review_engine/handler/default_handler.py

@@ -4,7 +4,7 @@
 from retrying import retry
 
 from config.config import api_config, gpt_message
-from load_api import create_llm_api_instance
+from llm_api.load_api import create_llm_api_instance
 from review_engine.handler.abstract_handler import ReviewHandle
 from utils.gitlab_parser import filter_diff_content
 from utils.logger import log
@@ -147,7 +147,9 @@ def default_handle(self, changes, merge_info, hook_info, reply):
     fetcher = GitlabMergeRequestFetcher(9885, 18)
     changes = fetcher.get_changes()
     info = fetcher.get_info()
-    reply = Reply(9885, 18)
+    reply = Reply({'type': 'merge_request',
+                     'project_id': 9885,
+                     'merge_request_iid': 18})
     hook_info = {
         "object_kind": "merge_request",
         "event_type": "merge_request",