ag-common 0.0.787 → 0.0.788

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

@@ -3,4 +3,3 @@ export declare const getAvailableCombinations: (service: string) => {
     key: string;
 }[];
 export declare const blockKeyService: (apiKey: string, service: string) => void;
-export declare const isKeyServiceAvailable: (apiKey: string, service: string) => boolean;

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

@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isKeyServiceAvailable = exports.blockKeyService = exports.getAvailableCombinations = void 0;
+exports.blockKeyService = exports.getAvailableCombinations = void 0;
 const node_cache_1 = __importDefault(require("node-cache"));
+const common_1 = require("../../../common");
 const log_1 = require("../../../common/helpers/log");
 const truncate_1 = require("../../../common/helpers/string/truncate");
 // Initialize NodeCache with 1 hour TTL for blocklisted key combinations
@@ -22,13 +23,12 @@ const addToBlocklist = (apiKey, service) => {
 // Get available API keys from environment (internal use only)
 const getApiKeys = () => {
     var _a;
-    return ((_a = process.env.GOOGLE_API_KEY) !== null && _a !== void 0 ? _a : '')
-        .split(',')
-        .filter((key) => key.trim() !== '');
+    return ((_a = process.env.GOOGLE_API_KEY) !== null && _a !== void 0 ? _a : '').split(',').filter(common_1.notEmpty);
 };
 // Get available key+service combinations
 const getAvailableCombinations = (service) => {
     const keys = getApiKeys();
+    (0, log_1.debug)(`got ${keys.length} GOOGLE_API_KEY keys`);
     const combinations = [];
     for (const key of keys) {
         if (!isBlocklisted(key, service)) {
@@ -43,6 +43,7 @@ const getAvailableCombinations = (service) => {
             combinations.push({ service, key });
         }
     }
+    (0, log_1.debug)(`returning ${combinations.length} google combinations`);
     return combinations;
 };
 exports.getAvailableCombinations = getAvailableCombinations;
@@ -52,8 +53,3 @@ const blockKeyService = (apiKey, service) => {
     addToBlocklist(apiKey, service);
 };
 exports.blockKeyService = blockKeyService;
-// Check if a key+service combination is available
-const isKeyServiceAvailable = (apiKey, service) => {
-    return !isBlocklisted(apiKey, service);
-};
-exports.isKeyServiceAvailable = isKeyServiceAvailable;

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

@@ -49,9 +49,9 @@ const sortModelsByPreference = (models, prefer) => {
 // Helper to get available key+model combinations
 const getAvailableGeminiCombinations = (prefer) => {
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    if (!genAIs) {
+    if (!genAIs || genAIs.length === 0) {
         const keyServiceCombinations = (0, apikey_1.getAvailableCombinations)('gemini');
-        const keys = Object.keys(keyServiceCombinations);
+        const keys = keyServiceCombinations.map((combo) => combo.key);
         genAIs = keys.map((k) => [k, new genai_1.GoogleGenAI({ apiKey: k })]);
     }
     const sortedModels = sortModelsByPreference(GEMINI_MODELS, prefer);

package/package.json

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