Skip to content

Commit 7380c8a

Browse files
bestsanmaobestsanmao
committed
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web into add_deepseek
2 parents 081daf9 + c0062ff commit 7380c8a

File tree

23 files changed

+361
-85
lines changed

23 files changed

+361
-85
lines changed

‎app/api/alibaba.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
import { prettyObject } from "@/app/utils/format";
99
import { NextRequest, NextResponse } from "next/server";
1010
import { auth } from "@/app/api/auth";
11-
import { isModelAvailableInServer } from "@/app/utils/model";
11+
import { isModelNotavailableInServer } from "@/app/utils/model";
1212

1313
const serverConfig = getServerSideConfig();
1414

@@ -89,7 +89,7 @@ async function request(req: NextRequest) {
8989

9090
// not undefined and is false
9191
if (
92-
isModelAvailableInServer(
92+
isModelNotavailableInServer(
9393
serverConfig.customModels,
9494
jsonBody?.model as string,
9595
ServiceProvider.Alibaba as string,

‎app/api/anthropic.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
import { prettyObject } from "@/app/utils/format";
1010
import { NextRequest, NextResponse } from "next/server";
1111
import { auth } from "./auth";
12-
import { isModelAvailableInServer } from "@/app/utils/model";
12+
import { isModelNotavailableInServer } from "@/app/utils/model";
1313
import { cloudflareAIGatewayUrl } from "@/app/utils/cloudflare";
1414

1515
const ALLOWD_PATH = new Set([Anthropic.ChatPath, Anthropic.ChatPath1]);
@@ -122,7 +122,7 @@ async function request(req: NextRequest) {
122122

123123
// not undefined and is false
124124
if (
125-
isModelAvailableInServer(
125+
isModelNotavailableInServer(
126126
serverConfig.customModels,
127127
jsonBody?.model as string,
128128
ServiceProvider.Anthropic as string,

‎app/api/baidu.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
import { prettyObject } from "@/app/utils/format";
99
import { NextRequest, NextResponse } from "next/server";
1010
import { auth } from "@/app/api/auth";
11-
import { isModelAvailableInServer } from "@/app/utils/model";
11+
import { isModelNotavailableInServer } from "@/app/utils/model";
1212
import { getAccessToken } from "@/app/utils/baidu";
1313

1414
const serverConfig = getServerSideConfig();
@@ -104,7 +104,7 @@ async function request(req: NextRequest) {
104104

105105
// not undefined and is false
106106
if (
107-
isModelAvailableInServer(
107+
isModelNotavailableInServer(
108108
serverConfig.customModels,
109109
jsonBody?.model as string,
110110
ServiceProvider.Baidu as string,

‎app/api/bytedance.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
import { prettyObject } from "@/app/utils/format";
99
import { NextRequest, NextResponse } from "next/server";
1010
import { auth } from "@/app/api/auth";
11-
import { isModelAvailableInServer } from "@/app/utils/model";
11+
import { isModelNotavailableInServer } from "@/app/utils/model";
1212

1313
const serverConfig = getServerSideConfig();
1414

@@ -88,7 +88,7 @@ async function request(req: NextRequest) {
8888

8989
// not undefined and is false
9090
if (
91-
isModelAvailableInServer(
91+
isModelNotavailableInServer(
9292
serverConfig.customModels,
9393
jsonBody?.model as string,
9494
ServiceProvider.ByteDance as string,

‎app/api/common.ts‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { NextRequest, NextResponse } from "next/server";
22
import { getServerSideConfig } from "../config/server";
33
import { OPENAI_BASE_URL, ServiceProvider } from "../constant";
44
import { cloudflareAIGatewayUrl } from "../utils/cloudflare";
5-
import { getModelProvider, isModelAvailableInServer } from "../utils/model";
5+
import { getModelProvider, isModelNotavailableInServer } from "../utils/model";
66

77
const serverConfig = getServerSideConfig();
88

@@ -118,15 +118,14 @@ export async function requestOpenai(req: NextRequest) {
118118

119119
// not undefined and is false
120120
if (
121-
isModelAvailableInServer(
121+
isModelNotavailableInServer(
122122
serverConfig.customModels,
123123
jsonBody?.model as string,
124-
ServiceProvider.OpenAI as string,
125-
) ||
126-
isModelAvailableInServer(
127-
serverConfig.customModels,
128-
jsonBody?.model as string,
129-
ServiceProvider.Azure as string,
124+
[
125+
ServiceProvider.OpenAI,
126+
ServiceProvider.Azure,
127+
jsonBody?.model as string, // support provider-unspecified model
128+
],
130129
)
131130
) {
132131
return NextResponse.json(

‎app/api/glm.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
import { prettyObject } from "@/app/utils/format";
99
import { NextRequest, NextResponse } from "next/server";
1010
import { auth } from "@/app/api/auth";
11-
import { isModelAvailableInServer } from "@/app/utils/model";
11+
import { isModelNotavailableInServer } from "@/app/utils/model";
1212

1313
const serverConfig = getServerSideConfig();
1414

@@ -89,7 +89,7 @@ async function request(req: NextRequest) {
8989

9090
// not undefined and is false
9191
if (
92-
isModelAvailableInServer(
92+
isModelNotavailableInServer(
9393
serverConfig.customModels,
9494
jsonBody?.model as string,
9595
ServiceProvider.ChatGLM as string,

‎app/api/iflytek.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
import { prettyObject } from "@/app/utils/format";
99
import { NextRequest, NextResponse } from "next/server";
1010
import { auth } from "@/app/api/auth";
11-
import { isModelAvailableInServer } from "@/app/utils/model";
11+
import { isModelNotavailableInServer } from "@/app/utils/model";
1212
// iflytek
1313

1414
const serverConfig = getServerSideConfig();
@@ -89,7 +89,7 @@ async function request(req: NextRequest) {
8989

9090
// not undefined and is false
9191
if (
92-
isModelAvailableInServer(
92+
isModelNotavailableInServer(
9393
serverConfig.customModels,
9494
jsonBody?.model as string,
9595
ServiceProvider.Iflytek as string,

‎app/api/moonshot.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
import { prettyObject } from "@/app/utils/format";
99
import { NextRequest, NextResponse } from "next/server";
1010
import { auth } from "@/app/api/auth";
11-
import { isModelAvailableInServer } from "@/app/utils/model";
11+
import { isModelNotavailableInServer } from "@/app/utils/model";
1212

1313
const serverConfig = getServerSideConfig();
1414

@@ -88,7 +88,7 @@ async function request(req: NextRequest) {
8888

8989
// not undefined and is false
9090
if (
91-
isModelAvailableInServer(
91+
isModelNotavailableInServer(
9292
serverConfig.customModels,
9393
jsonBody?.model as string,
9494
ServiceProvider.Moonshot as string,

‎app/api/xai.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
import { prettyObject } from "@/app/utils/format";
99
import { NextRequest, NextResponse } from "next/server";
1010
import { auth } from "@/app/api/auth";
11-
import { isModelAvailableInServer } from "@/app/utils/model";
11+
import { isModelNotavailableInServer } from "@/app/utils/model";
1212

1313
const serverConfig = getServerSideConfig();
1414

@@ -88,7 +88,7 @@ async function request(req: NextRequest) {
8888

8989
// not undefined and is false
9090
if (
91-
isModelAvailableInServer(
91+
isModelNotavailableInServer(
9292
serverConfig.customModels,
9393
jsonBody?.model as string,
9494
ServiceProvider.XAI as string,

0 commit comments

Comments
 (0)