perf: model framwork

2023-05-03 10:57:56 +08:00
parent aa74625f96
commit 91decc3683
19 changed files with 71 additions and 104 deletions
--- a/src/pages/api/chat/chat.ts
+++ b/src/pages/api/chat/chat.ts
@@ -5,7 +5,7 @@ import { axiosConfig, openaiChatFilter } from '@/service/utils/tools';
 import { ChatItemSimpleType } from '@/types/chat';
 import { jsonRes } from '@/service/response';
 import { PassThrough } from 'stream';
-import { modelList, ModelVectorSearchModeMap } from '@/constants/model';
+import { ChatModelMap, ModelVectorSearchModeMap } from '@/constants/model';
 import { pushChatBill } from '@/service/events/pushBill';
 import { gpt35StreamResponse } from '@/service/utils/openai';
 import { searchKb_openai } from '@/service/tools/searchKb';
@@ -47,10 +47,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
      authorization
    });

-    const modelConstantsData = modelList.find((item) => item.chatModel === model.chat.chatModel);
-    if (!modelConstantsData) {
-      throw new Error('模型加载异常');
-    }
+    const modelConstantsData = ChatModelMap[model.chat.chatModel];

    // 读取对话内容
    const prompts = [...content, prompt];
@@ -61,7 +58,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
        apiKey: userApiKey || systemKey,
        isPay: !userApiKey,
        text: prompt.value,
-        similarity: ModelVectorSearchModeMap[model.chat.searchMode]?.similarity || 0.22,
+        similarity: ModelVectorSearchModeMap[model.chat.searchMode]?.similarity,
        model,
        userId
      });
--- a/src/pages/api/openapi/chat/chat.ts
+++ b/src/pages/api/openapi/chat/chat.ts
@@ -1,11 +1,11 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { connectToDatabase } from '@/service/mongo';
 import { getOpenAIApi, authOpenApiKey, authModel } from '@/service/utils/auth';
-import { axiosConfig, openaiChatFilter, systemPromptFilter } from '@/service/utils/tools';
+import { axiosConfig, openaiChatFilter } from '@/service/utils/tools';
 import { ChatItemSimpleType } from '@/types/chat';
 import { jsonRes } from '@/service/response';
 import { PassThrough } from 'stream';
-import { modelList, ModelVectorSearchModeMap, ModelVectorSearchModeEnum } from '@/constants/model';
+import { ChatModelMap, ModelVectorSearchModeMap } from '@/constants/model';
 import { pushChatBill } from '@/service/events/pushBill';
 import { gpt35StreamResponse } from '@/service/utils/openai';
 import { searchKb_openai } from '@/service/tools/searchKb';
@@ -58,10 +58,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
      modelId
    });

-    const modelConstantsData = modelList.find((item) => item.chatModel === model.chat.chatModel);
-    if (!modelConstantsData) {
-      throw new Error('模型加载异常');
-    }
+    const modelConstantsData = ChatModelMap[model.chat.chatModel];

    // 使用了知识库搜索
    if (model.chat.useKb) {
--- a/src/pages/api/openapi/chat/chatGpt.ts
+++ b/src/pages/api/openapi/chat/chatGpt.ts
@@ -5,7 +5,7 @@ import { axiosConfig, openaiChatFilter } from '@/service/utils/tools';
 import { ChatItemSimpleType } from '@/types/chat';
 import { jsonRes } from '@/service/response';
 import { PassThrough } from 'stream';
-import { modelList } from '@/constants/model';
+import { ChatModelMap } from '@/constants/model';
 import { pushChatBill } from '@/service/events/pushBill';
 import { gpt35StreamResponse } from '@/service/utils/openai';

@@ -60,10 +60,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
      throw new Error('无权使用该模型');
    }

