diff --git a/app/components/chat.tsx b/app/components/chat.tsx index 975a64498..ce87ea05f 100644 --- a/app/components/chat.tsx +++ b/app/components/chat.tsx @@ -516,7 +516,7 @@ export function ChatActions(props: { const [showModelSelector, setShowModelSelector] = useState(false); const [showPluginSelector, setShowPluginSelector] = useState(false); const [showUploadImage, setShowUploadImage] = useState(false); - const current_day_token = localStorage.getItem("current_day_token") ?? ""; + // const current_day_token = localStorage.getItem("current_day_token") ?? ""; const [showSizeSelector, setShowSizeSelector] = useState(false); const [showQualitySelector, setShowQualitySelector] = useState(false); diff --git a/app/constant.ts b/app/constant.ts index 0e6cd731f..59cb9d7af 100644 --- a/app/constant.ts +++ b/app/constant.ts @@ -421,8 +421,8 @@ export const DEFAULT_MODELS = [ // }, // }, { - name: "gpt-4o-all", - describe: "GPT-4o,全能版,最贵", + name: "o1-preview-all", + describe: "GPT,o1,最新模型,目前较贵", available: true, sorted: seq++, provider: { diff --git a/app/store/chat.ts b/app/store/chat.ts index b10d12548..cd7f33501 100644 --- a/app/store/chat.ts +++ b/app/store/chat.ts @@ -2,13 +2,6 @@ import { getMessageTextContent, trimTopic } from "../utils"; import { indexedDBStorage } from "@/app/utils/indexedDB-storage"; import { nanoid } from "nanoid"; -import type { - ClientApi, - MultimodalContent, - RequestMessage, -} from "../client/api"; -import { getClientApi } from "../client/api"; -import { ChatControllerPool } from "../client/controller"; import { showToast } from "../components/ui-lib"; import { DEFAULT_INPUT_TEMPLATE, @@ -990,9 +983,6 @@ export const useChatStore = createPersistStore( ...modelcfg, stream: true, model: modelConfig.compressModel, - // providerName: getSummarizeModel(session.mask.modelConfig.model) - // .providerName, - // TODO: }, onUpdate(message) { session.memoryPrompt = message; diff --git a/app/store/config.ts b/app/store/config.ts index 3e59c806a..8842fb1e9 100644 --- a/app/store/config.ts +++ b/app/store/config.ts @@ -56,7 +56,7 @@ export const DEFAULT_CONFIG = { modelConfig: { model: "gpt-4o-mini" as ModelType, - providerName: "OpenAI" as ServiceProvider, + providerName: "Azure" as ServiceProvider, temperature: 0.8, top_p: 1, max_tokens: 2000, @@ -66,7 +66,7 @@ export const DEFAULT_CONFIG = { historyMessageCount: 5, compressMessageLengthThreshold: 4000, compressModel: "gpt-4o-mini" as ModelType, - compressProviderName: "OpenAI" as ServiceProvider, + compressProviderName: "Azure" as ServiceProvider, enableInjectSystemPrompts: true, template: config?.template ?? DEFAULT_INPUT_TEMPLATE, size: "1024x1024" as DalleSize, @@ -178,25 +178,13 @@ export const useAppConfig = createPersistStore( if (version < 3.8) { state.lastUpdate = Date.now(); } - // if (version < 3.8997) { - // state.lastUpdate = Date.now(); - // return { ...DEFAULT_CONFIG }; - // } - - if (version < 3.993) { - // state.modelConfig = DEFAULT_CONFIG.modelConfig; - return { ...DEFAULT_CONFIG }; - // state.modelConfig.template = - // state.modelConfig.template !== DEFAULT_INPUT_TEMPLATE - // ? state.modelConfig.template - // : config?.template ?? DEFAULT_INPUT_TEMPLATE; - } if (version < 4) { state.modelConfig.compressModel = DEFAULT_CONFIG.modelConfig.compressModel; state.modelConfig.compressProviderName = DEFAULT_CONFIG.modelConfig.compressProviderName; + return { ...DEFAULT_CONFIG }; } return state as any; diff --git a/app/utils/hooks.ts b/app/utils/hooks.ts index 96e7fb327..de91956be 100644 --- a/app/utils/hooks.ts +++ b/app/utils/hooks.ts @@ -23,9 +23,9 @@ export function useAllModels() { ]); // @ts-expect-error - if (status === "authenticated" && !session?.user?.isAdmin) { - // 过滤非管理员用户可使用的模型 - return models.filter((m) => !m.name.endsWith("-all")); - } + // if (status === "authenticated" && !session?.user?.isAdmin) { + // // TODO: 过滤非管理员用户可使用的模型 + // return models.filter((m) => !m.name.endsWith("-all")); + // } return models; }