@jerome-benoit/sap-ai-provider-v2 4.6.0 → 4.6.1

package/dist/index.cjs

@@ -330,6 +330,73 @@ var init_sap_ai_provider_options = __esm({
   }
 });
 
+// src/deep-merge.ts
+function deepMerge(...sources) {
+  let result = {};
+  for (const source of sources) {
+    if (source == null) continue;
+    result = mergeTwo(result, source, /* @__PURE__ */ new Set(), 0);
+  }
+  return result;
+}
+function cloneDeep(obj, ancestors, depth) {
+  if (depth > MAX_DEPTH) {
+    throw new Error("Maximum merge depth exceeded");
+  }
+  if (ancestors.has(obj)) {
+    throw new Error("Circular reference detected during deep merge");
+  }
+  ancestors.add(obj);
+  const result = {};
+  for (const key of Object.keys(obj)) {
+    if (!isSafeKey(key)) continue;
+    const value = obj[key];
+    result[key] = isPlainObject(value) ? cloneDeep(value, ancestors, depth + 1) : value;
+  }
+  ancestors.delete(obj);
+  return result;
+}
+function isPlainObject(value) {
+  if (value === null || typeof value !== "object") return false;
+  const proto = Object.getPrototypeOf(value);
+  return proto === Object.prototype || proto === null;
+}
+function isSafeKey(key) {
+  return !DANGEROUS_KEYS.has(key);
+}
+function mergeTwo(target, source, ancestors, depth) {
+  if (depth > MAX_DEPTH) {
+    throw new Error("Maximum merge depth exceeded");
+  }
+  if (ancestors.has(source)) {
+    throw new Error("Circular reference detected during deep merge");
+  }
+  ancestors.add(source);
+  for (const key of Object.keys(source)) {
+    if (!isSafeKey(key)) continue;
+    const sourceValue = source[key];
+    const targetValue = target[key];
+    if (isPlainObject(sourceValue) && isPlainObject(targetValue)) {
+      const cloned = cloneDeep(targetValue, /* @__PURE__ */ new Set(), depth + 1);
+      target[key] = mergeTwo(cloned, sourceValue, ancestors, depth + 1);
+    } else if (isPlainObject(sourceValue)) {
+      target[key] = cloneDeep(sourceValue, /* @__PURE__ */ new Set(), depth + 1);
+    } else {
+      target[key] = sourceValue;
+    }
+  }
+  ancestors.delete(source);
+  return target;
+}
+var DANGEROUS_KEYS, MAX_DEPTH;
+var init_deep_merge = __esm({
+  "src/deep-merge.ts"() {
+    "use strict";
+    DANGEROUS_KEYS = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototype"]);
+    MAX_DEPTH = 100;
+  }
+});
+
 // node_modules/@sap-cloud-sdk/util/dist/array.js
 var require_array = __commonJS({
   "node_modules/@sap-cloud-sdk/util/dist/array.js"(exports2) {
@@ -30693,73 +30760,6 @@ The model's response was blocked by content safety filters. Try a different prom
   }
 });
 
