ag-common 0.0.906 → 0.0.908

package/dist/api/helpers/google/apikey.d.ts

@@ -1,4 +1,4 @@
-export declare const getAvailableCombinations: (service: string) => {
+export declare const getAvailableCombinations: (service: string, resetIfExhausted?: boolean) => {
     service: string;
     key: string;
 }[];

package/dist/api/helpers/google/apikey.js

@@ -22,7 +22,7 @@ const getApiKeys = () => {
     return (process.env.GOOGLE_API_KEY ?? "").split(",").filter(array_1.notEmpty);
 };
 // Get available key+service combinations
-const getAvailableCombinations = (service) => {
+const getAvailableCombinations = (service, resetIfExhausted = true) => {
     const keys = getApiKeys();
     (0, log_1.debug)(`got ${keys.length} GOOGLE_API_KEY keys`);
     const combinations = [];
@@ -32,7 +32,7 @@ const getAvailableCombinations = (service) => {
         }
     }
     // If all combinations are blocklisted, clear the blocklist and try again
-    if (combinations.length === 0) {
+    if (combinations.length === 0 && resetIfExhausted) {
         (0, log_1.warn)(`All API key + service combinations were blocklisted for ${service}. Clearing blocklist and trying again.`);
         blocklist.flushAll();
         for (const key of keys) {
@@ -45,7 +45,7 @@ const getAvailableCombinations = (service) => {
 exports.getAvailableCombinations = getAvailableCombinations;
 // Block a key+service combination
 const blockKeyService = (apiKey, service) => {
-    (0, log_1.warn)(`key+service blocklisted: ${(0, truncate_1.truncate)(apiKey, 10)}_${service}`);
+    (0, log_1.warn)(`key+service blocklisted for ${service}`);
     addToBlocklist(apiKey, service);
 };
 exports.blockKeyService = blockKeyService;

package/dist/api/helpers/google/gemini.d.ts

@@ -1,12 +1,18 @@
 export type ModelPreference = "quality" | "fast" | undefined;
+/** Provenance of a successful response, with generation time in Unix milliseconds. */
+export type GenerationMetadata = {
+    model: string;
+    generatedAt: number;
+};
 export declare const isTextGenerationModel: (name: string) => boolean;
-export declare const geminiPromptImage: ({ prompt, urls, ident, prefer, }: {
+export declare const geminiPromptImage: ({ prompt, urls, ident, prefer, onGenerated, }: {
     prompt: string;
     urls?: string[];
     ident: string | undefined;
     prefer?: ModelPreference;
+    onGenerated?: (metadata: GenerationMetadata) => void;
 }) => Promise<string>;
-export declare const geminiPromptDirect: ({ prompt, images, ident, prefer, groundedSearch, }: {
+export declare const geminiPromptDirect: ({ prompt, images, ident, prefer, groundedSearch, onGenerated, }: {
     prompt: string;
     images?: {
         arraybuffer: ArrayBuffer;
@@ -15,5 +21,6 @@ export declare const geminiPromptDirect: ({ prompt, images, ident, prefer, groun
     ident: string | undefined;
     prefer?: ModelPreference;
     groundedSearch?: boolean;
+    onGenerated?: (metadata: GenerationMetadata) => void;
 }) => Promise<string>;
 export declare const resolveGroundedUrl: (url: string) => Promise<string>;

package/dist/api/helpers/google/gemini.js

@@ -112,7 +112,7 @@ const getAvailableGeminiCombinations = async (prefer) => {
     const combinations = [];
     for (const [key, ai] of genAIs) {
         for (const model of sortedModels) {
-            const keyServiceCombinations = (0, apikey_1.getAvailableCombinations)(`gemini-${model}`);
+            const keyServiceCombinations = (0, apikey_1.getAvailableCombinations)(`gemini-${model}`, false);
             const isAvailable = keyServiceCombinations.some((k) => k.key === key);
             if (isAvailable) {
                 combinations.push([key, ai, model]);
@@ -121,7 +121,7 @@ const getAvailableGeminiCombinations = async (prefer) => {
     }
     return combinations;
 };
-const geminiPromptImage = async ({ prompt, urls, ident, prefer, }) => {
+const geminiPromptImage = async ({ prompt, urls, ident, prefer, onGenerated, }) => {
     let images = [];
     if (urls && urls.length > 0) {
         images = await (0, async_1.asyncMap)(urls, (i) => (0, fetch_1.fetchToMemory)(i));
@@ -134,11 +134,12 @@ const geminiPromptImage = async ({ prompt, urls, ident, prefer, }) => {
         images: images.filter(array_1.notEmpty),
         ident,
         prefer,
+        onGenerated,
     });
     return r;
 };
 exports.geminiPromptImage = geminiPromptImage;
-const geminiPromptDirect = async ({ prompt, images = [], ident, prefer, groundedSearch = false, }) => {
+const geminiPromptDirect = async ({ prompt, images = [], ident, prefer, groundedSearch = false, onGenerated, }) => {
     const parts = images.map((i) => ({
         inlineData: {
             data: Buffer.from(i.arraybuffer).toString("base64"),
@@ -150,37 +151,54 @@ const geminiPromptDirect = async ({ prompt, images = [], ident, prefer, grounded
         if (combinations.length === 0) {
             throw new Error("No available API key and model combinations");
         }
-        const [key, ai, selectedModel] = combinations[0];
-        // Prepare the request configuration
-        const requestConfig = {
-            model: selectedModel,
-            contents: [{ parts: [{ text: prompt }, ...parts] }],
-            config: {},
-        };
-        // Add grounded search configuration if enabled
-        if (groundedSearch) {
-            requestConfig.config.tools = [{ googleSearch: {} }];
-        }
-        (0, log_1.info)("gem query on:" + selectedModel, requestConfig);
-        try {
-            const response = await ai.models.generateContent(requestConfig);
-            const rawtext = (response.text ?? "")
-                .replace(/```(json)?/gi, "")
-                .replace(/:[ ]+undefined/gim, ": null");
-            (0, log_1.info)("gem response");
-            (0, log_1.debug)("gem prompt:" + prompt, ident);
-            (0, log_1.debug)("gem response:" + rawtext);
-            (0, log_1.debug)("gem query usage:" + JSON.stringify(response.usageMetadata));
-            return rawtext;
-        }
-        catch (e) {
-            const mod = `gemini-${selectedModel}`;
-            if ((0, retryOnError_1.isOverloadedApiKeyError)(e)) {
-                (0, log_1.warn)("throughput exceeded for gemini:", mod);
-                (0, apikey_1.blockKeyService)(key, mod);
+        let lastFailure;
+        for (const [key, ai, selectedModel] of combinations) {
+            // Another concurrent prompt may have exhausted this combination already.
+            if (!(0, apikey_1.getAvailableCombinations)(`gemini-${selectedModel}`, false).some((entry) => entry.key === key))
+                continue;
+            // Prepare the request configuration
+            const requestConfig = {
+                model: selectedModel,
+                contents: [{ parts: [{ text: prompt }, ...parts] }],
+                config: {},
+            };
+            // Add grounded search configuration if enabled
+            if (groundedSearch) {
+                requestConfig.config.tools = [{ googleSearch: {} }];
+            }
+            (0, log_1.info)("gem query on:" + selectedModel, requestConfig);
+            try {
+                // oxlint-disable-next-line no-await-in-loop -- fallback depends on the previous model failing
+                const response = await ai.models.generateContent(requestConfig);
+                const rawtext = (response.text ?? "")
+                    .replace(/```(json)?/gi, "")
+                    .replace(/:[ ]+undefined/gim, ": null");
+                (0, log_1.info)("gem response");
+                (0, log_1.debug)("gem prompt:" + prompt, ident);
+                (0, log_1.debug)("gem response:" + rawtext);
+                (0, log_1.debug)("gem query usage:" + JSON.stringify(response.usageMetadata));
+                onGenerated?.({ model: response.modelVersion || selectedModel, generatedAt: Date.now() });
+                return rawtext;
+            }
+            catch (e) {
+                const mod = `gemini-${selectedModel}`;
+                const status = e.status;
+                const message = e instanceof Error ? e.message : String(e);
+                const unavailableModel = status === 404 && message.includes(selectedModel);
+                if (status === 429 || (0, retryOnError_1.isOverloadedApiKeyError)(e) || unavailableModel) {
+                    (0, log_1.warn)("Gemini model attempt failed; trying next available combination", {
+                        model: selectedModel,
+                        status,
+                        reason: unavailableModel ? "model unavailable" : "quota or capacity exhausted",
+                    });
+                    (0, apikey_1.blockKeyService)(key, mod);
+                    lastFailure = e;
+                    continue;
+                }
+                throw e;
             }
-            throw e;
         }
+        throw lastFailure ?? new Error("No available API key and model combinations");
     }, 1, 5000);
 };
 exports.geminiPromptDirect = geminiPromptDirect;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.906",
+  "version": "0.0.908",
   "license": "ISC",
   "author": "admin@gec.dev",
   "repository": {