Skip to content

Commit 9c7d4a0

Browse files
author
dreamer6680
committed
add feishuKonwledge dataset
1 parent 9709ae7 commit 9c7d4a0

File tree

37 files changed

+691
-127
lines changed

37 files changed

+691
-127
lines changed

packages/global/core/dataset/api.d.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ export type DatasetUpdateBody = {
2626
defaultPermission?: DatasetSchemaType['defaultPermission'];
2727
apiServer?: DatasetSchemaType['apiServer'];
2828
yuqueServer?: DatasetSchemaType['yuqueServer'];
29-
feishuServer?: DatasetSchemaType['feishuServer'];
29+
feishuShareServer?: DatasetSchemaType['feishuShareServer'];
30+
feishuKnowledgeServer?: DatasetSchemaType['feishuKnowledgeServer'];
3031
chunkSettings?: DatasetSchemaType['chunkSettings'];
3132

3233
// sync schedule

packages/global/core/dataset/apiDataset.d.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,17 @@ export type APIFileServer = {
1717
authorization?: string;
1818
basePath?: string;
1919
};
20-
export type FeishuServer = {
20+
export type FeishuShareServer = {
2121
appId: string;
2222
appSecret?: string;
2323
folderToken: string;
2424
};
25+
export type FeishuKnowledgeServer = {
26+
appId: string;
27+
appSecret: string;
28+
basePath?: string;
29+
};
30+
2531
export type YuqueServer = {
2632
userId: string;
2733
token?: string;

packages/global/core/dataset/constants.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ export enum DatasetTypeEnum {
77
websiteDataset = 'websiteDataset', // depp link
88
externalFile = 'externalFile',
99
apiDataset = 'apiDataset',
10-
feishu = 'feishu',
10+
feishuShare = 'feishuShare',
11+
feishuKnowledge = 'feishuKnowledge',
1112
yuque = 'yuque'
1213
}
1314
export const DatasetTypeMap = {
@@ -36,9 +37,14 @@ export const DatasetTypeMap = {
3637
label: i18nT('dataset:api_file'),
3738
collectionLabel: i18nT('common:File')
3839
},
39-
[DatasetTypeEnum.feishu]: {
40-
icon: 'core/dataset/feishuDatasetOutline',
41-
label: i18nT('dataset:feishu_dataset'),
40+
[DatasetTypeEnum.feishuShare]: {
41+
icon: 'core/dataset/feishuShareDatasetOutline',
42+
label: i18nT('dataset:feishu_share_dataset'),
43+
collectionLabel: i18nT('common:File')
44+
},
45+
[DatasetTypeEnum.feishuKnowledge]: {
46+
icon: 'core/dataset/feishuKnowledgeDatasetOutline',
47+
label: i18nT('dataset:feishu_knowledge_dataset'),
4248
collectionLabel: i18nT('common:File')
4349
},
4450
[DatasetTypeEnum.yuque]: {

packages/global/core/dataset/type.d.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ import type {
1212
ChunkSettingModeEnum
1313
} from './constants';
1414
import type { DatasetPermission } from '../../support/permission/dataset/controller';
15-
import type { APIFileServer, FeishuServer, YuqueServer } from './apiDataset';
15+
import type {
16+
APIFileServer,
17+
FeishuShareServer,
18+
YuqueServer,
19+
FeishuKnowledgeServer
20+
} from './apiDataset';
1621
import type { SourceMemberType } from 'support/user/type';
1722
import type { DatasetDataIndexTypeEnum } from './data/constants';
1823

@@ -73,8 +78,9 @@ export type DatasetSchemaType = {
7378

7479
inheritPermission: boolean;
7580
apiServer?: APIFileServer;
76-
feishuServer?: FeishuServer;
81+
feishuShareServer?: FeishuShareServer;
7782
yuqueServer?: YuqueServer;
83+
feishuKnowledgeServer?: FeishuKnowledgeServer;
7884

7985
// abandon
8086
autoSync?: boolean;
Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,33 @@
11
import type {
22
APIFileServer,
33
YuqueServer,
4-
FeishuServer
4+
FeishuShareServer,
5+
FeishuKnowledgeServer
56
} from '@fastgpt/global/core/dataset/apiDataset';
67
import { useApiDatasetRequest } from './api';
78
import { useYuqueDatasetRequest } from '../yuqueDataset/api';
8-
import { useFeishuDatasetRequest } from '../feishuDataset/api';
9+
import { useFeishuShareDatasetRequest } from '../feishuShareDataset/api';
10+
import { useFeishuKnowledgeDatasetRequest } from '../feishuKnowledgeDataset/api';
911

1012
export const getApiDatasetRequest = async (data: {
1113
apiServer?: APIFileServer;
1214
yuqueServer?: YuqueServer;
13-
feishuServer?: FeishuServer;
15+
feishuShareServer?: FeishuShareServer;
16+
feishuKnowledgeServer?: FeishuKnowledgeServer;
1417
}) => {
15-
const { apiServer, yuqueServer, feishuServer } = data;
18+
const { apiServer, yuqueServer, feishuShareServer, feishuKnowledgeServer } = data;
1619

1720
if (apiServer) {
1821
return useApiDatasetRequest({ apiServer });
1922
}
2023
if (yuqueServer) {
2124
return useYuqueDatasetRequest({ yuqueServer });
2225
}
23-
if (feishuServer) {
24-
return useFeishuDatasetRequest({ feishuServer });
26+
if (feishuShareServer) {
27+
return useFeishuShareDatasetRequest({ feishuShareServer });
28+
}
29+
if (feishuKnowledgeServer) {
30+
return useFeishuKnowledgeDatasetRequest({ feishuKnowledgeServer });
2531
}
2632
return Promise.reject('Can not find api dataset server');
2733
};

packages/service/core/dataset/collection/utils.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,8 @@ export const syncCollection = async (collection: CollectionWithDatasetType) => {
160160
type: DatasetSourceReadTypeEnum.apiFile,
161161
sourceId,
162162
apiServer: dataset.apiServer,
163-
feishuServer: dataset.feishuServer,
163+
feishuShareServer: dataset.feishuShareServer,
164+
feishuKnowledgeServer: dataset.feishuKnowledgeServer,
164165
yuqueServer: dataset.yuqueServer
165166
};
166167
})();

0 commit comments

Comments
 (0)