Fix Magistral latest reasoning extraction Fixes #4339

d21afa1ae58e5ab2c1e848d538eb94369de6db98

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: a848bc38033b29afb58ee6a0e410acc2f1c57476
4 files changed, +30 -17Ignore whitespace
public/index.html+1 -1
@@ -2065,7 +2065,7 @@
2065 </span>2065 </span>
2066 </div>2066 </div>
2067 </div>2067 </div>
2068 <div class="range-block" data-source="deepseek,aimlapi,openrouter,custom,claude,xai,makersuite,vertexai,pollinations,moonshot">2068 <div class="range-block" data-source="deepseek,aimlapi,openrouter,custom,claude,xai,makersuite,vertexai,pollinations,moonshot,mistralai">
2069 <label for="openai_show_thoughts" class="checkbox_label widthFreeExpand">2069 <label for="openai_show_thoughts" class="checkbox_label widthFreeExpand">
2070 <input id="openai_show_thoughts" type="checkbox" />2070 <input id="openai_show_thoughts" type="checkbox" />
2071 <span data-i18n="Request model reasoning">Request model reasoning</span>2071 <span data-i18n="Request model reasoning">Request model reasoning</span>
public/script.js+21 -16
@@ -5317,28 +5317,33 @@ function parseAndSaveLogprobs(data, continueFrom) {
5317 * @returns {string} Extracted message5317 * @returns {string} Extracted message
5318 */5318 */
5319export function extractMessageFromData(data, activeApi = null) {5319export function extractMessageFromData(data, activeApi = null) {
5320 if (typeof data === 'string') {5320 function getResult() {
5321 return data;5321 if (typeof data === 'string') {
5322 }5322 return data;
5323 }
53235324
5324 switch (activeApi ?? main_api) {5325 switch (activeApi ?? main_api) {
5325 case 'kobold':5326 case 'kobold':
5326 return data.results[0].text;5327 return data.results[0].text;
5327 case 'koboldhorde':5328 case 'koboldhorde':
5328 return data.text;5329 return data.text;
5329 case 'textgenerationwebui':5330 case 'textgenerationwebui':
5330 return data.choices?.[0]?.text5331 return data.choices?.[0]?.text
5331 ?? data.choices?.[0]?.message?.content5332 ?? data.choices?.[0]?.message?.content
5332 ?? data.content5333 ?? data.content
5333 ?? data.response5334 ?? data.response
5334 ?? '';5335 ?? '';
5335 case 'novel':5336 case 'novel':
5336 return data.output;5337 return data.output;
5337 case 'openai':5338 case 'openai':
5338 return data?.content?.find(p => p.type === 'text')?.text ?? data?.choices?.[0]?.message?.content ?? data?.choices?.[0]?.text ?? data?.text ?? data?.message?.content?.[0]?.text ?? data?.message?.tool_plan ?? '';5339 return data?.content?.find(p => p.type === 'text')?.text ?? data?.choices?.[0]?.message?.content ?? data?.choices?.[0]?.text ?? data?.text ?? data?.message?.content?.[0]?.text ?? data?.message?.tool_plan ?? '';
5339 default:5340 default:
5340 return '';5341 return '';
5342 }
5341 }5343 }
5344
5345 const result = getResult();
5346 return Array.isArray(result) ? result.map(x => x.text).filter(x => x).join('') : result;
5342}5347}
53435348
5344/**5349/**
public/scripts/openai.js+6 -0
@@ -2399,6 +2399,12 @@ export function getStreamingReply(data, state, { chatCompletionSource = null, ov
2399 '';2399 '';
2400 }2400 }
2401 return data.choices?.[0]?.delta?.content ?? data.choices?.[0]?.message?.content ?? data.choices?.[0]?.text ?? '';2401 return data.choices?.[0]?.delta?.content ?? data.choices?.[0]?.message?.content ?? data.choices?.[0]?.text ?? '';
2402 } else if (chat_completion_source === chat_completion_sources.MISTRALAI) {
2403 if (show_thoughts) {
2404 state.reasoning += (data.choices?.filter(x => x?.delta?.content?.[0]?.thinking)?.[0]?.delta?.content?.[0]?.thinking?.[0]?.text || '');
2405 }
2406 const content = data.choices?.[0]?.delta?.content ?? data.choices?.[0]?.message?.content ?? data.choices?.[0]?.text ?? '';
2407 return Array.isArray(content) ? content.map(x => x.text).filter(x => x).join('') : content;
2402 } else {2408 } else {
2403 return data.choices?.[0]?.delta?.content ?? data.choices?.[0]?.message?.content ?? data.choices?.[0]?.text ?? '';2409 return data.choices?.[0]?.delta?.content ?? data.choices?.[0]?.message?.content ?? data.choices?.[0]?.text ?? '';
2404 }2410 }
public/scripts/reasoning.js+2 -0
@@ -118,6 +118,8 @@ export function extractReasoningFromData(data, {
118 return data?.responseContent?.parts?.filter(part => part.thought)?.map(part => part.text)?.join('\n\n') ?? '';118 return data?.responseContent?.parts?.filter(part => part.thought)?.map(part => part.text)?.join('\n\n') ?? '';
119 case chat_completion_sources.CLAUDE:119 case chat_completion_sources.CLAUDE:
120 return data?.content?.find(part => part.type === 'thinking')?.thinking ?? '';120 return data?.content?.find(part => part.type === 'thinking')?.thinking ?? '';
121 case chat_completion_sources.MISTRALAI:
122 return data?.choices?.[0]?.message?.content?.[0]?.thinking?.map(part => part.text)?.filter(x => x)?.join('\n\n') ?? '';
121 case chat_completion_sources.AIMLAPI:123 case chat_completion_sources.AIMLAPI:
122 case chat_completion_sources.POLLINATIONS:124 case chat_completion_sources.POLLINATIONS:
123 case chat_completion_sources.MOONSHOT:125 case chat_completion_sources.MOONSHOT: