Merge remote-tracking branch 'upstream/main'

Author: guqing

.github/workflows/build-and-push-python-pg.yml

@@ -14,7 +14,7 @@ on:
           - linux/amd64,linux/arm64
 jobs:
   build-and-push-python-pg-to-ghcr:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Check Disk Space
         run: df -h
@@ -50,6 +50,9 @@ jobs:
             ${DOCKER_IMAGE_TAGS} .
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
+        with:
+          # Until https://github.com/tonistiigi/binfmt/issues/215
+          image: tonistiigi/binfmt:qemu-v7.0.0-28
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry

.github/workflows/build-and-push-vector-model.yml

@@ -19,7 +19,7 @@ on:
 
 jobs:
   build-and-push-vector-model-to-ghcr:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Check Disk Space
         run: df -h
@@ -55,6 +55,9 @@ jobs:
             ${DOCKER_IMAGE_TAGS} .
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
+        with:
+          # Until https://github.com/tonistiigi/binfmt/issues/215
+          image: tonistiigi/binfmt:qemu-v7.0.0-28
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry

.github/workflows/build-and-push.yml

@@ -36,7 +36,7 @@ on:
 jobs:
   build-and-push-to-fit2cloud-registry:
     if: ${{ contains(github.event.inputs.registry, 'fit2cloud') }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Check Disk Space
         run: df -h
@@ -73,6 +73,9 @@ jobs:
             ${DOCKER_IMAGE_TAGS} .
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
+        with:
+          # Until https://github.com/tonistiigi/binfmt/issues/215
+          image: tonistiigi/binfmt:qemu-v7.0.0-28
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
@@ -93,7 +96,7 @@ jobs:
 
   build-and-push-to-dockerhub:
     if: ${{ contains(github.event.inputs.registry, 'dockerhub') }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Check Disk Space
         run: df -h
@@ -130,6 +133,9 @@ jobs:
             ${DOCKER_IMAGE_TAGS} .
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
+        with:
+          # Until https://github.com/tonistiigi/binfmt/issues/215
+          image: tonistiigi/binfmt:qemu-v7.0.0-28
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry

apps/application/flow/step_node/application_node/i_application_node.py

@@ -11,13 +11,16 @@
 
 class ApplicationNodeSerializer(serializers.Serializer):
     application_id = serializers.CharField(required=True, error_messages=ErrMessage.char(_("Application ID")))
-    question_reference_address = serializers.ListField(required=True, error_messages=ErrMessage.list(_("User Questions")))
+    question_reference_address = serializers.ListField(required=True,
+                                                       error_messages=ErrMessage.list(_("User Questions")))
     api_input_field_list = serializers.ListField(required=False, error_messages=ErrMessage.list(_("API Input Fields")))
-    user_input_field_list = serializers.ListField(required=False, error_messages=ErrMessage.uuid(_("User Input Fields")))
+    user_input_field_list = serializers.ListField(required=False,
+                                                  error_messages=ErrMessage.uuid(_("User Input Fields")))
     image_list = serializers.ListField(required=False, error_messages=ErrMessage.list(_("picture")))
     document_list = serializers.ListField(required=False, error_messages=ErrMessage.list(_("document")))
     audio_list = serializers.ListField(required=False, error_messages=ErrMessage.list(_("Audio")))
-    child_node = serializers.DictField(required=False, allow_null=True, error_messages=ErrMessage.dict(_("Child Nodes")))
+    child_node = serializers.DictField(required=False, allow_null=True,
+                                       error_messages=ErrMessage.dict(_("Child Nodes")))
     node_data = serializers.DictField(required=False, allow_null=True, error_messages=ErrMessage.dict(_("Form Data")))
 
 
@@ -33,11 +36,16 @@ def _run(self):
             self.node_params_serializer.data.get('question_reference_address')[1:])
         kwargs = {}
         for api_input_field in self.node_params_serializer.data.get('api_input_field_list', []):
-            kwargs[api_input_field['variable']] = self.workflow_manage.get_reference_field(api_input_field['value'][0],
-                                                                                           api_input_field['value'][1:])
+            value = api_input_field.get('value', [''])[0] if api_input_field.get('value') else ''
+            kwargs[api_input_field['variable']] = self.workflow_manage.get_reference_field(value,
+                                                                                           api_input_field['value'][
+                                                                                           1:]) if value != '' else ''
+
         for user_input_field in self.node_params_serializer.data.get('user_input_field_list', []):
-            kwargs[user_input_field['field']] = self.workflow_manage.get_reference_field(user_input_field['value'][0],
-                                                                                         user_input_field['value'][1:])
+            value = user_input_field.get('value', [''])[0] if user_input_field.get('value') else ''
+            kwargs[user_input_field['field']] = self.workflow_manage.get_reference_field(value,
+                                                                                         user_input_field['value'][
+                                                                                         1:]) if value != '' else ''
         # 判断是否包含这个属性
         app_document_list = self.node_params_serializer.data.get('document_list', [])
         if app_document_list and len(app_document_list) > 0:
@@ -46,15 +54,17 @@ def _run(self):
                 app_document_list[1:])
             for document in app_document_list:
                 if 'file_id' not in document:
