From 423fb2d7bce20b0211a1631a29a2a38b20d19af9 Mon Sep 17 00:00:00 2001 From: Wu Jiayang <62842862+Wu-Jiayang@users.noreply.github.com> Date: Tue, 11 Feb 2025 18:44:56 +0800 Subject: [PATCH] Ensure the 'inputs' field in /chat-messages takes effect every time (#7955) Co-authored-by: Your Name Co-authored-by: -LAN- --- api/core/app/apps/advanced_chat/app_generator.py | 4 +--- api/core/app/apps/agent_chat/app_generator.py | 4 +--- api/core/app/apps/chat/app_generator.py | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/api/core/app/apps/advanced_chat/app_generator.py b/api/core/app/apps/advanced_chat/app_generator.py index 36f71fd478..930d4c80bc 100644 --- a/api/core/app/apps/advanced_chat/app_generator.py +++ b/api/core/app/apps/advanced_chat/app_generator.py @@ -140,9 +140,7 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator): app_config=app_config, file_upload_config=file_extra_config, conversation_id=conversation.id if conversation else None, - inputs=conversation.inputs - if conversation - else self._prepare_user_inputs( + inputs=self._prepare_user_inputs( user_inputs=inputs, variables=app_config.variables, tenant_id=app_model.tenant_id ), query=query, diff --git a/api/core/app/apps/agent_chat/app_generator.py b/api/core/app/apps/agent_chat/app_generator.py index e7f622263e..0b3704b018 100644 --- a/api/core/app/apps/agent_chat/app_generator.py +++ b/api/core/app/apps/agent_chat/app_generator.py @@ -148,9 +148,7 @@ class AgentChatAppGenerator(MessageBasedAppGenerator): model_conf=ModelConfigConverter.convert(app_config), file_upload_config=file_extra_config, conversation_id=conversation.id if conversation else None, - inputs=conversation.inputs - if conversation - else self._prepare_user_inputs( + inputs=self._prepare_user_inputs( user_inputs=inputs, variables=app_config.variables, tenant_id=app_model.tenant_id ), query=query, diff --git a/api/core/app/apps/chat/app_generator.py b/api/core/app/apps/chat/app_generator.py index dc7cf3667a..0f359f36d7 100644 --- a/api/core/app/apps/chat/app_generator.py +++ b/api/core/app/apps/chat/app_generator.py @@ -141,9 +141,7 @@ class ChatAppGenerator(MessageBasedAppGenerator): model_conf=ModelConfigConverter.convert(app_config), file_upload_config=file_extra_config, conversation_id=conversation.id if conversation else None, - inputs=conversation.inputs - if conversation - else self._prepare_user_inputs( + inputs=self._prepare_user_inputs( user_inputs=inputs, variables=app_config.variables, tenant_id=app_model.tenant_id ), query=query,