@contentgrowth/llm-service 0.7.5 → 0.7.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentgrowth/llm-service",
-  "version": "0.7.5",
+  "version": "0.7.7",
   "description": "Unified LLM Service for Content Growth",
   "main": "src/index.js",
   "type": "module",
@@ -15,8 +15,8 @@
   "author": "Content Growth",
   "license": "MIT",
   "dependencies": {
-    "@google/genai": "^1.31.0",
-    "openai": "^6.9.1"
+    "@google/genai": "^1.34.0",
+    "openai": "^6.15.0"
   },
   "devDependencies": {
     "dotenv": "^17.2.3"

package/src/index.js

@@ -4,6 +4,6 @@ export { BaseConfigProvider, DefaultConfigProvider } from './llm/config-provider
 export { MODEL_CONFIGS } from './llm/config-manager.js';
 export { OpenAIProvider } from './llm/providers/openai-provider.js';
 export { GeminiProvider } from './llm/providers/gemini-provider.js';
-export { extractJsonFromResponse } from './llm/json-utils.js';
+export { extractJsonFromResponse, extractTextAndJson } from './llm/json-utils.js';
 export { FINISH_REASONS } from './llm/providers/base-provider.js';
 

package/src/llm/json-utils.js

@@ -97,3 +97,51 @@ export function extractJsonFromResponse(text) {
   // If no valid JSON could be extracted by any method, return null.
   return null;
 }
+
+/**
+ * Generic helper to separate conversational text from a structured JSON payload.
+ * Supports both "Text + JSON" and "JSON + Text" patterns.
+ * 
+ * @param {string} input - The full response string
+ * @returns {{text: string, json: object|null}} 
+ */
+export function extractTextAndJson(input) {
+  if (!input) return { text: '', json: null };
+
+  // 1. Try to extract JSON using the existing robust extractor
+  const json = extractJsonFromResponse(input);
+
+  // 2. If no JSON found, return full input as text
+  if (!json) {
+    return { text: input, json: null };
+  }
+
+  // 3. If JSON found, we need to remove the JSON block to get the clean text
+  let text = input;
+
+  // Try fenced block first (most reliable) - same regex as extractJsonFromResponse
+  const fencedRegex = /```(?:json)?\s*({[\s\S]*?})\s*```/;
+  const fencedMatch = input.match(fencedRegex);
+
+  if (fencedMatch) {
+    // Replace the entire fenced block with empty string to leave just the text
+    // This handles both "Text + JSON" and "JSON + Text" patterns
+    text = input.replace(fencedMatch[0], '').trim();
+    return { text, json };
+  }
+
+  // Try brace extraction as fallback - same logic as extractJsonFromResponse
+  const firstBrace = input.indexOf('{');
+  const lastBrace = input.lastIndexOf('}');
+
+  if (firstBrace !== -1 && lastBrace > firstBrace) {
+    // Remove the brace block, keeping text before and after
+    const pre = input.substring(0, firstBrace);
+    const post = input.substring(lastBrace + 1);
+    text = (pre + post).trim();
+    return { text, json };
+  }
+
+  // Fallback: Return original text if we couldn't cleanly separate it
+  return { text: input, json };
+}

package/src/llm/providers/base-provider.js

@@ -113,4 +113,15 @@ export class BaseLLMProvider {
     async getVideoGenerationStatus(operationName) {
         throw new Error('Video generation not supported by this provider');
     }
+
+    /**
+     * Helper to get the last 6 digits of the API key for logging.
+     * @returns {string} "..." + last 6 chars, or "not_set"
+     */
+    _getMaskedApiKey() {
+        const key = this.config.apiKey;
+        if (!key) return 'not_set';
+        if (key.length <= 6) return '...';
+        return '...' + key.slice(-6);
+    }
 }

package/src/llm/providers/gemini-provider.js

@@ -186,7 +186,7 @@ export class GeminiProvider extends BaseLLMProvider {
         try {
             response = await this.client.models.generateContent(requestOptions);
         } catch (error) {
-            console.error('[GeminiProvider] generateContent failed:', error);
+            console.error(`[GeminiProvider] generateContent failed (API Key: ${this._getMaskedApiKey()}):`, error);
             throw error;
         }
 
@@ -486,7 +486,7 @@ export class GeminiProvider extends BaseLLMProvider {
 
             return { operationName: operation.name };
         } catch (error) {
-            console.error('[GeminiProvider] startVideoGeneration failed:', error);
+            console.error(`[GeminiProvider] startVideoGeneration failed (API Key: ${this._getMaskedApiKey()}):`, error);
             throw error;
         }
     }

package/src/llm/providers/openai-provider.js

@@ -56,7 +56,13 @@ export class OpenAIProvider extends BaseLLMProvider {
             requestPayload.response_format = this._buildResponseFormat(options);
         }
 
-        const response = await this.client.chat.completions.create(requestPayload);
+        let response;
+        try {
+            response = await this.client.chat.completions.create(requestPayload);
+        } catch (error) {
+            console.error(`[OpenAIProvider] chat completion failed (API Key: ${this._getMaskedApiKey()}):`, error);
+            throw error;
+        }
         const message = response.choices[0].message;
 
         // Validate that we have EITHER content OR tool calls