将生成图片或图片路径写入上下文中 放弃自控图片上下文
This commit is contained in:
@@ -158,8 +158,12 @@ async def chat_stream(request: DeepAgentChatRequest):
|
||||
"current_image": ""
|
||||
}
|
||||
# 用户上传图片
|
||||
input_image_content = ''
|
||||
if request.input_image_paths:
|
||||
for path in request.input_image_paths:
|
||||
input_image_content += "\n【附件上传图片路径】\n"
|
||||
for i, path in enumerate(request.input_image_paths):
|
||||
input_image_content += f"- 上传图片{i}: {path}\n"
|
||||
|
||||
bucket, object_name = path.split('/', 1)
|
||||
image_url = get_presigned_url(oss_client=minio_client, bucket=bucket, object_name=object_name)
|
||||
content.append({"type": "image_url", "image_url": {"url": image_url}})
|
||||
@@ -167,11 +171,16 @@ async def chat_stream(request: DeepAgentChatRequest):
|
||||
|
||||
# 用户引用图片
|
||||
if request.quote_image_path:
|
||||
input_image_content += "\n【附件引用图片路径】\n"
|
||||
input_image_content += f"- 引用图片: {request.quote_image_path}\n"
|
||||
|
||||
bucket, object_name = request.quote_image_path.split('/', 1)
|
||||
image_url = get_presigned_url(oss_client=minio_client, bucket=bucket, object_name=object_name)
|
||||
content.append({"type": "image_url", "image_url": {"url": image_url}})
|
||||
files["quote_image"] = request.quote_image_path
|
||||
|
||||
if initial_messages:
|
||||
content[0]['text'] += input_image_content
|
||||
final_messages = {
|
||||
"messages": [
|
||||
{
|
||||
@@ -181,6 +190,7 @@ async def chat_stream(request: DeepAgentChatRequest):
|
||||
],
|
||||
"files": files
|
||||
}
|
||||
logger.info(final_messages)
|
||||
async for stream in main_agent.astream(
|
||||
final_messages,
|
||||
config=current_config,
|
||||
@@ -233,8 +243,6 @@ async def chat_stream(request: DeepAgentChatRequest):
|
||||
tool_content_blocks = tools_token.content_blocks[0]
|
||||
tool_name = tools_token.name
|
||||
logger.info(f"[updates] {tool_name} -- {tool_content_blocks}")
|
||||
else:
|
||||
logger.info(f"[updates] -- {chunks}")
|
||||
|
||||
elif mode == "messages":
|
||||
# logger.info(f"[messages] -- {chunks}")
|
||||
|
||||
Reference in New Issue
Block a user