whai/cherry-studio
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(chat): system message empty error

Browse Source
This commit is contained in:
kangfenmao 2024-07-12 14:47:42 +08:00
parent c06b20e09d
commit 41e00a0ace
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/renderer/src/pages/home/components/Messages.tsx
View File

@ -57,7 +57,7 @@ const Messages: FC<Props> = ({ assistant, topic }) => {
const _messages = messages.filter((m) => m.id !== message.id) const _messages = messages.filter((m) => m.id !== message.id)
setMessages(_messages) setMessages(_messages)
localforage.setItem(`topic:${topic.id}`, { localforage.setItem(`topic:${topic.id}`, {
...topic, id: topic.id,
messages: _messages messages: _messages
}) })
} }

14
src/renderer/src/services/api.ts
View File

@ -42,13 +42,19 @@ export async function fetchChatCompletion({ messages, topic, assistant, onRespon
onResponse({ ..._message }) onResponse({ ..._message })
const systemMessage = assistant.prompt ? { role: 'system', content: assistant.prompt } : undefined
const userMessages = takeRight(messages, 5).map((message) => ({
role: message.role,
content: message.content
}))
const _messages = [systemMessage, ...userMessages].filter(Boolean) as ChatCompletionMessageParam[]
try { try {
const stream = await openaiProvider.chat.completions.create({ const stream = await openaiProvider.chat.completions.create({
model: model.id, model: model.id,
messages: [ messages: _messages,
{ role: 'system', content: assistant.prompt },
...takeRight(messages, 5).map((message) => ({ role: message.role, content: message.content }))
],
stream: true stream: true
}) })