Merge branch 'main_upstream' into feature/i18n

# Conflicts:
#	api.py
#	biz/event/event_manager.py
#	biz/utils/im/im_notifier.py
#	biz/utils/im/wecom.py
#	doc/faq.md

Author: mashb1t

api.py

@@ -160,6 +160,20 @@ def handle_webhook():
     else:
         return jsonify({'message': _('Invalid data format')}), 400
 
+def transform_gitlab_url(url):
+    # 去掉 http:// 或 https://
+    if url.startswith("http://"):
+        url = url[len("http://"):]
+    elif url.startswith("https://"):
+        url = url[len("https://"):]
+
+    if url.endswith('/'):
+        url = url[:-1]
+        
+    # 替换 . 和 / 为 _
+    transformed_url = url.replace('.', '_').replace('/', '_')
+    
+    return transformed_url
 
 def __handle_push_event(webhook_data: dict, gitlab_token: str, gitlab_url: str):
     try:
@@ -179,6 +193,7 @@ def __handle_push_event(webhook_data: dict, gitlab_token: str, gitlab_url: str):
             changes = filter_changes(changes)
             if not changes:
                 logger.info(_('未检测到PUSH代码的修改,修改文件可能不满足SUPPORTED_EXTENSIONS。'))
+                return
             review_result = _("关注的文件没有修改")
 
             if len(changes) > 0:
@@ -188,6 +203,8 @@ def __handle_push_event(webhook_data: dict, gitlab_token: str, gitlab_url: str):
             # 将review结果提交到Gitlab的 notes
             handler.add_push_notes(_('Auto Review Result: \n{}').format(review_result))
 
+        url_base = transform_gitlab_url(gitlab_url)
+
         event_manager['push_reviewed'].send(PushReviewEntity(
             project_name=webhook_data['project']['name'],
             author=webhook_data['user_username'],
@@ -196,6 +213,7 @@ def __handle_push_event(webhook_data: dict, gitlab_token: str, gitlab_url: str):
             commits=commits,
             score=score,
             review_result=review_result,
+            gitlab_url = url_base,
         ))
 
     except Exception as e:
@@ -236,9 +254,14 @@ def __handle_merge_request_event(webhook_data: dict, gitlab_token: str, gitlab_u
             commits_text = ';'.join(commit['title'] for commit in commits)
             review_result = review_code(str(changes), commits_text)
 
+            if "COT ABORT!" in review_result:
+                logger.error('COT ABORT!')
+                return
+
             # 将review结果提交到Gitlab的 notes
             handler.add_merge_request_notes(_('Auto Review Result: \n{}').format(review_result))
 
+            url_base = transform_gitlab_url(gitlab_url)
             # dispatch merge_request_reviewed event
             event_manager['merge_request_reviewed'].send(
                 MergeRequestReviewEntity(
@@ -250,7 +273,8 @@ def __handle_merge_request_event(webhook_data: dict, gitlab_token: str, gitlab_u
                     commits=commits,
                     score=CodeReviewer.parse_review_score(review_text=review_result),
                     url=webhook_data['object_attributes']['url'],
-                    review_result=review_result
+                    review_result=review_result,
+                    gitlab_url = url_base,
                 )
             )
 

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):
+                 commits: list, score: float, url: str, review_result: str, gitlab_url: str):
         self.project_name = project_name
         self.author = author
         self.source_branch = source_branch
@@ -10,6 +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 = gitlab_url
 
     @property
     def commit_messages(self):
@@ -19,14 +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):
+                 review_result: str, gitlab_url: 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 = gitlab_url
 
     @property
     def commit_messages(self):

biz/event/event_manager.py

@@ -44,7 +44,7 @@ def on_merge_request_reviewed(mr_review_entity: MergeRequestReviewEntity):
         review_result=mr_review_entity.review_result
     )
     im_notifier.send_notification(content=im_msg, msg_type='markdown', title=_('Merge Request Review'),
-                                  project_name=mr_review_entity.project_name)
+                                  project_name=mr_review_entity.project_name, url_base=mr_review_entity.gitlab_url)
 
     # 记录到数据库
     ReviewService().insert_mr_review_log(mr_review_entity)
