Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: built-in plugin dalle3 error #5787 #5795

Merged
merged 2 commits into from
Nov 11, 2024
Merged

fix: built-in plugin dalle3 error #5787 #5795

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b0f2e5
fix: built-in plugin dalle3 error #5787
Nov 10, 2024
18a6571
Update proxy.ts
JingSyue Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/api/proxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { NextRequest, NextResponse } from "next/server";
import { getServerSideConfig } from "@/app/config/server";

export async function handle(
req: NextRequest,
Expand All @@ -9,6 +10,7 @@ export async function handle(
if (req.method === "OPTIONS") {
return NextResponse.json({ body: "OK" }, { status: 200 });
}
const serverConfig = getServerSideConfig();

// remove path params from searchParams
req.nextUrl.searchParams.delete("path");
Expand All @@ -31,6 +33,11 @@ export async function handle(
return true;
}),
);
// if dalle3 use openai api key
if (req.headers.get("x-base-url")?.includes("openai")) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

includes('api.openai.com')

headers.set("Authorization", `Bearer ${serverConfig.apiKey}`);
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

πŸ› οΈ Refactor suggestion

Enhance API key injection robustness

While the implementation addresses the core issue, consider these improvements for better reliability:

  1. Use a more specific check for OpenAI endpoints
  2. Add validation for the API key
  3. Include proper error handling

Consider this enhanced implementation:

-  if (req.headers.get("x-base-url")?.includes("openai")) {
-    headers.set("Authorization", `Bearer ${serverConfig.apiKey}`);
+  const baseUrl = req.headers.get("x-base-url");
+  if (baseUrl?.includes("api.openai.com")) {
+    if (!serverConfig.apiKey) {
+      return NextResponse.json(
+        { error: "OpenAI API key not configured" },
+        { status: 500 }
+      );
+    }
+    headers.set("Authorization", `Bearer ${serverConfig.apiKey}`);
   }
πŸ“ Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
// if dalle3 use openai api key
if (req.headers.get("x-base-url")?.includes("openai")) {
headers.set("Authorization", `Bearer ${serverConfig.apiKey}`);
}
// if dalle3 use openai api key
const baseUrl = req.headers.get("x-base-url");
if (baseUrl?.includes("api.openai.com")) {
if (!serverConfig.apiKey) {
return NextResponse.json(
{ error: "OpenAI API key not configured" },
{ status: 500 }
);
}
headers.set("Authorization", `Bearer ${serverConfig.apiKey}`);
}

const controller = new AbortController();
const fetchOptions: RequestInit = {
headers,
Expand Down