zack3d/big-agi
1
0
Fork 0
mirror of https://github.com/enricoros/big-AGI.git synced 2026-05-10 21:50:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

Aix: Fix Gemini functionResponse

Browse Source
This commit is contained in:
Enrico Ros
2024-10-16 13:55:08 -07:00
parent 297f93b8ad
commit 677645b81c
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/aix/server/api/aix.router.ts
+1 -1
View File
@@ -44,7 +44,7 @@ export const aixRouter = createTRPCRouter({
try {
dispatch = createChatGenerateDispatch(access, model, chatGenerate, streaming);
} catch (error: any) {
chatGenerateTx.setRpcTerminatingIssue('dispatch-prepare', `**[Configuration Issue] ${prettyDialect}**: ${safeErrorString(error) || 'Unknown service preparation error'}`, false);
chatGenerateTx.setRpcTerminatingIssue('dispatch-prepare', `**[AIX Configuration Issue] ${prettyDialect}**: ${safeErrorString(error) || 'Unknown service preparation error'}`, false);
yield* chatGenerateTx.flushParticles();
return; // exit
}
src/modules/aix/server/dispatch/chatGenerate/adapters/anthropic.messageCreate.ts
+4 -2
View File
@@ -87,8 +87,10 @@ export function aixToAnthropicMessageCreate(model: AixAPI_Model, chatGenerate: A
// Preemptive error detection with server-side payload validation before sending it upstream
const validated = AnthropicWire_API_Message_Create.Request_schema.safeParse(payload);
if (!validated.success)
throw new Error(`Invalid message sequence for Anthropic models: ${validated.error.errors?.[0]?.message || validated.error.message || validated.error}`);
if (!validated.success) {
console.error('Anthropic: invalid messageCreate payload. Error:', validated.error.message);
throw new Error(`Invalid sequence for Anthropic models: ${validated.error.errors?.[0]?.message || validated.error.message || validated.error}.`);
}
return validated.data;
}
src/modules/aix/server/dispatch/chatGenerate/adapters/gemini.generateContent.ts
+8 -2
View File
@@ -53,8 +53,10 @@ export function aixToGeminiGenerateContent(model: AixAPI_Model, chatGenerate: Ai
// Preemptive error detection with server-side payload validation before sending it upstream
const validated = GeminiWire_API_Generate_Content.Request_schema.safeParse(payload);
if (!validated.success)
throw new Error(`Invalid message sequence for Gemini models: ${validated.error.errors?.[0]?.message || validated.error.message || validated.error}`);
if (!validated.success) {
console.warn('Gemini: invalid generateContent payload. Error:', validated.error.message);
throw new Error(`Invalid sequence for Gemini models: ${validated.error.errors?.[0]?.message || validated.error.message || validated.error}.`);
}
return validated.data;
}
@@ -159,6 +161,10 @@ function _toGeminiContents(chatSequence: AixMessages_ChatMessage[]): GeminiWire_
console.warn('Gemini: failed to parse (string -> JSON) function response result', e);
functionResponseResponse = { output: toolErrorPrefix + part.response.result };
}
if (Array.isArray(functionResponseResponse)) {
console.warn('toGeminiContents: Gemini requires results of function calls to be objects', { result: functionResponseResponse });
throw new Error('Gemini: unexpected array as function response');
}
} else {
functionResponseResponse = part.response.result;
}
src/modules/aix/server/dispatch/chatGenerate/adapters/openai.chatCompletions.ts
+4 -2
View File
@@ -87,8 +87,10 @@ export function aixToOpenAIChatCompletions(openAIDialect: OpenAIDialects, model:
// Preemptive error detection with server-side payload validation before sending it upstream
const validated = OpenAIWire_API_Chat_Completions.Request_schema.safeParse(payload);
if (!validated.success)
throw new Error(`Invalid message sequence for OpenAI models: ${validated.error.errors?.[0]?.message || validated.error.message || validated.error}`);
if (!validated.success) {
console.warn('OpenAI: invalid chatCompletions payload. Error:', validated.error);
throw new Error(`Invalid sequence for OpenAI models: ${validated.error.errors?.[0]?.message || validated.error.message || validated.error}.`);
}
// if (hotFixUseDeprecatedFunctionCalls)
// validated.data = _fixUseDeprecatedFunctionCalls(validated.data);