perf: prompt and gpt4

cdf4b9f3 · archer · e3c9b817 · cdf4b9f3 · cdf4b9f3 · cdf4b9f3
Commit cdf4b9f3 authored May 10, 2023 by archer
12 changed files
--- a/src/api/request.ts
+++ b/src/api/request.ts
 import axios, { Method, InternalAxiosRequestConfig, AxiosResponse } from 'axios';
-import { clearToken } from '@/utils/user';
+import { clearCookie } from '@/utils/user';
 import { TOKEN_ERROR_CODE } from '@/service/errorCode';
 interface ConfigType {
@@ -58,7 +58,7 @@ function responseError(err: any) {
    // 有报错响应
    const res = err.response;
    if (res.data.code in TOKEN_ERROR_CODE) {
-      clearToken();
+      clearCookie();
      return Promise.reject({ message: 'token过期，重新登录' });
    }
  }

--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -64,6 +64,8 @@ export const postLogin = ({ username, password }: { username: string; password: 
    password: createHashPassword(password)
  });
+export const loginOut = () => GET('/user/loginout');
 export const putUserInfo = (data: UserUpdateParams) => PUT('/user/update', data);
 export const getUserBills = (data: RequestPaging) =>

--- a/src/constants/model.ts
+++ b/src/constants/model.ts
@@ -29,7 +29,7 @@ export const ChatModelMap = {
    name: 'ChatGpt',
    contextMaxToken: 4096,
    systemMaxToken: 2500,
-    maxTemperature: 1.5,
+    maxTemperature: 1.2,
    price: 3
  },
  [OpenAiChatEnum.GPT4]: {
@@ -37,16 +37,16 @@ export const ChatModelMap = {
    name: 'Gpt4',
    contextMaxToken: 8000,
    systemMaxToken: 3500,
-    maxTemperature: 1.5,
+    maxTemperature: 1.2,
-    price: 30
+    price: 50
  },
  [OpenAiChatEnum.GPT432k]: {
    chatModel: OpenAiChatEnum.GPT432k,
    name: 'Gpt4-32k',
    contextMaxToken: 32000,
    systemMaxToken: 6000,
-    maxTemperature: 1.5,
+    maxTemperature: 1.2,
-    price: 30
+    price: 90
  },
  [ClaudeEnum.Claude]: {
    chatModel: ClaudeEnum.Claude,
@@ -60,6 +60,7 @@ export const ChatModelMap = {
 export const chatModelList: ChatModelItemType[] = [
  ChatModelMap[OpenAiChatEnum.GPT35],
+  ChatModelMap[OpenAiChatEnum.GPT4],
  ChatModelMap[ClaudeEnum.Claude]
 ];

--- a/src/pages/api/chat/chat.ts
+++ b/src/pages/api/chat/chat.ts
@@ -68,11 +68,11 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
        return res.send(searchPrompts[0]?.value);
      }
-      prompts.splice(prompts.length - 1, 0, ...searchPrompts);
+      prompts.splice(prompts.length - 3, 0, ...searchPrompts);
    } else {
      // 没有用知识库搜索，仅用系统提示词
      model.chat.systemPrompt &&
-        prompts.splice(prompts.length - 1, 0, {
+        prompts.splice(prompts.length - 3, 0, {
          obj: ChatRoleEnum.System,
          value: model.chat.systemPrompt
        });

--- a/src/pages/api/user/loginout.ts
+++ b/src/pages/api/user/loginout.ts
+// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@/service/response';
+import { clearCookie } from '@/service/utils/tools';
+export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
+  try {
+    clearCookie(res);
+    jsonRes(res);
+  } catch (err) {
+    jsonRes(res, {
+      code: 500,
+      error: err
+    });
+  }
+}
--- a/src/pages/number/index.tsx
+++ b/src/pages/number/index.tsx
@@ -7,7 +7,7 @@ import { useToast } from '@/hooks/useToast';
 import { useGlobalStore } from '@/store/global';
 import { useUserStore } from '@/store/user';
 import { UserType } from '@/types/user';
-import { clearToken } from '@/utils/user';
+import { clearCookie } from '@/utils/user';
 import { useRouter } from 'next/router';
 import { useQuery } from '@tanstack/react-query';
 import dynamic from 'next/dynamic';
@@ -75,7 +75,7 @@ const NumberSetting = () => {
  );
  const onclickLogOut = useCallback(() => {
-    clearToken();
+    clearCookie();
    setUserInfo(null);
    router.replace('/login');
  }, [router, setUserInfo]);

--- a/src/pages/promotion/index.tsx
+++ b/src/pages/promotion/index.tsx
@@ -81,7 +81,7 @@ const OpenApi = () => {
            mr={4}
            variant={'outline'}
            onClick={() => {
-              copyData(`${location.origin}?inviterId=${userInfo?._id}`, '已复制邀请链接');
+              copyData(`${location.origin}/?inviterId=${userInfo?._id}`, '已复制邀请链接');
            }}
          >
            复制邀请链接

--- a/src/service/plugins/searchKb.ts
+++ b/src/service/plugins/searchKb.ts
@@ -105,11 +105,11 @@ export const searchKb = async ({
      : [
          {
            obj: ChatRoleEnum.System,
-            value: `我们来玩问答游戏,规则为:
+            value: `我们在玩问答游戏,规则为:
 1.你完全忘记你已有的知识
 2.你只能回答关于"${model.name}"的问题
 3.你只能从知识库中选择内容进行回答
-4.如果问题不在知识库中,你会回答"我不知道。"
+4.如果问题不在知识库中,你必须回答:我不知道。
 务必遵守规则`
          }
        ])
@@ -161,7 +161,7 @@ export const searchKb = async ({
    searchPrompts: [
      {
        obj: ChatRoleEnum.System,
-        value: `知识库:'${filterSystemPrompt}'`
+        value: `知识库:${filterSystemPrompt}`
      },
      ...fixedPrompts
    ]

--- a/src/service/utils/auth.ts
+++ b/src/service/utils/auth.ts
@@ -55,11 +55,11 @@ export const getApiKey = async ({
    },
    [OpenAiChatEnum.GPT4]: {
      userOpenAiKey: user.openaiKey || '',
-      systemAuthKey: process.env.OPENAIKEY as string
+      systemAuthKey: process.env.GPT4KEY as string
    },
    [OpenAiChatEnum.GPT432k]: {
      userOpenAiKey: user.openaiKey || '',
-      systemAuthKey: process.env.OPENAIKEY as string
+      systemAuthKey: process.env.GPT4KEY as string
    },
    [ClaudeEnum.Claude]: {
      userOpenAiKey: '',

--- a/src/service/utils/chat/claude.ts
+++ b/src/service/utils/chat/claude.ts
@@ -25,9 +25,9 @@ export const lafClaudChat = async ({
    .filter((item) => item.obj === 'System')
    .map((item) => item.value)
    .join('\n');
-  const systemPromptText = systemPrompt ? `\n知识库内容:'${systemPrompt}'\n` : '';
+  const systemPromptText = systemPrompt ? `你本次知识:${systemPrompt}\n` : '';
-  const prompt = `${systemPromptText}\n我的问题是:'${messages[messages.length - 1].value}'`;
+  const prompt = `${systemPromptText}我的问题是:'${messages[messages.length - 1].value}'`;
  const lafResponse = await axios.post(
    'https://hnvacz.laf.run/claude-gpt',

--- a/src/service/utils/chat/index.ts
+++ b/src/service/utils/chat/index.ts
@@ -118,8 +118,8 @@ export const ChatContextFilter = ({
      messages: chats
    });
-    /* 整体 tokens 超出范围 */
+    /* 整体 tokens 超出范围, system必须保留 */
-    if (tokens >= maxTokens) {
+    if (tokens >= maxTokens && formatPrompts[i].obj !== ChatRoleEnum.System) {
      return chats.slice(1);
    }
  }

--- a/src/utils/user.ts
+++ b/src/utils/user.ts
 import { PRICE_SCALE } from '@/constants/common';
-const tokenKey = 'fast-gpt-token';
+import { loginOut } from '@/api/user';
-export const clearToken = () => {
+export const clearCookie = () => {
-  document.cookie = 'token=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';
+  try {
+    loginOut();
+  } catch (error) {
+    error;
+  }
 };
 /**