From 1d79decff982c9a7aa1bb8d3e968f2233b23919f Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期三, 07 八月 2024 19:13:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web
---
src/views/dmx/knowledgeLib/test.vue | 2
src/views/dmx/knowledgeLib/index.vue | 43 ++++++++++++++++++---
src/views/dmx/knowledgeLib/config.vue | 46 +++++++++++++++++-----
3 files changed, 73 insertions(+), 18 deletions(-)
diff --git a/src/views/dmx/knowledgeLib/config.vue b/src/views/dmx/knowledgeLib/config.vue
index 098e8db..16fdf1a 100644
--- a/src/views/dmx/knowledgeLib/config.vue
+++ b/src/views/dmx/knowledgeLib/config.vue
@@ -68,9 +68,9 @@
<!-- <a-option value="1">鑻辨枃</a-option>-->
<!-- </a-select>-->
<!-- </a-form-item>-->
- <a-form-item field="section" label="宓屽叆妯″瀷">
+ <a-form-item field="embd_id" label="宓屽叆妯″瀷">
<a-space direction="vertical" size="large">
- <a-select :size="'large'" v-model="form.embd_id" :style="{width:'100%'}" placeholder="璇烽�夋嫨 ..." :disabled="kbObj.chunk_num>0 || kbObj.token_num>0" allow-clear>
+ <a-select :size="'large'" v-model="form.embd_id" :style="{width:'100%'}" placeholder="璇烽�夋嫨 ..." :disabled="kbObj.chunk_num==0 && kbObj.token_num==0" allow-clear>
<a-optgroup :label="index" v-for="(item,index) in modelList" :key=index>
<a-option
v-for="(obj) in item"
@@ -84,7 +84,7 @@
</a-space>
</a-form-item>
<a-form-item field="parser_id" label="瑙ｆ瀽鏂规硶">
- <a-select v-model="form.parser_id" placeholder="璇烽�夋嫨" :disabled="kbObj.chunk_num>0 || kbObj.token_num>0" allow-clear>
+ <a-select v-model="form.parser_id" placeholder="璇烽�夋嫨" :disabled="kbObj.chunk_num==0 && kbObj.token_num==0" allow-clear>
<a-option v-for="item in parser_ids" :key="item.value" :label="item.name" :value="item.value"></a-option>
</a-select>
</a-form-item>
@@ -92,13 +92,13 @@
<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">
- <a-switch v-model="form.layout_recognize" />
+ <a-space direction="vertical">
+ <a-switch v-model="form.layout_recognize" size="small" />
</a-space>
</a-form-item>
<a-form-item field="raptor" label="浣跨敤鍙洖澧炲己RAPTOR绛栫暐">
- <a-space direction="vertical" size="large">
- <a-switch v-model="form.use_raptor" />
+ <a-space direction="vertical" >
+ <a-switch v-model="form.use_raptor" size="small" />
</a-space>
</a-form-item>
<div v-if="form.use_raptor">
@@ -130,8 +130,8 @@
<a-form-item>
<div style="width: 100%;text-align: right">
<a-space>
+ <a-button @click="cancelConfig">鍙栨秷</a-button>
<a-button type="primary" html-type="submit">淇濆瓨</a-button>
- <!-- <a-button @click="$refs.formRef.resetFields()">Reset</a-button>-->
</a-space>
</div>
</a-form-item>
@@ -196,7 +196,7 @@
const props = defineProps(['kbtenantInfo'])
-// const emit = defineEmits(['upTabdateItem'])
+const emit = defineEmits(['cancleConfig','saveConfig'])
// 瑙ｆ瀽鏂规硶鍒楄〃
let parser_ids = props.kbtenantInfo.parser_ids.split(",").map((item) => {
const [value1, value2] = item.split(":");
@@ -215,7 +215,7 @@
threshold: 0.32,
max_cluster: 233,
random_seed: 1500,
- chunk_token_num: 128,
+ chunk_token_num: 384,
use_raptor: false,
pages: {},
prompt: "璇锋�荤粨浠ヤ笅娈佃惤銆� 灏忓績鏁板瓧锛屼笉瑕佺紪閫犮�� 娈佃惤濡備笅锛歕n" +
@@ -234,6 +234,24 @@
{
required: true,
message:'鐭ヨ瘑搴撳悕绉颁笉鍏佽涓虹┖',
+ },
+ ],
+ embd_id: [
+ {
+ required: true,
+ message:'璇烽�夋嫨',
+ },
+ ],
+ parser_id: [
+ {
+ required: true,
+ message:'璇烽�夋嫨',
+ },
+ ],
+ prompt: [
+ {
+ required: true,
+ message:'鎻愮ず璇嶄笉鍏佽涓虹┖',
},
],
}
@@ -302,6 +320,8 @@
if(data.code == '0'){
Message.success("閰嶇疆鎴愬姛");
// window.location.reload();
+ emit('saveConfig')
+
}
// emit('upTabdateItem')
@@ -312,6 +332,11 @@
};
+
+const cancelConfig = () => {
+ emit('cancleConfig')
+}
+
function randomNumber() {
// 鐢熸垚涓�涓粙浜巑in鍜宮ax涔嬮棿鐨勯殢鏈烘暣鏁帮紙鍖呭惈min鍜宮ax锛�
@@ -360,7 +385,6 @@
let configObj = {
name: kbObj.name,
avatar: kbObj.avatar,
- chunk_token_num: kbObj.parser_config.chunk_token_num,
pages: kbObj.parser_config.pages,
description: kbObj.description,
language: "English",
diff --git a/src/views/dmx/knowledgeLib/index.vue b/src/views/dmx/knowledgeLib/index.vue
index 8213788..a4b50a3 100644
--- a/src/views/dmx/knowledgeLib/index.vue
+++ b/src/views/dmx/knowledgeLib/index.vue
@@ -256,7 +256,7 @@
</a-tab-pane>
<a-tab-pane key="3" :title="t('dmx.list.disposition')">
<div class="rt-container-main">
- <config ref="configForm" :kbtenantInfo="kbtenantInfo" :kbobj="kbobj"></config>
+ <config ref="configForm" :kbtenantInfo="kbtenantInfo" :kbobj="kbobj" @cancleConfig="cancleConfig" @saveConfig="saveConfig"></config>
</div>
</a-tab-pane>
</a-tabs>
@@ -604,8 +604,6 @@
selectedTab.value = tabs.value.findIndex(item=>item.id==id);
getKbdetail(id) // 鑾峰彇璇︽儏
activeKey.value = '3';
- // 璇︽儏
- // const kbtenantInfo = await queryKbtenantInfo();
}
@@ -643,6 +641,30 @@
) => {
size.value = val as SizeProps;
};
+
+ const cancleConfig = () => {
+ activeKey.value = '1';
+ let id = tabs.value[selectedTab.value].id;
+ fetchData({
+ kb_id: id,
+ page: 1,
+ page_size: 20
+ })
+ }
+
+ const saveConfig = async () => {
+ activeKey.value = '1';
+ let id = tabs.value[selectedTab.value].id;
+ const { data } = await queryKbList({ page: 1, page_size: 20 });
+ tabs.value = data;
+ fetchData({
+ kb_id: id,
+ page: 1,
+ page_size: 20
+ })
+ getKbdetail(id) // 鑾峰彇璇︽儏
+ }
+
const handleChange = (
checked: boolean | (string | boolean | number)[],
@@ -713,7 +735,7 @@
let data = await kbdocumentrm({doc_id: row.id})
if(data.code == 0){
Message.success('鍒犻櫎鎴愬姛');
- console.log(kbobj, 'kbobj');
+ // console.log(kbobj, 'kbobj');
fetchData({
kb_id: kbobj.id,
page: 1,
@@ -762,7 +784,7 @@
const run = async (row)=>{
- console.log(row);
+ // console.log(row);
row.loading = true;
let run = '1'
if(row.run!='2'){
@@ -781,6 +803,12 @@
Message.error('瑙ｆ瀽澶辫触');
row.run = '1';
}
+ fetchData({
+ kb_id: tabs.value[selectedTab.value].id,
+ page: 1,
+ page_size: 20
+ })
+
row.loading = false;
}
@@ -804,7 +832,10 @@
{ deep: true, immediate: true }
);
- onBeforeMount(()=>{
+ onBeforeMount(async()=>{
+ // const {data} = await queryKbtenantInfo();
+ // Object.assign(kbtenantInfo,data);
+ // console.log(kbtenantInfo,'kbtenantInfo鐨勬暟鎹�');
})
onMounted(()=>{
diff --git a/src/views/dmx/knowledgeLib/test.vue b/src/views/dmx/knowledgeLib/test.vue
index 5d88dad..75ce0af 100644
--- a/src/views/dmx/knowledgeLib/test.vue
+++ b/src/views/dmx/knowledgeLib/test.vue
@@ -29,7 +29,7 @@
</a-select>
</a-space>
</a-form-item>
- <a-form-item field="slider" label="Top-K" v-if="form.rerank_id === 'Jina' || form.rerank_id === 'BAAI'">
+ <a-form-item field="slider" label="Top-K" v-if="form.rerank_id">
<a-slider v-model="form.top_k" :min="1" :max="2048" />
</a-form-item>
<a-form-item >
--
Gitblit v1.8.0