-    const modelConstantsData = modelList.find((item) => item.chatModel === model.chat.chatModel);
-    if (!modelConstantsData) {
-      throw new Error('模型加载异常');
-    }
+    const modelConstantsData = ChatModelMap[model.chat.chatModel];

    // 如果有系统提示词，自动插入
    if (model.chat.systemPrompt) {
--- a/src/pages/api/openapi/chat/lafGpt.ts
+++ b/src/pages/api/openapi/chat/lafGpt.ts
@@ -1,11 +1,11 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { connectToDatabase, Model } from '@/service/mongo';
 import { getOpenAIApi, authOpenApiKey } from '@/service/utils/auth';
-import { axiosConfig, openaiChatFilter, systemPromptFilter } from '@/service/utils/tools';
+import { axiosConfig, openaiChatFilter } from '@/service/utils/tools';
 import { ChatItemSimpleType } from '@/types/chat';
 import { jsonRes } from '@/service/response';
 import { PassThrough } from 'stream';
-import { modelList, ModelVectorSearchModeMap, ChatModelEnum } from '@/constants/model';
+import { ChatModelMap, ModelVectorSearchModeMap, OpenAiChatEnum } from '@/constants/model';
 import { pushChatBill } from '@/service/events/pushBill';
 import { gpt35StreamResponse } from '@/service/utils/openai';
 import { searchKb_openai } from '@/service/tools/searchKb';
@@ -53,10 +53,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
      throw new Error('找不到模型');
    }

-    const modelConstantsData = modelList.find((item) => item.chatModel === model.chat.chatModel);
-    if (!modelConstantsData) {
-      throw new Error('model is undefined');
-    }
+    const modelConstantsData = ChatModelMap[model.chat.chatModel];

    console.log('laf gpt start');

