Skip to content

Commit 4948051

Browse files
feat: Related Knowledge
1 parent f7349d2 commit 4948051

File tree

22 files changed

+375
-343
lines changed

22 files changed

+375
-343
lines changed

ui/src/api/knowledge/knowledge.ts

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,23 @@ const getKnowledgeByFolder: (data?: any, loading?: Ref<boolean>) => Promise<Resu
2121
return get(`${prefix}/knowledge`, data, loading)
2222
}
2323

24+
/**
25+
* 知识库列表(无分页)
26+
* @param 参数
27+
* param {
28+
folder_id: "string",
29+
name: "string",
30+
tool_type: "string",
31+
desc: string,
32+
}
33+
*/
34+
const getKnowledgeList: (param?: any, loading?: Ref<boolean>) => Promise<Result<any>> = (
35+
param,
36+
loading,
37+
) => {
38+
return get(`${prefix}/knowledge`, param, loading)
39+
}
40+
2441
/**
2542
* 知识库分页列表
2643
* @param 参数
@@ -31,7 +48,7 @@ const getKnowledgeByFolder: (data?: any, loading?: Ref<boolean>) => Promise<Resu
3148
desc: string,
3249
}
3350
*/
34-
const getKnowledgeList: (
51+
const getKnowledgeListPage: (
3552
page: pageRequest,
3653
param?: any,
3754
loading?: Ref<boolean>,
@@ -234,14 +251,6 @@ const postWebKnowledge: (data: any, loading?: Ref<boolean>) => Promise<Result<an
234251
return post(`${prefix}/knowledge/web`, data, undefined, loading)
235252
}
236253

237-
/**
238-
* 获取全部知识库
239-
* @param 参数
240-
*/
241-
const getAllKnowledge: (loading?: Ref<boolean>) => Promise<Result<any[]>> = (loading) => {
242-
return get(`${prefix}`, undefined, loading)
243-
}
244-
245254
/**
246255
* 获取飞书文档列表
247256
* @param knowledge_id
@@ -269,6 +278,7 @@ const importLarkDocument: (
269278
export default {
270279
getKnowledgeByFolder,
271280
getKnowledgeList,
281+
getKnowledgeListPage,
272282
getKnowledgeDetail,
273283
putKnowledge,
274284
delKnowledge,
@@ -284,5 +294,4 @@ export default {
284294

285295
getLarkDocumentList,
286296
importLarkDocument,
287-
getAllKnowledge,
288297
}

ui/src/api/shared/knowledge.ts

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,23 @@ const getKnowledgeByFolder: (data?: any, loading?: Ref<boolean>) => Promise<Resu
7979
return get(`${prefix}/knowledge`, data, loading)
8080
}
8181

82+
/**
83+
* 知识库列表(无分页)
84+
* @param 参数
85+
* param {
86+
"folder_id": "string",
87+
"name": "string",
88+
"tool_type": "string",
89+
desc: string,
90+
}
91+
*/
92+
const getKnowledgeList: (param?: any, loading?: Ref<boolean>) => Promise<Result<any>> = (
93+
param,
94+
loading,
95+
) => {
96+
return get(`${prefix}/knowledge`, param, loading)
97+
}
98+
8299
/**
83100
* 知识库分页列表
84101
* @param 参数
@@ -89,7 +106,7 @@ const getKnowledgeByFolder: (data?: any, loading?: Ref<boolean>) => Promise<Resu
89106
desc: string,
90107
}
91108
*/
92-
const getKnowledgeList: (
109+
const getKnowledgeListPage: (
93110
page: pageRequest,
94111
param?: any,
95112
loading?: Ref<boolean>,
@@ -292,14 +309,6 @@ const postWebKnowledge: (data: any, loading?: Ref<boolean>) => Promise<Result<an
292309
return post(`${prefix}/knowledge/web`, data, undefined, loading)
293310
}
294311

295-
/**
296-
* 获取全部知识库
297-
* @param 参数
298-
*/
299-
const getAllKnowledge: (loading?: Ref<boolean>) => Promise<Result<any[]>> = (loading) => {
300-
return get(`${prefix}/knowledge`, undefined, loading)
301-
}
302-
303312
/**
304313
* 获取飞书文档列表
305314
* @param knowledge_id
@@ -327,6 +336,7 @@ const importLarkDocument: (
327336
export default {
328337
getKnowledgeByFolder,
329338
getKnowledgeList,
339+
getKnowledgeListPage,
330340
getKnowledgeDetail,
331341
putKnowledge,
332342
delKnowledge,
@@ -342,7 +352,6 @@ export default {
342352

343353
getLarkDocumentList,
344354
importLarkDocument,
345-
getAllKnowledge,
346355
getSharedWorkspaceKnowledge,
347356
getSharedWorkspaceKnowledgePage,
348357
getSharedAuthorizationKnowledgeGet,

ui/src/layout/components/breadcrumb/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ function changeMenu(id: string) {
169169
function getDataset() {
170170
loading.value = true
171171
knowledge
172-
.asyncGetAllKnowledge()
172+
.asyncGetRootKnowledge()
173173
.then((res: any) => {
174174
list.value = res.data
175175
common.saveBreadcrumb(list.value)

ui/src/locales/lang/en-US/views/application.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ export default {
131131
addKnowledge: 'Add Related Knowledge',
132132
addKnowledgePlaceholder: 'The selected knowledge must use the same embedding model',
133133
selected: 'Selected',
134-
countDataset: 'Knowledge',
135134

136135
selectSearchMode: 'Retrieval Mode',
137136
vectorSearch: 'Vector Search',

ui/src/locales/lang/zh-CN/views/application.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ export default {
122122
addKnowledge: '添加关联知识库',
123123
addKnowledgePlaceholder: '所选知识库必须使用相同的 Embedding 模型',
124124
selected: '已选',
125-
countDataset: '个知识库',
126125

127126
selectSearchMode: '检索模式',
128127
vectorSearch: '向量检索',

ui/src/locales/lang/zh-Hant/views/application.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ export default {
122122
addKnowledge: '新增關聯知識庫',
123123
addKnowledgePlaceholder: '所選知識庫必須使用相同的 Embedding 模型',
124124
selected: '已選',
125-
countDataset: '個知識庫',
126125

127126
selectSearchMode: '檢索模式',
128127
vectorSearch: '向量檢索',

ui/src/stores/modules-shared-system/knowledge.ts

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import {defineStore} from 'pinia'
2-
import type {knowledgeData} from '@/api/type/knowledge'
3-
import type {UploadUserFile} from 'element-plus'
1+
import { defineStore } from 'pinia'
2+
import type { knowledgeData } from '@/api/type/knowledge'
3+
import type { UploadUserFile } from 'element-plus'
44
import knowledgeApi from '@/api/shared/knowledge'
5-
import {type Ref} from 'vue'
5+
import { type Ref } from 'vue'
66

77
export interface knowledgeStateTypes {
88
baseInfo: knowledgeData | null
@@ -31,10 +31,13 @@ const useKnowledgeStore = defineStore('knowledg', {
3131
saveDocumentsFile(file: UploadUserFile[]) {
3232
this.documentsFiles = file
3333
},
34-
async asyncGetAllKnowledge(loading?: Ref<boolean>) {
34+
async asyncGetRootKnowledge(loading?: Ref<boolean>) {
3535
return new Promise((resolve, reject) => {
36+
const params = {
37+
folder_id: localStorage.getItem('workspace_id'),
38+
}
3639
knowledgeApi
37-
.getAllKnowledge(loading)
40+
.getKnowledgeList(params, loading)
3841
.then((data) => {
3942
resolve(data)
4043
})
@@ -43,10 +46,7 @@ const useKnowledgeStore = defineStore('knowledg', {
4346
})
4447
})
4548
},
46-
async asyncGetKnowledgeDetail(
47-
knowledge_id: string,
48-
loading?: Ref<boolean>,
49-
) {
49+
async asyncGetKnowledgeDetail(knowledge_id: string, loading?: Ref<boolean>) {
5050
return new Promise((resolve, reject) => {
5151
knowledgeApi
5252
.getKnowledgeDetail(knowledge_id, loading)
@@ -58,11 +58,7 @@ const useKnowledgeStore = defineStore('knowledg', {
5858
})
5959
})
6060
},
61-
async asyncSyncKnowledge(
62-
id: string,
63-
sync_type: string,
64-
loading?: Ref<boolean>,
65-
) {
61+
async asyncSyncKnowledge(id: string, sync_type: string, loading?: Ref<boolean>) {
6662
return new Promise((resolve, reject) => {
6763
knowledgeApi
6864
.putSyncWebKnowledge(id, sync_type, loading)

ui/src/stores/modules/application.ts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { defineStore } from 'pinia'
22
import applicationApi from '@/api/application/application'
3-
import knowledgeAPI from '@/api/knowledge/knowledge.ts'
43
import applicationXpackApi from '@/api/application/application-xpack'
54
import { type Ref } from 'vue'
65
import { getBrowserLang } from '@/locales/index'
@@ -36,19 +35,6 @@ const useApplicationStore = defineStore('application', {
3635
})
3736
},
3837

39-
async asyncGetApplicationKnowledge(id: string, loading?: Ref<boolean>) {
40-
return new Promise((resolve, reject) => {
41-
knowledgeAPI
42-
.getAllKnowledge(loading)
43-
.then((data) => {
44-
resolve(data)
45-
})
46-
.catch((error) => {
47-
reject(error)
48-
})
49-
})
50-
},
51-
5238
async asyncGetAccessToken(id: string, loading?: Ref<boolean>) {
5339
return new Promise((resolve, reject) => {
5440
const user = useUserStore()

ui/src/stores/modules/knowledge.ts

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import {defineStore} from 'pinia'
2-
import type {knowledgeData} from '@/api/type/knowledge'
3-
import type {UploadUserFile} from 'element-plus'
1+
import { defineStore } from 'pinia'
2+
import type { knowledgeData } from '@/api/type/knowledge'
3+
import type { UploadUserFile } from 'element-plus'
44
import knowledgeApi from '@/api/knowledge/knowledge'
5-
import {type Ref} from 'vue'
5+
import { type Ref } from 'vue'
66

77
export interface knowledgeStateTypes {
88
baseInfo: knowledgeData | null
@@ -31,10 +31,13 @@ const useKnowledgeStore = defineStore('knowledge', {
3131
saveDocumentsFile(file: UploadUserFile[]) {
3232
this.documentsFiles = file
3333
},
34-
async asyncGetAllKnowledge(loading?: Ref<boolean>) {
34+
async asyncGetRootKnowledge(loading?: Ref<boolean>) {
3535
return new Promise((resolve, reject) => {
36+
const params = {
37+
folder_id: localStorage.getItem('workspace_id'),
38+
}
3639
knowledgeApi
37-
.getAllKnowledge(loading)
40+
.getKnowledgeList(params, loading)
3841
.then((data) => {
3942
resolve(data)
4043
})
@@ -43,10 +46,7 @@ const useKnowledgeStore = defineStore('knowledge', {
4346
})
4447
})
4548
},
46-
async asyncGetKnowledgeDetail(
47-
knowledge_id: string,
48-
loading?: Ref<boolean>,
49-
) {
49+
async asyncGetKnowledgeDetail(knowledge_id: string, loading?: Ref<boolean>) {
5050
return new Promise((resolve, reject) => {
5151
knowledgeApi
5252
.getKnowledgeDetail(knowledge_id, loading)
@@ -58,11 +58,7 @@ const useKnowledgeStore = defineStore('knowledge', {
5858
})
5959
})
6060
},
61-
async asyncSyncKnowledge(
62-
id: string,
63-
sync_type: string,
64-
loading?: Ref<boolean>,
65-
) {
61+
async asyncSyncKnowledge(id: string, sync_type: string, loading?: Ref<boolean>) {
6662
return new Promise((resolve, reject) => {
6763
knowledgeApi
6864
.putSyncWebKnowledge(id, sync_type, loading)

ui/src/views/application/ApplicationSetting.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@
185185
<div class="flex align-center" style="width: 80%">
186186
<KnowledgeIcon
187187
:type="relatedObject(knowledgeList, item, 'id')?.type"
188+
class="mr-12"
188189
/>
189190

190191
<span
@@ -439,7 +440,7 @@ import { t } from '@/locales'
439440
import TTSModeParamSettingDialog from './component/TTSModeParamSettingDialog.vue'
440441
import ReasoningParamSettingDialog from './component/ReasoningParamSettingDialog.vue'
441442
442-
const { model, application } = useStore()
443+
const { knowledge, model, application } = useStore()
443444
444445
const route = useRoute()
445446
const {
@@ -628,7 +629,7 @@ function getDetail() {
628629
}
629630
630631
function getKnowledge() {
631-
application.asyncGetApplicationKnowledge(id, knowledgeLoading).then((res: any) => {
632+
knowledge.asyncGetRootKnowledge(knowledgeLoading).then((res: any) => {
632633
knowledgeList.value = res.data
633634
})
634635
}
@@ -706,8 +707,7 @@ function refresh() {
706707
707708
onMounted(() => {
708709
getModel()
709-
// todo
710-
// getKnowledge()
710+
getKnowledge()
711711
getDetail()
712712
getSTTModel()
713713
getTTSModel()

0 commit comments

Comments
 (0)