@contentgrowth/llm-service 1.3.7 → 1.4.0

package/dist/index.d.cts

@@ -1,6 +1,5 @@
 import OpenAI from 'openai';
 import Anthropic from '@anthropic-ai/sdk';
-import * as _google_genai from '@google/genai';
 import { GoogleGenAI } from '@google/genai';
 export { Modality } from '@google/genai';
 
@@ -567,6 +566,8 @@ declare namespace MODEL_CONFIGS {
  * Invalid model IDs that earlier versions of this library shipped as defaults.
  * Consumers persisted some of them (e.g. saved BYOK key configs), so we map them
  * to a valid equivalent instead of letting the provider return 404.
+ *
+ * NOTE: Imagen models are NOT included here - they should fail with clear error.
  */
 declare const LEGACY_MODEL_ALIASES: {
     'gpt-5.5-instant': string;
@@ -575,6 +576,10 @@ declare const LEGACY_MODEL_ALIASES: {
     'gemini-3.7-pro': string;
     'gemini-3.5-pro-image-preview': string;
     'gemini-3.7-pro-image-preview': string;
+    'gemini-3-pro-image': string;
+    'gemini-3.1-flash-image': string;
+    'gemini-3.1-flash-lite-image': string;
+    'gemini-2.5-flash-image': string;
     'claude-4.5-haiku': string;
     'claude-4.6-sonnet': string;
     'claude-4.8-opus': string;
@@ -619,13 +624,28 @@ declare class GoogleProvider extends BaseLLMProvider {
     models: {};
     defaultModel: any;
     _pendingOperations: Map<any, any>;
+    accessToken: any;
+    project: any;
+    location: any;
+    useDirectAPI: boolean;
     client: GoogleGenAI;
     /**
      * Perform the actual API call. Both AI Studio and Vertex AI use the
      * same @google/genai SDK method — the routing is determined by how
      * the client was constructed.
      */
-    _generateContent(requestOptions: any): Promise<_google_genai.GenerateContentResponse>;
+    _generateContent(requestOptions: any): Promise<any>;
+    /**
+     * Direct Vertex AI API call using pre-generated access token
+     * @private
+     */
+    private _directVertexAPICall;
+    /**
+     * Determine authentication mode from config for logging/debugging
+     * @private
+     * @returns {string} Auth mode description
+     */
+    private _getAuthMode;
     chat(userMessage: any, systemPrompt?: string, options?: {}): Promise<{
         text: string;
     }>;
@@ -637,18 +657,18 @@ declare class GoogleProvider extends BaseLLMProvider {
         tool_calls: {
             type: string;
             function: {
-                name: string;
+                name: any;
                 arguments: string;
             };
             thought_signature: any;
         }[];
         finishReason: string;
-        _rawFinishReason: _google_genai.FinishReason;
+        _rawFinishReason: any;
         _responseFormat: any;
         usage: {
-            prompt_tokens: number;
-            completion_tokens: number;
-            total_tokens: number;
+            prompt_tokens: any;
+            completion_tokens: any;
+            total_tokens: any;
         };
     }>;
     _chatCompletionWithModel(messages: any, systemPrompt: any, tools: any, modelName: any, maxTokens: any, temperature: any, options?: {}): Promise<{
@@ -659,18 +679,18 @@ declare class GoogleProvider extends BaseLLMProvider {
         tool_calls: {
             type: string;
             function: {
-                name: string;
+                name: any;
                 arguments: string;
             };
             thought_signature: any;
         }[];
         finishReason: string;
-        _rawFinishReason: _google_genai.FinishReason;
+        _rawFinishReason: any;
         _responseFormat: any;
         usage: {
-            prompt_tokens: number;
-            completion_tokens: number;
-            total_tokens: number;
+            prompt_tokens: any;
+            completion_tokens: any;
+            total_tokens: any;
         };
     }>;
     _buildGenerationConfig(options: any, maxTokens: any, temperature: any): {
@@ -684,8 +704,8 @@ declare class GoogleProvider extends BaseLLMProvider {
     _safeJsonParse(content: any): any;
     executeTools(tool_calls: any, messages: any, tenantId: any, toolImplementations: any, env: any): Promise<void>;
     imageGeneration(prompt: any, systemPrompt: any, options?: {}): Promise<{
-        imageData: string;
-        mimeType: string;
+        imageData: any;
+        mimeType: any;
         thought_signature: any;
     }>;
     _getModelForTier(tier: any): any;
@@ -788,26 +808,95 @@ declare function handleApiError(error: Error, operation?: string, context?: stri
 declare function sanitizeError(error: Error, context?: string): Error;
 
 /**
- * Google Auth Helper for Cloudflare Workers / Node.js
- * Generates an OAuth2 access token using a Service Account JSON.
+ * Google OAuth2 Token Manager
+ *
+ * Handles token generation, caching, and automatic refresh for
+ * Google Cloud service accounts. Tokens are cached and automatically
+ * refreshed when they expire (with a 5-minute safety buffer).
+ *
+ * @example
+ * const sa = parseGoogleCredentials(credentials);
+ * const tokenManager = new GoogleTokenManager(sa);
+ *
+ * // Get token (cached or fresh)
+ * const token = await tokenManager.getToken();
+ *
+ * // Force refresh
+ * tokenManager.invalidate();
+ * const newToken = await tokenManager.getToken();
  */
-declare class GoogleAuth {
+declare class GoogleTokenManager {
     /**
-     * @param {Object} credentials - Parsed Service Account JSON
+     * @param {object} serviceAccount - Parsed service account with client_email and private_key
+     * @param {object} options - Optional configuration
+     * @param {string} options.scope - OAuth2 scope (default: cloud-platform)
+     * @param {number} options.tokenLifetime - Token lifetime in seconds (default: 3600)
      */
-    constructor(credentials: any);
-    credentials: any;
-    tokenUrl: string;
-    scopes: string[];
+    constructor(serviceAccount: object, options?: {
+        scope: string;
+        tokenLifetime: number;
+    });
+    clientEmail: any;
+    privateKey: any;
+    projectId: any;
+    scope: string;
+    tokenLifetime: number;
+    _tokenCache: string;
+    _expiresAt: number;
+    /**
+     * Get a valid access token (cached or fresh)
+     *
+     * @returns {Promise<string>} OAuth2 access token
+     */
+    getToken(): Promise<string>;
+    /**
+     * Clear cached token (force refresh on next getToken call)
+     */
+    invalidate(): void;
+    /**
+     * Check if cached token is still valid
+     *
+     * @returns {boolean} True if token is valid
+     */
+    isValid(): boolean;
+    /**
+     * Get time until token expires (in seconds)
+     *
+     * @returns {number} Seconds until expiration (0 if no token or expired)
+     */
+    getTimeToExpiry(): number;
     /**
-     * Generate a signed JWT for the token exchange
+     * Generate OAuth2 token via JWT flow
+     *
+     * @private
+     * @returns {Promise<string>} Access token
+     */
+    private _generateToken;
+    /**
+     * Sign JWT using service account private key
+     *
+     * @private
+     * @param {object} header - JWT header
+     * @param {object} payload - JWT payload
+     * @returns {Promise<string>} Signed JWT
      */
-    createSignedJWT(): Promise<string>;
+    private _signJWT;
     /**
-     * Get an access token from Google OAuth2
-     * @returns {Promise<string>} Access Token
+     * Import PEM private key for signing
+     *
+     * @private
+     * @param {string} pemKey - PEM formatted private key
+     * @returns {Promise<CryptoKey>} Imported key
+     */
+    private _importPrivateKey;
+    /**
+     * Base64 URL encode (without padding)
+     *
+     * @private
+     * @param {string|ArrayBuffer} input - Data to encode
+     * @returns {string} Base64 URL encoded string
      */
-    getAccessToken(): Promise<string>;
+    private _base64UrlEncode;
 }
 
 /**
@@ -837,7 +926,7 @@ declare class TranscriptionService {
     endpoint: string;
     model: string;
     client: OpenAI;
-    googleAuth: GoogleAuth;
+    googleTokenManager: GoogleTokenManager;
     projectId: any;
     /**
      * Transcribe audio to text

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 import OpenAI from 'openai';
 import Anthropic from '@anthropic-ai/sdk';
-import * as _google_genai from '@google/genai';
 import { GoogleGenAI } from '@google/genai';
 export { Modality } from '@google/genai';
 
@@ -567,6 +566,8 @@ declare namespace MODEL_CONFIGS {
  * Invalid model IDs that earlier versions of this library shipped as defaults.
  * Consumers persisted some of them (e.g. saved BYOK key configs), so we map them
  * to a valid equivalent instead of letting the provider return 404.
+ *
+ * NOTE: Imagen models are NOT included here - they should fail with clear error.
  */
 declare const LEGACY_MODEL_ALIASES: {
     'gpt-5.5-instant': string;
@@ -575,6 +576,10 @@ declare const LEGACY_MODEL_ALIASES: {
     'gemini-3.7-pro': string;
     'gemini-3.5-pro-image-preview': string;
     'gemini-3.7-pro-image-preview': string;
+    'gemini-3-pro-image': string;
+    'gemini-3.1-flash-image': string;
+    'gemini-3.1-flash-lite-image': string;
+    'gemini-2.5-flash-image': string;
     'claude-4.5-haiku': string;
     'claude-4.6-sonnet': string;
     'claude-4.8-opus': string;
@@ -619,13 +624,28 @@ declare class GoogleProvider extends BaseLLMProvider {
     models: {};
     defaultModel: any;
     _pendingOperations: Map<any, any>;
+    accessToken: any;
+    project: any;
+    location: any;
+    useDirectAPI: boolean;
     client: GoogleGenAI;
     /**
      * Perform the actual API call. Both AI Studio and Vertex AI use the
      * same @google/genai SDK method — the routing is determined by how
      * the client was constructed.
      */
-    _generateContent(requestOptions: any): Promise<_google_genai.GenerateContentResponse>;
+    _generateContent(requestOptions: any): Promise<any>;
+    /**
+     * Direct Vertex AI API call using pre-generated access token
+     * @private
+     */
+    private _directVertexAPICall;
+    /**
+     * Determine authentication mode from config for logging/debugging
+     * @private
+     * @returns {string} Auth mode description
+     */
+    private _getAuthMode;
     chat(userMessage: any, systemPrompt?: string, options?: {}): Promise<{
         text: string;
     }>;
@@ -637,18 +657,18 @@ declare class GoogleProvider extends BaseLLMProvider {
         tool_calls: {
             type: string;
             function: {
-                name: string;
+                name: any;
                 arguments: string;
             };
             thought_signature: any;
         }[];
         finishReason: string;
-        _rawFinishReason: _google_genai.FinishReason;
+        _rawFinishReason: any;
         _responseFormat: any;
         usage: {
-            prompt_tokens: number;
-            completion_tokens: number;
-            total_tokens: number;
+            prompt_tokens: any;
+            completion_tokens: any;
+            total_tokens: any;
         };
     }>;
     _chatCompletionWithModel(messages: any, systemPrompt: any, tools: any, modelName: any, maxTokens: any, temperature: any, options?: {}): Promise<{
@@ -659,18 +679,18 @@ declare class GoogleProvider extends BaseLLMProvider {
         tool_calls: {
             type: string;
             function: {
-                name: string;
+                name: any;
                 arguments: string;
             };
             thought_signature: any;
         }[];
         finishReason: string;
-        _rawFinishReason: _google_genai.FinishReason;
+        _rawFinishReason: any;
         _responseFormat: any;
         usage: {
-            prompt_tokens: number;
-            completion_tokens: number;
-            total_tokens: number;
+            prompt_tokens: any;
+            completion_tokens: any;
+            total_tokens: any;
         };
     }>;
     _buildGenerationConfig(options: any, maxTokens: any, temperature: any): {
@@ -684,8 +704,8 @@ declare class GoogleProvider extends BaseLLMProvider {
     _safeJsonParse(content: any): any;
     executeTools(tool_calls: any, messages: any, tenantId: any, toolImplementations: any, env: any): Promise<void>;
     imageGeneration(prompt: any, systemPrompt: any, options?: {}): Promise<{
-        imageData: string;
-        mimeType: string;
+        imageData: any;
+        mimeType: any;
         thought_signature: any;
     }>;
     _getModelForTier(tier: any): any;
@@ -788,26 +808,95 @@ declare function handleApiError(error: Error, operation?: string, context?: stri
 declare function sanitizeError(error: Error, context?: string): Error;
 
 /**
- * Google Auth Helper for Cloudflare Workers / Node.js
- * Generates an OAuth2 access token using a Service Account JSON.
+ * Google OAuth2 Token Manager
+ *
+ * Handles token generation, caching, and automatic refresh for
+ * Google Cloud service accounts. Tokens are cached and automatically
+ * refreshed when they expire (with a 5-minute safety buffer).
+ *
+ * @example
+ * const sa = parseGoogleCredentials(credentials);
+ * const tokenManager = new GoogleTokenManager(sa);
+ *
+ * // Get token (cached or fresh)
+ * const token = await tokenManager.getToken();
+ *
+ * // Force refresh
+ * tokenManager.invalidate();
+ * const newToken = await tokenManager.getToken();
  */
-declare class GoogleAuth {
+declare class GoogleTokenManager {
     /**
-     * @param {Object} credentials - Parsed Service Account JSON
+     * @param {object} serviceAccount - Parsed service account with client_email and private_key
+     * @param {object} options - Optional configuration
+     * @param {string} options.scope - OAuth2 scope (default: cloud-platform)
+     * @param {number} options.tokenLifetime - Token lifetime in seconds (default: 3600)
      */
-    constructor(credentials: any);
-    credentials: any;
-    tokenUrl: string;
-    scopes: string[];
+    constructor(serviceAccount: object, options?: {
+        scope: string;
+        tokenLifetime: number;
+    });
+    clientEmail: any;
+    privateKey: any;
+    projectId: any;
+    scope: string;
+    tokenLifetime: number;
+    _tokenCache: string;
+    _expiresAt: number;
+    /**
+     * Get a valid access token (cached or fresh)
+     *
+     * @returns {Promise<string>} OAuth2 access token
+     */
+    getToken(): Promise<string>;
+    /**
+     * Clear cached token (force refresh on next getToken call)
+     */
+    invalidate(): void;
+    /**
+     * Check if cached token is still valid
+     *
+     * @returns {boolean} True if token is valid
+     */
+    isValid(): boolean;
+    /**
+     * Get time until token expires (in seconds)
+     *
+     * @returns {number} Seconds until expiration (0 if no token or expired)
+     */
+    getTimeToExpiry(): number;
     /**
-     * Generate a signed JWT for the token exchange
+     * Generate OAuth2 token via JWT flow
+     *
+     * @private
+     * @returns {Promise<string>} Access token
+     */
+    private _generateToken;
+    /**
+     * Sign JWT using service account private key
+     *
+     * @private
+     * @param {object} header - JWT header
+     * @param {object} payload - JWT payload
+     * @returns {Promise<string>} Signed JWT
      */
-    createSignedJWT(): Promise<string>;
+    private _signJWT;
     /**
-     * Get an access token from Google OAuth2
-     * @returns {Promise<string>} Access Token
+     * Import PEM private key for signing
+     *
+     * @private
+     * @param {string} pemKey - PEM formatted private key
+     * @returns {Promise<CryptoKey>} Imported key
+     */
+    private _importPrivateKey;
+    /**
+     * Base64 URL encode (without padding)
+     *
+     * @private
+     * @param {string|ArrayBuffer} input - Data to encode
+     * @returns {string} Base64 URL encoded string
      */
-    getAccessToken(): Promise<string>;
+    private _base64UrlEncode;
 }
 
 /**
@@ -837,7 +926,7 @@ declare class TranscriptionService {
     endpoint: string;
     model: string;
     client: OpenAI;
-    googleAuth: GoogleAuth;
+    googleTokenManager: GoogleTokenManager;
     projectId: any;
     /**
      * Transcribe audio to text