gardel/Mofox-Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #63 from SaigyoujiYusora/debug

Browse Source 
fix: <think> was not generated
This commit is contained in:
HYY
2025-03-06 08:30:31 +08:00
committed by GitHub
parent 3ef20ac1c9 bd982ba556
commit 59af990923
1 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/models/utils_model.py
View File

@@ -69,10 +69,10 @@ class LLM_request:
think_match = None think_match = None
reasoning_content = message.get("reasoning_content", "") reasoning_content = message.get("reasoning_content", "")
if not reasoning_content: if not reasoning_content:
think_match = re.search(r'<think>(.*?)</think>', content, re.DOTALL) think_match = re.search(r'(?:<think>)?(.*?)</think>', content, re.DOTALL)
if think_match: if think_match:
reasoning_content = think_match.group(1).strip() reasoning_content = think_match.group(1).strip()
content = re.sub(r'<think>.*?</think>', '', content, flags=re.DOTALL).strip() content = re.sub(r'(?:<think>)?.*?</think>', '', content, flags=re.DOTALL, count=1).strip()
return content, reasoning_content return content, reasoning_content
return "没有返回结果", "" return "没有返回结果", ""
@@ -130,7 +130,6 @@ class LLM_request:
current_image_base64 = image_base64 current_image_base64 = image_base64
current_image_base64 = compress_base64_image_by_scale(current_image_base64) current_image_base64 = compress_base64_image_by_scale(current_image_base64)
for retry in range(max_retries): for retry in range(max_retries):
try: try:
data = build_request_data(current_image_base64) data = build_request_data(current_image_base64)
@@ -156,10 +155,10 @@ class LLM_request:
think_match = None think_match = None
reasoning_content = message.get("reasoning_content", "") reasoning_content = message.get("reasoning_content", "")
if not reasoning_content: if not reasoning_content:
think_match = re.search(r'<think>(.*?)</think>', content, re.DOTALL) think_match = re.search(r'(?:<think>)?(.*?)</think>', content, re.DOTALL)
if think_match: if think_match:
reasoning_content = think_match.group(1).strip() reasoning_content = think_match.group(1).strip()
content = re.sub(r'<think>.*?</think>', '', content, flags=re.DOTALL).strip() content = re.sub(r'(?:<think>)?.*?</think>', '', content, flags=re.DOTALL, count=1).strip()
return content, reasoning_content return content, reasoning_content
return "没有返回结果", "" return "没有返回结果", ""
@@ -211,8 +210,15 @@ class LLM_request:
result = await response.json() result = await response.json()
if "choices" in result and len(result["choices"]) > 0: if "choices" in result and len(result["choices"]) > 0:
content = result["choices"][0]["message"]["content"] message = result["choices"][0]["message"]
reasoning_content = result["choices"][0]["message"].get("reasoning_content", "") 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, count=1).strip()
return content, reasoning_content return content, reasoning_content
return "没有返回结果", "" return "没有返回结果", ""
@@ -288,10 +294,10 @@ class LLM_request:
think_match = None think_match = None
reasoning_content = message.get("reasoning_content", "") reasoning_content = message.get("reasoning_content", "")
if not reasoning_content: if not reasoning_content:
think_match = re.search(r'<think>(.*?)</think>', content, re.DOTALL) think_match = re.search(r'(?:<think>)?(.*?)</think>', content, re.DOTALL)
if think_match: if think_match:
reasoning_content = think_match.group(1).strip() reasoning_content = think_match.group(1).strip()
content = re.sub(r'<think>.*?</think>', '', content, flags=re.DOTALL).strip() content = re.sub(r'(?:<think>)?.*?</think>', '', content, flags=re.DOTALL, count=1).strip()
return content, reasoning_content return content, reasoning_content
return "没有返回结果", "" return "没有返回结果", ""