perf: system model list

5f66f452 · archer · 4ec02c65 · 5f66f452 · 5f66f452 · 5f66f452
Commit 5f66f452 authored May 13, 2023 by archer
12 changed files
--- a/.env.template
+++ b/.env.template
 # proxy
 # AXIOS_PROXY_HOST=127.0.0.1
 # AXIOS_PROXY_PORT=7890
-# OPENAI_BASE_URL=https://api.openai.com/v1
-# OPENAI_BASE_URL_AUTH=可选的安全凭证
 # 是否开启队列任务。 1-开启，0-关闭（请求parentUrl去执行任务,单机时直接填1）
 queueTask=1
 parentUrl=https://hostname/api/openapi/startEvents
@@ -17,7 +15,13 @@ aliTemplateCode=SMS_xxx
 # token
 TOKEN_KEY=xxx
 # openai
+# OPENAI_BASE_URL=https://api.openai.com/v1
+# OPENAI_BASE_URL_AUTH=可选的安全凭证
 OPENAIKEY=sk-xxx
+GPT4KEY=sk-xxx
+# claude
+CLAUDE_BASE_URL=calude模型请求地址
+CLAUDE_KEY=CLAUDE_KEY
 # db
 MONGODB_URI=mongodb://username:password@0.0.0.0:27017/test?authSource=admin
 PG_HOST=0.0.0.0

--- a/docs/deploy/docker.md
+++ b/docs/deploy/docker.md
@@ -170,9 +170,6 @@ services:
      # proxy（可选）
      - AXIOS_PROXY_HOST=127.0.0.1
      - AXIOS_PROXY_PORT=7890
-      # openai 中转连接（可选）
-      - OPENAI_BASE_URL=https://api.openai.com/v1
-      - OPENAI_BASE_URL_AUTH=可选的安全凭证
      # 是否开启队列任务。 1-开启，0-关闭（请求 parentUrl 去执行任务,单机时直接填1）
      - queueTask=1
      - parentUrl=https://hostname/api/openapi/startEvents
@@ -195,8 +192,14 @@ services:
      - PG_USER=fastgpt # POSTGRES_USER
      - PG_PASSWORD=1234 # POSTGRES_PASSWORD
      - PG_DB_NAME=fastgpt # POSTGRES_DB
-      # openai api key
+      # openai
      - OPENAIKEY=sk-xxxxx
+      - GPT4KEY=sk-xxx
+      - OPENAI_BASE_URL=https://api.openai.com/v1
+      - OPENAI_BASE_URL_AUTH=可选的安全凭证
+      # claude
+      - CLAUDE_BASE_URL=calude模型请求地址
+      - CLAUDE_KEY=CLAUDE_KEY
  nginx:
    image: nginx:alpine3.17
    container_name: nginx

--- a/docs/deploy/fastgpt/docker-compose.yml
+++ b/docs/deploy/fastgpt/docker-compose.yml
@@ -39,9 +39,6 @@ services:
      # proxy（可选）
      - AXIOS_PROXY_HOST=127.0.0.1
      - AXIOS_PROXY_PORT=7890
-      # openai 中转连接（可选）
-      - OPENAI_BASE_URL=https://api.openai.com/v1
-      - OPENAI_BASE_URL_AUTH=可选的安全凭证
      # 是否开启队列任务。 1-开启，0-关闭（请求 parentUrl 去执行任务,单机时直接填1）
      - queueTask=1
      - parentUrl=https://hostname/api/openapi/startEvents
@@ -64,8 +61,14 @@ services:
      - PG_USER=fastgpt # POSTGRES_USER
      - PG_PASSWORD=1234 # POSTGRES_PASSWORD
      - PG_DB_NAME=fastgpt # POSTGRES_DB
-      # openai api key
+      # openai
      - OPENAIKEY=sk-xxxxx
+      - GPT4KEY=sk-xxx
+      - OPENAI_BASE_URL=https://api.openai.com/v1
+      - OPENAI_BASE_URL_AUTH=可选的安全凭证
+      # claude
+      - CLAUDE_BASE_URL=calude模型请求地址
+      - CLAUDE_KEY=CLAUDE_KEY
  nginx:
    image: nginx:alpine3.17
    container_name: nginx

--- a/src/api/system.ts
+++ b/src/api/system.ts
 import { GET, POST, PUT } from './request';
+import type { ChatModelItemType } from '@/constants/model';
 export const getFilling = () => GET<{ beianText: string }>('/system/getFiling');
