test/dify
1
0
Fork 0
mirror of https://gitee.com/dify_ai/dify.git synced 2024-12-04 20:28:12 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix: JSON mode with an image doesn't work for Gemini (#5169)

Browse Source
This commit is contained in:
rerorero 2024-06-14 03:32:09 +09:00 committed by GitHub
parent 5ec7d85629
commit b85ae146a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/core/model_runtime/model_providers/__base/large_language_model.py
View File

@ -14,6 +14,7 @@ from core.model_runtime.entities.llm_entities import LLMMode, LLMResult, LLMResu
from core.model_runtime.entities.message_entities import ( from core.model_runtime.entities.message_entities import (
AssistantPromptMessage, AssistantPromptMessage,
PromptMessage, PromptMessage,
PromptMessageContentType,
PromptMessageTool, PromptMessageTool,
SystemPromptMessage, SystemPromptMessage,
UserPromptMessage, UserPromptMessage,
@ -205,8 +206,14 @@ if you are not sure about the structure.
)) ))
if len(prompt_messages) > 0 and isinstance(prompt_messages[-1], UserPromptMessage): if len(prompt_messages) > 0 and isinstance(prompt_messages[-1], UserPromptMessage):
# add ```JSON\n to the last message # add ```JSON\n to the last text message
if isinstance(prompt_messages[-1].content, str):
prompt_messages[-1].content += f"\n```{code_block}\n" prompt_messages[-1].content += f"\n```{code_block}\n"
elif isinstance(prompt_messages[-1].content, list):
for i in range(len(prompt_messages[-1].content) - 1, -1, -1):
if prompt_messages[-1].content[i].type == PromptMessageContentType.TEXT:
prompt_messages[-1].content[i].data += f"\n```{code_block}\n"
break
else: else:
# append a user message # append a user message
prompt_messages.append(UserPromptMessage( prompt_messages.append(UserPromptMessage(