Merge 41b33a1c1e into 1e20b64048

app/api/common.ts

@@ -124,6 +124,11 @@ export async function requestOpenai(req: NextRequest) {
           [
             ServiceProvider.OpenAI,
             ServiceProvider.Azure,
+            // 自定义等级
+            "L1",
+            "L2",
+            "L3",
+            "L4",
             jsonBody?.model as string, // support provider-unspecified model
           ],
         )

app/api/openai.ts

@@ -14,8 +14,11 @@ function getModels(remoteModelRes: OpenAIListModelResponse) {
   if (config.disableGPT4) {
     remoteModelRes.data = remoteModelRes.data.filter(
       (m) =>
-        !(m.id.startsWith("gpt-4") || m.id.startsWith("chatgpt-4o") || m.id.startsWith("o1")) ||
+        !(
-        m.id.startsWith("gpt-4o-mini"),
+          m.id.startsWith("gpt-4") ||
+          m.id.startsWith("chatgpt-4o") ||
+          m.id.startsWith("o1")
+        ) || m.id.startsWith("gpt-4o-mini"),
     );
   }
 

app/api/proxy.ts

@@ -34,16 +34,16 @@ export async function handle(
     }),
   );
   // if dalle3 use openai api key
-    const baseUrl = req.headers.get("x-base-url");
+  const baseUrl = req.headers.get("x-base-url");
-    if (baseUrl?.includes("api.openai.com")) {
+  if (baseUrl?.includes("api.openai.com")) {
-      if (!serverConfig.apiKey) {
+    if (!serverConfig.apiKey) {
-        return NextResponse.json(
+      return NextResponse.json(
-          { error: "OpenAI API key not configured" },
+        { error: "OpenAI API key not configured" },
-          { status: 500 },
+        { status: 500 },
-        );
+      );
-      }
-      headers.set("Authorization", `Bearer ${serverConfig.apiKey}`);
     }
+    headers.set("Authorization", `Bearer ${serverConfig.apiKey}`);
+  }
 
   const controller = new AbortController();
   const fetchOptions: RequestInit = {

app/components/markdown.tsx

@@ -7,6 +7,7 @@ import RemarkGfm from "remark-gfm";
 import RehypeHighlight from "rehype-highlight";
 import { useRef, useState, RefObject, useEffect, useMemo } from "react";
 import { copyToClipboard, useWindowSize } from "../utils";
+import "lowlight/lib/all";
 import mermaid from "mermaid";
 import Locale from "../locales";
 import LoadingIcon from "../icons/three-dots.svg";

package.json

@@ -36,6 +36,7 @@
     "html-to-image": "^1.11.11",
     "idb-keyval": "^6.2.1",
     "lodash-es": "^4.17.21",
+    "lowlight": "^2.0.0",
     "markdown-to-txt": "^2.0.1",
     "mermaid": "^10.6.1",
     "nanoid": "^5.0.3",