Browse Source

fix: cannot regenerate with image(#15060) (#16611)

Co-authored-by: werido <359066432@qq.com>
tags/1.3.0
Jimmyy 6 months ago
parent
commit
aead48726e
No account linked to committer's email address

+ 1
- 0
api/fields/conversation_fields.py View File

"size": fields.Integer, "size": fields.Integer,
"transfer_method": fields.String, "transfer_method": fields.String,
"belongs_to": fields.String(default="user"), "belongs_to": fields.String(default="user"),
"upload_file_id": fields.String(default=None),
} }


agent_thought_fields = { agent_thought_fields = {

+ 1
- 1
api/models/model.py View File

files.append(file) files.append(file)


result = [ result = [
{"belongs_to": message_file.belongs_to, **file.to_dict()}
{"belongs_to": message_file.belongs_to, "upload_file_id": message_file.upload_file_id, **file.to_dict()}
for (file, message_file) in zip(files, message_files) for (file, message_file) in zip(files, message_files)
] ]



+ 2
- 2
web/app/components/base/chat/chat-with-history/hooks.tsx View File

id: `question-${item.id}`, id: `question-${item.id}`,
content: item.query, content: item.query,
isAnswer: false, isAnswer: false,
message_files: getProcessedFilesFromResponse(questionFiles.map((item: any) => ({ ...item, related_id: item.id }))),
message_files: getProcessedFilesFromResponse(questionFiles.map((item: any) => ({ ...item, related_id: item.id, upload_file_id: item.upload_file_id }))),
parentMessageId: item.parent_message_id || undefined, parentMessageId: item.parent_message_id || undefined,
}) })
const answerFiles = item.message_files?.filter((file: any) => file.belongs_to === 'assistant') || [] const answerFiles = item.message_files?.filter((file: any) => file.belongs_to === 'assistant') || []
feedback: item.feedback, feedback: item.feedback,
isAnswer: true, isAnswer: true,
citation: item.retriever_resources, citation: item.retriever_resources,
message_files: getProcessedFilesFromResponse(answerFiles.map((item: any) => ({ ...item, related_id: item.id }))),
message_files: getProcessedFilesFromResponse(answerFiles.map((item: any) => ({ ...item, related_id: item.id, upload_file_id: item.upload_file_id }))),
parentMessageId: `question-${item.id}`, parentMessageId: `question-${item.id}`,
}) })
}) })

+ 1
- 1
web/app/components/base/file-uploader/utils.ts View File

progress: 100, progress: 100,
transferMethod: fileItem.transfer_method, transferMethod: fileItem.transfer_method,
supportFileType: fileItem.type, supportFileType: fileItem.type,
uploadedId: fileItem.related_id,
uploadedId: fileItem.upload_file_id || fileItem.related_id,
url: fileItem.url, url: fileItem.url,
} }
}) })

+ 1
- 0
web/types/workflow.ts View File

transfer_method: TransferMethod transfer_method: TransferMethod
type: string type: string
url: string url: string
upload_file_id: string
} }


export type NodeFinishedResponse = { export type NodeFinishedResponse = {

Loading…
Cancel
Save