Northern_Lights/cherry-studio
1
0
Fork 0
mirror of https://github.com/CherryHQ/cherry-studio.git synced 2026-01-09 06:49:02 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix(GeminiAPIClient): update abortSignal option and ensure userLastMessage is pushed to messages (#7387)

Browse Source
This commit is contained in:
SuYao 2025-06-20 14:46:22 +08:00 committed by GitHub
parent 3e142f67ad
commit 1915ba5bfb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/renderer/src/aiCore/clients/gemini/GeminiAPIClient.ts
View File

@ -85,7 +85,7 @@ export class GeminiAPIClient extends BaseApiClient<
...rest, ...rest,
config: { config: {
...rest.config, ...rest.config,
abortSignal: options?.abortSignal, abortSignal: options?.signal,
httpOptions: { httpOptions: {
...rest.config?.httpOptions, ...rest.config?.httpOptions,
timeout: options?.timeout timeout: options?.timeout
@ -479,6 +479,7 @@ export class GeminiAPIClient extends BaseApiClient<
for (const message of messages) { for (const message of messages) {
history.push(await this.convertMessageToSdkParam(message)) history.push(await this.convertMessageToSdkParam(message))
} }
messages.push(userLastMessage)
} }
} }

2
src/renderer/src/types/sdk.ts
View File

@ -102,6 +102,6 @@ export type GeminiSdkToolCall = FunctionCall
export type GeminiOptions = { export type GeminiOptions = {
streamOutput: boolean streamOutput: boolean
abortSignal?: AbortSignal signal?: AbortSignal
timeout?: number timeout?: number
} }