c9277cec · permissionBRICK/SillyTavern

public/index.html+1 -1 Viewed

                                             </span>
                                         </div>
                                     </div>
-                                    <div class="range-block" data-source="openai,cohere,mistralai,custom,claude,openrouter,groq,deepseek">
+                                    <div class="range-block" data-source="openai,cohere,mistralai,custom,claude,openrouter,groq,deepseek,makersuite">
                                         <label for="openai_function_calling" class="checkbox_label flexWrap widthFreeExpand">
                                             <input id="openai_function_calling" type="checkbox" />
                                             <span data-i18n="Enable function calling">Enable function calling</span>

public/scripts/sse-stream.js+5 -0 Viewed

     else if (Array.isArray(json.candidates)) {
         for (let i = 0; i < json.candidates.length; i++) {
             const isNotPrimary = json.candidates?.[0]?.index > 0;
+            const hasToolCalls = json?.candidates?.[0]?.content?.parts?.some(p => p?.functionCall);
             if (isNotPrimary || json.candidates.length === 0) {
                 return null;
+            }
+            if (hasToolCalls) {
+                yield { data: json, chunk: '' };
+                return;
+            }
             if (typeof json.candidates[0].content === 'object' && Array.isArray(json.candidates[i].content.parts)) {
                 for (let j = 0; j < json.candidates[i].content.parts.length; j++) {
                     if (typeof json.candidates[i].content.parts[j].text === 'string') {

public/scripts/tool-calling.js+33 -0 Viewed

+                }
+            }
+        }
+        if (Array.isArray(parsed?.candidates)) {
+            for (let choiceIndex = 0; choiceIndex < parsed.candidates.length; choiceIndex++) {
+                const candidate = parsed.candidates[choiceIndex];
+                if (Array.isArray(candidate?.content?.parts)) {
+                    for (let toolCallIndex = 0; toolCallIndex < candidate.content.parts.length; toolCallIndex++) {
+                        const part = candidate.content.parts[toolCallIndex];
+                        if (part.functionCall) {
+                            if (!Array.isArray(toolCalls[choiceIndex])) {
+                                toolCalls[choiceIndex] = [];
+                            }
+                            if (toolCalls[choiceIndex][toolCallIndex] === undefined) {
+                                toolCalls[choiceIndex][toolCallIndex] = {};
+                            }
+                            const targetToolCall = toolCalls[choiceIndex][toolCallIndex];
+                            ToolManager.#applyToolCallDelta(targetToolCall, part.functionCall);
+                        }
+                    }
+                }
+            }
+        }
+    }
     /**

             chat_completion_sources.GROQ,
             chat_completion_sources.COHERE,
             chat_completion_sources.DEEPSEEK,
+            chat_completion_sources.MAKERSUITE,
         ];
         return supportedSources.includes(oai_settings.chat_completion_source);
+    }

      * @returns {any[]} Tool calls from the response data
      */
     static #getToolCallsFromData(data) {
+        const getRandomId = () => Math.random().toString(36).substring(2);
         const isClaudeToolCall = c => Array.isArray(c) ? c.filter(x => x).every(isClaudeToolCall) : c?.input && c?.name && c?.id;
+        const isGoogleToolCall = c => Array.isArray(c) ? c.filter(x => x).every(isGoogleToolCall) : c?.name && c?.args;
         const convertClaudeToolCall = c => ({ id: c.id, function: { name: c.name, arguments: c.input } });
+        const convertGoogleToolCall = (c) => ({ id: getRandomId(), function: { name: c.name, arguments: c.args } });
         // Parsed tool calls from streaming data
         if (Array.isArray(data) && data.length > 0 && Array.isArray(data[0])) {

@@ -594,6 +618,10 @@ export class ToolManager {
594	return data[0].filter(x => x).map(convertClaudeToolCall);	618	return data[0].filter(x => x).map(convertClaudeToolCall);
595	}	619	}
596		620
		621	if (isGoogleToolCall(data[0])) {
		622	return data[0].filter(x => x).map(convertGoogleToolCall);
		623	}
		624
597	if (typeof data[0]?.[0]?.tool_calls === 'object') {	625	if (typeof data[0]?.[0]?.tool_calls === 'object') {
598	return Array.isArray(data[0]?.[0]?.tool_calls) ? data[0][0].tool_calls : [data[0][0].tool_calls];	626	return Array.isArray(data[0]?.[0]?.tool_calls) ? data[0][0].tool_calls : [data[0][0].tool_calls];
599	}	627	}

             return data[0];
+        }
+        // Google AI Studio tool calls
+        if (Array.isArray(data?.responseContent?.parts)) {
+            return data.responseContent.parts.filter(p => p.functionCall).map(p => convertGoogleToolCall(p.functionCall));
+        }
         // Parsed tool calls from non-streaming data
         if (Array.isArray(data?.choices)) {
             // Find a choice with 0-index

src/endpoints/backends/chat-completions.js+15 -1 Viewed

             tools.push(searchTool);
+        }
+        if (Array.isArray(request.body.tools) && request.body.tools.length > 0) {
+            const functionDeclarations = [];
+            for (const tool of request.body.tools) {
+                if (tool.type === 'function') {
+                    if (tool.function.parameters?.$schema) {
+                        delete tool.function.parameters.$schema;
+                    }
+                    functionDeclarations.push(tool.function);
+                }
+            }
+            tools.push({ function_declarations: functionDeclarations });
+        }
         let body = {
             contents: prompt.contents,
             safetySettings: safetySettings,

+            }
             const responseContent = candidates[0].content ?? candidates[0].output;
