diff --git a/apps/application/flow/loop_workflow_manage.py b/apps/application/flow/loop_workflow_manage.py index c236b15dcc5..0272d2c9940 100644 --- a/apps/application/flow/loop_workflow_manage.py +++ b/apps/application/flow/loop_workflow_manage.py @@ -186,6 +186,9 @@ def generate_prompt(self, prompt: str): @return: 格式化后的提示词 """ + if not prompt: + return '' + context = {**self.get_workflow_content(), **self.parentWorkflowManage.get_workflow_content()} prompt = self.reset_prompt(prompt) prompt_template = PromptTemplate.from_template(prompt, template_format='jinja2') diff --git a/apps/application/flow/workflow_manage.py b/apps/application/flow/workflow_manage.py index 1bf5a0a31ca..d076c086b72 100644 --- a/apps/application/flow/workflow_manage.py +++ b/apps/application/flow/workflow_manage.py @@ -781,6 +781,9 @@ def generate_prompt(self, prompt: str): @param prompt: 提示词信息 @return: 格式化后的提示词 """ + if not prompt: + return '' + context = self.get_workflow_content() prompt = self.reset_prompt(prompt) prompt_template = PromptTemplate.from_template(prompt, template_format='jinja2') diff --git a/apps/chat/serializers/chat.py b/apps/chat/serializers/chat.py index 4514dc457bc..1e5dcce67a4 100644 --- a/apps/chat/serializers/chat.py +++ b/apps/chat/serializers/chat.py @@ -73,9 +73,10 @@ def is_valid(self, *, raise_exception=False): class ChatMessageSerializers(serializers.Serializer): message = serializers.CharField(required=True, label=_("User Questions")) - stream = serializers.BooleanField(required=True, + stream = serializers.BooleanField(required=False, default=False, label=_("Is the answer in streaming mode")) - re_chat = serializers.BooleanField(required=True, label=_("Do you want to reply again")) + re_chat = serializers.BooleanField(required=False, default=False, + label=_("Do you want to reply again")) chat_record_id = serializers.UUIDField(required=False, allow_null=True, label=_("Conversation record id")) @@ -336,8 +337,8 @@ def is_valid_application_simple(self, *, chat_info: ChatInfo, raise_exception=Fa def chat_simple(self, chat_info: ChatInfo, instance, base_to_response): message = instance.get('message') - re_chat = instance.get('re_chat') - stream = instance.get('stream') + re_chat = instance.get('re_chat', False) + stream = instance.get('stream', False) chat_user_id = self.data.get('chat_user_id') chat_user_type = self.data.get('chat_user_type') ip_address = self.data.get('ip_address') @@ -391,8 +392,8 @@ def get_chat_record(chat_info, chat_record_id): def chat_work_flow(self, chat_info: ChatInfo, instance: dict, base_to_response): message = instance.get('message') - re_chat = instance.get('re_chat') - stream = instance.get('stream') + re_chat = instance.get('re_chat', False) + stream = instance.get('stream', False) chat_user_id = self.data.get("chat_user_id") chat_user_type = self.data.get('chat_user_type') ip_address = self.data.get('ip_address')