Merge accb13436d into 365cb4b368

Merge branch 'main' into main
Merge remote-tracking branch 'origin'
2024-11-16 11:42:29 +08:00 · 2024-11-15 09:22:22 +08:00 · 2024-11-11 11:24:55 +08:00 · 2024-09-04 03:35:14 +00:00 · 2024-09-04 03:34:31 +00:00 · 2024-09-03 15:40:46 +00:00
3 changed files with 3 additions and 9 deletions
--- a/api/core/app/apps/advanced_chat/app_generator.py
+++ b/api/core/app/apps/advanced_chat/app_generator.py
@ -125,9 +125,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(user_inputs=inputs, app_config=app_config),
+            inputs=self._prepare_user_inputs(user_inputs=inputs, app_config=app_config),
            query=query,
            files=file_objs,
            parent_message_id=args.get("parent_message_id") if invoke_from != InvokeFrom.SERVICE_API else UUID_NIL,
--- a/api/core/app/apps/agent_chat/app_generator.py
+++ b/api/core/app/apps/agent_chat/app_generator.py
@ -132,9 +132,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(user_inputs=inputs, app_config=app_config),
+            inputs=self._prepare_user_inputs(user_inputs=inputs, app_config=app_config),
            query=query,
            files=file_objs,
            parent_message_id=args.get("parent_message_id") if invoke_from != InvokeFrom.SERVICE_API else UUID_NIL,
--- a/api/core/app/apps/chat/app_generator.py
+++ b/api/core/app/apps/chat/app_generator.py
@ -130,9 +130,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(user_inputs=inputs, app_config=app_config),
+            inputs=self._prepare_user_inputs(user_inputs=inputs, app_config=app_config),
            query=query,
            files=file_objs,
            parent_message_id=args.get("parent_message_id") if invoke_from != InvokeFrom.SERVICE_API else UUID_NIL,
Author	SHA1	Message	Date
Wu Jiayang	ca7466e907	Merge `accb13436d` into `365cb4b368`	2024-11-15 09:22:22 +08:00
Wu Jiayang	accb13436d	Merge branch 'main' into main	2024-11-11 11:24:55 +08:00
Your Name	6c010e90e5	Merge remote-tracking branch 'origin'	2024-09-04 03:35:14 +00:00
Your Name	da809f32fc	Ensure the 'inputs' field in /chat-messages takes effect every time	2024-09-04 03:34:31 +00:00
Your Name	e4d5d9113f	Merge remote-tracking branch 'origin'	2024-09-03 15:40:46 +00:00
Your Name	3c05404007	Ensure the 'inputs' field in /chat-messages takes effect every time	2024-09-03 15:39:37 +00:00