mirror of
https://github.com/langgenius/dify.git
synced 2026-01-13 21:57:48 +08:00
fix: missing content if assistant message with tool_calls (#30083)
Some checks are pending
autofix.ci / autofix (push) Waiting to run
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/amd64, build-api-amd64) (push) Waiting to run
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/arm64, build-api-arm64) (push) Waiting to run
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/amd64, build-web-amd64) (push) Waiting to run
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/arm64, build-web-arm64) (push) Waiting to run
Build and Push API & Web / create-manifest (api, DIFY_API_IMAGE_NAME, merge-api-images) (push) Blocked by required conditions
Build and Push API & Web / create-manifest (web, DIFY_WEB_IMAGE_NAME, merge-web-images) (push) Blocked by required conditions
Main CI Pipeline / Check Changed Files (push) Waiting to run
Main CI Pipeline / API Tests (push) Blocked by required conditions
Main CI Pipeline / Web Tests (push) Blocked by required conditions
Main CI Pipeline / Style Check (push) Waiting to run
Main CI Pipeline / VDB Tests (push) Blocked by required conditions
Main CI Pipeline / DB Migration Test (push) Blocked by required conditions
Some checks are pending
autofix.ci / autofix (push) Waiting to run
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/amd64, build-api-amd64) (push) Waiting to run
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/arm64, build-api-arm64) (push) Waiting to run
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/amd64, build-web-amd64) (push) Waiting to run
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/arm64, build-web-arm64) (push) Waiting to run
Build and Push API & Web / create-manifest (api, DIFY_API_IMAGE_NAME, merge-api-images) (push) Blocked by required conditions
Build and Push API & Web / create-manifest (web, DIFY_WEB_IMAGE_NAME, merge-web-images) (push) Blocked by required conditions
Main CI Pipeline / Check Changed Files (push) Waiting to run
Main CI Pipeline / API Tests (push) Blocked by required conditions
Main CI Pipeline / Web Tests (push) Blocked by required conditions
Main CI Pipeline / Style Check (push) Waiting to run
Main CI Pipeline / VDB Tests (push) Blocked by required conditions
Main CI Pipeline / DB Migration Test (push) Blocked by required conditions
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
This commit is contained in:
parent
8f43629cd8
commit
9be863fefa
@ -188,7 +188,7 @@ class FunctionCallAgentRunner(BaseAgentRunner):
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
assistant_message = AssistantPromptMessage(content="", tool_calls=[])
|
assistant_message = AssistantPromptMessage(content=response, tool_calls=[])
|
||||||
if tool_calls:
|
if tool_calls:
|
||||||
assistant_message.tool_calls = [
|
assistant_message.tool_calls = [
|
||||||
AssistantPromptMessage.ToolCall(
|
AssistantPromptMessage.ToolCall(
|
||||||
@ -200,8 +200,6 @@ class FunctionCallAgentRunner(BaseAgentRunner):
|
|||||||
)
|
)
|
||||||
for tool_call in tool_calls
|
for tool_call in tool_calls
|
||||||
]
|
]
|
||||||
else:
|
|
||||||
assistant_message.content = response
|
|
||||||
|
|
||||||
self._current_thoughts.append(assistant_message)
|
self._current_thoughts.append(assistant_message)
|
||||||
|
|
||||||
|
|||||||
@ -251,10 +251,7 @@ class AssistantPromptMessage(PromptMessage):
|
|||||||
|
|
||||||
:return: True if prompt message is empty, False otherwise
|
:return: True if prompt message is empty, False otherwise
|
||||||
"""
|
"""
|
||||||
if not super().is_empty() and not self.tool_calls:
|
return super().is_empty() and not self.tool_calls
|
||||||
return False
|
|
||||||
|
|
||||||
return True
|
|
||||||
|
|
||||||
|
|
||||||
class SystemPromptMessage(PromptMessage):
|
class SystemPromptMessage(PromptMessage):
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user