@@ -76,7 +76,8 @@ def on_push_reviewed(entity: PushReviewEntity):
         im_msg += _("#### AI Review 结果: \n {review_result}\n\n").format(review_result=entity.review_result)
     im_notifier.send_notification(content=im_msg, msg_type='markdown',
                                   title=_("{project_name} Push Event").format(project_name=entity.project_name),
-                                  project_name=entity.project_name)
+                                  project_name=entity.project_name,
+                                  url_base=entity.gitlab_url)
 
     # 记录到数据库
     ReviewService().insert_push_review_log(entity)

biz/utils/im/dingtalk.py

@@ -13,7 +13,7 @@ def __init__(self, webhook_url=None):
         self.enabled = os.environ.get('DINGTALK_ENABLED', '0') == '1'
         self.default_webhook_url = webhook_url or os.environ.get('DINGTALK_WEBHOOK_URL')
 
-    def _get_webhook_url(self, project_name=None):
+    def _get_webhook_url(self, project_name=None, url_base=None):
         """
         获取项目对应的 Webhook URL
         :param project_name: 项目名称
@@ -32,6 +32,12 @@ def _get_webhook_url(self, project_name=None):
         for env_key, env_value in os.environ.items():
             if env_key.upper() == target_key:
                 return env_value  # 找到匹配项，直接返回
+            
+        # url_base 优先级次之
+        target_key_url_base = f"WECOM_WEBHOOK_URL_{url_base.upper()}"
+        for env_key, env_value in os.environ.items():
+            if target_key_url_base !=None and  env_key.upper() == target_key_url_base:
+                return env_value  # 找到匹配项，直接返回
 
         # 如果未找到匹配的环境变量，降级使用全局的 Webhook URL
         if self.default_webhook_url:
@@ -40,13 +46,13 @@ def _get_webhook_url(self, project_name=None):
         # 如果既未找到匹配项，也没有默认值，抛出异常
         raise ValueError(_("未找到项目 '{}' 对应的钉钉Webhook URL，且未设置默认的 Webhook URL。").format(project_name))
 
-    def send_message(self, content: str, msg_type='text', title='通知', is_at_all=False, project_name=None):
+    def send_message(self, content: str, msg_type='text', title='通知', is_at_all=False, project_name=None, url_base = None):
         if not self.enabled:
             logger.info(_("钉钉推送未启用"))
             return
 
         try:
-            post_url = self._get_webhook_url(project_name=project_name)
+            post_url = self._get_webhook_url(project_name=project_name, url_base=url_base)
             headers = {
                 "Content-Type": "application/json",
                 "Charset": "UTF-8"

biz/utils/im/feishu.py

@@ -13,7 +13,7 @@ def __init__(self, webhook_url=None):
         self.default_webhook_url = webhook_url or os.environ.get('FEISHU_WEBHOOK_URL', '')
         self.enabled = os.environ.get('FEISHU_ENABLED', '0') == '1'
 
-    def _get_webhook_url(self, project_name=None):
+    def _get_webhook_url(self, project_name=None, url_base=None):
         """
         获取项目对应的 Webhook URL
         :param project_name: 项目名称
@@ -32,6 +32,12 @@ def _get_webhook_url(self, project_name=None):
         for env_key, env_value in os.environ.items():
             if env_key.upper() == target_key:
                 return env_value  # 找到匹配项，直接返回
+            
+        # url_base 优先级次之
+        target_key_url_base = f"WECOM_WEBHOOK_URL_{url_base.upper()}"
+        for env_key, env_value in os.environ.items():
+            if target_key_url_base !=None and  env_key.upper() == target_key_url_base:
+                return env_value  # 找到匹配项，直接返回
 
         # 如果未找到匹配的环境变量，降级使用全局的 Webhook URL
         if self.default_webhook_url:
@@ -40,7 +46,7 @@ def _get_webhook_url(self, project_name=None):
         # 如果既未找到匹配项，也没有默认值，抛出异常
         raise ValueError(_("未找到项目 '{project_name}' 对应的 Feishu Webhook URL，且未设置默认的 Webhook URL。"))
 
