Skip to content

Commit 89ad567

Browse files
feat: lark knowledge
1 parent 19e8e76 commit 89ad567

File tree

7 files changed

+66
-77
lines changed

7 files changed

+66
-77
lines changed

ui/src/api/knowledge/knowledge.ts

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,6 @@ Object.defineProperty(prefix, 'value', {
1313
},
1414
})
1515

16-
/**
17-
* 获得知识库文件夹列表
18-
* @params 参数
19-
* {folder_id: string,
20-
* name: string,
21-
* user_id: string,
22-
* desc: string,}
23-
*/
24-
const getKnowledgeByFolder: (data?: any, loading?: Ref<boolean>) => Promise<Result<Array<any>>> = (
25-
data,
26-
loading,
27-
) => {
28-
return get(`${prefix.value}`, data, loading)
29-
}
30-
3116
/**
3217
* 知识库列表(无分页)
3318
* @param 参数
@@ -212,7 +197,7 @@ const postKnowledge: (data: knowledgeData, loading?: Ref<boolean>) => Promise<Re
212197
}
213198

214199
/**
215-
* 获取当前用户可使用的向量化模型列表
200+
* 获取当前用户可使用的向量化模型列表 (没用到)
216201
* @param application_id
217202
* @param loading
218203
* @query { query_text: string, top_number: number, similarity: number }
@@ -227,9 +212,8 @@ const getKnowledgeEmdeddingModel: (
227212

228213
/**
229214
* 获取当前用户可使用的模型列表
230-
* @param application_id
215+
* @param
231216
* @param loading
232-
* @query { query_text: string, top_number: number, similarity: number }
233217
* @returns
234218
*/
235219
const getKnowledgeModel: (loading?: Ref<boolean>) => Promise<Result<Array<any>>> = (loading) => {
@@ -255,15 +239,23 @@ const postWebKnowledge: (data: any, loading?: Ref<boolean>) => Promise<Result<an
255239
return post(`${prefix.value}/web`, data, undefined, loading)
256240
}
257241

242+
// 创建飞书知识库
258243
const postLarkKnowledge: (data: any, loading?: Ref<boolean>) => Promise<Result<Array<any>>> = (
259244
data,
260245
loading,
261246
) => {
262247
return post(`${prefix.value}/lark/save`, data, null, loading)
263248
}
264249

