refactor: update project configuration and enhance reply module functionality

Author: Robbings

config/config.py

@@ -1,22 +1,33 @@
-# GPT 相关配置
-# model list
-model_quester_anster = "text-davinci-003"
-model_gpt_35_turbo = "gpt-3.5-turbo"
-model_gpt_4o = "gpt-4o"
-model_programming_translate = "code-davinci-002"
-
 # api 接口封装类
 llm_api_impl = "large_model.api.default_api.DefaultApi"
 
-# api 配置方式参考 docs/llm_api.md
+# DeepSeek配置示例
+# api 配置方式参考 docs/config.md
 # 默认使用认UnionLLM，参考：https://github.com/EvalsOne/UnionLLM/tree/main/docs
 # UnionLLM兼容LiteLLM，参考LiteLLM文档：https://docs.litellm.ai/docs
 api_config = {
-    "api_key": "your openai key",
-    "api_base": "https://api.openai.com/v1",
-    "model": model_gpt_4o,
-    "provider": "openai",
+    "api_key": "your deepseek key",
+    "model": 'deepseek-chat',
+    "provider": "deepseek",
 }
+# # GPT API 配置示例
+# # model list
+# model_gpt_35_turbo = "gpt-3.5-turbo"
+# model_gpt_4o = "gpt-4o"
+#
+# api_config = {
+#     "api_key": "your openai key",
+#     "api_base": "https://api.openai.com/v1",
+#     "model": model_gpt_4o,
+#     "provider": "openai",
+# }
+
+# ollama 配置示例
+# api_config = {
+#     "api_base": "http://localhost:11434",
+#     "model": "llama3.2",
+#     "provider": "ollama",
+# }
 
 # 2. 提示词
 gpt_message = """
@@ -39,7 +50,7 @@
 #### 💻修改后的代码：
 ```python
 {变量4}
-
+```
          """
 
 # -------------Gitlab info------------------

reply_module/reply.py

@@ -5,6 +5,11 @@
 
 class Reply:
     def __init__(self, config):
+        """
+        初始化 Reply 实例
+        Args:
+            config (dict): 配置字典，包含初始化所需的配置信息
+        """
         if not isinstance(config, dict):
             raise Exception('Reply config should be a dict.')
         if 'type' not in config:
@@ -14,68 +19,98 @@ def __init__(self, config):
         self.lock = threading.Lock()
 
     def add_reply(self, reply_msg):
-        # reply 格式检查：title, content 必选
+        """
+        添加回复消息
+        Args:
+            reply_msg (dict): 回复消息字典，必须包含 'content' 字段
+        """
         if 'content' not in reply_msg:
             raise Exception('Reply format error, title and content are required.')
-        if 'priority' in reply_msg:
-            if not isinstance(reply_msg['priority'], int):
-                raise Exception('Reply format error, priority should be an integer.')
-            elif reply_msg['priority'] == 0:
+        if 'msg_type' in reply_msg:
+            if not isinstance(reply_msg['msg_type'], str):
+                raise Exception('Reply format error, msg_type should be a string.')
+            reply_msg['msg_type'] = [t.strip() for t in reply_msg['msg_type'].split(',')]
+            if 'SINGLE' in reply_msg['msg_type']:
                 self.send_single_message(reply_msg)
                 return
-
+        else:
+            reply_msg['msg_type'] = ['NORMAL']
+        if 'target' not in reply_msg:
+            reply_msg['target'] = 'all'
+        if 'title' not in reply_msg:
+            reply_msg['title'] = ''
+        if 'group_id' not in reply_msg:
+            reply_msg['group_id'] = 0
         with self.lock:  # 加锁
             self.replies.append(reply_msg)
 
     def send(self):
-        msg_list = {}
-        main_msg = None
+        """
+        实时发送单条消息
+        Args:
+            reply (dict): 单条回复消息字典，必须包含 'content' 字段
+        Returns:
+            bool: 表示发送是否成功
+        """
+        msg_groups = {}
+        main_msg_group = []
         with self.lock:  # 加锁
             # 发送所有消息的逻辑
             for msg in self.replies:
-                if msg['title'] == '__MAIN_REVIEW__':
-                    main_msg = msg
+                if 'MAIN' in msg['msg_type']:
+                    # msg 加入到 main_msg 中
+                    main_msg_group.append(msg)
                     continue
-                self.__parse_msg(msg, msg_list)
+                self.__parse_msg(msg, msg_groups)
 
             self.replies = []  # 清空已发送的消息
-        if main_msg:
-            self.__parse_msg(main_msg, msg_list)
+        for main_msg in main_msg_group:
+            self.__parse_msg(main_msg, msg_groups)
         ret = True
-        for target, msg in msg_list.items():
+        for target, msg_group in msg_groups.items():
             reply_target = ReplyFactory.get_reply_instance(target, self.config)
