From f1cfa644c5612f92e9720a50ac116d9f8b120aa9 Mon Sep 17 00:00:00 2001
From: nai-degen <khoners@protonmail.com>
Date: Thu, 12 Sep 2024 23:05:43 -0500
Subject: [PATCH] maybe fixes openai sk-svcacct keys

---
 src/proxy/middleware/request/onproxyreq/add-key.ts | 2 +-
 src/proxy/openai-image.ts                          | 2 +-
 src/shared/key-management/openai/provider.ts       | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/proxy/middleware/request/onproxyreq/add-key.ts b/src/proxy/middleware/request/onproxyreq/add-key.ts
index 160e8d0..5333496 100644
--- a/src/proxy/middleware/request/onproxyreq/add-key.ts
+++ b/src/proxy/middleware/request/onproxyreq/add-key.ts
@@ -71,7 +71,7 @@ export const addKey: HPMRequestCallback = (proxyReq, req) => {
       break;
     case "openai":
       const key: OpenAIKey = assignedKey as OpenAIKey;
-      if (key.organizationId) {
+      if (key.organizationId && !key.key.includes("svcacct")) {
         proxyReq.setHeader("OpenAI-Organization", key.organizationId);
       }
       proxyReq.setHeader("Authorization", `Bearer ${assignedKey.key}`);
diff --git a/src/proxy/openai-image.ts b/src/proxy/openai-image.ts
index a1fab53..aed15cc 100644
--- a/src/proxy/openai-image.ts
+++ b/src/proxy/openai-image.ts
@@ -26,7 +26,7 @@ const handleModelRequest: RequestHandler = (_req, res) => {
   if (new Date().getTime() - modelListValid < 1000 * 60) {
     return res.status(200).json(modelListCache);
   }
-  const result = generateModelList().filter((m: { id: string }) =>
+  const result = generateModelList("openai").filter((m: { id: string }) =>
     KNOWN_MODELS.includes(m.id)
   );
   modelListCache = { object: "list", data: result };
diff --git a/src/shared/key-management/openai/provider.ts b/src/shared/key-management/openai/provider.ts
index 27176b1..a5a3bf8 100644
--- a/src/shared/key-management/openai/provider.ts
+++ b/src/shared/key-management/openai/provider.ts
@@ -343,6 +343,7 @@ export class OpenAIKeyProvider implements KeyProvider<OpenAIKey> {
 
     key.rateLimitedAt = Date.now();
     key.rateLimitRequestsReset = KEY_REUSE_DELAY;
+    key.rateLimitedUntil = Date.now() + KEY_REUSE_DELAY;
   }
 }