250+
const putLarkKnowledge: (
251+
knowledge_id: string,
252+
data: any,
253+
loading?: Ref<boolean>
254+
) => Promise<Result<any>> = (knowledge_id, data, loading) => {
255+
return put(`${prefix}/lark/${knowledge_id}`, data, undefined, loading)
256+
}
257+
265258
export default {
266-
getKnowledgeByFolder,
267259
getKnowledgeList,
268260
getKnowledgeListPage,
269261
getKnowledgeDetail,
@@ -278,6 +270,6 @@ export default {
278270
postKnowledge,
279271
getKnowledgeModel,
280272
postWebKnowledge,
281-
282273
postLarkKnowledge,
274+
putLarkKnowledge
283275
}

ui/src/api/shared/knowledge.ts

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,7 @@ import { type Ref } from 'vue'
44
import type { pageRequest } from '@/api/type/common'
55
import type { knowledgeData } from '@/api/type/knowledge'
66

7-
const prefix = '/system/shared'
8-
9-
/**
10-
* 获得知识库文件夹列表
11-
* @params 参数
12-
* {folder_id: string,
13-
* name: string,
14-
* user_id: string,
15-
* desc: string,}
16-
*/
17-
const getKnowledgeByFolder: (data?: any, loading?: Ref<boolean>) => Promise<Result<Array<any>>> = (
18-
data,
19-
loading,
20-
) => {
21-
return get(`${prefix}/knowledge`, data, loading)
22-
}
7+
const prefix = '/system/shared/knowledge'
238

249
/**
2510
* 知识库列表(无分页)
@@ -35,7 +20,7 @@ const getKnowledgeList: (param?: any, loading?: Ref<boolean>) => Promise<Result<
3520
param,
3621
loading,
3722
) => {
38-
return get(`${prefix}/knowledge`, param, loading)
23+
return get(`${prefix}`, param, loading)
3924
}
4025

4126
/**
@@ -53,7 +38,7 @@ const getKnowledgeListPage: (
5338
param?: any,
5439
loading?: Ref<boolean>,
5540
) => Promise<Result<any>> = (page, param, loading) => {
56-
return get(`${prefix}/knowledge/${page.current_page}/${page.page_size}`, param, loading)
41+
return get(`${prefix}/${page.current_page}/${page.page_size}`, param, loading)
5742
}
5843

5944
/**
@@ -64,7 +49,7 @@ const getKnowledgeDetail: (knowledge_id: string, loading?: Ref<boolean>) => Prom
6449
knowledge_id,
6550
loading,
6651
) => {
67-
return get(`${prefix}/knowledge/${knowledge_id}`, undefined, loading)
52+
return get(`${prefix}/${knowledge_id}`, undefined, loading)
6853
}
6954

7055
/**
@@ -81,7 +66,7 @@ const putKnowledge: (
8166
data: any,
8267
loading?: Ref<boolean>,
8368
) => Promise<Result<any>> = (knowledge_id, data, loading) => {
84-
return put(`${prefix}/knowledge/${knowledge_id}`, data, undefined, loading)
69+
return put(`${prefix}/${knowledge_id}`, data, undefined, loading)
8570
}
8671

8772
/**
@@ -103,7 +88,7 @@ const putReEmbeddingKnowledge: (
10388
knowledge_id: string,
10489
loading?: Ref<boolean>,
10590
) => Promise<Result<any>> = (knowledge_id, loading) => {
106-
return put(`${prefix}/knowledge/${knowledge_id}/embedding`, undefined, undefined, loading)
91+
return put(`${prefix}/${knowledge_id}/embedding`, undefined, undefined, loading)
10792
}
10893

10994
/**
@@ -119,7 +104,7 @@ const exportKnowledge: (
119104
) => Promise<any> = (knowledge_name, knowledge_id, loading) => {
120105
return exportExcel(
121106
knowledge_name + '.xlsx',
122-
`${prefix}/${knowledge_id}/knowledge/${knowledge_id}/export`,
107+
`${prefix}/${knowledge_id}/export`,
123108
undefined,
124109
loading,
125110
)
@@ -138,7 +123,7 @@ const exportZipKnowledge: (
138123
) => Promise<any> = (knowledge_name, knowledge_id, loading) => {
139124
return exportFile(
140125
knowledge_name + '.zip',
141-
`${prefix}/${knowledge_id}/knowledge/${knowledge_id}/export_zip`,
126+
`${prefix}/${knowledge_id}/export_zip`,
142127
undefined,
143128
loading,
144129
)
@@ -184,7 +169,7 @@ const putSyncWebKnowledge: (
184169
sync_type: string,
185170
loading?: Ref<boolean>,
186171
) => Promise<Result<any>> = (knowledge_id, sync_type, loading) => {
187-
return put(`${prefix}/knowledge/${knowledge_id}/sync`, undefined, { sync_type }, loading)
172+
return put(`${prefix}/${knowledge_id}/sync`, undefined, { sync_type }, loading)
188173
}
189174

190175
/**
@@ -201,7 +186,7 @@ const postKnowledge: (data: knowledgeData, loading?: Ref<boolean>) => Promise<Re
201186
data,
202187
loading,
203188
) => {
204-
return post(`${prefix}/knowledge/base`, data, undefined, loading, 1000 * 60 * 5)
189+
return post(`${prefix}/base`, data, undefined, loading, 1000 * 60 * 5)
205190
}
206191

207192
/**
@@ -226,7 +211,7 @@ const getKnowledgeEmdeddingModel: (
226211
* @returns
227212
*/
228213
const getKnowledgeModel: (loading?: Ref<boolean>) => Promise<Result<Array<any>>> = (loading) => {
229-
return get(`${prefix}/knowledge/model`, loading)
214+
return get(`${prefix}/model`, loading)
230215
}
231216

232217
/**
@@ -245,17 +230,25 @@ const postWebKnowledge: (data: any, loading?: Ref<boolean>) => Promise<Result<an
245230
data,
246231
loading,
247232
) => {
248-
return post(`${prefix}/knowledge/web`, data, undefined, loading)
233+
return post(`${prefix}/web`, data, undefined, loading)
249234
}
250235
const postLarkKnowledge: (data: any, loading?: Ref<boolean>) => Promise<Result<Array<any>>> = (
251236
data,
252237
loading,
253238
) => {
254-
return post(`${prefix}/knowledge/lark/save`, data, null, loading)
239+
return post(`${prefix}/lark/save`, data, null, loading)
255240
}
256241

242+
const putLarkKnowledge: (
243+
knowledge_id: string,
244+
data: any,
245+
loading?: Ref<boolean>
246+
) => Promise<Result<any>> = (knowledge_id, data, loading) => {
247+
return put(`${prefix}/lark/${knowledge_id}`, data, undefined, loading)
248+
}
249+
250+
257251
export default {
258-
getKnowledgeByFolder,
259252
getKnowledgeList,
260253
getKnowledgeListPage,
261254
getKnowledgeDetail,
@@ -270,8 +263,8 @@ export default {
270263
postKnowledge,
271264
getKnowledgeModel,
272265
postWebKnowledge,
273-
274266
postLarkKnowledge,
267+
putLarkKnowledge
275268
} as {
276269
[key: string]: any
277270
}

ui/src/views/knowledge/component/BaseForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</el-form-item>
3030
<el-form-item
3131
:label="$t('views.knowledge.form.EmbeddingModel.label')"
32-
prop="embedding_model_id"
32+
prop="embedding"
3333
>
3434
<ModelSelect
3535
v-model="form.embedding"

ui/src/views/knowledge/create-component/CreateKnowledgeDialog.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const submitHandle = async () => {
5757
}
5858
KnowledgeApi.postKnowledge(obj, loading).then((res) => {
5959
MsgSuccess(t('common.createSuccess'))
60-
// router.push({ path: `/knowledge/${res.data.id}/${currentFolder.value.id}/document` })
60+
router.push({ path: `/knowledge/${res.data.id}/${currentFolder.value.id}/document` })
6161
emit('refresh')
6262
})
6363
} else {

ui/src/views/knowledge/create-component/CreateLarkKnowledgeDialog.vue

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,29 @@
1010
<!-- 基本信息 -->
1111
<BaseForm ref="BaseFormRef" v-if="dialogVisible" />
1212
<el-form
13-
ref="DatasetFormRef"
13+
ref="knowledgeFormRef"
1414
:rules="rules"
15-
:model="datasetForm"
15+
:model="knowledgeForm"
1616
label-position="top"
1717
require-asterisk-position="right"
1818
>
1919
<el-form-item label="App ID" prop="app_id">
2020
<el-input
21-
v-model="datasetForm.app_id"
21+
v-model="knowledgeForm.app_id"
2222
:placeholder="$t('views.application.applicationAccess.larkSetting.appIdPlaceholder')"
2323
/>
2424
</el-form-item>
2525
<el-form-item label="App Secret" prop="app_secret">
2626
<el-input
27-
v-model="datasetForm.app_secret"
27+
v-model="knowledgeForm.app_secret"
2828
type="password"
2929
show-password
3030
:placeholder="$t('views.application.applicationAccess.larkSetting.appSecretPlaceholder')"
3131
/>
3232
</el-form-item>
3333
<el-form-item label="Folder Token" prop="folder_token">
3434
<el-input
35-
v-model="datasetForm.folder_token"
35+
v-model="knowledgeForm.folder_token"
3636
:placeholder="
3737
$t('views.application.applicationAccess.larkSetting.folderTokenPlaceholder')
3838
"
@@ -63,12 +63,13 @@ const emit = defineEmits(['refresh'])
6363
6464
const router = useRouter()
6565
const BaseFormRef = ref()
66-
const DatasetFormRef = ref()
66+
const knowledgeFormRef = ref()
6767
6868
const loading = ref(false)
6969
const dialogVisible = ref<boolean>(false)
70+
const currentFolder = ref<any>(null)
7071
71-
const datasetForm = ref<any>({
72+
const knowledgeForm = ref<any>({
7273
type: '0',
7374
source_url: '',
7475
selector: '',
@@ -124,29 +125,34 @@ const rules = reactive({
124125
125126
watch(dialogVisible, (bool) => {
126127
if (!bool) {
127-
datasetForm.value = {
128+
knowledgeForm.value = {
128129
type: '0',
129130
source_url: '',
130131
selector: '',
131132
}
132-
DatasetFormRef.value?.clearValidate()
133+
knowledgeFormRef.value?.clearValidate()
133134
}
134135
})
135136
136-
const open = () => {
137+
const open = (folder: string) => {
138+
currentFolder.value = folder
137139
dialogVisible.value = true
138140
}
139141
140142
const submitHandle = async () => {
141143
if (await BaseFormRef.value?.validate()) {
142-
await DatasetFormRef.value.validate((valid: any) => {
144+
await knowledgeFormRef.value.validate((valid: any) => {
143145
if (valid) {
144-
const obj = { ...BaseFormRef.value.form, ...datasetForm.value }
145-
// KnowledgeApi.postLarkKnowledge(obj, loading).then((res) => {
146-
// MsgSuccess(t('common.createSuccess'))
147-
// router.push({ path: `/knowledge/${res.data.id}/document` })
148-
// emit('refresh')
149-
// })
146+
const obj = {
147+
folder_id: currentFolder.value?.id,
148+
...BaseFormRef.value.form,
149+
...knowledgeForm.value,
150+
}
151+
KnowledgeApi.postLarkKnowledge(obj, loading).then((res: any) => {
152+
MsgSuccess(t('common.createSuccess'))
153+
router.push({ path: `/knowledge/${res.data.id}/${currentFolder.value.id}/document` })
154+
emit('refresh')
155+
})
150156
} else {
151157
return false
152158
}

ui/src/views/shared/knowledge-shared/component/BaseForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</el-form-item>
3030
<el-form-item
3131
:label="$t('views.knowledge.form.EmbeddingModel.label')"
32-
prop="embedding_model_id"
32+
prop="embedding"
3333
>
3434
<ModelSelect
3535
v-model="form.embedding"

ui/src/views/shared/knowledge-shared/create-component/CreateLarkKnowledgeDialog.vue

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,11 @@ const submitHandle = async () => {
142142
await KnowledgeFormRef.value.validate((valid: any) => {
143143
if (valid) {
144144
const obj = { ...BaseFormRef.value.form, ...datasetForm.value }
145-
KnowledgeApi.postLarkKnowledge({ ...obj, embedding_model_id: obj.embedding }, loading).then(
146-
(res: any) => {
147-
MsgSuccess(t('common.createSuccess'))
148-
router.push({ path: `/knowledge/${res.data.id}/document` })
149-
emit('refresh')
150-
},
151-
)
145+
KnowledgeApi.postLarkKnowledge(obj, loading).then((res: any) => {
146+
MsgSuccess(t('common.createSuccess'))
147+
router.push({ path: `/knowledge/${res.data.id}/document` })
148+
emit('refresh')
149+
})
152150
} else {
153151
return false
154152
}

0 commit comments

Comments
 (0)