-    def send_message(self, content, msg_type='text', title=None, is_at_all=False, project_name=None):
+    def send_message(self, content, msg_type='text', title=None, is_at_all=False, project_name=None, url_base=None):
         """
         发送飞书消息
         :param content: 消息内容
@@ -54,7 +60,7 @@ def send_message(self, content, msg_type='text', title=None, is_at_all=False, pr
             return
 
         try:
-            post_url = self._get_webhook_url(project_name=project_name)
+            post_url = self._get_webhook_url(project_name=project_name, url_base=url_base)
             if msg_type == 'markdown':
                 data = {
                     "msg_type": "interactive",

biz/utils/im/im_notifier.py

@@ -1,28 +1,31 @@
+from biz.utils.i18n import get_translator
 from biz.utils.im.dingtalk import DingTalkNotifier
 from biz.utils.im.feishu import FeishuNotifier
 from biz.utils.im.wecom import WeComNotifier
-from biz.utils.i18n import get_translator
+
 _ = get_translator()
 
-def send_notification(content, msg_type='text', title=_("通知"), is_at_all=False, project_name=None):
+
+def send_notification(content, msg_type='text', title=_("通知"), is_at_all=False, project_name=None, url_base=None):
     """
     发送通知消息到配置的平台(钉钉和企业微信)
     :param content: 消息内容
     :param msg_type: 消息类型，支持text和markdown
     :param title: 消息标题(markdown类型时使用)
     :param is_at_all: 是否@所有人
+    :param url_base: gitlab服务器的url地址 http://www.gitlab.com 传递进来自动移除http和https，转换成 www_gitlab_com
     """
     # 钉钉推送
     notifier = DingTalkNotifier()
     notifier.send_message(content=content, msg_type=msg_type, title=title, is_at_all=is_at_all,
-                          project_name=project_name)
+                          project_name=project_name, url_base=url_base)
 
     # 企业微信推送
     wecom_notifier = WeComNotifier()
     wecom_notifier.send_message(content=content, msg_type=msg_type, title=title, is_at_all=is_at_all,
-                                project_name=project_name)
+                                project_name=project_name, url_base=url_base)
 
     # 飞书推送
     feishu_notifier = FeishuNotifier()
     feishu_notifier.send_message(content=content, msg_type=msg_type, title=title, is_at_all=is_at_all,
-                                 project_name=project_name)
+                                 project_name=project_name, url_base=url_base)

biz/utils/im/wecom.py

@@ -15,7 +15,7 @@ def __init__(self, webhook_url=None):
         self.default_webhook_url = webhook_url or os.environ.get('WECOM_WEBHOOK_URL', '')
         self.enabled = os.environ.get('WECOM_ENABLED', '0') == '1'
 
-    def _get_webhook_url(self, project_name=None):
+    def _get_webhook_url(self, project_name=None, url_base=None):
         """
         获取项目对应的 Webhook URL
         :param project_name: 项目名称
@@ -31,8 +31,16 @@ def _get_webhook_url(self, project_name=None):
 
         # 遍历所有环境变量（忽略大小写），找到项目对应的 Webhook URL
         target_key = f"WECOM_WEBHOOK_URL_{project_name.upper()}"
+
+        # 仓库名称优先级高，先匹配
+        for env_key, env_value in os.environ.items():
+            if env_key.upper() == target_key :
+                return env_value  # 找到匹配项，直接返回
+        
+        # url_base 优先级次之
+        target_key_url_base = f"WECOM_WEBHOOK_URL_{url_base.upper()}"
         for env_key, env_value in os.environ.items():
-            if env_key.upper() == target_key:
+            if target_key_url_base !=None and  env_key.upper() == target_key_url_base:
                 return env_value  # 找到匹配项，直接返回
 
         # 如果未找到匹配的环境变量，降级使用全局的 Webhook URL
@@ -61,7 +69,7 @@ def format_markdown_content(self, content, title=None):
         formatted_content += content
         return formatted_content
 
