Merge remote-tracking branch 'upstream/main'

This commit is contained in:
ZhaoLiu
2023-06-24 12:19:38 +08:00
79 changed files with 1831 additions and 544 deletions

View File

@@ -1,6 +1,7 @@
import { create } from "zustand";
import { persist } from "zustand/middleware";
import { StoreKey } from "../constant";
import { getClientConfig } from "../config/client";
import { DEFAULT_INPUT_TEMPLATE, StoreKey } from "../constant";
export enum SubmitKey {
Enter = "Enter",
@@ -21,7 +22,7 @@ export const DEFAULT_CONFIG = {
avatar: "1f437",
fontSize: 14,
theme: Theme.Auto as Theme,
tightBorder: false,
tightBorder: !!getClientConfig()?.isApp,
sendPreviewBubble: false,
sidebarWidth: 300,
@@ -34,9 +35,11 @@ export const DEFAULT_CONFIG = {
temperature: 0.8,
max_tokens: 2000,
presence_penalty: 0,
frequency_penalty: 0,
sendMemory: true,
historyMessageCount: 4,
compressMessageLengthThreshold: 1000,
template: DEFAULT_INPUT_TEMPLATE,
},
};
@@ -60,6 +63,10 @@ export const ALL_MODELS = [
name: "gpt-4-0314",
available: ENABLE_GPT4,
},
{
name: "gpt-4-0613",
available: ENABLE_GPT4,
},
{
name: "gpt-4-32k",
available: ENABLE_GPT4,
@@ -68,6 +75,10 @@ export const ALL_MODELS = [
name: "gpt-4-32k-0314",
available: ENABLE_GPT4,
},
{
name: "gpt-4-32k-0613",
available: ENABLE_GPT4,
},
{
name: "gpt-3.5-turbo",
available: true,
@@ -76,6 +87,18 @@ export const ALL_MODELS = [
name: "gpt-3.5-turbo-0301",
available: true,
},
{
name: "gpt-3.5-turbo-0613",
available: true,
},
{
name: "gpt-3.5-turbo-16k",
available: true,
},
{
name: "gpt-3.5-turbo-16k-0613",
available: true,
},
{
name: "qwen-v1", // 通义千问
available: false,
@@ -116,7 +139,7 @@ export function limitNumber(
export function limitModel(name: string) {
return ALL_MODELS.some((m) => m.name === name && m.available)
? name
: ALL_MODELS[4].name;
: "gpt-3.5-turbo";
}
export const ModalConfigValidator = {
@@ -129,6 +152,9 @@ export const ModalConfigValidator = {
presence_penalty(x: number) {
return limitNumber(x, -2, 2, 0);
},
frequency_penalty(x: number) {
return limitNumber(x, -2, 2, 0);
},
temperature(x: number) {
return limitNumber(x, 0, 1, 1);
},
@@ -151,14 +177,16 @@ export const useAppConfig = create<ChatConfigStore>()(
}),
{
name: StoreKey.Config,
version: 2,
version: 3.1,
migrate(persistedState, version) {
if (version === 2) return persistedState as any;
if (version === 3.1) return persistedState as any;
const state = persistedState as ChatConfig;
state.modelConfig.sendMemory = true;
state.modelConfig.historyMessageCount = 4;
state.modelConfig.compressMessageLengthThreshold = 1000;
state.modelConfig.frequency_penalty = 0;
state.modelConfig.template = DEFAULT_INPUT_TEMPLATE;
state.dontShowMaskSplashScreen = false;
return state;