-// src/deep-merge.ts
-function deepMerge(...sources) {
-  let result = {};
-  for (const source of sources) {
-    if (source == null) continue;
-    result = mergeTwo(result, source, /* @__PURE__ */ new Set(), 0);
-  }
-  return result;
-}
-function cloneDeep(obj, ancestors, depth) {
-  if (depth > MAX_DEPTH) {
-    throw new Error("Maximum merge depth exceeded");
-  }
-  if (ancestors.has(obj)) {
-    throw new Error("Circular reference detected during deep merge");
-  }
-  ancestors.add(obj);
-  const result = {};
-  for (const key of Object.keys(obj)) {
-    if (!isSafeKey(key)) continue;
-    const value = obj[key];
-    result[key] = isPlainObject(value) ? cloneDeep(value, ancestors, depth + 1) : value;
-  }
-  ancestors.delete(obj);
-  return result;
-}
-function isPlainObject(value) {
-  if (value === null || typeof value !== "object") return false;
-  const proto = Object.getPrototypeOf(value);
-  return proto === Object.prototype || proto === null;
-}
-function isSafeKey(key) {
-  return !DANGEROUS_KEYS.has(key);
-}
-function mergeTwo(target, source, ancestors, depth) {
-  if (depth > MAX_DEPTH) {
-    throw new Error("Maximum merge depth exceeded");
-  }
-  if (ancestors.has(source)) {
-    throw new Error("Circular reference detected during deep merge");
-  }
-  ancestors.add(source);
-  for (const key of Object.keys(source)) {
-    if (!isSafeKey(key)) continue;
-    const sourceValue = source[key];
-    const targetValue = target[key];
-    if (isPlainObject(sourceValue) && isPlainObject(targetValue)) {
-      const cloned = cloneDeep(targetValue, /* @__PURE__ */ new Set(), depth + 1);
-      target[key] = mergeTwo(cloned, sourceValue, ancestors, depth + 1);
-    } else if (isPlainObject(sourceValue)) {
-      target[key] = cloneDeep(sourceValue, /* @__PURE__ */ new Set(), depth + 1);
-    } else {
-      target[key] = sourceValue;
-    }
-  }
-  ancestors.delete(source);
-  return target;
-}
-var DANGEROUS_KEYS, MAX_DEPTH;
-var init_deep_merge = __esm({
-  "src/deep-merge.ts"() {
-    "use strict";
-    DANGEROUS_KEYS = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototype"]);
-    MAX_DEPTH = 100;
-  }
-});
-
 // src/strategy-utils.ts
 function applyParameterOverrides(modelParams, options, sapModelParams, settingsModelParams, mappings) {
   for (const mapping of mappings) {
@@ -30836,19 +30836,7 @@ function buildGenerateResult(config) {
       modelId,
       timestamp: /* @__PURE__ */ new Date()
     },
-    usage: {
-      inputTokens: {
-        cacheRead: tokenUsage?.prompt_tokens_details?.cached_tokens,
-        cacheWrite: void 0,
-        noCache: tokenUsage?.prompt_tokens_details?.cached_tokens != null ? (tokenUsage.prompt_tokens ?? 0) - tokenUsage.prompt_tokens_details.cached_tokens : tokenUsage?.prompt_tokens,
-        total: tokenUsage?.prompt_tokens
-      },
-      outputTokens: {
-        reasoning: tokenUsage?.completion_tokens_details?.reasoning_tokens,
-        text: tokenUsage?.completion_tokens_details?.reasoning_tokens != null ? (tokenUsage.completion_tokens ?? 0) - tokenUsage.completion_tokens_details.reasoning_tokens : tokenUsage?.completion_tokens,
-        total: tokenUsage?.completion_tokens
-      }
-    },
+    usage: mapTokenUsage(tokenUsage),
     warnings
   };
 }
@@ -31078,12 +31066,9 @@ function createStreamTransformer(config) {
         }
         const finalUsage = streamResponseGetTokenUsage();
         if (finalUsage) {
-          streamState.usage.inputTokens.total = finalUsage.prompt_tokens;
-          streamState.usage.inputTokens.cacheRead = finalUsage.prompt_tokens_details?.cached_tokens;
-          streamState.usage.inputTokens.noCache = finalUsage.prompt_tokens_details?.cached_tokens != null ? (finalUsage.prompt_tokens ?? 0) - finalUsage.prompt_tokens_details.cached_tokens : finalUsage.prompt_tokens;
-          streamState.usage.outputTokens.total = finalUsage.completion_tokens;
-          streamState.usage.outputTokens.reasoning = finalUsage.completion_tokens_details?.reasoning_tokens;
-          streamState.usage.outputTokens.text = finalUsage.completion_tokens_details?.reasoning_tokens != null ? (finalUsage.completion_tokens ?? 0) - finalUsage.completion_tokens_details.reasoning_tokens : finalUsage.completion_tokens;
+          const mapped = mapTokenUsage(finalUsage);
+          streamState.usage.inputTokens = mapped.inputTokens;
+          streamState.usage.outputTokens = mapped.outputTokens;
         }
         const streamCitations = streamResponseGetCitations?.();
         if (streamCitations?.length) {
@@ -31343,6 +31328,23 @@ function mapFinishReason(reason) {
       return { raw, unified: "other" };
   }
 }
+function mapTokenUsage(tokenUsage) {
+  const cachedTokens = tokenUsage?.prompt_tokens_details?.cached_tokens;
+  const reasoningTokens = tokenUsage?.completion_tokens_details?.reasoning_tokens;
+  return {
+    inputTokens: {
+      cacheRead: cachedTokens,
+      cacheWrite: void 0,
+      noCache: cachedTokens != null ? (tokenUsage?.prompt_tokens ?? 0) - cachedTokens : tokenUsage?.prompt_tokens,
+      total: tokenUsage?.prompt_tokens
+    },
+    outputTokens: {
+      reasoning: reasoningTokens,
+      text: reasoningTokens != null ? (tokenUsage?.completion_tokens ?? 0) - reasoningTokens : tokenUsage?.completion_tokens,
+      total: tokenUsage?.completion_tokens
+    }
+  };
+}
 function mapToolChoice(toolChoice) {
   if (!toolChoice) {
     return void 0;
@@ -31433,7 +31435,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = true ? "4.6.0" : "0.0.0-test";
+    VERSION = true ? "4.6.1" : "0.0.0-test";
   }
 });
 
@@ -31442,6 +31444,7 @@ var BaseEmbeddingModelStrategy;
 var init_base_embedding_model_strategy = __esm({
   "src/base-embedding-model-strategy.ts"() {
     "use strict";
+    init_deep_merge();
     init_sap_ai_error();
     init_strategy_utils();
     init_version();
@@ -31482,6 +31485,12 @@ var init_base_embedding_model_strategy = __esm({
           });
         }
       }
+      mergeModelParams(settings, embeddingOptions) {
+        return deepMerge(
+          settings.modelParams ?? {},
+          embeddingOptions?.modelParams ?? {}
+        );
+      }
     };
   }
 });
