zack3d/simple-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix GCP checker

Browse Source
This commit is contained in:
Cg.
2024-07-05 13:43:12 +09:00
parent eb5019cce1
commit 2b4c2d1157
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/key-management/gcp/checker.ts
+11 -12
View File
@@ -66,15 +66,16 @@ export class GcpKeyChecker extends KeyCheckerBase<GcpKey> {
}); });
} else { } else {
if (key.haikuEnabled) { if (key.haikuEnabled) {
this.invokeModel("claude-3-haiku@20240307", key, false) await this.invokeModel("claude-3-haiku@20240307", key, false)
} else if (key.sonnetEnabled) { } else if (key.sonnetEnabled) {
this.invokeModel("claude-3-sonnet@20240229", key, false) await this.invokeModel("claude-3-sonnet@20240229", key, false)
} else if (key.sonnet35Enabled) { } else if (key.sonnet35Enabled) {
this.invokeModel("claude-3-5-sonnet@20240620", key, false) await this.invokeModel("claude-3-5-sonnet@20240620", key, false)
} else { } else {
this.invokeModel("claude-3-opus@20240229", key, false) await this.invokeModel("claude-3-opus@20240229", key, false)
} }
this.updateKey(key.hash, { lastChecked: Date.now() });
this.log.debug( this.log.debug(
{ key: key.hash}, { key: key.hash},
"GCP key check complete." "GCP key check complete."
@@ -102,9 +103,9 @@ export class GcpKeyChecker extends KeyCheckerBase<GcpKey> {
} else if (status === 429) { } else if (status === 429) {
this.log.warn( this.log.warn(
{ key: key.hash, error: data }, { key: key.hash, error: data },
"Key is rate limited. Rechecking in 10 seconds." "Key is rate limited. Rechecking in a minute."
); );
const next = Date.now() - (KEY_CHECK_PERIOD - 10 * 1000); const next = Date.now() - (KEY_CHECK_PERIOD - 60 * 1000);
this.updateKey(key.hash, { lastChecked: next }); this.updateKey(key.hash, { lastChecked: next });
} else { } else {
this.log.error( this.log.error(
@@ -150,15 +151,13 @@ export class GcpKeyChecker extends KeyCheckerBase<GcpKey> {
payload, payload,
{ {
headers: GcpKeyChecker.getRequestHeaders(accessToken), headers: GcpKeyChecker.getRequestHeaders(accessToken),
validateStatus: initial ? function (status: number) { validateStatus: initial ? () => true : (status: number) => status >= 200 && status < 300
return (status >= 200 && status < 300) || status === 400 || status === 401 || status === 403;
} : undefined
} }
); );
this.log.debug({ data }, "Response from GCP"); this.log.debug({ key: key.hash, data }, "Response from GCP");
if (status === 400 || status === 401 || status === 403) { if (initial) {
return false; return (status >= 200 && status < 300) || (status === 429 || status === 529);
} }
return true; return true;