Northern_Lights/cherry-studio
1
0
Fork 0
mirror of https://github.com/CherryHQ/cherry-studio.git synced 2026-01-04 20:00:00 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix: anthropic message generating error

Browse Source
This commit is contained in:
kangfenmao 2024-08-14 20:35:57 +08:00
parent e1c2457ca2
commit 1307aceec1
1 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/renderer/src/services/ProviderSDK.ts
View File

@ -56,24 +56,36 @@ export default class ProviderSDK {
})) }))
if (this.isAnthropic) { if (this.isAnthropic) {
await this.anthropicSdk.messages return new Promise<void>((resolve, reject) => {
.stream({ const stream = this.anthropicSdk.messages
model: model.id, .stream({
messages: [systemMessage, ...userMessages].filter(Boolean) as MessageParam[], model: model.id,
max_tokens: maxTokens || DEFAULT_MAX_TOKENS, messages: userMessages.filter(Boolean) as MessageParam[],
temperature: assistant?.settings?.temperature max_tokens: maxTokens || DEFAULT_MAX_TOKENS,
}) temperature: assistant?.settings?.temperature,
.on('text', (text) => onChunk({ text: text || '' })) system: assistant.prompt,
.on('finalMessage', (message) => stream: true
onChunk({
usage: {
prompt_tokens: message.usage.input_tokens,
completion_tokens: message.usage.output_tokens,
total_tokens: sum(Object.values(message.usage))
}
}) })
) .on('text', (text) => {
return if (window.keyv.get(EVENT_NAMES.CHAT_COMPLETION_PAUSED)) {
resolve()
return stream.controller.abort()
}
onChunk({ text })
})
.on('finalMessage', (message) => {
onChunk({
text: '',
usage: {
prompt_tokens: message.usage.input_tokens,
completion_tokens: message.usage.output_tokens,
total_tokens: sum(Object.values(message.usage))
}
})
resolve()
})
.on('error', (error) => reject(error))
})
} }
if (this.isGemini) { if (this.isGemini) {
@ -140,9 +152,10 @@ export default class ProviderSDK {
if (this.isAnthropic) { if (this.isAnthropic) {
const response = await this.anthropicSdk.messages.create({ const response = await this.anthropicSdk.messages.create({
model: model.id, model: model.id,
messages: messages as MessageParam[], messages: messages.filter((m) => m.role === 'user') as MessageParam[],
max_tokens: 4096, max_tokens: 4096,
temperature: assistant?.settings?.temperature, temperature: assistant?.settings?.temperature,
system: assistant.prompt,
stream: false stream: false
}) })
@ -179,7 +192,7 @@ export default class ProviderSDK {
const model = getTopNamingModel() || assistant.model || getDefaultModel() const model = getTopNamingModel() || assistant.model || getDefaultModel()
const userMessages = takeRight(messages, 5).map((message) => ({ const userMessages = takeRight(messages, 5).map((message) => ({
role: 'user', role: message.role,
content: message.content content: message.content
})) }))
@ -190,10 +203,11 @@ export default class ProviderSDK {
if (this.isAnthropic) { if (this.isAnthropic) {
const message = await this.anthropicSdk.messages.create({ const message = await this.anthropicSdk.messages.create({
messages: [systemMessage, ...userMessages] as Anthropic.Messages.MessageParam[], messages: userMessages as Anthropic.Messages.MessageParam[],
model: model.id, model: model.id,
system: systemMessage.content,
stream: false, stream: false,
max_tokens: 50 max_tokens: 4096
}) })
return message.content[0].type === 'text' ? message.content[0].text : null return message.content[0].type === 'text' ? message.content[0].text : null