+export const getSystemModelList = () => GET<ChatModelItemType[]>('/system/getModels');
--- a/src/components/Layout/index.tsx
+++ b/src/components/Layout/index.tsx
@@ -21,7 +21,7 @@ const Layout = ({ children, isPcDevice }: { children: JSX.Element; isPcDevice: b
  const { isPc } = useScreen({ defaultIsPc: isPcDevice });
  const router = useRouter();
  const { colorMode, setColorMode } = useColorMode();
-  const { Loading } = useLoading({ defaultLoading: true });
+  const { Loading } = useLoading();
  const { loading } = useGlobalStore();
  const isChatPage = useMemo(

--- a/src/constants/model.ts
+++ b/src/constants/model.ts
+import { getSystemModelList } from '@/api/system';
 import type { ModelSchema } from '@/types/mongoSchema';
 export const embeddingModel = 'text-embedding-ada-002';
@@ -58,11 +59,15 @@ export const ChatModelMap = {
  }
 };
-export const chatModelList: ChatModelItemType[] = [
+let chatModelList: ChatModelItemType[] = [];
-  ChatModelMap[OpenAiChatEnum.GPT35],
+export const getChatModelList = async () => {
-  ChatModelMap[OpenAiChatEnum.GPT4],
+  if (chatModelList.length > 0) {
-  ChatModelMap[ClaudeEnum.Claude]
+    return chatModelList;
-];
+  }
+  const list = await getSystemModelList();
+  chatModelList = list;
+  return list;
+};
 export enum ModelStatusEnum {
  running = 'running',

--- a/src/pages/api/system/getModels.ts
+++ b/src/pages/api/system/getModels.ts
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@/service/response';
+import type { ChatModelItemType } from '@/constants/model';
+import { ChatModelMap, OpenAiChatEnum, ClaudeEnum } from '@/constants/model';
+// get the models available to the system
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  const chatModelList: ChatModelItemType[] = [];
+  if (process.env.OPENAIKEY) {
+    chatModelList.push(ChatModelMap[OpenAiChatEnum.GPT35]);
+  }
+  if (process.env.GPT4KEY) {
+    chatModelList.push(ChatModelMap[OpenAiChatEnum.GPT4]);
+  }
+  if (process.env.CLAUDE_KEY) {
+    chatModelList.push(ChatModelMap[ClaudeEnum.Claude]);
+  }
+  jsonRes(res, {
+    data: chatModelList
+  });
+}
--- a/src/pages/model/components/detail/components/ModelDataCard.tsx
+++ b/src/pages/model/components/detail/components/ModelDataCard.tsx
@@ -138,7 +138,7 @@ const ModelDataCard = ({ modelId, isOwner }: { modelId: string; isOwner: boolean
  });
  return (
-    <>
+    <Box position={'relative'}>
      <Flex>
        <Box fontWeight={'bold'} fontSize={'lg'} flex={1} mr={2}>
          知识库数据: {total}组
@@ -303,7 +303,7 @@ const ModelDataCard = ({ modelId, isOwner }: { modelId: string; isOwner: boolean
      {isOpenSelectCsvModal && (
        <SelectCsvModal modelId={modelId} onClose={onCloseSelectCsvModal} onSuccess={refetchData} />
      )}
-    </>
+    </Box>
  );
 };

--- a/src/pages/model/components/detail/components/ModelEditForm.tsx
+++ b/src/pages/model/components/detail/components/ModelEditForm.tsx
@@ -21,12 +21,13 @@ import {
 import { QuestionOutlineIcon } from '@chakra-ui/icons';
 import type { ModelSchema } from '@/types/mongoSchema';
 import { UseFormReturn } from 'react-hook-form';
-import { ChatModelMap, ModelVectorSearchModeMap, chatModelList } from '@/constants/model';
+import { ChatModelMap, ModelVectorSearchModeMap, getChatModelList } from '@/constants/model';
 import { formatPrice } from '@/utils/user';
 import { useConfirm } from '@/hooks/useConfirm';
 import { useSelectFile } from '@/hooks/useSelectFile';
 import { useToast } from '@/hooks/useToast';
 import { compressImg } from '@/utils/file';
+import { useQuery } from '@tanstack/react-query';
 const ModelEditForm = ({
  formHooks,
@@ -70,6 +71,8 @@ const ModelEditForm = ({
    [setValue, toast]
  );
+  const { data: chatModelList = [] } = useQuery(['init'], getChatModelList);
  return (
    <>
      <Card p={4}>
@@ -299,104 +302,6 @@ const ModelEditForm = ({
        </Card>
      )}
      <File onSelect={onSelectFile} />
-      {/* <Card p={4}>
-        <Box fontWeight={'bold'}>安全策略</Box>
-        <FormControl mt={2}>
-          <Flex alignItems={'center'}>
-            <Box flex={'0 0 120px'} w={0}>
-              单句最大长度:
-            </Box>
-            <Input
-              flex={1}
-              type={'number'}
-              {...register('security.contentMaxLen', {
-                required: '单句长度不能为空',
-                min: {
-                  value: 0,
-                  message: '单句长度最小为0'
-                },
-                max: {
-                  value: 4000,
-                  message: '单句长度最长为4000'
-                },
-                valueAsNumber: true
-              })}
-            ></Input>
-          </Flex>
-        </FormControl>
-        <FormControl mt={5}>
-          <Flex alignItems={'center'}>
-            <Box flex={'0 0 120px'} w={0}>
-              上下文最大长度:
-            </Box>
-            <Input
-              flex={1}
-              type={'number'}
-              {...register('security.contextMaxLen', {
-                required: '上下文长度不能为空',
-                min: {
-                  value: 1,
-                  message: '上下文长度最小为5'
-                },
-                max: {
-                  value: 400000,
-                  message: '上下文长度最长为 400000'
-                },
-                valueAsNumber: true
-              })}
-            ></Input>
-          </Flex>
-        </FormControl>
-        <FormControl mt={5}>
-          <Flex alignItems={'center'}>
-            <Box flex={'0 0 120px'} w={0}>
-              聊天过期时间:
-            </Box>
-            <Input
-              flex={1}
-              type={'number'}
-              {...register('security.expiredTime', {
-                required: '聊天过期时间不能为空',
-                min: {
-                  value: 0.1,
-                  message: '聊天过期时间最小为0.1小时'
-                },
-                max: {
-                  value: 999999,
-                  message: '聊天过期时间最长为 999999 小时'
-                },
-                valueAsNumber: true
-              })}
-            ></Input>
-            <Box ml={3}>小时</Box>
-          </Flex>
-        </FormControl>
-        <FormControl mt={5} pb={5}>
-          <Flex alignItems={'center'}>
-            <Box flex={'0 0 130px'} w={0}>
-              聊天最大加载次数:
-            </Box>
-            <Box flex={1}>
-              <Input
-                type={'number'}
-                {...register('security.maxLoadAmount', {
-                  required: '聊天最大加载次数不能为空',
-                  max: {
-                    value: 999999,
-                    message: '聊天最大加载次数最小为 999999 次'
-                  },
-                  valueAsNumber: true
-                })}
-              ></Input>
-              <Box fontSize={'sm'} color={'blackAlpha.400'} position={'absolute'}>
-                设置为-1代表不限制次数
-              </Box>
-            </Box>
-            <Box ml={3}>次</Box>
-          </Flex>
-        </FormControl>
-      </Card> */}
      <ConfirmChild />
    </>
  );

--- a/src/pages/model/index.tsx
+++ b/src/pages/model/index.tsx
@@ -34,7 +34,7 @@ const Model = ({ modelId, isPcDevice }: { modelId: string; isPcDevice: boolean }
          <ModelList modelId={modelId} />
        </Box>
      )}
-      <Box flex={1} h={'100%'}>
+      <Box flex={1} h={'100%'} position={'relative'}>
        {modelId && <ModelDetail modelId={modelId} isPc={isPc} />}
      </Box>
    </Flex>

--- a/src/service/utils/auth.ts
+++ b/src/service/utils/auth.ts
@@ -63,7 +63,7 @@ export const getApiKey = async ({
    },
    [ClaudeEnum.Claude]: {
      userOpenAiKey: '',
-      systemAuthKey: process.env.LAFKEY as string
+      systemAuthKey: process.env.CLAUDE_KEY as string
    }
  };

--- a/src/service/utils/chat/claude.ts
+++ b/src/service/utils/chat/claude.ts
@@ -30,7 +30,7 @@ export const lafClaudChat = async ({
  const prompt = `${systemPromptText}我的问题是:'${messages[messages.length - 1].value}'`;
  const lafResponse = await axios.post(
-    'https://hnvacz.laf.run/claude-gpt',
+    process.env.CLAUDE_BASE_URL || '',
    {
      prompt,
      stream,