@@ -31496,7 +31505,6 @@ var init_foundation_models_embedding_model_strategy = __esm({
   "src/foundation-models-embedding-model-strategy.ts"() {
     "use strict";
     init_base_embedding_model_strategy();
-    init_deep_merge();
     init_strategy_utils();
     FoundationModelsEmbeddingModelStrategy = class extends BaseEmbeddingModelStrategy {
       ClientClass;
@@ -31505,10 +31513,7 @@ var init_foundation_models_embedding_model_strategy = __esm({
         this.ClientClass = ClientClass;
       }
       createClient(config, settings, embeddingOptions) {
-        const mergedParams = deepMerge(
-          settings.modelParams ?? {},
-          embeddingOptions?.modelParams ?? {}
-        );
+        const mergedParams = this.mergeModelParams(settings, embeddingOptions);
         return {
           client: new this.ClientClass(
             buildModelDeployment(config, settings.modelVersion),
@@ -31552,7 +31557,6 @@ var init_orchestration_embedding_model_strategy = __esm({
   "src/orchestration-embedding-model-strategy.ts"() {
     "use strict";
     init_base_embedding_model_strategy();
-    init_deep_merge();
     init_strategy_utils();
     OrchestrationEmbeddingModelStrategy = class extends BaseEmbeddingModelStrategy {
       ClientClass;
@@ -31561,10 +31565,7 @@ var init_orchestration_embedding_model_strategy = __esm({
         this.ClientClass = ClientClass;
       }
       createClient(config, settings, embeddingOptions) {
-        const mergedParams = deepMerge(
-          settings.modelParams ?? {},
-          embeddingOptions?.modelParams ?? {}
-        );
+        const mergedParams = this.mergeModelParams(settings, embeddingOptions);
         const embeddingConfig = {
           model: {
             name: config.modelId,
@@ -31803,7 +31804,7 @@ var init_foundation_models_language_model_strategy = __esm({
         super();
         this.ClientClass = ClientClass;
       }
-      buildRequest(config, settings, options, commonParts) {
+      buildRequest(_config, settings, options, commonParts) {
         const warnings = [];
         const toolsResult = convertToolsToSAPFormat(
           options.tools
@@ -32419,44 +32420,34 @@ function convertStreamPartToV2(internalPart) {
         type: "file"
       };
     case "finish":
-      return {
-        finishReason: convertFinishReasonToV2(internalPart.finishReason),
-        type: "finish",
-        usage: convertUsageToV2(internalPart.usage),
-        ...internalPart.providerMetadata !== void 0 && {
-          providerMetadata: convertProviderMetadataToV2(internalPart.providerMetadata)
-        }
-      };
+      return withProviderMetadata(
+        {
+          finishReason: convertFinishReasonToV2(internalPart.finishReason),
+          type: "finish",
+          usage: convertUsageToV2(internalPart.usage)
+        },
+        internalPart.providerMetadata
+      );
     case "raw":
       return {
         rawValue: internalPart.rawValue,
         type: "raw"
       };
     case "reasoning-delta":
-      return {
-        delta: internalPart.delta,
-        id: internalPart.id,
-        type: "reasoning-delta",
-        ...internalPart.providerMetadata !== void 0 && {
-          providerMetadata: convertProviderMetadataToV2(internalPart.providerMetadata)
-        }
-      };
+      return withProviderMetadata(
+        { delta: internalPart.delta, id: internalPart.id, type: "reasoning-delta" },
+        internalPart.providerMetadata
+      );
     case "reasoning-end":
-      return {
-        id: internalPart.id,
-        type: "reasoning-end",
-        ...internalPart.providerMetadata !== void 0 && {
-          providerMetadata: convertProviderMetadataToV2(internalPart.providerMetadata)
-        }
-      };
+      return withProviderMetadata(
+        { id: internalPart.id, type: "reasoning-end" },
+        internalPart.providerMetadata
+      );
     case "reasoning-start":
-      return {
-        id: internalPart.id,
-        type: "reasoning-start",
-        ...internalPart.providerMetadata !== void 0 && {
-          providerMetadata: convertProviderMetadataToV2(internalPart.providerMetadata)
-        }
-      };
+      return withProviderMetadata(
+        { id: internalPart.id, type: "reasoning-start" },
+        internalPart.providerMetadata
+      );
     case "response-metadata":
       return {
         id: internalPart.id,
@@ -32466,114 +32457,97 @@ function convertStreamPartToV2(internalPart) {
       };
     case "source":
       if (internalPart.sourceType === "url") {
-        return {
+        return withProviderMetadata(
+          {
+            id: internalPart.id,
+            sourceType: "url",
+            title: internalPart.title,
+            type: "source",
+            url: internalPart.url
+          },
+          internalPart.providerMetadata
+        );
+      }
+      return withProviderMetadata(
+        {
+          filename: internalPart.filename,
           id: internalPart.id,
-          sourceType: "url",
+          mediaType: internalPart.mediaType,
+          sourceType: "document",
           title: internalPart.title,
-          type: "source",
-          url: internalPart.url,
-          ...internalPart.providerMetadata !== void 0 && {
-            providerMetadata: convertProviderMetadataToV2(internalPart.providerMetadata)
-          }
-        };
-      }
-      return {
-        filename: internalPart.filename,
-        id: internalPart.id,
-        mediaType: internalPart.mediaType,
-        sourceType: "document",
-        title: internalPart.title,
-        type: "source",
-        ...internalPart.providerMetadata !== void 0 && {
-          providerMetadata: convertProviderMetadataToV2(internalPart.providerMetadata)
-        }
-      };
+          type: "source"
+        },
+        internalPart.providerMetadata
+      );
     case "stream-start":
       return {
         type: "stream-start",
         warnings: convertWarningsToV2(internalPart.warnings)
       };
     case "text-delta":
-      return {
-        delta: internalPart.delta,
-        id: internalPart.id,
-        type: "text-delta",
-        ...internalPart.providerMetadata !== void 0 && {
-          providerMetadata: convertProviderMetadataToV2(internalPart.providerMetadata)
-        }
-      };
+      return withProviderMetadata(
+        { delta: internalPart.delta, id: internalPart.id, type: "text-delta" },
+        internalPart.providerMetadata
+      );
     case "text-end":
-      return {
-        id: internalPart.id,
-        type: "text-end",
-        ...internalPart.providerMetadata !== void 0 && {
-          providerMetadata: convertProviderMetadataToV2(internalPart.providerMetadata)
-        }
-      };
+      return withProviderMetadata(
+        { id: internalPart.id, type: "text-end" },
+        internalPart.providerMetadata
+      );
     case "text-start":
-      return {
-        id: internalPart.id,
-        type: "text-start",
-        ...internalPart.providerMetadata !== void 0 && {
-          providerMetadata: convertProviderMetadataToV2(internalPart.providerMetadata)
-        }
-      };
+      return withProviderMetadata(
+        { id: internalPart.id, type: "text-start" },
+        internalPart.providerMetadata
+      );
     case "tool-approval-request":
       return null;
     case "tool-call":
-      return {
-        input: internalPart.input,
-        toolCallId: internalPart.toolCallId,
-        toolName: internalPart.toolName,
-        type: "tool-call",
-        ...internalPart.providerExecuted !== void 0 && {
-          providerExecuted: internalPart.providerExecuted
+      return withProviderMetadata(
+        {
+          input: internalPart.input,
+          toolCallId: internalPart.toolCallId,
+          toolName: internalPart.toolName,
+          type: "tool-call",
+          ...internalPart.providerExecuted !== void 0 && {
+            providerExecuted: internalPart.providerExecuted
+          }
         },
-        ...internalPart.providerMetadata !== void 0 && {
-          providerMetadata: convertProviderMetadataToV2(internalPart.providerMetadata)
-        }
-      };
+        internalPart.providerMetadata
+      );
     case "tool-input-delta":
-      return {
-        delta: internalPart.delta,
-        id: internalPart.id,
-        type: "tool-input-delta",
-        ...internalPart.providerMetadata !== void 0 && {
-          providerMetadata: convertProviderMetadataToV2(internalPart.providerMetadata)
-        }
-      };
+      return withProviderMetadata(
+        { delta: internalPart.delta, id: internalPart.id, type: "tool-input-delta" },
+        internalPart.providerMetadata
+      );
     case "tool-input-end":
-      return {
-        id: internalPart.id,
-        type: "tool-input-end",
-        ...internalPart.providerMetadata !== void 0 && {
-          providerMetadata: convertProviderMetadataToV2(internalPart.providerMetadata)
-        }
-      };
+      return withProviderMetadata(
+        { id: internalPart.id, type: "tool-input-end" },
+        internalPart.providerMetadata
+      );
     case "tool-input-start":
-      return {
-        id: internalPart.id,
-        toolName: internalPart.toolName,
-        type: "tool-input-start",
-        ...internalPart.providerExecuted !== void 0 && {
-          providerExecuted: internalPart.providerExecuted
+      return withProviderMetadata(
+        {
+          id: internalPart.id,
+          toolName: internalPart.toolName,
+          type: "tool-input-start",
+          ...internalPart.providerExecuted !== void 0 && {
+            providerExecuted: internalPart.providerExecuted
+          }
         },
-        ...internalPart.providerMetadata !== void 0 && {
-          providerMetadata: convertProviderMetadataToV2(internalPart.providerMetadata)
-        }
-      };
+        internalPart.providerMetadata
+      );
     case "tool-result":
-      return {
-        result: internalPart.result,
-        toolCallId: internalPart.toolCallId,
-        toolName: internalPart.toolName,
-        type: "tool-result",
-        ...internalPart.isError !== void 0 && { isError: internalPart.isError },
-        ...internalPart.dynamic !== void 0 && { providerExecuted: internalPart.dynamic },
-        ...internalPart.providerMetadata !== void 0 && {
-          providerMetadata: convertProviderMetadataToV2(internalPart.providerMetadata)
-        }
-      };
+      return withProviderMetadata(
+        {
+          result: internalPart.result,
+          toolCallId: internalPart.toolCallId,
+          toolName: internalPart.toolName,
+          type: "tool-result",
+          ...internalPart.isError !== void 0 && { isError: internalPart.isError },
+          ...internalPart.dynamic !== void 0 && { providerExecuted: internalPart.dynamic }
+        },
+        internalPart.providerMetadata
+      );
   }
 }
 function convertUsageToV2(internalUsage) {
@@ -32618,6 +32592,10 @@ function createV2StreamFromInternal(internalStream) {
     })
   );
 }
+function withProviderMetadata(obj, metadata) {
+  if (metadata === void 0) return obj;
+  return { ...obj, providerMetadata: convertProviderMetadataToV2(metadata) };
+}
 
 // src/sap-ai-embedding-model.ts
 var import_provider_utils5 = require("@ai-sdk/provider-utils");