@cortexkit/pi-anthropic-auth 1.12.2 → 1.13.0

package/dist/stream.js

@@ -1,4 +1,4 @@
-import { applyClaudeCodeHeaders, CACHE_KEEP_EXTENDED_TTL_BETA, CacheKeepManager, dumpDirectRequest, FAST_MODE_BETA, FallbackAccountManager, getCache1hPersistentMode, getRelayConfig, getRoutingMode, isApiKeyAccount, isCache1hPersistentlyEnabled, isCacheKeepHybridActive, isDumpPersistentlyEnabled, isFastModePersistentlyEnabled, isOAuthAccount, isValidApiBaseURL, loadAccounts, mergeAnthropicBetas, QuotaManager, resolveClaudeCodeIdentity, sendViaRelay, setDumpEnabled, shouldFallbackStatus, } from '@cortexkit/anthropic-auth-core';
+import { applyClaudeCodeHeaders, CACHE_KEEP_EXTENDED_TTL_BETA, CacheKeepManager, dumpDirectRequest, FAST_MODE_BETA, FallbackAccountManager, getCache1hPersistentMode, getRelayConfig, getRoutingMode, isApiKeyAccount, isCache1hPersistentlyEnabled, isCacheKeepHybridActive, isDumpPersistentlyEnabled, isFastModePersistentlyEnabled, isOAuthAccount, isValidApiBaseURL, loadAccounts, mergeAnthropicBetas, QuotaManager, quotaSnapshotModelScopeIsExhausted, resolveClaudeCodeIdentity, sendViaRelay, setDumpEnabled, shouldFallbackStatus, } from '@cortexkit/anthropic-auth-core';
 import { calculateCost, createAssistantMessageEventStream, } from '@earendil-works/pi-ai';
 import { buildAnthropicRequest, fromClaudeCodeToolName } from "./convert.js";
 import { getPiAccountStoragePath } from "./paths.js";
@@ -219,7 +219,7 @@ async function sendAnthropicRequest(options) {
     });
 }
 function quotaSnapshotIsExhausted(quota) {
-    return Object.values(quota ?? {}).some((window) => window && window.remainingPercent <= 0);
+    return ['five_hour', 'seven_day'].some((key) => (quota?.[key]?.remainingPercent ?? 1) <= 0);
 }
 export function primaryResponseAllowsApiFallback(preflight) {
     return (preflight === 'rate_limit_error' ||
@@ -262,8 +262,33 @@ async function executeWithFallback(options) {
             return false;
         }
     }
+    async function primaryQuotaRefreshConfirmsModelScopeExhausted() {
+        try {
+            const quota = await quotaManager.refreshMain(options.primaryAccessToken);
+            const entry = quotaManager.getMain(options.primaryAccessToken);
+            return Boolean(entry &&
+                entry.refreshAfter > Date.now() &&
+                quotaSnapshotModelScopeIsExhausted(quota, options.model.id));
+        }
+        catch {
+            return false;
+        }
+    }
+    function primaryCachedModelScopeExhausted() {
+        const entry = quotaManager.getMain(options.primaryAccessToken);
+        return Boolean(entry &&
+            quotaSnapshotModelScopeIsExhausted(entry.quota, options.model.id));
+    }
+    function primaryFreshModelScopeExhausted() {
+        const entry = quotaManager.getMain(options.primaryAccessToken);
+        return Boolean(entry &&
+            entry.refreshAfter > Date.now() &&
+            quotaSnapshotModelScopeIsExhausted(entry.quota, options.model.id));
+    }
     async function tryFallbackAccounts(routeOptions = {}) {
-        const usableOAuth = await manager.getUsableFallbackAccounts(storage);
+        const usableOAuth = await manager.getUsableFallbackAccounts(storage, {
+            modelId: options.model.id,
+        });
         const usableOAuthById = new Map(usableOAuth.map((account) => [account.id, account]));
         for (const configured of storage?.accounts ?? []) {
             let response = null;
@@ -311,6 +336,13 @@ async function executeWithFallback(options) {
         if (fallback)
             return fallback;
     }
+    else if (primaryFreshModelScopeExhausted() ||
+        (primaryCachedModelScopeExhausted() &&
+            (await primaryQuotaRefreshConfirmsModelScopeExhausted()))) {
+        const fallback = await tryFallbackAccounts();
+        if (fallback)
+            return fallback;
+    }
     const primary = await sendAnthropicRequest({
         ...options,
         accessToken: options.primaryAccessToken,
@@ -320,9 +352,11 @@ async function executeWithFallback(options) {
         if (!shouldFallbackStatus(primaryPreflight.status, storage))
             return primaryPreflight;
     }
-    const allowApiFallback = primaryResponseAllowsApiFallback(primaryPreflight) &&
-        (await primaryQuotaRefreshConfirmsExhausted());
-    if (!fallbackFirst || allowApiFallback) {
+    const primaryAllowsQuotaFallback = primaryResponseAllowsApiFallback(primaryPreflight);
+    const allowApiFallback = primaryAllowsQuotaFallback && (await primaryQuotaRefreshConfirmsExhausted());
+    const allowModelScopedOAuthFallback = primaryAllowsQuotaFallback &&
+        (await primaryQuotaRefreshConfirmsModelScopeExhausted());
+    if (!fallbackFirst || allowApiFallback || allowModelScopedOAuthFallback) {
         const fallback = await tryFallbackAccounts({
             includeApiRoutes: allowApiFallback,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/pi-anthropic-auth",
-  "version": "1.12.2",
+  "version": "1.13.0",
   "type": "module",
   "repository": {
     "type": "git",
@@ -36,7 +36,7 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "@cortexkit/anthropic-auth-core": "1.12.2"
+    "@cortexkit/anthropic-auth-core": "1.13.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-ai": "*",