Skip to content

Commit

Permalink
Merge pull request ChatGPTNextWeb#1842 from Yidadaa/bugfix-0607
Browse files Browse the repository at this point in the history
fix: ChatGPTNextWeb#1815 refuse to serve when disable gpt4
  • Loading branch information
Yidadaa authored Jun 6, 2023
2 parents 5da90d2 + 5854d12 commit 21ae88a
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 11 deletions.
25 changes: 23 additions & 2 deletions app/api/common.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { NextRequest } from "next/server";
import { NextRequest, NextResponse } from "next/server";

export const OPENAI_URL = "api.openai.com";
const DEFAULT_PROTOCOL = "https";
const PROTOCOL = process.env.PROTOCOL ?? DEFAULT_PROTOCOL;
const BASE_URL = process.env.BASE_URL ?? OPENAI_URL;
const DISABLE_GPT4 = !!process.env.DISABLE_GPT4;

export async function requestOpenai(req: NextRequest) {
const controller = new AbortController();
Expand Down Expand Up @@ -41,10 +42,30 @@ export async function requestOpenai(req: NextRequest) {
},
cache: "no-store",
method: req.method,
body: req.body,
body: req.clone().body,
signal: controller.signal,
};

// #1815 try to refuse gpt4 request
if (DISABLE_GPT4) {
try {
const clonedBody = await req.clone().json();
if ((clonedBody?.model ?? "").includes("gpt-4")) {
return NextResponse.json(
{
error: true,
message: "you are not allowed to use gpt-4 model",
},
{
status: 403,
},
);
}
} catch (e) {
console.error("[OpenAI] gpt4 filter", e);
}
}

try {
const res = await fetch(fetchUrl, fetchOptions);

Expand Down
8 changes: 0 additions & 8 deletions app/store/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,6 @@ export const ALL_MODELS = [
name: "gpt-4-32k-0314",
available: ENABLE_GPT4,
},
{
name: "gpt-4-mobile",
available: ENABLE_GPT4,
},
{
name: "text-davinci-002-render-sha-mobile",
available: true,
},
{
name: "gpt-3.5-turbo",
available: true,
Expand Down
2 changes: 1 addition & 1 deletion app/store/update.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export const useUpdateStore = create<UpdateStore>()(
}));
}
} catch (e) {
showToast((e as Error).message);
console.error((e as Error).message);
}
},
}),
Expand Down

0 comments on commit 21ae88a

Please sign in to comment.