-    def send_message(self, content, msg_type='text', title=None, is_at_all=False, project_name=None):
+    def send_message(self, content, msg_type='text', title=None, is_at_all=False, project_name=None, url_base=None):
         """
         发送企业微信消息
         :param content: 消息内容
@@ -74,7 +82,7 @@ def send_message(self, content, msg_type='text', title=None, is_at_all=False, pr
             return
 
         try:
-            post_url = self._get_webhook_url(project_name=project_name)
+            post_url = self._get_webhook_url(project_name=project_name, url_base=url_base)
             if msg_type == 'markdown':
                 formatted_content = self.format_markdown_content(content, title)
                 data = {
@@ -100,6 +108,30 @@ def send_message(self, content, msg_type='text', title=None, is_at_all=False, pr
 
             if response.status_code != 200:
                 logger.error(_("企业微信消息发送失败! webhook_url:{}, error_msg:{}").format(post_url, response.text))
+
+                try:
+                    data = json.loads(response.text)
+                    errmsg = data.get("errmsg")
+                    if errmsg and "markdown.content exceed max length" in errmsg:
+                        # markdown渲染过长了，尝试text发送
+                        data = {
+                            "msgtype": "text",
+                            "text": {
+                                "content": content,
+                                "mentioned_list": ["@all"] if is_at_all else []
+                            }
+                        }
+
+                        response = requests.post(
+                            url=post_url,
+                            json=data,
+                            headers={'Content-Type': 'application/json'}
+                        )
+
+                except json.JSONDecodeError as e:
+                    print(f"JSON 解析失败: {e}")
+                except Exception as e:
+                    logger.error(_("企业微信消息发送失败! {}").format(e))
                 return
 
             result = response.json()

core/llm/client/ollama_client.py

@@ -27,7 +27,12 @@ def _extract_content(self, content: str) -> str:
         Returns:
             str: 提取后的内容。
         """
-        if re.search(r'<think>.*?</think>', content, re.DOTALL):
+        if "<think>" in content and "</think>" not in content:
+            # 大模型回复的时候，思考链有可能截断，那么果断忽略回复，返回空
+            return "COT ABORT!"
+        elif "<think>" not in content and "</think>" in content:
+            return content.split("</think>", 1)[1].strip()
+        elif re.search(r'<think>.*?</think>', content, re.DOTALL):
             return re.sub(r'<think>.*?</think>', '', content, flags=re.DOTALL).strip()
         return content
 

doc/faq.md

@@ -69,10 +69,26 @@ OLLAMA_API_BASE_URL=http://127.0.0.1:11434  # 错误
 OLLAMA_API_BASE_URL=http://{宿主机/外网IP地址}:11434  # 正确
 ```
 
-#### 5. 翻译
+#### 5.如何支持多个git服务器及对应的不通webhook地址
+
+在项目的 .env 文件中，配置不同GIT项目对应的群机器人的 Webhook 地址。替换
+以 DingTalk 为例，配置如下：
+
+```
+DINGTALK_ENABLED=1
+# git服务器A实际地址 http://192.168.30.164/
+DINGTALK_WEBHOOK_192_168_30_164=https://oapi.dingtalk.com/robot/send?access_token={access_token_of_project_a}
+# git服务器A实际地址 http://192.168.35.164/
+DINGTALK_WEBHOOK_192_168_35_164=https://oapi.dingtalk.com/robot/send?access_token={access_token_of_project_a}
+```
+
+飞书和企业微信的配置方式类似，GIT服务器的群机器人优先级，仓库名字>特定服务器地址>默认服务器地址
+
+#### 6. 翻译
+
 更改翻译后无法正确应用，我该怎么办？
 该应用程序使用 python 原生 gettext 实现来加载各种语言的翻译。如果您更改了翻译文件，但是应用程序没有正确应用新的翻译，您可以尝试以下步骤：
 1. 更新翻译: `bash translations_update.sh`
 2. 通过向具有空 msgstr 的新行添加值来手动调整 `locales/<locale>/LC_Messages/messages.po` 中缺失的翻译
 3. 编译翻译：`bash translations_compile.sh`
-4. 重新启动您的应用程序
+4. 重新启动您的应用程序