jyapayne/dify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Feat/chat message image first for agent and advanced_chat APP (#23796)

Browse source 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
This commit is contained in:
jiangbo721 2025-08-22 16:42:15 +08:00 • committed by GitHub
commit 805b698c2e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
api/core/agent/base_agent_runner.py
View file

@ -512,7 +512,6 @@ class BaseAgentRunner(AppRunner):
if not file_objs:
return UserPromptMessage(content=message.query)
prompt_message_contents: list[PromptMessageContentUnionTypes] = []
prompt_message_contents.append(TextPromptMessageContent(data=message.query))
for file in file_objs:
prompt_message_contents.append(
file_manager.to_prompt_message_content(
@ -520,4 +519,6 @@ class BaseAgentRunner(AppRunner):
image_detail_config=image_detail_config,
)
)
prompt_message_contents.append(TextPromptMessageContent(data=message.query))
return UserPromptMessage(content=prompt_message_contents)

6
api/core/agent/cot_chat_agent_runner.py
View file

@ -39,9 +39,6 @@ class CotChatAgentRunner(CotAgentRunner):
Organize user query
"""
if self.files:
prompt_message_contents: list[PromptMessageContentUnionTypes] = []
prompt_message_contents.append(TextPromptMessageContent(data=query))
# get image detail config
image_detail_config = (
self.application_generate_entity.file_upload_config.image_config.detail
@ -52,6 +49,8 @@ class CotChatAgentRunner(CotAgentRunner):
else None
)
image_detail_config = image_detail_config or ImagePromptMessageContent.DETAIL.LOW
prompt_message_contents: list[PromptMessageContentUnionTypes] = []
for file in self.files:
prompt_message_contents.append(
file_manager.to_prompt_message_content(
@ -59,6 +58,7 @@ class CotChatAgentRunner(CotAgentRunner):
image_detail_config=image_detail_config,
)
)
prompt_message_contents.append(TextPromptMessageContent(data=query))
prompt_messages.append(UserPromptMessage(content=prompt_message_contents))
else:

6
api/core/agent/fc_agent_runner.py
View file

@ -395,9 +395,6 @@ class FunctionCallAgentRunner(BaseAgentRunner):
Organize user query
"""
if self.files:
prompt_message_contents: list[PromptMessageContentUnionTypes] = []
prompt_message_contents.append(TextPromptMessageContent(data=query))
# get image detail config
image_detail_config = (
self.application_generate_entity.file_upload_config.image_config.detail
@ -408,6 +405,8 @@ class FunctionCallAgentRunner(BaseAgentRunner):
else None
)
image_detail_config = image_detail_config or ImagePromptMessageContent.DETAIL.LOW
prompt_message_contents: list[PromptMessageContentUnionTypes] = []
for file in self.files:
prompt_message_contents.append(
file_manager.to_prompt_message_content(
@ -415,6 +414,7 @@ class FunctionCallAgentRunner(BaseAgentRunner):
image_detail_config=image_detail_config,
)
)
prompt_message_contents.append(TextPromptMessageContent(data=query))
prompt_messages.append(UserPromptMessage(content=prompt_message_contents))
else: