@contentgrowth/llm-service 1.2.0 → 1.2.2

package/dist/index.cjs

@@ -122,7 +122,8 @@ var DefaultConfigProvider = class extends BaseConfigProvider {
     return {
       provider: tenantConfig.provider,
       models: MODEL_CONFIGS[tenantConfig.provider],
-      apiKey: tenantConfig.api_key,
+      // for backward compatibility, api_key is deprecated and shall never be used!!
+      apiKey: tenantConfig.apiKey || tenantConfig.api_key,
       project: tenantConfig.project,
       location: tenantConfig.location,
       temperature: parseFloat(env.DEFAULT_TEMPERATURE || "0.7"),
@@ -687,7 +688,7 @@ var GoogleProvider = class extends BaseLLMProvider {
     );
   }
   async _chatCompletionWithModel(messages, systemPrompt, tools, modelName, maxTokens, temperature, options = {}) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     const generationConfig = {
       temperature: (_a = options.temperature) != null ? _a : temperature,
       maxOutputTokens: (_b = options.maxTokens) != null ? _b : maxTokens
@@ -713,8 +714,41 @@ ${msg.content}`;
         }
       }
     }
-    const contents = geminiMessages.map((msg, index) => {
-      var _a2, _b2, _c2, _d2;
+    const contents = [];
+    let pendingToolParts = [];
+    for (let index = 0; index < geminiMessages.length; index++) {
+      const msg = geminiMessages[index];
+      if (msg.role === "tool") {
+        let assistantMsg = null;
+        for (let j = index - 1; j >= 0; j--) {
+          if (geminiMessages[j].role === "assistant" && geminiMessages[j].tool_calls) {
+            assistantMsg = geminiMessages[j];
+            break;
+          }
+        }
+        const toolCall = (_c = assistantMsg == null ? void 0 : assistantMsg.tool_calls) == null ? void 0 : _c.find((tc) => tc.id === msg.tool_call_id);
+        pendingToolParts.push({
+          functionResponse: {
+            name: ((_d = toolCall == null ? void 0 : toolCall.function) == null ? void 0 : _d.name) || "unknown_tool",
+            response: { content: msg.content }
+          }
+        });
+        const nextMsg = geminiMessages[index + 1];
+        if (!nextMsg || nextMsg.role !== "tool") {
+          if (options.responseFormat === "json" || ((_e = options.responseFormat) == null ? void 0 : _e.type) === "json_schema" || options.responseSchema) {
+            pendingToolParts.push({ text: "\n\n[SYSTEM NOTE: The output MUST be valid JSON as per the schema. Do not include markdown formatting or explanations.]" });
+          } else {
+            pendingToolParts.push({ text: "\n\n[SYSTEM NOTE: Please ensure your response adheres strictly to the constraints defined in the System Prompt.]" });
+          }
+          contents.push({ role: "user", parts: pendingToolParts });
+          pendingToolParts = [];
+        }
+        continue;
+      }
+      if (pendingToolParts.length > 0) {
+        contents.push({ role: "user", parts: pendingToolParts });
+        pendingToolParts = [];
+      }
       let role = "";
       let parts2;
       switch (msg.role) {
@@ -723,7 +757,7 @@ ${msg.content}`;
           parts2 = [{ text: msg.content }];
           if (index === geminiMessages.length - 1) {
             let reminder = "";
-            if (options.responseFormat === "json" || ((_a2 = options.responseFormat) == null ? void 0 : _a2.type) === "json_schema" || options.responseSchema) {
+            if (options.responseFormat === "json" || ((_f = options.responseFormat) == null ? void 0 : _f.type) === "json_schema" || options.responseSchema) {
               reminder = "\n\n[SYSTEM NOTE: The output MUST be valid JSON as per the schema. Do not include markdown formatting or explanations.]";
             } else {
               reminder = "\n\n[SYSTEM NOTE: Please ensure your response adheres strictly to the constraints defined in the System Prompt.]";
@@ -757,27 +791,11 @@ ${msg.content}`;
             parts2 = [part];
           }
           break;
-        case "tool":
-          role = "user";
-          const preceding_message = messages[index - 1];
-          const tool_call = (_b2 = preceding_message == null ? void 0 : preceding_message.tool_calls) == null ? void 0 : _b2.find((tc) => tc.id === msg.tool_call_id);
-          parts2 = [{
-            functionResponse: {
-              name: ((_c2 = tool_call == null ? void 0 : tool_call.function) == null ? void 0 : _c2.name) || "unknown_tool",
-              response: { content: msg.content }
-            }
-          }];
-          if (options.responseFormat === "json" || ((_d2 = options.responseFormat) == null ? void 0 : _d2.type) === "json_schema" || options.responseSchema) {
-            parts2.push({ text: "\n\n[SYSTEM NOTE: The output MUST be valid JSON as per the schema. Do not include markdown formatting or explanations.]" });
-          } else {
-            parts2.push({ text: "\n\n[SYSTEM NOTE: Please ensure your response adheres strictly to the constraints defined in the System Prompt.]" });
-          }
-          break;
         default:
-          return null;
+          continue;
       }
-      return { role, parts: parts2 };
-    }).filter(Boolean);
+      contents.push({ role, parts: parts2 });
+    }
     while (contents.length > 0 && contents[0].role !== "user") {
       contents.shift();
     }
@@ -801,11 +819,11 @@ ${msg.content}`;
       }
     }
     const response = await this._generateContent(requestOptions);
-    const candidate = (_c = response.candidates) == null ? void 0 : _c[0];
+    const candidate = (_g = response.candidates) == null ? void 0 : _g[0];
     if (!candidate) {
       throw new LLMServiceException("No candidates returned from model", 500);
     }
-    const parts = ((_d = candidate.content) == null ? void 0 : _d.parts) || [];
+    const parts = ((_h = candidate.content) == null ? void 0 : _h.parts) || [];
     let textContent = "";
     let toolCalls = null;
     let responseThoughtSignature = null;
@@ -850,9 +868,9 @@ ${msg.content}`;
       _rawFinishReason: candidate.finishReason,
       _responseFormat: options.responseFormat,
       usage: {
-        prompt_tokens: ((_e = response.usageMetadata) == null ? void 0 : _e.promptTokenCount) || 0,
-        completion_tokens: ((_f = response.usageMetadata) == null ? void 0 : _f.candidatesTokenCount) || 0,
-        total_tokens: ((_g = response.usageMetadata) == null ? void 0 : _g.totalTokenCount) || 0
+        prompt_tokens: ((_i = response.usageMetadata) == null ? void 0 : _i.promptTokenCount) || 0,
+        completion_tokens: ((_j = response.usageMetadata) == null ? void 0 : _j.candidatesTokenCount) || 0,
+        total_tokens: ((_k = response.usageMetadata) == null ? void 0 : _k.totalTokenCount) || 0
       },
       ...options.responseFormat && this._shouldAutoParse(options) ? {
         parsedContent: this._safeJsonParse(textContent)