-                    raise ValueError(_("Parameter value error: The uploaded document lacks file_id, and the document upload fails"))
+                    raise ValueError(
+                        _("Parameter value error: The uploaded document lacks file_id, and the document upload fails"))
         app_image_list = self.node_params_serializer.data.get('image_list', [])
         if app_image_list and len(app_image_list) > 0:
             app_image_list = self.workflow_manage.get_reference_field(
                 app_image_list[0],
                 app_image_list[1:])
             for image in app_image_list:
                 if 'file_id' not in image:
-                    raise ValueError(_("Parameter value error: The uploaded image lacks file_id, and the image upload fails"))
+                    raise ValueError(
+                        _("Parameter value error: The uploaded image lacks file_id, and the image upload fails"))
 
         app_audio_list = self.node_params_serializer.data.get('audio_list', [])
         if app_audio_list and len(app_audio_list) > 0:
@@ -63,7 +73,8 @@ def _run(self):
                 app_audio_list[1:])
             for audio in app_audio_list:
                 if 'file_id' not in audio:
-                    raise ValueError(_("Parameter value error: The uploaded audio lacks file_id, and the audio upload fails."))
+                    raise ValueError(
+                        _("Parameter value error: The uploaded audio lacks file_id, and the audio upload fails."))
         return self.execute(**self.node_params_serializer.data, **self.flow_params_serializer.data,
                             app_document_list=app_document_list, app_image_list=app_image_list,
                             app_audio_list=app_audio_list,

apps/application/flow/step_node/application_node/impl/base_application_node.py

@@ -220,20 +220,25 @@ def execute(self, application_id, message, chat_id, chat_record_id, stream, re_c
     def get_details(self, index: int, **kwargs):
         global_fields = []
         for api_input_field in self.node_params_serializer.data.get('api_input_field_list', []):
+            value = api_input_field.get('value', [''])[0] if api_input_field.get('value') else ''
             global_fields.append({
                 'label': api_input_field['variable'],
                 'key': api_input_field['variable'],
                 'value': self.workflow_manage.get_reference_field(
-                    api_input_field['value'][0],
-                    api_input_field['value'][1:])
+                    value,
+                    api_input_field['value'][1:]
+                ) if value != '' else ''
             })
+
         for user_input_field in self.node_params_serializer.data.get('user_input_field_list', []):
+            value = user_input_field.get('value', [''])[0] if user_input_field.get('value') else ''
             global_fields.append({
                 'label': user_input_field['label'],
                 'key': user_input_field['field'],
                 'value': self.workflow_manage.get_reference_field(
-                    user_input_field['value'][0],
-                    user_input_field['value'][1:])
+                    value,
+                    user_input_field['value'][1:]
+                ) if value != '' else ''
             })
         return {
             'name': self.node.properties.get('stepName'),

apps/application/flow/step_node/condition_node/impl/base_condition_node.py

@@ -36,6 +36,10 @@ def branch_assertion(self, branch):
         return all(condition_list) if condition == 'and' else any(condition_list)
 
     def assertion(self, field_list: List[str], compare: str, value):
+        try:
+            value = self.workflow_manage.generate_prompt(value)
+        except Exception as e:
+            pass
         field_value = self.workflow_manage.get_reference_field(field_list[0], field_list[1:])
         for compare_handler in compare_handle_list:
             if compare_handler.support(field_list[0], field_list[1:], field_value, compare, value):

apps/application/serializers/application_serializers.py

@@ -374,6 +374,8 @@ def edit(self, instance: Dict, with_valid=True):
                 application_access_token.show_source = instance.get('show_source')
             if 'language' in instance and instance.get('language') is not None:
                 application_access_token.language = instance.get('language')
+            if 'language' not in instance or instance.get('language') is None:
+                application_access_token.language = None
             application_access_token.save()
             application_setting_model = DBModelManage.get_model('application_setting')
             xpack_cache = DBModelManage.get_model('xpack_cache')

apps/application/serializers/chat_message_serializers.py

@@ -222,13 +222,19 @@ def chat(self, instance: Dict, with_valid=True):
         client_type = self.data.get('client_type')
         chat_id = self.generate_chat(chat_id, application_id, message, client_id)
         return ChatMessageSerializer(
-            data={'chat_id': chat_id, 'message': message,
-                  're_chat': re_chat,
-                  'stream': stream,
-                  'application_id': application_id,
-                  'client_id': client_id,
-                  'client_type': client_type, 'form_data': instance.get('form_data', {})}).chat(
-            base_to_response=OpenaiToResponse())
+            data={
+                'chat_id': chat_id, 'message': message,
+                're_chat': re_chat,
+                'stream': stream,
+                'application_id': application_id,
+                'client_id': client_id,
+                'client_type': client_type,
+                'form_data': instance.get('form_data', {}),
+                'image_list': instance.get('image_list', []),
+                'document_list': instance.get('document_list', []),
+                'audio_list': instance.get('audio_list', []),
+            }
+        ).chat(base_to_response=OpenaiToResponse())
 
 
 class ChatMessageSerializer(serializers.Serializer):