GithubProxy/ChatGPT-Next-Web
1
0
Fork 1
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-05-19 12:10:17 +09:00
Code Issues Packages Projects Releases Wiki Activity

修复 VISION_MDOELS 在 docker 运行阶段不生效的问题

Browse Source
This commit is contained in:
code-october 2024-12-30 08:58:41 +00:00
parent d56566cd73
commit 57c88c0717
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/api/config/route.ts
View File

@ -14,6 +14,7 @@ const DANGER_CONFIG = {
disableFastLink: serverConfig.disableFastLink, disableFastLink: serverConfig.disableFastLink,
customModels: serverConfig.customModels, customModels: serverConfig.customModels,
defaultModel: serverConfig.defaultModel, defaultModel: serverConfig.defaultModel,
visionModels: serverConfig.visionModels,
}; };
declare global { declare global {

1
app/config/build.ts
View File

@ -40,7 +40,6 @@ export const getBuildConfig = () => {
buildMode, buildMode,
isApp, isApp,
template: process.env.DEFAULT_INPUT_TEMPLATE ?? DEFAULT_INPUT_TEMPLATE, template: process.env.DEFAULT_INPUT_TEMPLATE ?? DEFAULT_INPUT_TEMPLATE,
visionModels: process.env.VISION_MODELS || "",
}; };
}; };

3
app/config/server.ts
View File

@ -23,6 +23,7 @@ declare global {
DISABLE_FAST_LINK?: string; // disallow parse settings from url or not DISABLE_FAST_LINK?: string; // disallow parse settings from url or not
CUSTOM_MODELS?: string; // to control custom models CUSTOM_MODELS?: string; // to control custom models
DEFAULT_MODEL?: string; // to control default model in every new chat window DEFAULT_MODEL?: string; // to control default model in every new chat window
VISION_MODELS?: string; // to control vision models
// stability only // stability only
STABILITY_URL?: string; STABILITY_URL?: string;
@ -128,6 +129,7 @@ export const getServerSideConfig = () => {
const disableGPT4 = !!process.env.DISABLE_GPT4; const disableGPT4 = !!process.env.DISABLE_GPT4;
let customModels = process.env.CUSTOM_MODELS ?? ""; let customModels = process.env.CUSTOM_MODELS ?? "";
let defaultModel = process.env.DEFAULT_MODEL ?? ""; let defaultModel = process.env.DEFAULT_MODEL ?? "";
let visionModels = process.env.VISION_MODELS ?? "";
if (disableGPT4) { if (disableGPT4) {
if (customModels) customModels += ","; if (customModels) customModels += ",";
@ -249,6 +251,7 @@ export const getServerSideConfig = () => {
disableFastLink: !!process.env.DISABLE_FAST_LINK, disableFastLink: !!process.env.DISABLE_FAST_LINK,
customModels, customModels,
defaultModel, defaultModel,
visionModels,
allowedWebDavEndpoints, allowedWebDavEndpoints,
}; };
}; };

6
app/store/access.ts
View File

@ -131,6 +131,7 @@ const DEFAULT_ACCESS_STATE = {
disableFastLink: false, disableFastLink: false,
customModels: "", customModels: "",
defaultModel: "", defaultModel: "",
visionModels: "",
// tts config // tts config
edgeTTSVoiceName: "zh-CN-YunxiNeural", edgeTTSVoiceName: "zh-CN-YunxiNeural",
@ -145,7 +146,10 @@ export const useAccessStore = createPersistStore(
return get().needCode; return get().needCode;
}, },
setVisionModels() {
this.fetch();
return get().visionModels;
},
edgeVoiceName() { edgeVoiceName() {
this.fetch(); this.fetch();

6
app/utils.ts
View File

@ -6,7 +6,7 @@ import { ServiceProvider } from "./constant";
// import { fetch as tauriFetch, ResponseType } from "@tauri-apps/api/http"; // import { fetch as tauriFetch, ResponseType } from "@tauri-apps/api/http";
import { fetch as tauriStreamFetch } from "./utils/stream"; import { fetch as tauriStreamFetch } from "./utils/stream";
import { VISION_MODEL_REGEXES, EXCLUDE_VISION_MODEL_REGEXES } from "./constant"; import { VISION_MODEL_REGEXES, EXCLUDE_VISION_MODEL_REGEXES } from "./constant";
import { getClientConfig } from "./config/client"; import { useAccessStore } from "./store";
import { ModelSize } from "./typing"; import { ModelSize } from "./typing";
export function trimTopic(topic: string) { export function trimTopic(topic: string) {
@ -255,8 +255,8 @@ export function getMessageImages(message: RequestMessage): string[] {
} }
export function isVisionModel(model: string) { export function isVisionModel(model: string) {
const clientConfig = getClientConfig(); const visionModels = useAccessStore.getState().visionModels;
const envVisionModels = clientConfig?.visionModels const envVisionModels = visionModels
?.split(",") ?.split(",")
.map((m) => m.trim()); .map((m) => m.trim());
if (envVisionModels?.includes(model)) { if (envVisionModels?.includes(model)) {