fix

Author: wangliang181230

apps/application/flow/step_node/variable_assign_node/impl/base_variable_assign_node.py

@@ -73,19 +73,21 @@ def execute(self, variable_list, **kwargs) -> NodeResult:
         for variable in variable_list:
             if 'fields' not in variable:
                 continue
+
             if 'global' == variable['fields'][0]:
                 result = self.handle(variable, self.global_evaluation)
                 result_list.append(result)
-            if 'chat' == variable['fields'][0]:
+            elif 'chat' == variable['fields'][0]:
                 result = self.handle(variable, self.chat_evaluation)
                 result_list.append(result)
                 is_chat = True
-            if 'loop' == variable['fields'][0]:
+            elif 'loop' == variable['fields'][0]:
                 result = self.handle(variable, self.loop_evaluation)
                 result_list.append(result)
-            if 'output' == variable['fields'][0]:
+            elif 'output' == variable['fields'][0]:
                 result = self.handle(variable, self.out_evaluation)
                 result_list.append(result)
+
         if is_chat:
             from application.flow.loop_workflow_manage import LoopWorkflowManage
             if isinstance(self.workflow_manage, LoopWorkflowManage):

apps/application/serializers/application_chat_record.py

@@ -168,7 +168,7 @@ def reset_chat_record(chat_record, show_source, show_exec):
             'padding_problem_text': chat_record.details.get('problem_padding').get(
                 'padding_problem_text') if 'problem_padding' in chat_record.details else None,
             **(show_source_dict if show_source else {}),
-            **(show_exec_dict if show_exec else show_exec_dict)
+            **(show_exec_dict if show_exec else {})
         }
 
     def page(self, current_page: int, page_size: int, with_valid=True, show_source=None, show_exec=None):

apps/chat/serializers/chat.py

@@ -382,10 +382,10 @@ def get_chat_record(chat_info, chat_record_id):
                                 str(chat_record.id) == str(chat_record_id)]
             if chat_record_list is not None and len(chat_record_list):
                 return chat_record_list[-1]
-        chat_record = QuerySet(ChatRecord).filter(id=chat_record_id, chat_id=chat_info.chat_id).first()
-        if chat_record is None:
-            if not is_valid_uuid(chat_record_id):
-                raise ChatException(500, _("Conversation record does not exist"))
+            chat_record = QuerySet(ChatRecord).filter(id=chat_record_id, chat_id=chat_info.chat_id).first()
+            if chat_record is None:
+                if not is_valid_uuid(chat_record_id):
+                    raise ChatException(500, _("Conversation record does not exist"))
         chat_record = QuerySet(ChatRecord).filter(id=chat_record_id).first()
         return chat_record
 

ui/src/locales/lang/en-US/workflow.ts

@@ -188,7 +188,7 @@ export default {
       result: 'Search Results',
       searchParam: 'Search Parameters',
       select_variable: 'Select Variable',
-      valueMessage: `Value or name `,
+      valueMessage: 'Value or name',
 
       searchQuestion: {
         label: 'Search Question',