@flutchai/flutch-sdk 0.2.11 → 0.2.14

package/dist/index.cjs

@@ -4477,11 +4477,17 @@ async function executeToolWithAttachments(params) {
     threshold = DEFAULT_ATTACHMENT_THRESHOLD,
     injectIntoArg = "data",
     sourceAttachmentId,
-    threadId
+    threadId,
+    toolSchema
   } = params;
   const argsWithInjection = { ...enrichedArgs };
   try {
-    if (shouldInjectData(argsWithInjection, attachments, injectIntoArg)) {
+    if (shouldInjectData(
+      argsWithInjection,
+      attachments,
+      injectIntoArg,
+      toolSchema
+    )) {
       const attachment = sourceAttachmentId ? attachments[sourceAttachmentId] : getLatestAttachment(attachments);
       if (attachment) {
         const attachmentKey = sourceAttachmentId || attachment.toolCallId;
@@ -4543,9 +4549,17 @@ async function executeToolWithAttachments(params) {
   });
   return { toolMessage };
 }
-function shouldInjectData(args, attachments, dataArgName) {
+function shouldInjectData(args, attachments, dataArgName, toolSchema) {
   if (Object.keys(attachments).length === 0) return false;
-  return args[dataArgName] === void 0;
+  if (args[dataArgName] !== void 0) return false;
+  if (toolSchema) {
+    const hasProperty = toolSchema.properties && dataArgName in toolSchema.properties;
+    const isRequired = toolSchema.required?.includes(dataArgName);
+    if (!hasProperty && !isRequired) {
+      return false;
+    }
+  }
+  return true;
 }
 var _internals = {
   shouldInjectData,
@@ -6452,12 +6466,19 @@ function hashToolsConfig(toolsConfig) {
   const sorted = toolsConfig.map((t) => `${t.toolName}:${t.enabled}:${JSON.stringify(t.config || {})}`).sort().join("|");
   return crypto.createHash("md5").update(sorted).digest("hex").slice(0, 16);
 }
-function generateModelCacheKey(modelId, temperature, maxTokens, toolsConfig) {
+var DEFAULT_ROUTER_URL = "https://router.flutch.ai";
+function resolveRouterURL(baseURL) {
+  return baseURL ?? process.env.FLUTCH_ROUTER_URL ?? DEFAULT_ROUTER_URL;
+}
+function generateModelCacheKey(modelId, temperature, maxTokens, toolsConfig, baseURL) {
   const parts = [
     modelId,
     temperature ?? "default",
     maxTokens ?? "default"
   ];
+  if (baseURL) {
+    parts.push(baseURL);
+  }
   if (toolsConfig && toolsConfig.length > 0) {
     parts.push(hashToolsConfig(toolsConfig));
   }
@@ -6585,7 +6606,8 @@ var ModelInitializer = class _ModelInitializer {
       config.modelId,
       config.temperature,
       config.maxTokens,
-      config.toolsConfig
+      config.toolsConfig,
+      config.baseURL
     );
   }
   // Chat model creators
@@ -6594,7 +6616,8 @@ var ModelInitializer = class _ModelInitializer {
       modelName,
       defaultTemperature,
       defaultMaxTokens,
-      apiToken
+      apiToken,
+      baseURL
     }) => {
       const config = buildOpenAIModelConfig(
         modelName,
@@ -6602,18 +6625,21 @@ var ModelInitializer = class _ModelInitializer {
         defaultMaxTokens,
         apiToken || this.resolveApiKey("openai" /* OPENAI */) || ""
       );
+      config.configuration = { baseURL: `${resolveRouterURL(baseURL)}/v1` };
       return new openai.ChatOpenAI(config);
     },
     ["anthropic" /* ANTHROPIC */]: ({
       modelName,
       defaultTemperature,
       defaultMaxTokens,
-      apiToken
+      apiToken,
+      baseURL
     }) => new anthropic.ChatAnthropic({
       modelName,
       temperature: defaultTemperature,
       maxTokens: defaultMaxTokens,
-      anthropicApiKey: apiToken || this.resolveApiKey("anthropic" /* ANTHROPIC */)
+      anthropicApiKey: apiToken || this.resolveApiKey("anthropic" /* ANTHROPIC */),
+      anthropicApiUrl: resolveRouterURL(baseURL)
     }),
     ["cohere" /* COHERE */]: ({
       modelName,
@@ -6695,7 +6721,8 @@ var ModelInitializer = class _ModelInitializer {
       ),
       defaultMaxTokens: Number(
         config.maxTokens ?? modelConfig.defaultMaxTokens
-      )
+      ),
+      baseURL: config.baseURL ?? modelConfig.baseURL
     };
     this.logger.debug(`Creating new chat model instance: ${cacheKey}`);
     let model;