Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web

src/views/dmx/IntelligentAgent/components/agentConfig.vue

@@ -32,7 +32,7 @@
   >
     <a-row class="">
       <a-col :span="24">
-        <a-tabs type="capsule" size="large">
+        <a-tabs type="capsule" size="large" v-model="keyLarge" @tab-click="console.log(keyLarge)">
           <a-tab-pane key="1" title="助理设置">
             <a-divider style="margin-bottom: 20px;margin-top: 0" />
             <div style="width: 100%;" :style="{height:height}">
@@ -309,6 +309,7 @@ const file = ref();
 const formRef = ref();
 const formRef1 = ref();
 const formRef2 = ref();
+const keyLarge = ref('1');
 const form = reactive({
   name: "",
   icon: "",
@@ -448,24 +449,27 @@ const handleOpened = (el) => {
   //   txt: '',// 备注
   // });
   formRef.value.resetFields();
-  form.name = "";
-  form.prompt_config.system = "你是一个智能助手，请总结知识库的内容来回答问题，请列举知识库中的数据详细回答。当所有知识库内容都与问题无关时，你的回答必须包括“知识库中未找到您要的答案！”这句话。" +
-    "回答需要考虑聊天历史。\n        以下是知识库：\n        {knowledge}\n        以上是知识库。";
-  formRef.value.resetFields();
   formRef1.value.resetFields();
   formRef2.value.resetFields();
+
+  if(props.typeAngint=='add'){
+    form.name = "";
+    form.prompt_config.system = "你是一个智能助手，请总结知识库的内容来回答问题，请列举知识库中的数据详细回答。当所有知识库内容都与问题无关时，你的回答必须包括“知识库中未找到您要的答案！”这句话。" +
+      "回答需要考虑聊天历史。\n        以下是知识库：\n        {knowledge}\n        以上是知识库。";
+  }
+
 };
 
 
 const handleBeforeOk = async (done) => {
   formRef.value.validate().then(res => {
-    console.log('res:', res)
+    // console.log('res:', res)
   })
   formRef1.value.validate().then(res => {
-    console.log('res:', res)
+    // console.log('res:', res)
   })
   formRef2.value.validate().then(res => {
-    console.log('res:', res)
+    // console.log('res:', res)
   })
   if (form.name && form.kb_ids.length>0 && form.prompt_config.system && form.llm_id) {
     let title = '创建成功';

src/views/dmx/knowledgeLib/config.vue

@@ -89,7 +89,7 @@
             </a-select>
           </a-form-item>
           <a-form-item field="slider" label="块Token数">
-            <a-slider v-model="form.chunk_token_num" :max="1000"  show-input />
+            <a-slider v-model="form.chunk_token_num" :min="0" :max="2048"  show-input />
           </a-form-item>
           <a-form-item  label="布局识别" >
             <a-space direction="vertical" size="large">
@@ -107,19 +107,16 @@
                 v-model="form.prompt"
                 style="height: 10rem;border: 1px solid  var(--color-fill-3);border-radius: 4px" placeholder="请填写提示词"  />
             </a-form-item>
-            <a-form-item field="slider" label="最大token数"
-                         :rules="[{type:'number', min:5,message:'slider is min than 5'}]">
-              <a-slider v-model="form.max_token" :min="1" :max="1000" show-input/>
+            <a-form-item field="slider" label="最大token数">
+              <a-slider v-model="form.max_token" :min="0" :max="2048" show-input/>
             </a-form-item>
-            <a-form-item field="slider" label="阈值" :rules="[{type:'number', min:5,message:'slider is min than 5'}]">
-              <a-slider v-model="form.threshold"  show-tooltip show-input/>
+            <a-form-item field="slider" label="阈值" >
+              <a-slider v-model="form.threshold"  :step="0.01" :min="0" :max="1"  show-input/>
             </a-form-item>
-            <a-form-item field="slider" label="最大聚类数"
-                         :rules="[{type:'number', min:5,message:'slider is min than 5'}]">
-              <a-slider v-model="form.max_cluster" :max="1000" show-input/>
+            <a-form-item field="slider" label="最大聚类数">
+              <a-slider v-model="form.max_cluster" :min="1" :max="1024" show-input/>
             </a-form-item>
-            <a-form-item field="slider" label="随机种子" v-model="form.random_seed"
-                         :rules="[{type:'number', min:5,message:'slider is min than 5'}]">
+            <a-form-item field="slider" label="随机种子" v-model="form.random_seed">
               <a-input-number v-model="form.random_seed" :style="{width:'300px',marginRight:'1rem',borderRadius:'4px'}"
                               placeholder="请输入" class="input-demo" :min="10" :max="100" />
               <a-button type="primary" @click="randomNumber">

src/views/dmx/knowledgeLib/test.vue

@@ -8,12 +8,12 @@
           <a-divider style="margin-top: 10px" />
           <a-form ref="formRef"  :model="form" :style="{width:'100%'}" layout="vertical"  @submit="handleSubmit">
             <a-form-item field="similarity_threshold" label="相似度阈值">
-              <a-slider v-model="form.similarity_threshold"  />
+              <a-slider v-model="form.similarity_threshold" :step="0.01" :min="0" :max="1"  />
             </a-form-item>
-            <a-form-item field="slider" label="关键字相似度权重" :rules="[{type:'number', min:5,message:'slider is min than 5'}]">
-              <a-slider v-model="form.vector_similarity_weight"  />
+            <a-form-item field="slider" label="关键字相似度权重" >
+              <a-slider v-model="form.vector_similarity_weight" :step="0.01" :min="0" :max="1"  />
             </a-form-item>
-            <a-form-item field="section" label="Rerank模型" :rules="[{match:/section one/,message:'请选择'}]">
+            <a-form-item field="section" label="Rerank模型" >
               <a-space direction="vertical" size="large">
                 <a-select :size="'large'" v-model="form.rerank_id" :style="{width:'100%'}" placeholder="请选择 ..." allow-clear>
                   <a-optgroup  :label="index" v-for="(item,index) in modelList" :key=index>
@@ -84,10 +84,10 @@ let form = reactive({
   page: 1,
   question: '',
   rerank_id: '',
-  similarity_threshold: 20,
+  similarity_threshold: 0.2,
   size: 10,
   top_k: 1024,
-  vector_similarity_weight: 30,
+  vector_similarity_weight: 0.3,
 });
 
 
@@ -104,8 +104,6 @@ const handleSubmit = async ({values, errors}) => {
     ...form,
     kb_id:kbid.value,
   }
-  formObj.similarity_threshold = formObj.similarity_threshold/100;
-  formObj.vector_similarity_weight = formObj.vector_similarity_weight/100;
    const data = await kbretrievalTest(formObj);
 }
 

src/views/dmx/knowledgeLib/tool.vue

@@ -33,9 +33,8 @@
             <div class="parser">
               <a-form ref="formRef" :rules="rules" :model="form"  auto-label-width @submit="handleSubmit" >
                 <a-divider style="margin-top: 10px" />
-                <a-form-item field="slider" label="块token数"
-                             :rules="[{type:'number', min:1,message:'slider is min than 1'}]">
-                  <a-slider v-model="form.chunk_token_num" :max="1000" show-input />
+                <a-form-item field="slider" label="块Token数">
+                  <a-slider v-model="form.chunk_token_num" :min="0" :max="2048"  show-input />
                 </a-form-item>
                 <a-divider style="margin-top: 10px" />
                 <a-form-item field="raptor" label="使用召回增强RAPTOR策略">
@@ -49,16 +48,14 @@
                       v-model="form.prompt"
                       style="height: 10rem;border: 1px solid  var(--color-fill-3);border-radius: 4px" placeholder="请填写提示词"  />
                   </a-form-item>
-                  <a-form-item field="slider" label="最大token数"
-                               :rules="[{type:'number', min:5,message:'slider is min than 5'}]">
-                    <a-slider v-model="form.max_token" :min="1" :max="1000" show-input/>
+                  <a-form-item field="slider" label="最大token数">
+                    <a-slider v-model="form.max_token" :min="0" :max="2048" show-input/>
                   </a-form-item>
-                  <a-form-item field="slider" label="阈值" :rules="[{type:'number', min:5,message:'slider is min than 5'}]">
-                    <a-slider v-model="form.threshold"  show-tooltip show-input/>
+                  <a-form-item field="slider" label="阈值" >
+                    <a-slider v-model="form.threshold"  :step="0.01" :min="0" :max="1"  show-input/>
                   </a-form-item>
-                  <a-form-item field="slider" label="最大聚类数"
-                               :rules="[{type:'number', min:5,message:'slider is min than 5'}]">
-                    <a-slider v-model="form.max_cluster" :max="1000" show-input/>
+                  <a-form-item field="slider" label="最大聚类数">
+                    <a-slider v-model="form.max_cluster" :min="1" :max="1024" show-input/>
                   </a-form-item>
                   <a-form-item field="slider" label="随机种子" v-model="form.random_seed"
                                :rules="[{type:'number', min:5,message:'slider is min than 5'}]">
@@ -218,7 +215,7 @@ const form = reactive({
   parser_id: props.item.parser_id,
   doc_id: props.item.id,
   max_token: 698,
-  threshold: 30,
+  threshold: 0.30,
   max_cluster: 233,
   random_seed: 1500,
   chunk_token_num: 128,