maybe fixes openai sk-svcacct keys
This commit is contained in:
parent
6a908b09cb
commit
f1cfa644c5
|
@ -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}`);
|
||||
|
|
|
@ -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 };
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue