Merge remote-tracking branch 'upstream/main'

This commit is contained in:
Hk-Gosuto
2023-11-08 18:43:40 +08:00
20 changed files with 147 additions and 716 deletions

View File

@@ -20,7 +20,7 @@ export async function requestOpenai(req: NextRequest) {
baseUrl = `${PROTOCOL}://${baseUrl}`;
}
if (baseUrl.endsWith('/')) {
if (baseUrl.endsWith("/")) {
baseUrl = baseUrl.slice(0, -1);
}
@@ -31,9 +31,12 @@ export async function requestOpenai(req: NextRequest) {
console.log("[Org ID]", process.env.OPENAI_ORG_ID);
}
const timeoutId = setTimeout(() => {
controller.abort();
}, 10 * 60 * 1000);
const timeoutId = setTimeout(
() => {
controller.abort();
},
10 * 60 * 1000,
);
const fetchUrl = `${baseUrl}/${openaiPath}`;
const fetchOptions: RequestInit = {

View File

@@ -11,6 +11,7 @@ const DANGER_CONFIG = {
hideUserApiKey: serverConfig.hideUserApiKey,
disableGPT4: serverConfig.disableGPT4,
hideBalanceQuery: serverConfig.hideBalanceQuery,
disableFastLink: serverConfig.disableFastLink,
};
declare global {