@contentgrowth/llm-service 0.7.6 → 0.7.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentgrowth/llm-service",
-  "version": "0.7.6",
+  "version": "0.7.8",
   "description": "Unified LLM Service for Content Growth",
   "main": "src/index.js",
   "type": "module",

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/config-manager.js

@@ -16,11 +16,11 @@ export const MODEL_CONFIGS = {
         free: 'gpt-4o-mini',
     },
     gemini: {
-        default: 'gemini-2.5-flash',
-        edge: 'gemini-2.5-pro',
-        fast: 'gemini-2.5-flash-lite',
-        cost: 'gemini-2.5-flash-lite',
-        free: 'gemini-2.0-flash-lite',
+        default: 'gemini-3-flash-preview', // 'gemini-2.5-flash',
+        edge: 'gemini-3-pro-preview', // 'gemini-2.5-pro',
+        fast: 'gemini-3-flash-preview', // 'gemini-2.5-flash-lite',
+        cost: 'gemini-3-flash-preview', // 'gemini-2.5-flash-lite',
+        free: 'gemini-3-flash-preview', // 'gemini-2.0-flash-lite',
         video: 'veo',
     },
 };

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/gemini-provider.js

@@ -113,12 +113,24 @@ export class GeminiProvider extends BaseLLMProvider {
                     break;
                 case 'assistant':
                     role = 'model';
+                    parts = [];
+                    
+                    // Always include text if present (Thought)
+                    if (msg.content) {
+                        parts.push({ text: msg.content });
+                    }
+                    
+                    // Append tool calls if present (Call)
                     if (msg.tool_calls) {
-                        parts = msg.tool_calls.map(tc => ({
+                        const callParts = msg.tool_calls.map(tc => ({
                             functionCall: { name: tc.function.name, args: tc.function.arguments }
                         }));
-                    } else {
-                        parts = [{ text: msg.content || '' }];
+                        parts.push(...callParts);
+                    }
+                    
+                    // Safety fallback: if nothing was added, ensure valid structure
+                    if (parts.length === 0) {
+                        parts.push({ text: '' });
                     }
                     break;
                 case 'tool':