Merge branch 'main' of https://github.com/maxkb-dev/maxkb

Author: liqiang-fit2cloud

apps/application/flow/step_node/document_extract_node/impl/base_document_extract_node.py

@@ -40,7 +40,6 @@ def bytes_to_uploaded_file(file_bytes, file_name="file.txt"):
 class BaseDocumentExtractNode(IDocumentExtractNode):
     def save_context(self, details, workflow_manage):
         self.context['content'] = details.get('content')
-        self.answer_text = details.get('content')
 
 
     def execute(self, document, chat_id, **kwargs):

apps/application/flow/step_node/search_dataset_node/i_search_dataset_node.py

@@ -66,7 +66,7 @@ def _run(self):
         if self.flow_params_serializer.data.get('re_chat', False):
             history_chat_record = self.flow_params_serializer.data.get('history_chat_record', [])
             paragraph_id_list = [p.get('id') for p in flat_map(
-                [get_paragraph_list(chat_record, self.node.id) for chat_record in history_chat_record if
+                [get_paragraph_list(chat_record, self.runtime_node_id) for chat_record in history_chat_record if
                  chat_record.problem_text == question])]
             exclude_paragraph_id_list = list(set(paragraph_id_list))
 

apps/locales/en_US/LC_MESSAGES/django.po

@@ -6761,3 +6761,6 @@ msgstr ""
 
 msgid "AI reply: "
 msgstr ""
+
+msgid "The network is busy, try again later."
+msgstr ""

apps/locales/zh_CN/LC_MESSAGES/django.po

@@ -6900,3 +6900,6 @@ msgstr "思考过程: "
 
 msgid "AI reply: "
 msgstr "AI 回复: "
+
+msgid "The network is busy, try again later."
+msgstr "网络繁忙，请稍后再试。"

apps/locales/zh_Hant/LC_MESSAGES/django.po

@@ -6911,4 +6911,7 @@ msgid "Think: "
 msgstr "思考過程: "
 
 msgid "AI reply: "
-msgstr "AI 回覆: "
+msgstr "AI 回覆: "
+
+msgid "The network is busy, try again later."
+msgstr "網絡繁忙，請稍後再試。"

ui/src/components/ai-chat/component/answer-content/index.vue

@@ -122,7 +122,7 @@ function showSource(row: any) {
   return false
 }
 const regenerationChart = (chat: chatType) => {
-  props.sendMessage(chat.problem_text, { rechat: true })
+  props.sendMessage(chat.problem_text, { re_chat: true })
 }
 const stopChat = (chat: chatType) => {
   props.chatManagement.stop(chat.id)

ui/src/components/ai-chat/component/operation-button/ChatOperationButton.vue

@@ -86,6 +86,7 @@ import applicationApi from '@/api/application'
 import { datetimeFormat } from '@/utils/time'
 import { MsgError } from '@/utils/message'
 import { t } from '@/locales'
+import bus from '@/bus'
 const route = useRoute()
 const {
   params: { id }
@@ -277,6 +278,11 @@ const pausePlayAnswerText = () => {
 }
 
 onMounted(() => {
+  bus.on('pause-autoplay', () => {
+    pausePlayAnswerText()
+    // console.log(1234)
+  })
+  bus.emit('pause-autoplay')
   // 第一次回答后自动播放， 打开历史记录不自动播放
   if (props.tts && props.tts_autoplay && buttonData.value.write_ed && !buttonData.value.update_time) {
     playAnswerText(buttonData.value.answer_text)

ui/src/components/ai-chat/component/user-form/index.vue

@@ -16,7 +16,9 @@
         <el-icon class="mr-8 arrow-icon" :class="showUserInput ? 'rotate-90' : ''"
           ><CaretRight
         /></el-icon>
+        <span class="break-all ellipsis-1 mr-16" :title="inputFieldConfig.title">
         {{ inputFieldConfig.title }}
+        </span>
       </div>
       <el-scrollbar max-height="160">
         <el-collapse-transition>

ui/src/components/dynamics-form/constructor/data.ts

@@ -4,6 +4,10 @@ const input_type_list = [
     label: t('dynamicsForm.input_type_list.TextInput'),
     value: 'TextInput'
   },
+  {
+    label: t('dynamicsForm.input_type_list.PasswordInput'),
+    value: 'PasswordInput'
+  },
   {
     label: t('dynamicsForm.input_type_list.Slider'),
     value: 'Slider'

ui/src/components/dynamics-form/constructor/items/PasswordInputConstructor.vue

@@ -0,0 +1,194 @@
+<template>
+  <el-form-item :label="$t('dynamicsForm.TextInput.length.label')" required>
+    <el-row class="w-full">
+      <el-col :span="11">
+        <el-form-item
+          :rules="[
+            {
+              required: true,
+              message: $t('dynamicsForm.TextInput.length.minRequired'),
+              trigger: 'change'
+            }
+          ]"
+          prop="minlength"
+        >
+          <el-input-number
+            style="width: 100%"
+            :min="1"
+            :step="1"
+            step-strictly
+            v-model="formValue.minlength"
+            controls-position="right"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="2" class="text-center">
+        <span>-</span>
+      </el-col>
+      <el-col :span="11">
+        <el-form-item
+          :rules="[
+            {
+              required: true,
+              message: $t('dynamicsForm.TextInput.length.maxRequired'),
+              trigger: 'change'
+            }
+          ]"
+          prop="maxlength"
+        >
+          <el-input-number
+            style="width: 100%"
+            :min="formValue.minlength > formValue.maxlength ? formValue.minlength : 1"
+            step-strictly
+            :step="1"
+            v-model="formValue.maxlength"
+            controls-position="right"
+          />
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form-item>
+
+  <el-form-item
+    class="defaultValueItem"
+    :required="formValue.required"
+    prop="default_value"
+    :label="$t('dynamicsForm.default.label')"
+    :rules="
+      formValue.required ? [{ required: true, message: `${$t('dynamicsForm.default.label')}${$t('dynamicsForm.default.requiredMessage')}` }, ...rules] : rules
+    "
+  >
+    <div class="defaultValueCheckbox">
+      <el-checkbox
+        v-model="formValue.show_default_value"
+        :label="$t('dynamicsForm.default.show')"
+      />
+    </div>
+
+    <el-input
+      v-model="formValue.default_value"
+      :maxlength="formValue.maxlength"
+      :minlength="formValue.minlength"
+      :placeholder="$t('dynamicsForm.default.placeholder')"
+      show-word-limit
+      type="password"
+      show-password
+    />
+  </el-form-item>
+</template>
+<script setup lang="ts">
+import { computed, onMounted, watch } from 'vue'
+import { t } from '@/locales'
+
+const props = defineProps<{
+  modelValue: any
+}>()
+const emit = defineEmits(['update:modelValue'])
+const formValue = computed({
+  set: (item) => {
+    emit('update:modelValue', item)
+  },
+  get: () => {
+    return props.modelValue
+  }
+})
+watch(
+  () => formValue.value.minlength,
+  () => {
+    if (formValue.value.minlength > formValue.value.maxlength) {
+      formValue.value.maxlength = formValue.value.minlength
+    }
+  }
+)
+const getData = () => {
+  return {
+    input_type: 'PasswordInput',
+    attrs: {
+      maxlength: formValue.value.maxlength,
+      minlength: formValue.value.minlength,
+      'show-word-limit': true,
+      type: 'password',
+      'show-password': true
+    },
+    default_value: formValue.value.default_value,
+    show_default_value: formValue.value.show_default_value,
+    props_info: {
+      rules: formValue.value.required
+        ? [
+          {
+            required: true,
+            message: `${formValue.value.label} ${t('dynamicsForm.default.requiredMessage')}`
+          },
+          {
+            min: formValue.value.minlength,
+            max: formValue.value.maxlength,
+            message: `${formValue.value.label}${t('dynamicsForm.TextInput.length.requiredMessage1')} ${formValue.value.minlength} ${t('dynamicsForm.TextInput.length.requiredMessage2')} ${formValue.value.maxlength} ${t('dynamicsForm.TextInput.length.requiredMessage3')}`,
+            trigger: 'blur'
+          }
+        ]
+        : [
+          {
+            min: formValue.value.minlength,
+            max: formValue.value.maxlength,
+            message: `${formValue.value.label}${t('dynamicsForm.TextInput.length.requiredMessage1')} ${formValue.value.minlength} ${t('dynamicsForm.TextInput.length.requiredMessage2')} ${formValue.value.maxlength} ${t('dynamicsForm.TextInput.length.requiredMessage3')}`,
+            trigger: 'blur'
+          }
+        ]
+    }
+  }
+}
+const rander = (form_data: any) => {
+  const attrs = form_data.attrs || {}
+  formValue.value.minlength = attrs.minlength
+  formValue.value.maxlength = attrs.maxlength
+  formValue.value.default_value = form_data.default_value
+  formValue.value.show_default_value = form_data.show_default_value
+  formValue.value.show_password = attrs['show-password']
+}
+const rangeRules = [
+  {
+    required: true,
+    validator: (rule: any, value: any, callback: any) => {
+      if (!formValue.value.minlength) {
+        callback(new Error(t('dynamicsForm.TextInput.length.requiredMessage4')))
+      }
+      if (!formValue.value.maxlength) {
+        callback(new Error(t('dynamicsForm.TextInput.length.requiredMessage4')))
+      }
+      return true
+    },
+    message: `${formValue.value.label} ${t('dynamicsForm.default.requiredMessage')}`
+  }
+]
+const rules = computed(() => [
+  {
+    min: formValue.value.minlength,
+    max: formValue.value.maxlength,
+    message: `${t('dynamicsForm.TextInput.length.requiredMessage1')} ${formValue.value.minlength} ${t('dynamicsForm.TextInput.length.requiredMessage2')} ${formValue.value.maxlength} ${t('dynamicsForm.TextInput.length.requiredMessage3')}`,
+    trigger: 'blur'
+  }
+])
+
+defineExpose({ getData, rander })
+onMounted(() => {
+  formValue.value.minlength = 0
+  formValue.value.maxlength = 20
+  formValue.value.default_value = ''
+  formValue.value.show_password = true
+
+  if (formValue.value.show_default_value === undefined) {
+    formValue.value.show_default_value = true
+  }
+})
+</script>
+<style lang="scss" scoped>
+.defaultValueItem {
+  position: relative;
+
+  .defaultValueCheckbox {
+    position: absolute;
+    right: 0;
+    top: -35px;
+  }
+}
+</style>