feat: remove loading from model and use DvaModel instead of redundant types such as kAModelType (#47)

* feat: use DvaModel instead of redundant types such as kAModelType

* feat: set the type for registerServer

* feat: remove loading from model

web/src/pages/add-knowledge/components/knowledge-search/model.ts

@@ -1,8 +1,8 @@
-import { Effect, Reducer, Subscription } from 'umi'
-import { message } from 'antd';
 import kbService from '@/services/kbService';
+import omit from 'lodash/omit';
+import { DvaModel } from 'umi';
 
-export interface kSearchModelState {
+export interface KSearchModelState {
   loading: boolean;
   data: any[];
   total: number;
@@ -13,26 +13,10 @@ export interface kSearchModelState {
   question: string;
   doc_ids: any[];
   pagination: any;
-  doc_id: string
+  doc_id: string;
+}
 
-}
-export interface chunkgModelType {
-  namespace: 'kSearchModel';
-  state: kSearchModelState;
-  effects: {
-    chunk_list: Effect;
-    get_chunk: Effect;
-    create_hunk: Effect;
-    switch_chunk: Effect;
-    rm_chunk: Effect;
-    getKfList: Effect;
-  };
-  reducers: {
-    updateState: Reducer<kSearchModelState>;
-  };
-  subscriptions: { setup: Subscription };
-}
-const Model: chunkgModelType = {
+const model: DvaModel<KSearchModelState> = {
   namespace: 'kSearchModel',
   state: {
     loading: false,
@@ -45,114 +29,132 @@ const Model: chunkgModelType = {
     question: '',
     doc_ids: [],
     pagination: { page: 1, size: 30 },
-    doc_id: ''
+    doc_id: '',
+  },
+  reducers: {
+    updateState(state, { payload }) {
+      return {
+        ...state,
+        ...payload,
+      };
+    },
   },
   subscriptions: {
     setup({ dispatch, history }) {
-      history.listen(location => {
-        console.log(location)
+      history.listen((location) => {
+        console.log(location);
       });
-    }
+    },
   },
   effects: {
     *getKfList({ payload = {} }, { call, put }) {
-      const { data, response } = yield call(kbService.get_document_list, payload);
+      const { data, response } = yield call(
+        kbService.get_document_list,
+        payload,
+      );
 
-      const { retcode, data: res, retmsg } = data
+      const { retcode, data: res, retmsg } = data;
       if (retcode === 0) {
         yield put({
           type: 'updateState',
           payload: {
-            d_list: res
-          }
+            d_list: res,
+          },
         });
       }
     },
-    * chunk_list({ payload = {}, callback }, { call, put }) {
-      const { data, response } = yield call(kbService.retrieval_test, payload);
-      const { retcode, data: res, retmsg } = data
+    *chunk_list({ payload = {} }, { call, put, select }) {
+      const { question, doc_ids, pagination }: KSearchModelState = yield select(
+        (state: any) => state.kSearchModel,
+      );
+      const { data } = yield call(kbService.retrieval_test, {
+        ...payload,
+        ...pagination,
+        question,
+        doc_ids,
+        similarity_threshold: 0.1,
+      });
+      const { retcode, data: res, retmsg } = data;
       if (retcode === 0) {
-        console.log(res)
         yield put({
           type: 'updateState',
           payload: {
             data: res.chunks,
             total: res.total,
-            loading: false
-          }
+          },
         });
-        callback && callback()
-
       }
     },
-    *switch_chunk({ payload = {}, callback }, { call, put }) {
-      const { data, response } = yield call(kbService.switch_chunk, payload);
-      const { retcode, data: res, retmsg } = data
+    *switch_chunk({ payload = {} }, { call, put }) {
+      const { data } = yield call(
+        kbService.switch_chunk,
+        omit(payload, ['kb_id']),
+      );
+      const { retcode } = data;
       if (retcode === 0) {
-        callback && callback()
-
+        yield put({
+          type: 'chunk_list',
+          payload: {
+            kb_id: payload.kb_id,
+          },
+        });
       }
     },
-    *rm_chunk({ payload = {}, callback }, { call, put }) {
-      console.log('shanchu')
-      const { data, response } = yield call(kbService.rm_chunk, payload);
-      const { retcode, data: res, retmsg } = data
+    *rm_chunk({ payload = {} }, { call, put }) {
+      const { data } = yield call(kbService.rm_chunk, {
+        chunk_ids: payload.chunk_ids,
+      });
+      const { retcode, data: res, retmsg } = data;
       if (retcode === 0) {
-        callback && callback()
-
+        // TODO: Can be extracted
+        yield put({
+          type: 'chunk_list',
+          payload: {
+            kb_id: payload.kb_id,
+          },
+        });
       }
     },
-    * get_chunk({ payload = {}, callback }, { call, put }) {
+    *get_chunk({ payload = {} }, { call, put }) {
       const { data, response } = yield call(kbService.get_chunk, payload);
-      const { retcode, data: res, retmsg } = data
+      const { retcode, data: res, retmsg } = data;
       if (retcode === 0) {
-
         yield put({
           type: 'updateState',
           payload: {
-            chunkInfo: res
-          }
+            chunkInfo: res,
+          },
         });
-        callback && callback(res)
-
       }
     },
     *create_hunk({ payload = {} }, { call, put }) {
       yield put({
         type: 'updateState',
         payload: {
-          loading: true
-        }
+          loading: true,
+        },
       });
-      let service = kbService.create_chunk
+      let service = kbService.create_chunk;
       if (payload.chunk_id) {
-        service = kbService.set_chunk
+        service = kbService.set_chunk;
       }
       const { data, response } = yield call(service, payload);
-      const { retcode, data: res, retmsg } = data
+      const { retcode, data: res, retmsg } = data;
       yield put({
         type: 'updateState',
         payload: {
-          loading: false
-        }
+          loading: false,
+        },
       });
       if (retcode === 0) {
         yield put({
           type: 'updateState',
           payload: {
-            isShowCreateModal: false
-          }
+            isShowCreateModal: false,
+          },
         });
       }
     },
   },
-  reducers: {
-    updateState(state, { payload }) {
-      return {
-        ...state,
-        ...payload
-      };
-    }
-  }
 };
-export default Model;
+export default model;