AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-06-04 11:14:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Co-authored-by: werido <359066432@qq.com>
This commit is contained in:
Jimmyy 2025-04-16 09:56:46 +08:00 committed by GitHub
parent cd17ce9250
commit aead48726e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/fields/conversation_fields.py
View File

@ -42,6 +42,7 @@ message_file_fields = {
"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 = {

2
api/models/model.py
View File

@ -1155,7 +1155,7 @@ class Message(db.Model): # type: ignore[name-defined]
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)
] ]

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

@ -52,7 +52,7 @@ function getFormattedChatList(messages: any[]) {
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') || []
@ -63,7 +63,7 @@ function getFormattedChatList(messages: any[]) {
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}`,
}) })
}) })

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

@ -134,7 +134,7 @@ export const getProcessedFilesFromResponse = (files: FileResponse[]) => {
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
web/types/workflow.ts
View File

@ -197,6 +197,7 @@ export type FileResponse = {
transfer_method: TransferMethod transfer_method: TransferMethod
type: string type: string
url: string url: string
upload_file_id: string
} }
export type NodeFinishedResponse = { export type NodeFinishedResponse = {