Merge pull request #52 from SaigyoujiYusora/debug

增加<think>标签处理

src/plugins/models/utils_model.py

@@ -2,6 +2,7 @@ import aiohttp
 import asyncio
 import requests
 import time
+import re
 from typing import Tuple, Union
 from nonebot import get_driver
 from loguru import logger
@@ -11,6 +12,7 @@ from ..chat.utils_image import compress_base64_image_by_scale
 driver = get_driver()
 config = driver.config
 
+
 class LLM_request:
     def __init__(self, model, **kwargs):
         # 将大写的配置键转换为小写并从config中获取实际值
@@ -106,14 +108,17 @@ class LLM_request:
                 **self.params
             }
         
+
         # 发送请求到完整的chat/completions端点
         api_url = f"{self.base_url.rstrip('/')}/chat/completions"
         logger.info(f"发送请求到URL: {api_url}")  # 记录请求的URL
 
         max_retries = 3
         base_wait_time = 15
+        
         current_image_base64 = image_base64
         
+
         for retry in range(max_retries):
             try:
                 data = build_request_data(current_image_base64)
@@ -124,6 +129,7 @@ class LLM_request:
                             logger.warning(f"遇到请求限制(429)，等待{wait_time}秒后重试...")
                             await asyncio.sleep(wait_time)
                             continue
+
                         elif response.status == 413:
                             logger.warning("图片太大(413)，尝试压缩...")
                             current_image_base64 = compress_base64_image_by_scale(current_image_base64)
@@ -133,8 +139,15 @@ class LLM_request:
 
                         result = await response.json()
                         if "choices" in result and len(result["choices"]) > 0:
-                            content = result["choices"][0]["message"]["content"]
-                            reasoning_content = result["choices"][0]["message"].get("reasoning_content", "")
+                            message = result["choices"][0]["message"]
+                            content = message.get("content", "")
+                            think_match = None
+                            reasoning_content = message.get("reasoning_content", "")
+                            if not reasoning_content:
+                                think_match = re.search(r'<think>(.*?)</think>', content, re.DOTALL)
+                            if think_match:
+                                reasoning_content = think_match.group(1).strip()
+                            content = re.sub(r'<think>.*?</think>', '', content, flags=re.DOTALL).strip()
                             return content, reasoning_content
                         return "没有返回结果", ""
 
@@ -201,8 +214,15 @@ class LLM_request:
 
                 result = response.json()
                 if "choices" in result and len(result["choices"]) > 0:
-                    content = result["choices"][0]["message"]["content"]
-                    reasoning_content = result["choices"][0]["message"].get("reasoning_content", "")
+                    message = result["choices"][0]["message"]
+                    content = message.get("content", "")
+                    think_match = None
+                    reasoning_content = message.get("reasoning_content", "")
+                    if not reasoning_content:
+                        think_match = re.search(r'<think>(.*?)</think>', content, re.DOTALL)
+                    if think_match:
+                        reasoning_content = think_match.group(1).strip()
+                    content = re.sub(r'<think>.*?</think>', '', content, flags=re.DOTALL).strip()
                     return content, reasoning_content
                 return "没有返回结果", ""