@@ -66,7 +63,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
    // 请求一次 chatgpt 拆解需求
    const promptResponse = await chatAPI.createChatCompletion(
      {
-        model: ChatModelEnum.GPT35,
+        model: OpenAiChatEnum.GPT35,
        temperature: 0,
        frequency_penalty: 0.5, // 越大，重复内容越少
        presence_penalty: -0.5, // 越大，越容易出现新内容
--- a/src/pages/api/openapi/chat/vectorGpt.ts
+++ b/src/pages/api/openapi/chat/vectorGpt.ts
@@ -1,11 +1,15 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 import { connectToDatabase, Model } from '@/service/mongo';
-import { axiosConfig, systemPromptFilter, openaiChatFilter } from '@/service/utils/tools';
+import { axiosConfig, openaiChatFilter } from '@/service/utils/tools';
 import { getOpenAIApi, authOpenApiKey } from '@/service/utils/auth';
 import { ChatItemSimpleType } from '@/types/chat';
 import { jsonRes } from '@/service/response';
 import { PassThrough } from 'stream';
-import { modelList, ModelVectorSearchModeMap, ModelVectorSearchModeEnum } from '@/constants/model';
+import {
+  ChatModelMap,
+  ModelVectorSearchModeMap,
+  ModelVectorSearchModeEnum
+} from '@/constants/model';
 import { pushChatBill } from '@/service/events/pushBill';
 import { gpt35StreamResponse } from '@/service/utils/openai';
 import { searchKb_openai } from '@/service/tools/searchKb';
@@ -62,10 +66,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
      throw new Error('无权使用该模型');
    }

-    const modelConstantsData = modelList.find((item) => item.chatModel === model.chat.chatModel);
-    if (!modelConstantsData) {
-      throw new Error('模型初始化异常');
-    }
+    const modelConstantsData = ChatModelMap[model.chat.chatModel];

    // 获取向量匹配到的提示词
    const { code, searchPrompt } = await searchKb_openai({
--- a/src/pages/chat/index.tsx
+++ b/src/pages/chat/index.tsx
@@ -27,7 +27,7 @@ import {
 import { useToast } from '@/hooks/useToast';
 import { useScreen } from '@/hooks/useScreen';
 import { useQuery } from '@tanstack/react-query';
-import { ChatModelEnum } from '@/constants/model';
+import { OpenAiChatEnum } from '@/constants/model';
 import dynamic from 'next/dynamic';
 import { useGlobalStore } from '@/store/global';
 import { useCopyData } from '@/utils/tools';
@@ -69,7 +69,7 @@ const Chat = ({ modelId, chatId }: { modelId: string; chatId: string }) => {
    name: '',
    avatar: '/icon/logo.png',
    intro: '',
-    chatModel: ChatModelEnum.GPT35,
+    chatModel: OpenAiChatEnum.GPT35,
    history: []
  }); // 聊天框整体数据

--- a/src/pages/model/detail/components/ModelEditForm.tsx
+++ b/src/pages/model/detail/components/ModelEditForm.tsx
@@ -21,7 +21,7 @@ import {
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
 import type { ModelSchema } from '@/types/mongoSchema';
 import { UseFormReturn } from 'react-hook-form';
-import { ChatModelMap, modelList, ModelVectorSearchModeMap } from '@/constants/model';
+import { ChatModelMap, ModelVectorSearchModeMap } from '@/constants/model';
 import { formatPrice } from '@/utils/user';
 import { useConfirm } from '@/hooks/useConfirm';
 import { useSelectFile } from '@/hooks/useSelectFile';
@@ -110,17 +110,14 @@ const ModelEditForm = ({
          <Box flex={'0 0 80px'} w={0}>
            对话模型:
          </Box>
-          <Box>{ChatModelMap[getValues('chat.chatModel')]}</Box>
+          <Box>{ChatModelMap[getValues('chat.chatModel')].name}</Box>
        </Flex>
        <Flex alignItems={'center'} mt={5}>
          <Box flex={'0 0 80px'} w={0}>
            价格:
          </Box>
          <Box>
-            {formatPrice(
-              modelList.find((item) => item.chatModel === getValues('chat.chatModel'))?.price || 0,
-              1000
-            )}
+            {formatPrice(ChatModelMap[getValues('chat.chatModel')].price, 1000)}
            元/1K tokens(包括上下文和回答)
          </Box>
        </Flex>
--- a/src/pages/model/detail/index.tsx
+++ b/src/pages/model/detail/index.tsx
@@ -5,7 +5,7 @@ import type { ModelSchema } from '@/types/mongoSchema';
 import { Card, Box, Flex, Button, Tag, Grid } from '@chakra-ui/react';
 import { useToast } from '@/hooks/useToast';
 import { useForm } from 'react-hook-form';
-import { formatModelStatus, modelList, defaultModel } from '@/constants/model';
+import { formatModelStatus, defaultModel } from '@/constants/model';
 import { useGlobalStore } from '@/store/global';
 import { useScreen } from '@/hooks/useScreen';
 import { useQuery } from '@tanstack/react-query';
--- a/src/pages/model/list/components/ModelPhoneList.tsx
+++ b/src/pages/model/list/components/ModelPhoneList.tsx
@@ -43,7 +43,7 @@ const ModelPhoneList = ({
          </Flex>
          <Flex mt={5}>
            <Box flex={'0 0 100px'}>对话模型: </Box>
-            <Box color={'blackAlpha.500'}>{ChatModelMap[model.chat.chatModel]}</Box>
+            <Box color={'blackAlpha.500'}>{ChatModelMap[model.chat.chatModel].name}</Box>
          </Flex>
          <Flex mt={5}>
            <Box flex={'0 0 100px'}>模型温度: </Box>
--- a/src/pages/model/list/components/ModelTable.tsx
+++ b/src/pages/model/list/components/ModelTable.tsx
@@ -36,7 +36,7 @@ const ModelTable = ({
      key: 'service',
      render: (model: ModelSchema) => (
        <Box fontWeight={'bold'} whiteSpace={'pre-wrap'} maxW={'200px'}>
-          {ChatModelMap[model.chat.chatModel]}
+          {ChatModelMap[model.chat.chatModel].name}
        </Box>
      )
    },
--- a/src/pages/number/components/PayModal.tsx
+++ b/src/pages/number/components/PayModal.tsx
@@ -85,25 +85,6 @@ const PayModal = ({ onClose }: { onClose: () => void }) => {
          <ModalBody py={0}>
            {!payId && (
              <>
-                {/* 价格表 */}
-                {/* <TableContainer mb={4}>
-                  <Table>
-                    <Thead>
-                      <Tr>
-                        <Th>模型类型</Th>
-                        <Th>价格(元/1K tokens，包含所有上下文)</Th>
-                      </Tr>
-                    </Thead>
-                    <Tbody>
-                      {modelList.map((item, i) => (
-                        <Tr key={item.model}>
-                          <Td>{item.name}</Td>
-                          <Td>{formatPrice(item.price, 1000)}</Td>
-                        </Tr>
-                      ))}
-                    </Tbody>
-                  </Table>
-                </TableContainer> */}
                <Grid gridTemplateColumns={'repeat(4,1fr)'} gridGap={5} mb={4}>
                  {[5, 10, 20, 50].map((item) => (
                    <Button