-            ret &= reply_target.send(msg)
+            for msg in msg_group:
+                ret &= reply_target.send(msg)
         return ret
 
     def send_single_message(self, reply):
         """
-        实时发送消息
+        实时发送单条消息
+
+        Args:
+            reply (dict): 单条回复消息字典，必须包含 'content' 字段
+        Returns:
+            bool: 表示发送是否成功
         """
         targets = [t.strip() for t in reply['target'].split(',')]
         if 'all' in targets:
             targets = ReplyFactory.get_all_targets()
         ret = True
         for target in targets:
             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")
-            else:
+            if ('TITLE_IGNORE' in reply['msg_type'] or 'MAIN' in reply['msg_type']
+                    or 'title' not in reply or not reply['title']):
                 ret &= reply_target.send(reply['content'])
+            else:
+                title = f"## {reply['title']}\n\n" if 'title' in reply else ''
+                ret &= reply_target.send(f"{title}{reply['content']}\n\n")
         return ret
 
-    def __parse_msg(self, msg, msg_list):
+    def __parse_msg(self, msg, msg_groups):
         targets = [t.strip() for t in msg['target'].split(',')]
-        if 'all' in targets:
+        if 'target' not in msg or 'all' in targets:
             targets = ReplyFactory.get_all_targets()
         for target in targets:
-            msg_list[target] = msg_list.get(target, '')
-            # 如果msg['title']不存在
-            if 'title' not in msg or msg['title'] in ['__IGNORE__', '__MAIN_REVIEW__']:
-                msg_list[target] = f"{msg['content']}\n\n" + msg_list[target]
+            if target not in msg_groups:
+                msg_groups[target] = {}
+            if msg['group_id'] not in msg_groups[target]:
+                msg_groups[target][msg['group_id']] = []
+            if ('TITLE_IGNORE' in msg['msg_type'] or 'MAIN' in msg['msg_type']
+                    or 'title' not in msg or not msg['title']):
+                msg_groups[target][msg['group_id']].insert(0, msg['content'])
             else:
-                msg_list[target] += f"## {msg['title']}\n\n{msg['content']}\n\n"
-
+                title = f"## {msg['title']}\n\n" if 'title' in msg else ''
+                msg_groups[target][msg['group_id']].append(f"{title}{msg['content']}\n\n")
 
 if __name__ == '__main__':
     reply = Reply({'type': 'merge_request',

review_engine/handler/abstract_handler.py renamed to review_engine/abstract_handler.py

@@ -3,8 +3,8 @@
 
 from retrying import retry
 
-from config.config import api_config, gpt_message
-from review_engine.handler.abstract_handler import ReviewHandle
+from config.config import gpt_message
+from review_engine.abstract_handler import ReviewHandle
 from utils.gitlab_parser import filter_diff_content
 from utils.logger import log
 
@@ -78,10 +78,9 @@ def default_handle(self, changes, merge_info, hook_info, reply, model):
             review_info = chat_review(changes, model)
             if review_info:
                 reply.add_reply({
-                    'title': '__MAIN_REVIEW__',
                     'content': review_info,
+                    'msg_type': 'MAIN, SINGLE',
                     'target': 'all',
-                    'priority': 0
                 })
                 reply.add_reply({
                     'title': '__MAIN_REVIEW__',
@@ -96,7 +95,7 @@ def default_handle(self, changes, merge_info, hook_info, reply, model):
                         f"- **Code Review 状态**: ✅\n"
                     ),
                     'target': 'dingtalk',
-                    'priority': 0
+                    'msg_type': 'MAIN, SINGLE',
                 })
             else:
                 reply.add_reply({
@@ -113,7 +112,7 @@ def default_handle(self, changes, merge_info, hook_info, reply, model):
                         f"- **Code Review 状态**: pass ✅\n"
                     ),
                     'target': 'dingtalk',
-                    'priority': 0
+                    'msg_type': 'MAIN, SINGLE',
                 })
 
 
@@ -130,7 +129,7 @@ def default_handle(self, changes, merge_info, hook_info, reply, model):
                     f"- **目标分支**: `{hook_info['object_attributes']['target_branch']}`\n"
                 ),
                 'target': 'dingtalk',
-                'priority': 0
+                'msg_type': 'MAIN, SINGLE',
             })
 
         else:

review_engine/handler/default_handler.py

@@ -10,7 +10,7 @@ def __init__(self, reply):
         self.handles = []
         self.reply = reply
         # 动态导入所有的handle，位置在handle目录下
-        from .handler.abstract_handler import ReviewHandle
+        from review_engine.abstract_handler import ReviewHandle
         for handle in ReviewHandle.__subclasses__():
             self.handles.append(handle())
 
@@ -23,10 +23,4 @@ def handle_merge(self, changes, merge_info, webhook_info):
             thread.start()
         for thread in threads:
             thread.join()
-        self.reply.send()
-
-
-
-
-
-
+        self.reply.send()