ag-common 0.0.875 → 0.0.877

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

@@ -15,14 +15,18 @@ const array_1 = require("../../../common/helpers/array");
 const async_1 = require("../../../common/helpers/async");
 const fetch_1 = require("../../../common/helpers/fetch");
 const log_1 = require("../../../common/helpers/log");
+const node_cache_1 = require("../../../common/helpers/node-cache");
+const retryOnError_1 = require("../retryOnError");
 const apikey_1 = require("./apikey");
 let genAIs;
-// Available Gemini models
-const GEMINI_MODELS = [
+const geminiModelsCache = new node_cache_1.TypedNodeCache({ stdTTL: 86400 });
+const geminiModelsCacheKey = 'gemini-models-v1';
+const FALLBACK_GEMINI_MODELS = [
     'gemini-3-flash-preview',
     'gemini-3-pro-preview',
     'gemini-2.5-pro',
     'gemini-2.5-flash',
+    'gemini-2.5-flash-lite',
 ];
 // Helper to sort models based on preference
 const sortModelsByPreference = (models, prefer) => {
@@ -54,15 +58,53 @@ const sortModelsByPreference = (models, prefer) => {
     // Default behavior - no sorting
     return modelArray;
 };
+const normalizeModelName = (name) => name.replace(/^models\//, '');
+const getAvailableGeminiModels = () => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
+    const cachedModels = geminiModelsCache.get(geminiModelsCacheKey);
+    if (cachedModels && cachedModels.length > 0) {
+        return cachedModels;
+    }
+    const keyServiceCombinations = (0, apikey_1.getAvailableCombinations)('gemini');
+    const key = (_a = keyServiceCombinations[0]) === null || _a === void 0 ? void 0 : _a.key;
+    if (!key) {
+        (0, log_1.warn)('No GOOGLE_API_KEY available. Falling back to default Gemini models.');
+        return [...FALLBACK_GEMINI_MODELS];
+    }
+    try {
+        const response = yield fetch(`https://generativelanguage.googleapis.com/v1beta/models?key=${encodeURIComponent(key)}`);
+        if (!response.ok) {
+            throw new Error(`model list fetch failed with status ${response.status}`);
+        }
+        const payload = (yield response.json());
+        const discoveredModels = [
+            ...new Set(((_b = payload.models) !== null && _b !== void 0 ? _b : [])
+                .filter((m) => { var _a; return ((_a = m.supportedGenerationMethods) !== null && _a !== void 0 ? _a : []).includes('generateContent'); })
+                .map((m) => { var _a; return normalizeModelName((_a = m.name) !== null && _a !== void 0 ? _a : ''); })
+                .filter((name) => name.startsWith('gemini') && !name.includes('embedding'))),
+        ];
+        if (discoveredModels.length === 0) {
+            throw new Error('no gemini generateContent models discovered');
+        }
+        geminiModelsCache.set(geminiModelsCacheKey, discoveredModels);
+        (0, log_1.info)(`loaded ${discoveredModels.length} Gemini models from API`);
+        return discoveredModels;
+    }
+    catch (e) {
+        (0, log_1.warn)(`Failed to load Gemini models from API. Falling back to defaults. ${String(e)}`);
+        return [...FALLBACK_GEMINI_MODELS];
+    }
+});
 // Helper to get available key+model combinations
-const getAvailableGeminiCombinations = (prefer) => {
+const getAvailableGeminiCombinations = (prefer) => __awaiter(void 0, void 0, void 0, function* () {
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     if (!genAIs || genAIs.length === 0) {
         const keyServiceCombinations = (0, apikey_1.getAvailableCombinations)('gemini');
         const keys = keyServiceCombinations.map((combo) => combo.key);
         genAIs = keys.map((k) => [k, new genai_1.GoogleGenAI({ apiKey: k })]);
     }
-    const sortedModels = sortModelsByPreference(GEMINI_MODELS, prefer);
+    const availableModels = yield getAvailableGeminiModels();
+    const sortedModels = sortModelsByPreference(availableModels, prefer);
     const combinations = [];
     for (const [key, ai] of genAIs) {
         for (const model of sortedModels) {
@@ -74,7 +116,7 @@ const getAvailableGeminiCombinations = (prefer) => {
         }
     }
     return combinations;
-};
+});
 const geminiPromptImage = (_a) => __awaiter(void 0, [_a], void 0, function* ({ prompt, urls, ident, prefer, }) {
     let images = [];
     if (urls && urls.length > 0) {
@@ -94,53 +136,50 @@ const geminiPromptImage = (_a) => __awaiter(void 0, [_a], void 0, function* ({ p
 });
 exports.geminiPromptImage = geminiPromptImage;
 const geminiPromptDirect = (_a) => __awaiter(void 0, [_a], void 0, function* ({ prompt, images = [], ident, prefer, groundedSearch = false, }) {
-    var _b;
-    const combinations = getAvailableGeminiCombinations(prefer);
-    if (combinations.length === 0) {
-        throw new Error('No available API key and model combinations');
-    }
-    const [key, ai, selectedModel] = combinations[0];
     const parts = images.map((i) => ({
         inlineData: {
             data: Buffer.from(i.arraybuffer).toString('base64'),
             mimeType: i.type,
         },
     }));
-    // 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 = yield ai.models.generateContent(requestConfig);
-        const rawtext = ((_b = response.text) !== null && _b !== void 0 ? _b : '')
-            .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 em = e.message.toLowerCase();
-        const mod = `gemini-${selectedModel}`;
-        if (em.includes('429') || em.includes('safety')) {
-            (0, log_1.warn)('throughput exceeded for gemini:', mod);
-            (0, apikey_1.blockKeyService)(key, mod);
+    return (0, retryOnError_1.retryOnError)(`geminiPromptDirect:${ident !== null && ident !== void 0 ? ident : 'unknown'}`, () => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
+        const combinations = yield getAvailableGeminiCombinations(prefer);
+        if (combinations.length === 0) {
+            throw new Error('No available API key and model combinations');
         }
-        if (em.includes('is not supported')) {
-            (0, log_1.warn)('model not supported for gemini:', mod);
-            (0, apikey_1.blockKeyService)(key, mod);
+        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: {} }];
         }
-        throw e;
-    }
+        (0, log_1.info)('gem query on:' + selectedModel, requestConfig);
+        try {
+            const response = yield ai.models.generateContent(requestConfig);
+            const rawtext = ((_a = response.text) !== null && _a !== void 0 ? _a : '')
+                .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);
+            }
+            throw e;
+        }
+    }), 1, 5000);
 });
 exports.geminiPromptDirect = geminiPromptDirect;
 const resolveGroundedUrl = (url) => __awaiter(void 0, void 0, void 0, function* () {

package/dist/api/helpers/index.d.ts

@@ -6,6 +6,7 @@ export * from './cosmos';
 export * from './dynamo';
 export * from './enforceDynamoProvisionCap';
 export * from './google';
+export * from './retryOnError';
 export * from './s3';
 export * from './ses';
 export * from './sqs';

package/dist/api/helpers/index.js

@@ -22,6 +22,7 @@ __exportStar(require("./cosmos"), exports);
 __exportStar(require("./dynamo"), exports);
 __exportStar(require("./enforceDynamoProvisionCap"), exports);
 __exportStar(require("./google"), exports);
+__exportStar(require("./retryOnError"), exports);
 __exportStar(require("./s3"), exports);
 __exportStar(require("./ses"), exports);
 __exportStar(require("./sqs"), exports);

package/dist/api/helpers/retryOnError.d.ts

@@ -0,0 +1,8 @@
+export declare const overloadedMessages: string[];
+export declare const retryableErrorMessages: string[];
+export declare const isOverloadedApiKeyError: (error: Error) => boolean;
+export declare const isRetryableApiError: (error: Error) => boolean;
+export declare function retryOnError<T>(
+/** so we can log retries with useful info */
+debugIdent: string, fn: () => Promise<T>, retries?: number, errorDelay?: number, errorCheck?: (error: Error) => boolean): Promise<T>;
+export declare const sleep: (ms: number) => Promise<unknown>;

package/dist/api/helpers/retryOnError.js

@@ -0,0 +1,57 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sleep = exports.isRetryableApiError = exports.isOverloadedApiKeyError = exports.retryableErrorMessages = exports.overloadedMessages = void 0;
+exports.retryOnError = retryOnError;
+const log_1 = require("../../common/helpers/log");
+exports.overloadedMessages = [
+    '429',
+    'current usage',
+    'current quota',
+    'overloaded',
+];
+exports.retryableErrorMessages = [
+    ...exports.overloadedMessages,
+    '500',
+    '503',
+    'safety',
+    'invalid_type',
+    'expected',
+];
+const errorContainsAnyMessage = (error, messages) => {
+    const message = error.message.toLowerCase();
+    return messages.some((m) => message.includes(m.toLowerCase()));
+};
+const isOverloadedApiKeyError = (error) => errorContainsAnyMessage(error, exports.overloadedMessages);
+exports.isOverloadedApiKeyError = isOverloadedApiKeyError;
+const isRetryableApiError = (error) => errorContainsAnyMessage(error, exports.retryableErrorMessages);
+exports.isRetryableApiError = isRetryableApiError;
+function retryOnError(debugIdent_1, fn_1) {
+    return __awaiter(this, arguments, void 0, function* (
+    /** so we can log retries with useful info */
+    debugIdent, fn, retries = 1, errorDelay = 2000, errorCheck = exports.isRetryableApiError) {
+        try {
+            return yield fn();
+        }
+        catch (error) {
+            const e = error;
+            const em = e.message;
+            if (retries > 0 && errorCheck(e)) {
+                (0, log_1.info)(`Operation ${debugIdent} failed. Retrying after ${errorDelay}ms...`, em);
+                yield (0, exports.sleep)(errorDelay);
+                return retryOnError(debugIdent, fn, retries - 1, errorDelay, errorCheck);
+            }
+            throw error;
+        }
+    });
+}
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+exports.sleep = sleep;

package/dist/index.d.ts

@@ -1,4 +1,3 @@
 export * from './api';
-export * from './common';
 export * from './node';
 export * from './ui';

package/dist/index.js

@@ -15,6 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./api"), exports);
-__exportStar(require("./common"), exports);
 __exportStar(require("./node"), exports);
 __exportStar(require("./ui"), exports);

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.875",
+  "version": "0.0.877",
   "name": "ag-common",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",