mirror of
https://github.com/CherryHQ/cherry-studio.git
synced 2025-12-26 03:31:24 +08:00
fix: image abort error and message render error (#5303)
This commit is contained in:
parent
86d00762ee
commit
eec9618084
@ -1350,7 +1350,7 @@
|
||||
"websearch": {
|
||||
"blacklist": "Blacklist",
|
||||
"blacklist_description": "Results from the following websites will not appear in search results",
|
||||
"blacklist_tooltip": "Please use the following format (separated by line breaks)\nexample.com\nhttps://www.example.com\nhttps://example.com\n*://*.example.com",
|
||||
"blacklist_tooltip": "Please use the following format (separated by newlines)\nPattern matching: *://*.example.com/*\nRegular expression: /example\\.(net|org)/",
|
||||
"check": "Check",
|
||||
"check_failed": "Verification failed",
|
||||
"check_success": "Verification successful",
|
||||
|
||||
@ -149,10 +149,10 @@ export default abstract class BaseProvider {
|
||||
const knowledgeReferences: KnowledgeReference[] = window.keyv.get(`knowledge-search-${message.id}`)
|
||||
|
||||
if (!isEmpty(knowledgeReferences)) {
|
||||
console.log(`Found ${knowledgeReferences.length} knowledge base references in cache for ID: ${message.id}`)
|
||||
// console.log(`Found ${knowledgeReferences.length} knowledge base references in cache for ID: ${message.id}`)
|
||||
return knowledgeReferences
|
||||
}
|
||||
console.log(`No knowledge base references found in cache for ID: ${message.id}`)
|
||||
// console.log(`No knowledge base references found in cache for ID: ${message.id}`)
|
||||
return []
|
||||
}
|
||||
|
||||
|
||||
@ -902,27 +902,24 @@ export default class OpenAIProvider extends BaseProvider {
|
||||
const defaultModel = getDefaultModel()
|
||||
const model = assistant.model || defaultModel
|
||||
const lastUserMessage = messages.findLast((m) => m.role === 'user')
|
||||
const { abortController, signalPromise } = this.createAbortController(lastUserMessage?.id, true)
|
||||
const { abortController } = this.createAbortController(lastUserMessage?.id, true)
|
||||
const { signal } = abortController
|
||||
const response = await this.sdk.images.generate(
|
||||
{
|
||||
model: model.id,
|
||||
prompt: lastUserMessage?.content || ''
|
||||
prompt: lastUserMessage?.content || '',
|
||||
response_format: model.id.includes('gpt-image-1') ? undefined : 'b64_json'
|
||||
},
|
||||
{
|
||||
signal
|
||||
}
|
||||
)
|
||||
|
||||
await signalPromise?.promise?.catch((error) => {
|
||||
throw error
|
||||
})
|
||||
|
||||
return onChunk({
|
||||
text: '',
|
||||
generateImage: {
|
||||
type: 'url',
|
||||
images: response.data.map((item) => item.url).filter((url): url is string => url !== undefined)
|
||||
type: 'base64',
|
||||
images: response.data.map((item) => `data:image/png;base64,${item.b64_json}`)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@ -228,7 +228,7 @@ export async function fetchChatCompletion({
|
||||
if (generateImage && generateImage.images.length > 0) {
|
||||
const existingImages = message.metadata?.generateImage?.images || []
|
||||
generateImage.images = [...existingImages, ...generateImage.images]
|
||||
console.log('generateImage', generateImage)
|
||||
// console.log('generateImage', generateImage)
|
||||
message.metadata = {
|
||||
...message.metadata,
|
||||
generateImage: generateImage
|
||||
|
||||
Loading…
Reference in New Issue
Block a user