run-llama/LlamaIndexTS
1
0
Fork 0
mirror of https://github.com/run-llama/LlamaIndexTS.git synced 2026-07-16 07:14:29 -04:00
Code Issues 138 Packages Projects Releases 10 Wiki Activity

fix: google start chat tools params (#1716)

Browse Source 
Co-authored-by: Marcus Schiesser <mail@marcusschiesser.de>
This commit is contained in:
Thomas Vanier
2025-03-10 12:07:36 +01:00
committed by GitHub
parent b5cb35a732
commit 33f98565ab
2 changed files with 32 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.changeset/mighty-squids-pull.md
+5
View File
@@ -0,0 +1,5 @@
---
"@llamaindex/google": patch
---
Fix google start chat tools parameter
packages/providers/google/src/base.ts
+27 -38
View File
@@ -231,29 +231,37 @@ export class Gemini extends ToolCallLLM<GeminiAdditionalChatOptions> {
};
}
private createStartChatParams(
params: GeminiChatParamsNonStreaming | GeminiChatParamsStreaming,
) {
const context = getChatContext(params);
const common = {
history: context.history,
safetySettings: DEFAULT_SAFETY_SETTINGS,
};
return params.tools?.length
? {
...common,
// only if non-empty tools list
tools: [
{
functionDeclarations: params.tools.map(
mapBaseToolToGeminiFunctionDeclaration,
),
},
],
safetySettings: DEFAULT_SAFETY_SETTINGS,
}
: common;
}
protected async nonStreamChat(
params: GeminiChatParamsNonStreaming,
): Promise<GeminiChatNonStreamResponse> {
const context = getChatContext(params);
const client = this.session.getGenerativeModel(this.metadata);
const chat = client.startChat(
params.tools
? {
history: context.history,
tools: [
{
functionDeclarations: params.tools.map(
mapBaseToolToGeminiFunctionDeclaration,
),
},
],
safetySettings: DEFAULT_SAFETY_SETTINGS,
}
: {
history: context.history,
safetySettings: DEFAULT_SAFETY_SETTINGS,
},
);
const chat = client.startChat(this.createStartChatParams(params));
const { response } = await chat.sendMessage(context.message);
const topCandidate = response.candidates![0]!;
@@ -279,26 +287,7 @@ export class Gemini extends ToolCallLLM<GeminiAdditionalChatOptions> {
): GeminiChatStreamResponse {
const context = getChatContext(params);
const client = this.session.getGenerativeModel(this.metadata);
const tools = params.tools?.length
? [
{
functionDeclarations: params.tools.map(
mapBaseToolToGeminiFunctionDeclaration,
),
},
]
: [];
const startChatParams = params.tools
? {
history: context.history,
tools,
safetySettings: DEFAULT_SAFETY_SETTINGS,
}
: {
history: context.history,
safetySettings: DEFAULT_SAFETY_SETTINGS,
};
const chat = client.startChat(startChatParams);
const chat = client.startChat(this.createStartChatParams(params));
const result = await chat.sendMessageStream(context.message);
yield* this.session.getChatStream(result);
}