= {
namespace: 'kSModel',
state: {
isShowPSwModal: false,
- isShowTntModal: false,
tenantIfo: {},
knowledgeDetails: {} as any,
},
diff --git a/web/src/pages/add-knowledge/components/knowledge-setting/utils.ts b/web/src/pages/add-knowledge/components/knowledge-setting/utils.ts
index 9cb8cd055..e92c0a9ba 100644
--- a/web/src/pages/add-knowledge/components/knowledge-setting/utils.ts
+++ b/web/src/pages/add-knowledge/components/knowledge-setting/utils.ts
@@ -5,9 +5,9 @@ const getImageName = (prefix: string, length: number) =>
export const ImageMap = {
book: getImageName('book', 4),
- laws: getImageName('law', 4),
+ laws: getImageName('law', 2),
manual: getImageName('manual', 4),
- picture: getImageName('picture', 2),
+ picture: getImageName('media', 2),
naive: getImageName('naive', 2),
paper: getImageName('paper', 2),
presentation: getImageName('presentation', 2),
@@ -32,10 +32,13 @@ export const TextMap = {
The chunk granularity is consistent with 'ARTICLE', and all the upper level text will be included in the chunk.
`,
},
- manual: { title: '', description: `Only PDF is supported.
+ manual: {
+ title: '',
+ description: `
Only PDF is supported.
We assume manual has hierarchical section structure. We use the lowest section titles as pivots to slice documents.
So, the figures and tables in the same section will not be sliced apart, and chunk size might be large.
-
` },
+ `,
+ },
naive: {
title: '',
description: `Supported file formats are DOCX, EXCEL, PPT, IMAGE, PDF, TXT .
@@ -100,19 +103,19 @@ export const TextMap = {
Every row in table will be treated as a chunk.
`,
-},
-picture: {
- title: '',
- description: `
+ },
+ picture: {
+ title: '',
+ description: `
Image files are supported. Video is coming soon.
If the picture has text in it, OCR is applied to extract the text as its text description.
If the text extracted by OCR is not enough, visual LLM is used to get the descriptions.
`,
},
-one: {
- title: '',
- description: `
+ one: {
+ title: '',
+ description: `
Supported file formats are DOCX, EXCEL, PDF, TXT .
For a document, it will be treated as an entire chunk, no split at all.
diff --git a/web/src/pages/add-knowledge/model.ts b/web/src/pages/add-knowledge/model.ts
index accfd7bc4..637e309a4 100644
--- a/web/src/pages/add-knowledge/model.ts
+++ b/web/src/pages/add-knowledge/model.ts
@@ -1,7 +1,6 @@
import { DvaModel } from 'umi';
export interface kAModelState {
isShowPSwModal: boolean;
- isShowTntModal: boolean;
tenantIfo: any;
id: string;
doc_id: string;
@@ -11,7 +10,6 @@ const model: DvaModel = {
namespace: 'kAModel',
state: {
isShowPSwModal: false,
- isShowTntModal: false,
tenantIfo: {},
id: '',
doc_id: '',
diff --git a/web/src/pages/setting/CPwModal.tsx b/web/src/pages/setting/CPwModal.tsx
deleted file mode 100644
index c9713709d..000000000
--- a/web/src/pages/setting/CPwModal.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { rsaPsw } from '@/utils';
-import { Form, Input, Modal } from 'antd';
-import { useTranslation } from 'react-i18next';
-import { useDispatch, useSelector } from 'umi';
-
-type FieldType = {
- newPassword?: string;
- password?: string;
-};
-
-const CpwModal = () => {
- const dispatch = useDispatch();
- const settingModel = useSelector((state: any) => state.settingModel);
- const { isShowPSwModal } = settingModel;
- const { t } = useTranslation();
- const [form] = Form.useForm();
-
- const handleCancel = () => {
- dispatch({
- type: 'settingModel/updateState',
- payload: {
- isShowPSwModal: false,
- },
- });
- };
- const handleOk = async () => {
- try {
- const values = await form.validateFields();
- var password = rsaPsw(values.password);
- var new_password = rsaPsw(values.newPassword);
-
- dispatch({
- type: 'settingModel/setting',
- payload: {
- password,
- new_password,
- },
- });
- } catch (errorInfo) {
- console.log('Failed:', errorInfo);
- }
- };
-
- return (
-
-
-
- );
-};
-export default CpwModal;
diff --git a/web/src/pages/setting/List.tsx b/web/src/pages/setting/List.tsx
deleted file mode 100644
index b86a380df..000000000
--- a/web/src/pages/setting/List.tsx
+++ /dev/null
@@ -1,146 +0,0 @@
-import { useTranslation } from 'react-i18next';
-
-import { useEffect, useState } from 'react';
-import styles from './index.less';
-
-import { RadarChartOutlined } from '@ant-design/icons';
-import { ProCard } from '@ant-design/pro-components';
-import { Button, Card, Col, Row, Tag } from 'antd';
-import { useDispatch, useSelector } from 'umi';
-
-interface DataType {
- key: React.Key;
- name: string;
- age: number;
- address: string;
- description: string;
-}
-
-const SettingList = () => {
- const dispatch = useDispatch();
- const settingModel = useSelector((state: any) => state.settingModel);
- const { llmInfo = {}, factoriesList, myLlm = [] } = settingModel;
- const { OpenAI = [], tongyi = [] } = llmInfo;
- const [collapsed, setCollapsed] = useState(true);
- const { t } = useTranslation();
-
- useEffect(() => {
- dispatch({
- type: 'settingModel/factories_list',
- payload: {},
- });
- dispatch({
- type: 'settingModel/llm_list',
- payload: {},
- });
- dispatch({
- type: 'settingModel/my_llm',
- payload: {},
- });
- }, [dispatch]);
-
- return (
-
- {myLlm.map((item: any) => {
- return (
-
可折叠-图标自定义
-
-
-
- {item.tags.split(',').map((d: string) => {
- return {d} ;
- })}
-
- {buildInCollapsed ? (
-
显示{OpenAI.length}个模型
- ) : (
-
收起{OpenAI.length}个模型
- )}
-
{
- e.stopPropagation();
- dispatch({
- type: 'settingModel/updateState',
- payload: {
- llm_factory: item.llm_factory,
- isShowSAKModal: true,
- },
- });
- }}
- >
- 设置
-
- }
- style={{ marginBlockStart: 16 }}
- headerBordered
- collapsible
- defaultCollapsed
- >
- );
- })}
-
-
- {factoriesList.map((item: any) => {
- return (
- {
- e.stopPropagation();
- dispatch({
- type: 'settingModel/updateState',
- payload: {
- llm_factory: item.name,
- isShowSAKModal: true,
- },
- });
- }}
- >
- 设置
-
- }
- >
-
- {item.tags.split(',').map((d: string) => {
- return {d} ;
- })}
-
-
-
- );
- })}
-
-
- );
-};
-export default SettingList;
diff --git a/web/src/pages/setting/SAKModal.tsx b/web/src/pages/setting/SAKModal.tsx
deleted file mode 100644
index 43744cb12..000000000
--- a/web/src/pages/setting/SAKModal.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { Form, Input, Modal } from 'antd';
-import { useTranslation } from 'react-i18next';
-import { useDispatch, useSelector } from 'umi';
-
-type FieldType = {
- api_key?: string;
-};
-
-const SakModal = () => {
- const dispatch = useDispatch();
- const settingModel = useSelector((state: any) => state.settingModel);
- const { isShowSAKModal, llm_factory } = settingModel;
- const { t } = useTranslation();
- const [form] = Form.useForm();
-
- const handleCancel = () => {
- dispatch({
- type: 'settingModel/updateState',
- payload: {
- isShowSAKModal: false,
- },
- });
- };
- const handleOk = async () => {
- try {
- const values = await form.validateFields();
-
- dispatch({
- type: 'settingModel/set_api_key',
- payload: {
- api_key: values.api_key,
- llm_factory: llm_factory,
- },
- });
- } catch (errorInfo) {
- console.log('Failed:', errorInfo);
- }
- };
-
- return (
-
-
-
- );
-};
-export default SakModal;
diff --git a/web/src/pages/setting/SSModal.tsx b/web/src/pages/setting/SSModal.tsx
deleted file mode 100644
index 6e89669b4..000000000
--- a/web/src/pages/setting/SSModal.tsx
+++ /dev/null
@@ -1,144 +0,0 @@
-import { Form, Modal, Select } from 'antd';
-import { useTranslation } from 'react-i18next';
-import { useDispatch, useSelector } from 'umi';
-
-type FieldType = {
- embd_id?: string;
- img2txt_id?: string;
- llm_id?: string;
- asr_id?: string;
-};
-
-const SsModal = () => {
- const dispatch = useDispatch();
- const settingModel = useSelector((state: any) => state.settingModel);
- const { isShowSSModal, llmInfo = {}, tenantIfo } = settingModel;
- const [form] = Form.useForm();
- const { t } = useTranslation();
-
- const handleCancel = () => {
- dispatch({
- type: 'settingModel/updateState',
- payload: {
- isShowSSModal: false,
- },
- });
- };
-
- const handleOk = async () => {
- try {
- const values = await form.validateFields();
- const retcode = await dispatch({
- type: 'settingModel/set_tenant_info',
- payload: {
- ...values,
- tenant_id: tenantIfo.tenant_id,
- },
- });
- retcode === 0 &&
- dispatch({
- type: 'settingModel/updateState',
- payload: {
- isShowSSModal: false,
- },
- });
- } catch (errorInfo) {
- console.log('Failed:', errorInfo);
- }
- };
-
- const handleChange = () => {};
-
- return (
-
-
-
- );
-};
-export default SsModal;
diff --git a/web/src/pages/setting/TntModal.tsx b/web/src/pages/setting/TntModal.tsx
deleted file mode 100644
index 72a5ef809..000000000
--- a/web/src/pages/setting/TntModal.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import { useOneNamespaceEffectsLoading } from '@/hooks/storeHooks';
-import { Modal, Table } from 'antd';
-import { ColumnsType } from 'antd/es/table';
-import { useTranslation } from 'react-i18next';
-import { useDispatch, useSelector } from 'umi';
-import styles from './index.less';
-
-interface DataType {
- key: React.Key;
- name: string;
- role: string;
- time: string;
-}
-
-const TntModal = () => {
- const dispatch = useDispatch();
- const settingModel = useSelector((state: any) => state.settingModel);
- const { isShowTntModal, tenantIfo, factoriesList } = settingModel;
- const { t } = useTranslation();
- const loading = useOneNamespaceEffectsLoading('settingModel', [
- 'getTenantInfo',
- ]);
-
- const columns: ColumnsType = [
- { title: '姓名', dataIndex: 'name', key: 'name' },
- { title: '活动时间', dataIndex: 'update_date', key: 'update_date' },
- { title: '角色', dataIndex: 'role', key: 'age' },
- ];
-
- const handleCancel = () => {
- dispatch({
- type: 'settingModel/updateState',
- payload: {
- isShowTntModal: false,
- },
- });
- };
-
- const handleOk = async () => {
- dispatch({
- type: 'settingModel/updateState',
- payload: {
- isShowTntModal: false,
- },
- });
- };
-
- return (
-
- {tenantIfo.name}
-
-
- );
-};
-export default TntModal;
diff --git a/web/src/pages/setting/index.less b/web/src/pages/setting/index.less
deleted file mode 100644
index 5904ac850..000000000
--- a/web/src/pages/setting/index.less
+++ /dev/null
@@ -1,49 +0,0 @@
-.settingPage {
- padding: 10px;
-}
-
-.avatar {
- display: flex;
- justify-content: center;
-}
-
-.tenantIfo {
- height: 50px;
- background-color: #f4dfdf;
- margin-bottom: 10px;
- padding: 5px;
- box-sizing: border-box;
- display: flex;
- align-items: center;
-}
-
-.list {
- :global {
- .ant-pro-card-header {
- height: 150px;
- background-color: rgb(229, 231, 235);
- }
- }
-}
-
-ul {
- li {
- display: flex;
- justify-content: space-between;
- margin-bottom: 5px;
-
- .statusDisaabled {
- width: 10px;
- height: 10px;
- border-radius: 40%;
- background: rgba(0, 0, 0, 0.4);
- }
-
- .statusAvailable {
- width: 10px;
- height: 10px;
- border-radius: 50%;
- background: green;
- }
- }
-}
\ No newline at end of file
diff --git a/web/src/pages/setting/index.tsx b/web/src/pages/setting/index.tsx
deleted file mode 100644
index dbb6bccc1..000000000
--- a/web/src/pages/setting/index.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import { Button, FloatButton } from 'antd';
-import i18n from 'i18next';
-import { useTranslation } from 'react-i18next';
-
-import authorizationUtil from '@/utils/authorizationUtil';
-import { useEffect } from 'react';
-import { useDispatch, useSelector } from 'umi';
-import CPwModal from './CPwModal';
-import List from './List';
-import SAKModal from './SAKModal';
-import SSModal from './SSModal';
-import TntModal from './TntModal';
-import styles from './index.less';
-
-const Setting = () => {
- const dispatch = useDispatch();
- const settingModel = useSelector((state: any) => state.settingModel);
- const { t } = useTranslation();
- const userInfo = authorizationUtil.getUserInfoObject();
-
- const changeLang = (val: string) => {
- // 改变状态里的 语言 进行切换
- i18n.changeLanguage(val);
- };
-
- useEffect(() => {
- dispatch({
- type: 'settingModel/getTenantInfo',
- payload: {},
- });
- }, []);
-
- const showCPwModal = () => {
- dispatch({
- type: 'settingModel/updateState',
- payload: {
- isShowPSwModal: true,
- },
- });
- };
- const showTntModal = () => {
- dispatch({
- type: 'settingModel/updateState',
- payload: {
- isShowTntModal: true,
- },
- });
- };
- const showSSModal = () => {
- dispatch({
- type: 'settingModel/updateState',
- payload: {
- isShowSSModal: true,
- },
- });
- };
- return (
-
-
-
-
-
账号：{userInfo.name}
-
- 密码：******
-
- 修改密码
-
-
-
-
-
-
- 租户
-
-
- 系统模型设置
-
-
-
-
-
-
-
-
i18n.changeLanguage(i18n.language == 'en' ? 'zh' : 'en')}
- type="default"
- style={{ right: 94, fontSize: 14 }}
- />
- ;
- llmInfo: IThirdAiModelCollection;
- myLlmList: Record;
- factoryList: IFactory[];
- userInfo: IUserInfo;
-}
-
-const model: DvaModel = {
- namespace: 'settingModel',
- state: {
- llm_factory: '',
- tenantIfo: null,
- llmInfo: {},
- myLlmList: {},
- factoryList: [],
- userInfo: {} as IUserInfo,
- },
- reducers: {
- updateState(state, { payload }) {
- return {
- ...state,
- ...payload,
- };
- },
- setUserInfo(state, { payload }) {
- return {
- ...state,
- userInfo: payload,
- };
- },
- },
- effects: {
- *setting({ payload = {} }, { call, put }) {
- const { data } = yield call(userService.setting, payload);
- const { retcode } = data;
- if (retcode === 0) {
- message.success('Modified!');
- yield put({
- type: 'getUserInfo',
- });
- }
- },
- *getUserInfo({ payload = {} }, { call, put }) {
- const { data } = yield call(userService.user_info, payload);
- const { retcode, data: res } = data;
-
- // const userInfo = {
- // avatar: res.avatar,
- // name: res.nickname,
- // email: res.email,
- // };
- // authorizationUtil.setUserInfo(userInfo);
- if (retcode === 0) {
- yield put({ type: 'setUserInfo', payload: res });
- // localStorage.setItem('userInfo',res.)
- }
- },
- *getTenantInfo({ payload = {} }, { call, put }) {
- const { data } = yield call(userService.get_tenant_info, payload);
- const { retcode, data: res } = data;
- // llm_id 对应chat_id
- // asr_id 对应speech2txt
-
- if (retcode === 0) {
- res.chat_id = res.llm_id;
- res.speech2text_id = res.asr_id;
- yield put({
- type: 'updateState',
- payload: {
- tenantIfo: res,
- },
- });
- }
- },
- *set_tenant_info({ payload = {} }, { call, put }) {
- const { data } = yield call(userService.set_tenant_info, payload);
- const { retcode } = data;
- if (retcode === 0) {
- message.success('Modified!');
- yield put({
- type: 'getTenantInfo',
- });
- }
- return retcode;
- },
-
- *factories_list({ payload = {} }, { call, put }) {
- const { data } = yield call(userService.factories_list);
- const { retcode, data: res } = data;
- if (retcode === 0) {
- yield put({
- type: 'updateState',
- payload: {
- factoryList: res,
- },
- });
- }
- },
- *llm_list({ payload = {} }, { call, put }) {
- const { data } = yield call(userService.llm_list, payload);
- const { retcode, data: res } = data;
- if (retcode === 0) {
- yield put({
- type: 'updateState',
- payload: {
- llmInfo: res,
- },
- });
- }
- },
- *my_llm({ payload = {} }, { call, put }) {
- const { data } = yield call(userService.my_llm);
- const { retcode, data: res } = data;
- if (retcode === 0) {
- yield put({
- type: 'updateState',
- payload: {
- myLlmList: res,
- },
- });
- }
- },
- *set_api_key({ payload = {} }, { call, put }) {
- const { data } = yield call(userService.set_api_key, payload);
- const { retcode } = data;
- if (retcode === 0) {
- message.success('Modified!');
- yield put({ type: 'my_llm' });
- yield put({ type: 'factories_list' });
- yield put({
- type: 'updateState',
- });
- }
- return retcode;
- },
- },
-};
-export default model;
+import { ITenantInfo } from '@/interfaces/database/knowledge';
+import {
+ IFactory,
+ IMyLlmValue,
+ IThirdOAIModelCollection as IThirdAiModelCollection,
+} from '@/interfaces/database/llm';
+import { IUserInfo } from '@/interfaces/database/userSetting';
+import userService from '@/services/userService';
+import { message } from 'antd';
+import { DvaModel } from 'umi';
+
+export interface SettingModelState {
+ llm_factory: string;
+ tenantIfo: Nullable;
+ llmInfo: IThirdAiModelCollection;
+ myLlmList: Record;
+ factoryList: IFactory[];
+ userInfo: IUserInfo;
+}
+
+const model: DvaModel = {
+ namespace: 'settingModel',
+ state: {
+ llm_factory: '',
+ tenantIfo: null,
+ llmInfo: {},
+ myLlmList: {},
+ factoryList: [],
+ userInfo: {} as IUserInfo,
+ },
+ reducers: {
+ updateState(state, { payload }) {
+ return {
+ ...state,
+ ...payload,
+ };
+ },
+ setUserInfo(state, { payload }) {
+ return {
+ ...state,
+ userInfo: payload,
+ };
+ },
+ },
+ effects: {
+ *setting({ payload = {} }, { call, put }) {
+ const { data } = yield call(userService.setting, payload);
+ const { retcode } = data;
+ if (retcode === 0) {
+ message.success('Modified!');
+ yield put({
+ type: 'getUserInfo',
+ });
+ }
+ },
+ *getUserInfo({ payload = {} }, { call, put }) {
+ const { data } = yield call(userService.user_info, payload);
+ const { retcode, data: res } = data;
+
+ // const userInfo = {
+ // avatar: res.avatar,
+ // name: res.nickname,
+ // email: res.email,
+ // };
+ // authorizationUtil.setUserInfo(userInfo);
+ if (retcode === 0) {
+ yield put({ type: 'setUserInfo', payload: res });
+ // localStorage.setItem('userInfo',res.)
+ }
+ },
+ *getTenantInfo({ payload = {} }, { call, put }) {
+ const { data } = yield call(userService.get_tenant_info, payload);
+ const { retcode, data: res } = data;
+ // llm_id 对应chat_id
+ // asr_id 对应speech2txt
+
+ if (retcode === 0) {
+ res.chat_id = res.llm_id;
+ res.speech2text_id = res.asr_id;
+ yield put({
+ type: 'updateState',
+ payload: {
+ tenantIfo: res,
+ },
+ });
+ }
+ },
+ *set_tenant_info({ payload = {} }, { call, put }) {
+ const { data } = yield call(userService.set_tenant_info, payload);
+ const { retcode } = data;
+ if (retcode === 0) {
+ message.success('Modified!');
+ yield put({
+ type: 'getTenantInfo',
+ });
+ }
+ return retcode;
+ },
+
+ *factories_list({ payload = {} }, { call, put }) {
+ const { data } = yield call(userService.factories_list);
+ const { retcode, data: res } = data;
+ if (retcode === 0) {
+ yield put({
+ type: 'updateState',
+ payload: {
+ factoryList: res,
+ },
+ });
+ }
+ },
+ *llm_list({ payload = {} }, { call, put }) {
+ const { data } = yield call(userService.llm_list, payload);
+ const { retcode, data: res } = data;
+ if (retcode === 0) {
+ yield put({
+ type: 'updateState',
+ payload: {
+ llmInfo: res,
+ },
+ });
+ }
+ },
+ *my_llm({ payload = {} }, { call, put }) {
+ const { data } = yield call(userService.my_llm);
+ const { retcode, data: res } = data;
+ if (retcode === 0) {
+ yield put({
+ type: 'updateState',
+ payload: {
+ myLlmList: res,
+ },
+ });
+ }
+ },
+ *set_api_key({ payload = {} }, { call, put }) {
+ const { data } = yield call(userService.set_api_key, payload);
+ const { retcode } = data;
+ if (retcode === 0) {
+ message.success('Modified!');
+ yield put({ type: 'my_llm' });
+ yield put({ type: 'factories_list' });
+ yield put({
+ type: 'updateState',
+ });
+ }
+ return retcode;
+ },
+ },
+};
+export default model;
diff --git a/web/src/routes.ts b/web/src/routes.ts
index 0a3018ac4..b6d9e9bcc 100644
--- a/web/src/routes.ts
+++ b/web/src/routes.ts
@@ -52,10 +52,6 @@ const routes = [
path: '/chat',
component: '@/pages/chat',
},
- {
- path: '/setting',
- component: '@/pages/setting',
- },
{
path: '/user-setting',
component: '@/pages/user-setting',
-