@contentgrowth/llm-service 0.6.1 → 0.6.3

package/package.json

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

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

@@ -48,7 +48,7 @@ export class GeminiProvider extends BaseLLMProvider {
             tools: tools ? [{ functionDeclarations: tools.map(t => t.function) }] : undefined,
         };
 
-        // Add JSON mode support for Gemini
+        // Add JSON mode support for Gemini (only used when NO tools are present)
         if (options.responseFormat) {
             modelConfig.generationConfig = this._buildGenerationConfig(options, maxTokens, temperature);
         } else if (options.temperature !== undefined || options.maxTokens !== undefined) {
@@ -130,13 +130,30 @@ export class GeminiProvider extends BaseLLMProvider {
         const response = result.response;
         const toolCalls = response.functionCalls();
 
+        let textContent = '';
+        try {
+            textContent = response.text();
+        } catch (e) {
+            // response.text() throws if there is no text content (e.g. only tool calls)
+            // This is expected behavior for tool-only responses
+        }
+        // Validate that we have EITHER content OR tool calls
+        if (!textContent && (!toolCalls || toolCalls.length === 0)) {
+            console.error('[GeminiProvider] Model returned empty response (no text, no tool calls)');
+            console.error('[GeminiProvider] Last message:', JSON.stringify(lastMessage, null, 2));
+            throw new LLMServiceException(
+                'Model returned empty response. This usually means the prompt or schema is confusing the model.',
+                500
+            );
+        }
+
         // Return with parsed JSON if applicable
         return {
-            content: response.text(),
+            content: textContent,
             tool_calls: toolCalls ? toolCalls.map(fc => ({ type: 'function', function: fc })) : null,
             _responseFormat: options.responseFormat,
             ...(options.responseFormat && this._shouldAutoParse(options) ? {
-                parsedContent: this._safeJsonParse(response.text())
+                parsedContent: this._safeJsonParse(textContent)
             } : {})
         };
     }

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

@@ -1,6 +1,7 @@
 import OpenAI from 'openai';
 import { BaseLLMProvider } from './base-provider.js';
 import { extractJsonFromResponse } from '../json-utils.js';
+import { LLMServiceException } from '../../llm-service.js';
 
 export class OpenAIProvider extends BaseLLMProvider {
     constructor(config) {
@@ -58,6 +59,15 @@ export class OpenAIProvider extends BaseLLMProvider {
         const response = await this.client.chat.completions.create(requestPayload);
         const message = response.choices[0].message;
 
+        // Validate that we have EITHER content OR tool calls
+        if (!message.content && (!message.tool_calls || message.tool_calls.length === 0)) {
+            console.error('[OpenAIProvider] Model returned empty response (no text, no tool calls)');
+            throw new LLMServiceException(
+                'Model returned empty response. This usually means the prompt or schema is confusing the model.',
+                500
+            );
+        }
+
         // Return with parsed JSON if applicable
         return {
             content: message.content,

package/src/llm-service.js

@@ -166,20 +166,18 @@ export class LLMService {
      * @param {string} tenantId - Tenant identifier
      * @param {string} systemPrompt - System instructions
      * @param {Array} tools - Tools array
-     * @param {Object} options - Options object (for responseFormat, etc.)
      * @returns {Object} Response with content, tool_calls, and optionally parsedContent
      */
-    async chatWithTools(messages, tenantId, systemPrompt, tools = [], options = {}) {
+    async chatWithTools(messages, tenantId, systemPrompt, tools = []) {
         const provider = await this._getProvider(tenantId);
 
         let currentMessages = [...messages];
 
-        // Initial call - pass options to enable JSON mode, etc.
+        // Initial call - no options since tools + JSON mode are incompatible
         const initialResponse = await provider.chatCompletion(
             currentMessages,
             systemPrompt,
-            tools,
-            options
+            tools
         );
 
         let { content, tool_calls, parsedContent } = initialResponse;
@@ -192,12 +190,11 @@ export class LLMService {
             // Execute tools using the provider's helper (which formats results for that provider)
             await provider.executeTools(tool_calls, currentMessages, tenantId, this.toolImplementations, this.env);
 
-            // Next call - also pass options
+            // Next call - no options
             const nextResponse = await provider.chatCompletion(
                 currentMessages,
                 systemPrompt,
-                tools,
-                options
+                tools
             );
 
             content = nextResponse.content;