From e0219d2121732227922341fb3878e3a4d1b04d9d Mon Sep 17 00:00:00 2001 From: liudong <liudong> Date: 星期三, 07 八月 2024 19:28:08 +0800 Subject: [PATCH] 配置bug页面修改 --- src/views/dmx/knowledgeLib/config.vue | 295 +++++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 198 insertions(+), 97 deletions(-) diff --git a/src/views/dmx/knowledgeLib/config.vue b/src/views/dmx/knowledgeLib/config.vue index d530bbb..b7abcb2 100644 --- a/src/views/dmx/knowledgeLib/config.vue +++ b/src/views/dmx/knowledgeLib/config.vue @@ -1,7 +1,7 @@ <template> <div class="main-container"> <div style="position: absolute;top: 0;left: 0;width: 100%;padding: 0 20px"> - <h4 style="margin-bottom: 10px">閰嶇疆</h4> + <h4 style="margin-bottom: 10px"></h4> <div style="color: #666666;">鍦ㄨ繖閲屾洿鏂版偍鐨勭煡璇嗗簱璇︾粏淇℃伅锛屽挨鍏舵槸瑙f瀽鏂规硶銆�</div> <a-divider style="margin-top: 20px" /> </div> @@ -15,7 +15,7 @@ <a-form-item field="section" label="鐭ヨ瘑搴撳浘鐗�"> <a-space direction="vertical" :style="{ width: '100%' }"> <a-upload - action="/" + :auto-upload="false" :fileList="file ? [file] : []" :show-file-list="false" @change="onChange" @@ -60,7 +60,7 @@ </a-space> </a-form-item> <a-form-item field="section" label="鎻忚堪"> - <a-textarea placeholder="" allow-clear /> + <a-textarea placeholder="" v-model="form.description" allow-clear /> </a-form-item> <!-- <a-form-item field="section" label="璇█" :rules="[{match:/section one/,message:'璇烽�夋嫨'}]">--> <!-- <a-select v-model="form.section" placeholder="璇烽�夋嫨" allow-clear>--> @@ -68,68 +68,60 @@ <!-- <a-option value="1">鑻辨枃</a-option>--> <!-- </a-select>--> <!-- </a-form-item>--> - <a-form-item field="section" label="宓屽叆妯″瀷" :rules="[{match:/section one/,message:'璇烽�夋嫨'}]"> - <a-select v-model="form.embd_id" placeholder="璇烽�夋嫨" allow-clear> - <a-option value="section one">Section One</a-option> - <a-option value="section two">Section Two</a-option> - <a-option value="section three">Section Three</a-option> - </a-select> - </a-form-item> - <a-form-item field="section" label="瑙f瀽鏂规硶" :rules="[{match:/section one/,message:'璇烽�夋嫨'}]"> - <a-select v-model="form.parser_id" placeholder="璇烽�夋嫨" allow-clear> - <a-option value="section one">Section One</a-option> - <a-option value="section two">Section Two</a-option> - <a-option value="section three">Section Three</a-option> - </a-select> - </a-form-item> - <a-form-item field="slider" label="鍧桾oken鏁�" - :rules="[{type:'number', min:5,message:'slider is min than 5'}]"> - <a-slider v-model="form.chunk_token_num" :max="100" show-input /> -<!-- <a-input-number v-model="form.score" :style="{width:'100px',marginLeft:'2rem',borderRadius:'4px'}"--> -<!-- placeholder="Please Enter" class="input-demo" :min="10" :max="1000" />--> - </a-form-item> - <a-form-item field="slider" label="甯冨眬璇嗗埆" :rules="[{type:'number', min:5,message:'slider is min than 5'}]"> + <a-form-item field="embd_id" label="宓屽叆妯″瀷"> <a-space direction="vertical" size="large"> - <a-switch v-model="form.score" checked-value="yes" unchecked-value="no" /> + <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" + :key='obj.fid' + :value="obj.llm_name" + > + {{obj.llm_name}} + </a-option> + </a-optgroup> + </a-select> + </a-space> + </a-form-item> + <a-form-item field="parser_id" label="瑙f瀽鏂规硶"> + <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> + <a-form-item field="slider" label="鍧桾oken鏁�"> + <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"> + <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" @change="onChangeRAPTOR" /> + <a-space direction="vertical" > + <a-switch v-model="form.use_raptor" size="small" /> </a-space> </a-form-item> <div v-if="form.use_raptor"> <a-form-item field="prompt" label="鎻愮ず璇�"> <a-textarea v-model="form.prompt" - style="height: 10rem;border: 1px solid var(--color-fill-3);border-radius: 4px" - placeholder="璇峰~鍐欐彁绀鸿瘝" /> + style="height: 10rem;border: 1px solid var(--color-fill-3);border-radius: 4px" placeholder="璇峰~鍐欐彁绀鸿瘝" /> </a-form-item> - <a-form-item field="slider" label="鏈�澶oken鏁�" - :rules="[{type:'number', min:5,message:'slider is min than 5'}]"> - <a-slider v-model="form.max_token" :min="1" :max="1000" /> - <a-input-number v-model="form.max_token" :style="{width:'100px',marginLeft:'2rem',borderRadius:'4px'}" - placeholder="Please Enter" class="input-demo" :min="10" :max="1000" /> + <a-form-item field="slider" label="鏈�澶oken鏁�"> + <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" :max="1" /> - <a-input-number v-model="form.threshold" :style="{width:'100px',marginLeft:'2rem',borderRadius:'4px'}" - placeholder="Please Enter" class="input-demo" :min="0" :max="1" /> + <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" /> - <a-input-number v-model="form.max_cluster" :style="{width:'100px',marginLeft:'2rem',borderRadius:'4px'}" - placeholder="Please Enter" class="input-demo" :min="10" :max="1000" /> + <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"> <icon-plus /> </a-button> - </a-form-item> </div> @@ -138,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> @@ -199,14 +191,15 @@ <script lang="ts" setup> import { onMounted, onBeforeMount, reactive, ref } from "vue"; import { Message } from "@arco-design/web-vue"; +import { queryModelList,kbUpdate } from "@/api/kbList"; +import message from "@arco-design/web-vue/es/message"; +import useLoading from "@/hooks/loading"; +const { loading,setLoading } = useLoading(true); - -const props = defineProps(["kbtenantInfo", "kbobj", "kbdetail"]); -// const emit = defineEmits(['upTabdateItem']) - -const kbtenantInfo = props.kbtenantInfo; - -let parser_ids = kbtenantInfo.parser_ids.split(",").map((item) => { +const props = defineProps(['kbtenantInfo']) +const emit = defineEmits(['cancleConfig','saveConfig']) +// 瑙f瀽鏂规硶鍒楄〃 +let parser_ids = props.kbtenantInfo.parser_ids.split(",").map((item) => { const [value1, value2] = item.split(":"); return { name: value2, @@ -214,14 +207,16 @@ }; }); +let kbObj = reactive({}); + const form = reactive({ - name: '', + name: kbObj.name, avatar: '',// - max_token: 698, + max_token: 600, threshold: 0.32, max_cluster: 233, random_seed: 1500, - chunk_token_num: 128, + chunk_token_num: 384, use_raptor: false, pages: {}, prompt: "璇锋�荤粨浠ヤ笅娈佃惤銆� 灏忓績鏁板瓧锛屼笉瑕佺紪閫犮�� 娈佃惤濡備笅锛歕n" + @@ -230,8 +225,8 @@ description: "", language: "English", permission: "", - embd_id: "", - parser_id: "", + embd_id: "BAAI/bge-large-zh-v1.5", + parser_id: kbObj.parser_id, layout_recognize: true }); @@ -242,29 +237,104 @@ message:'鐭ヨ瘑搴撳悕绉颁笉鍏佽涓虹┖', }, ], + embd_id: [ + { + required: true, + message:'璇烽�夋嫨', + }, + ], + parser_id: [ + { + required: true, + message:'璇烽�夋嫨', + }, + ], + prompt: [ + { + required: true, + message:'鎻愮ず璇嶄笉鍏佽涓虹┖', + }, + ], } - - let visible = ref(false); -let loading = ref(false); const formRef = ref(null); const modelList = ref({}); const file = ref(); const onChange = (_, currentFile) => { - file.value = { - ...currentFile - // url: URL.createObjectURL(currentFile.file), - }; + file.value = currentFile; + convertImageToBase64(file.value.file).then((result)=>{ + form.avatar = result; + }) }; + +function convertImageToBase64(file) { + return new Promise((resolve, reject) => { + const reader = new FileReader(); + reader.onloadend = function() { + resolve(reader.result); + }; + reader.onerror = reject; + reader.readAsDataURL(file); + }); +} + const onProgress = (currentFile) => { file.value = currentFile; }; -const handleSubmit = ({ values, errors }) => { - console.log("values:", values, "\nerrors:", errors); +const handleSubmit = async ({ values, errors }) => { + if (errors){ + return; + } + let parms = { + name: form.name, + avatar: form.avatar, + description: form.description, + language: form.language, + permission: form.permission, + embd_id: form.embd_id, + parser_id: form.parser_id, + parser_config: { + chunk_token_num: form.chunk_token_num, + layout_recognize: form.layout_recognize, + }, + kb_id: kbObj.id, + } + if(form.use_raptor){ + parms.parser_config.raptor = { + use_raptor: form.use_raptor, + prompt: form.prompt, + max_token: form.max_token, + threshold: form.threshold, + max_cluster: form.max_cluster, + random_seed: form.random_seed, + }; + } + try { + + const data = await kbUpdate(parms); + if(data.code == '0'){ + Message.success("閰嶇疆鎴愬姛"); + // window.location.reload(); + emit('saveConfig') + + } + // emit('upTabdateItem') + + } catch (err) { + Message.error(err.message); + } + + + }; + +const cancelConfig = () => { + emit('cancleConfig') +} + function randomNumber() { // 鐢熸垚涓�涓粙浜巑in鍜宮ax涔嬮棿鐨勯殢鏈烘暣鏁帮紙鍖呭惈min鍜宮ax锛� @@ -273,14 +343,6 @@ form.random_seed = Math.floor(Math.random() * (max - min + 1)) + min; } -const onChangeRAPTOR = () => { - console.log(form); -}; - - -const handleClick = () => { - visible.value = true; -}; const handleBeforeOk = (done) => { formRef.value.validate().then(res => { console.log("form:", form); @@ -292,31 +354,70 @@ } }); }; -const handleCancel = () => { - visible.value = false; -}; +const handleOpened =(el) => { + Object.assign(form,{ -const handleOpened = (el) => { - Object.assign(form, { - name: "",// 鐢ㄦ埛鍚� - nameJoin: "",// 鏄电О - post: "",// 宀椾綅 - txt: ""// 澶囨敞 }); formRef.value.resetFields(); - console.log(props.record, "record"); - // if(props.edit == 'edit'){ - // Object.assign(form,props.record); - // } +} + +const queryModel = async (params) => { + try { + const data = await queryModelList(params); + // console.log(data.data, '澶фā鍨嬪垪琛�'); + modelList.value = data.data + } catch (err) { + // you can report use errorHandler or other + } finally { + + } }; -onBeforeMount(() => { +const changekbObj = (value) => { + formRef.value.resetFields(); + kbObj = value; + console.log(kbObj, 'kbObj'); + // if(kbObj.avatar){ + // file.value.url = kbObj.avatar + // } + let configObj = { + name: kbObj.name, + avatar: kbObj.avatar, + pages: kbObj.parser_config.pages, + description: kbObj.description, + language: "English", + permission: kbObj.permission, + embd_id: props.kbtenantInfo.embd_id || kbObj.embd_id, + parser_id: kbObj.parser_id, + layout_recognize: true, + } + let raptor = {} + if(kbObj.parser_config && kbObj.parser_config.raptor){ + raptor = kbObj.parser_config.raptor; + Object.assign(form,{ + ...configObj, + ...raptor, + use_raptor: kbObj.parser_config.raptor.use_raptor, + }); + }else{ + Object.assign(form,configObj); + } + console.log(form,'閰嶇疆椤甸潰琛ㄥ崟淇℃伅'); +} -}); -onMounted(() => { +defineExpose({ + changekbObj +}) -}); +onBeforeMount(()=>{ + queryModel({}) +}) +onMounted(()=>{ + + +}) + </script> <script lang="ts"> @@ -336,7 +437,7 @@ height: 100%; overflow: auto; //background: #626aea; - background: #ffffff; + background: var(--color-bg-2); padding-top: 80px; &-lf { @@ -344,7 +445,7 @@ //height: 100%; //border: 1px solid #cccccc; border-radius: 10px; - + //border: 1px solid var(--color-fill-3); &-top { width: 100%; height: 60px; @@ -397,10 +498,10 @@ border-radius: 10px; overflow: hidden; padding: 20px; - section { width: 100%; - color: #333333; + //color: #333333; + color: var(--color-text-1); } } } -- Gitblit v1.8.0