@ljoukov/llm 4.0.10 → 4.0.12

package/dist/index.js

@@ -6,9 +6,9 @@ import {
   FinishReason,
   FunctionCallingConfigMode,
   ThinkingLevel,
-  createFunctionResponsePartFromBase64,
-  createFunctionResponsePartFromUri,
-  createPartFromFunctionResponse
+  createPartFromBase64,
+  createPartFromFunctionResponse,
+  createPartFromUri
 } from "@google/genai";
 import { zodToJsonSchema } from "@alcyone-labs/zod-to-json-schema";
 import { z as z3 } from "zod";
@@ -4643,12 +4643,12 @@ function buildGeminiToolOutputMediaPart(item) {
     if (!parsed) {
       return null;
     }
-    return createFunctionResponsePartFromBase64(parsed.dataBase64, parsed.mimeType);
+    return createPartFromBase64(parsed.dataBase64, parsed.mimeType);
   }
   if (item.type === "input_file") {
     const dataUrl = typeof item.file_url === "string" ? parseDataUrlPayload(item.file_url) : null;
     if (dataUrl) {
-      const part = createFunctionResponsePartFromBase64(dataUrl.dataBase64, dataUrl.mimeType);
+      const part = createPartFromBase64(dataUrl.dataBase64, dataUrl.mimeType);
       const displayName = item.filename?.trim();
       if (displayName && part.inlineData) {
         part.inlineData.displayName = displayName;
@@ -4657,7 +4657,7 @@ function buildGeminiToolOutputMediaPart(item) {
     }
     const inferredMimeType = inferToolOutputMimeTypeFromFilename(item.filename);
     if (typeof item.file_data === "string" && item.file_data.trim().length > 0 && inferredMimeType) {
-      const part = createFunctionResponsePartFromBase64(item.file_data, inferredMimeType);
+      const part = createPartFromBase64(item.file_data, inferredMimeType);
       const displayName = item.filename?.trim();
       if (displayName && part.inlineData) {
         part.inlineData.displayName = displayName;
@@ -4665,7 +4665,7 @@ function buildGeminiToolOutputMediaPart(item) {
       return part;
     }
     if (typeof item.file_url === "string" && item.file_url.trim().length > 0 && inferredMimeType) {
-      const part = createFunctionResponsePartFromUri(item.file_url, inferredMimeType);
+      const part = createPartFromUri(item.file_url, inferredMimeType);
       const displayName = item.filename?.trim();
       if (displayName && part.fileData) {
         part.fileData.displayName = displayName;
@@ -4699,41 +4699,35 @@ function toGeminiToolOutputPlaceholder(item) {
     media: dataUrl || typeof item.file_data === "string" && item.file_data.trim().length > 0 ? "attached-inline-data" : typeof item.file_url === "string" && item.file_url.trim().length > 0 ? "attached-file-data" : void 0
   };
 }
-function buildGeminiFunctionResponsePart(options) {
+function buildGeminiFunctionResponseParts(options) {
   const outputItems = toGeminiToolOutputItems(options.outputPayload);
   if (!outputItems) {
     const responsePayload2 = isPlainRecord(options.outputPayload) ? sanitiseLogValue(options.outputPayload) : { output: sanitiseLogValue(options.outputPayload) };
     if (options.callId) {
-      return createPartFromFunctionResponse(options.callId, options.toolName, responsePayload2);
+      return [createPartFromFunctionResponse(options.callId, options.toolName, responsePayload2)];
     }
-    return {
-      functionResponse: {
-        name: options.toolName,
-        response: responsePayload2
+    return [
+      {
+        functionResponse: {
+          name: options.toolName,
+          response: responsePayload2
+        }
       }
-    };
+    ];
   }
   const responseOutput = outputItems.map((item) => toGeminiToolOutputPlaceholder(item));
-  const responseMediaParts = outputItems.flatMap((item) => {
+  const responseParts = outputItems.flatMap((item) => {
     const mediaPart = buildGeminiToolOutputMediaPart(item);
     return mediaPart ? [mediaPart] : [];
   });
   const responsePayload = { output: responseOutput };
-  if (options.callId) {
-    return createPartFromFunctionResponse(
-      options.callId,
-      options.toolName,
-      responsePayload,
-      responseMediaParts
-    );
-  }
-  return {
+  const functionResponsePart = options.callId ? createPartFromFunctionResponse(options.callId, options.toolName, responsePayload) : {
     functionResponse: {
       name: options.toolName,
-      response: { output: responseOutput },
-      ...responseMediaParts.length > 0 ? { parts: responseMediaParts } : {}
+      response: responsePayload
     }
   };
+  return [functionResponsePart, ...responseParts];
 }
 function parseOpenAiToolArguments(raw) {
   const trimmed = raw.trim();
@@ -7333,8 +7327,6 @@ async function runToolLoop(request) {
             let thoughtsText2 = "";
             const modelParts = [];
             const functionCalls = [];
-            const seenFunctionCallIds = /* @__PURE__ */ new Set();
-            const seenFunctionCallKeys = /* @__PURE__ */ new Set();
             let latestUsageMetadata;
             let resolvedModelVersion;
             for await (const chunk of stream) {
@@ -7351,34 +7343,13 @@ async function runToolLoop(request) {
                 continue;
               }
               const primary = candidates[0];
-              const parts = primary?.content?.parts;
-              if (!parts || parts.length === 0) {
+              const parts = primary?.content?.parts ?? [];
+              const chunkFunctionCalls = chunk.functionCalls ?? [];
+              if (parts.length === 0 && chunkFunctionCalls.length === 0) {
                 continue;
               }
               for (const part of parts) {
                 modelParts.push(part);
-                const call = part.functionCall;
-                if (call) {
-                  const id = typeof call.id === "string" ? call.id : "";
-                  const shouldAdd = (() => {
-                    if (id.length > 0) {
-                      if (seenFunctionCallIds.has(id)) {
-                        return false;
-                      }
-                      seenFunctionCallIds.add(id);
-                      return true;
-                    }
-                    const key = JSON.stringify({ name: call.name ?? "", args: call.args ?? null });
-                    if (seenFunctionCallKeys.has(key)) {
-                      return false;
-                    }
-                    seenFunctionCallKeys.add(key);
-                    return true;
-                  })();
-                  if (shouldAdd) {
-                    functionCalls.push(call);
-                  }
-                }
                 if (typeof part.text === "string" && part.text.length > 0) {
                   if (part.thought) {
                     thoughtsText2 += part.text;
@@ -7391,6 +7362,15 @@ async function runToolLoop(request) {
                   }
                 }
               }
+              if (chunkFunctionCalls.length > 0) {
+                functionCalls.push(...chunkFunctionCalls);
+                continue;
+              }
+              for (const part of parts) {
+                if (part.functionCall) {
+                  functionCalls.push(part.functionCall);
+                }
+              }
             }
             return {
               responseText: responseText2,
@@ -7561,7 +7541,7 @@ async function runToolLoop(request) {
             durationMs: result.durationMs
           });
           responseParts.push(
-            buildGeminiFunctionResponsePart({
+            ...buildGeminiFunctionResponseParts({
               toolName: entry.toolName,
               callId: entry.call.id,
               outputPayload