+            const functionCall = (candidates?.[0]?.content?.parts ?? []).some(part => part.functionCall);
             console.warn('Google AI Studio response:', responseContent);
             const responseText = typeof responseContent === 'string' ? responseContent : responseContent?.parts?.filter(part => !part.thought)?.map(part => part.text)?.join('\n\n');
-            if (!responseText) {
+            if (!responseText && !functionCall) {
                 let message = 'Google AI Studio Candidate text empty';
                 console.warn(message, generateResponseJson);
                 return response.send({ error: { message } });

src/prompt-converters.js+38 -4 Viewed

 import crypto from 'node:crypto';
-import { getConfigValue } from './util.js';
+import { getConfigValue, tryParse } from './util.js';
 const PROMPT_PLACEHOLDER = getConfigValue('promptPlaceholder', 'Let\'s get started.');

+    }
     const system_instruction = { parts: { text: sys_prompt.trim() } };
+    const toolNameMap = {};
     const contents = [];
     messages.forEach((message, index) => {
         // fix the roles
-        if (message.role === 'system') {
+        if (message.role === 'system' || message.role === 'tool') {
             message.role = 'user';
         } else if (message.role === 'assistant') {
             message.role = 'model';

         // Convert the content to an array of parts
         if (!Array.isArray(message.content)) {
-            message.content = [{ type: 'text', text: String(message.content ?? '') }];
+            const content = (() => {
+                const hasToolCalls = Array.isArray(message.tool_calls) && message.tool_calls.length > 0;
+                const hasToolCallId = typeof message.tool_call_id === 'string' && message.tool_call_id.length > 0;
+                if (hasToolCalls) {
+                    return { type: 'tool_calls', tool_calls: message.tool_calls };
+                }
+                if (hasToolCallId) {
+                    return { type: 'tool_call_id', tool_call_id: message.tool_call_id, content: String(message.content ?? '') };
+                }
+                return { type: 'text', text: String(message.content ?? '') };
+            })();
+            message.content = [content];
+        }
         // similar story as claude

         message.content.forEach((part) => {
             if (part.type === 'text') {
                 parts.push({ text: part.text });
+            } else if (part.type === 'tool_call_id') {
+                const name = toolNameMap[part.tool_call_id] ?? 'unknown';
+                parts.push({
+                    functionResponse: {
+                        name: name,
+                        response: { name: name, content: part.content },
+                    },
+                });
+            } else if (part.type === 'tool_calls') {
+                part.tool_calls.forEach((toolCall) => {
+                    parts.push({
+                        functionCall: {
+                            name: toolCall.function.name,
+                            args: tryParse(toolCall.function.arguments) ?? toolCall.function.arguments,
+                        },
+                    });
+                    toolNameMap[toolCall.id] = toolCall.function.name;
+                });
             } else if (part.type === 'image_url' && isMultimodal) {
                 const mimeType = part.image_url.url.split(';')[0].split(':')[1];
                 const base64Data = part.image_url.url.split(',')[1];

@@ -473,7 +507,7 @@ export function convertGooglePrompt(messages, model, useSysPrompt, names) {
473	if (part.text) {	507	if (part.text) {
474	contents[contents.length - 1].parts[0].text += '\n\n' + part.text;	508	contents[contents.length - 1].parts[0].text += '\n\n' + part.text;
475	}	509	}
476	if (part.inlineData) {	510	if (part.inlineData \|\| part.functionCall) {
477	contents[contents.length - 1].parts.push(part);	511	contents[contents.length - 1].parts.push(part);
478	}	512	}
479	});	513	});

Gemini: Add tool calling