rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Gemini: Fix cross-chunk parsing of multipart replies

Browse Source
This commit is contained in:
Cohee
2024-12-27 23:15:09 +02:00
parent 77f5f00151
commit 39cfb35c1a
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/scripts/openai.js
View File

@ -2098,7 +2098,7 @@ function getStreamingReply(data) {
if (oai_settings.chat_completion_source === chat_completion_sources.CLAUDE) { if (oai_settings.chat_completion_source === chat_completion_sources.CLAUDE) {
return data?.delta?.text || ''; return data?.delta?.text || '';
} else if (oai_settings.chat_completion_source === chat_completion_sources.MAKERSUITE) { } else if (oai_settings.chat_completion_source === chat_completion_sources.MAKERSUITE) {
return data?.candidates?.[0]?.content?.parts?.[0]?.text || ''; return data?.candidates?.[0]?.content?.parts?.map(x => x.text)?.join('\n\n') || '';
} else if (oai_settings.chat_completion_source === chat_completion_sources.COHERE) { } else if (oai_settings.chat_completion_source === chat_completion_sources.COHERE) {
return data?.delta?.message?.content?.text || data?.delta?.message?.tool_plan || ''; return data?.delta?.message?.content?.text || data?.delta?.message?.tool_plan || '';
} else { } else {
@ -2110,7 +2110,7 @@ function getStreamingReply(data) {
* parseChatCompletionLogprobs converts the response data returned from a chat * parseChatCompletionLogprobs converts the response data returned from a chat
* completions-like source into an array of TokenLogprobs found in the response. * completions-like source into an array of TokenLogprobs found in the response.
* @param {Object} data - response data from a chat completions-like source * @param {Object} data - response data from a chat completions-like source
* @returns {import('logprobs.js').TokenLogprobs[] | null} converted logprobs * @returns {import('./logprobs.js').TokenLogprobs[] | null} converted logprobs
*/ */
function parseChatCompletionLogprobs(data) { function parseChatCompletionLogprobs(data) {
if (!data) { if (!data) {
@ -2139,7 +2139,7 @@ function parseChatCompletionLogprobs(data) {
* completion API and converts into the structure used by the Token Probabilities * completion API and converts into the structure used by the Token Probabilities
* view. * view.
* @param {{content: { token: string, logprob: number, top_logprobs: { token: string, logprob: number }[] }[]}} logprobs * @param {{content: { token: string, logprob: number, top_logprobs: { token: string, logprob: number }[] }[]}} logprobs
* @returns {import('logprobs.js').TokenLogprobs[] | null} converted logprobs * @returns {import('./logprobs.js').TokenLogprobs[] | null} converted logprobs
*/ */
function parseOpenAIChatLogprobs(logprobs) { function parseOpenAIChatLogprobs(logprobs) {
const { content } = logprobs ?? {}; const { content } = logprobs ?? {};
@ -2167,7 +2167,7 @@ function parseOpenAIChatLogprobs(logprobs) {
* completion API and converts into the structure used by the Token Probabilities * completion API and converts into the structure used by the Token Probabilities
* view. * view.
* @param {{tokens: string[], token_logprobs: number[], top_logprobs: { token: string, logprob: number }[][]}} logprobs * @param {{tokens: string[], token_logprobs: number[], top_logprobs: { token: string, logprob: number }[][]}} logprobs
* @returns {import('logprobs.js').TokenLogprobs[] | null} converted logprobs * @returns {import('./logprobs.js').TokenLogprobs[] | null} converted logprobs
*/ */
function parseOpenAITextLogprobs(logprobs) { function parseOpenAITextLogprobs(logprobs) {
const { tokens, token_logprobs, top_logprobs } = logprobs ?? {}; const { tokens, token_logprobs, top_logprobs } = logprobs ?? {};

6
src/endpoints/backends/chat-completions.js
View File

@ -367,15 +367,15 @@ async function sendMakerSuiteRequest(request, response) {
} }
const responseContent = candidates[0].content ?? candidates[0].output; const responseContent = candidates[0].content ?? candidates[0].output;
const responseText = typeof responseContent === 'string' ? responseContent : responseContent?.parts?.[0]?.text; console.log('Google AI Studio response:', responseContent);
const responseText = typeof responseContent === 'string' ? responseContent : responseContent?.parts?.map(part => part.text)?.join('\n\n');
if (!responseText) { if (!responseText) {
let message = 'Google AI Studio Candidate text empty'; let message = 'Google AI Studio Candidate text empty';
console.log(message, generateResponseJson); console.log(message, generateResponseJson);
return response.send({ error: { message } }); return response.send({ error: { message } });
} }
console.log('Google AI Studio response:', responseText);
// Wrap it back to OAI format // Wrap it back to OAI format
const reply = { choices: [{ 'message': { 'content': responseText } }] }; const reply = { choices: [{ 'message': { 'content': responseText } }] };
return response.send(reply); return response.send(reply);