@flutchai/flutch-sdk 0.2.15 → 0.2.17

package/dist/index.cjs

@@ -25,6 +25,7 @@ var openai = require('@langchain/openai');
 var aws = require('@langchain/aws');
 var anthropic = require('@langchain/anthropic');
 var cohere = require('@langchain/cohere');
+var cohereAi = require('cohere-ai');
 var document_compressors = require('@langchain/core/retrievers/document_compressors');
 var mistralai = require('@langchain/mistralai');
 
@@ -6466,9 +6467,18 @@ 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 normalizeToolConfigs(tools) {
+  if (!tools || tools.length === 0) return void 0;
+  return tools.map(
+    (t) => typeof t === "string" ? { toolName: t, enabled: true } : { toolName: t.name, enabled: t.enabled !== false, config: t.config }
+  );
+}
 var DEFAULT_ROUTER_URL = "https://router.flutch.ai";
 function resolveRouterURL(baseURL) {
-  return baseURL ?? process.env.FLUTCH_ROUTER_URL ?? DEFAULT_ROUTER_URL;
+  if (baseURL) return baseURL;
+  if (process.env.FLUTCH_ROUTER_URL) return process.env.FLUTCH_ROUTER_URL;
+  if (process.env.FLUTCH_API_TOKEN) return DEFAULT_ROUTER_URL;
+  return void 0;
 }
 function generateModelCacheKey(modelId, temperature, maxTokens, toolsConfig, baseURL) {
   const parts = [
@@ -6508,13 +6518,14 @@ var VoyageAIRerank = class extends document_compressors.BaseDocumentCompressor {
   model;
   topN;
   truncation;
-  baseUrl = "https://api.voyageai.com/v1/rerank";
+  baseUrl;
   constructor(config) {
     super();
     this.apiKey = config.apiKey || process.env.VOYAGEAI_API_KEY || "";
     this.model = config.model || "rerank-2";
     this.topN = config.topN || 20;
     this.truncation = config.truncation ?? true;
+    this.baseUrl = config.baseUrl ? `${config.baseUrl}/v1/rerank` : "https://api.voyageai.com/v1/rerank";
     if (!this.apiKey) {
       throw new Error(
         "VoyageAI API key is required. Set VOYAGEAI_API_KEY environment variable or pass apiKey in config."
@@ -6574,12 +6585,15 @@ var ModelInitializer = class _ModelInitializer {
   };
   /**
    * Resolve API key for a provider.
-   * Uses custom resolver if provided, falls back to process.env.
+   * Priority: custom resolver > FLUTCH_API_TOKEN > provider-specific env var.
    */
   resolveApiKey(provider) {
     if (this.apiKeyResolver) {
       return this.apiKeyResolver(provider);
     }
+    if (process.env.FLUTCH_API_TOKEN) {
+      return process.env.FLUTCH_API_TOKEN;
+    }
     const envVar = _ModelInitializer.DEFAULT_ENV_MAP[provider];
     return envVar ? process.env[envVar] : void 0;
   }
@@ -6625,7 +6639,10 @@ var ModelInitializer = class _ModelInitializer {
         defaultMaxTokens,
         apiToken || this.resolveApiKey("openai" /* OPENAI */) || ""
       );
-      config.configuration = { baseURL: `${resolveRouterURL(baseURL)}/v1` };
+      const routerURL = resolveRouterURL(baseURL);
+      if (routerURL) {
+        config.configuration = { baseURL: `${routerURL}/v1` };
+      }
       return new openai.ChatOpenAI(config);
     },
     ["anthropic" /* ANTHROPIC */]: ({
@@ -6639,52 +6656,81 @@ var ModelInitializer = class _ModelInitializer {
       temperature: defaultTemperature,
       maxTokens: defaultMaxTokens,
       anthropicApiKey: apiToken || this.resolveApiKey("anthropic" /* ANTHROPIC */),
-      anthropicApiUrl: resolveRouterURL(baseURL)
+      ...resolveRouterURL(baseURL) && {
+        anthropicApiUrl: resolveRouterURL(baseURL)
+      }
     }),
     ["cohere" /* COHERE */]: ({
       modelName,
       defaultTemperature,
       defaultMaxTokens,
-      apiToken
-    }) => new cohere.ChatCohere({
-      model: modelName,
-      temperature: defaultTemperature,
-      apiKey: apiToken || this.resolveApiKey("cohere" /* COHERE */)
-    }),
+      apiToken,
+      baseURL
+    }) => {
+      const routerURL = resolveRouterURL(baseURL);
+      const token = apiToken || this.resolveApiKey("cohere" /* COHERE */);
+      return routerURL ? new cohere.ChatCohere({
+        model: modelName,
+        temperature: defaultTemperature,
+        client: new cohereAi.CohereClient({ token, baseUrl: routerURL })
+      }) : new cohere.ChatCohere({
+        model: modelName,
+        temperature: defaultTemperature,
+        apiKey: token
+      });
+    },
     ["mistral" /* MISTRAL */]: ({
       modelName,
       defaultTemperature,
       defaultMaxTokens,
       apiToken,
       baseURL
-    }) => new mistralai.ChatMistralAI({
-      model: modelName,
-      temperature: defaultTemperature,
-      maxTokens: defaultMaxTokens,
-      apiKey: apiToken || this.resolveApiKey("mistral" /* MISTRAL */),
-      // Route through the same gateway as OpenAI/Anthropic.
-      // Without serverURL, ChatMistralAI ignores FLUTCH_ROUTER_URL and calls
-      // api.mistral.ai directly — inconsistent with other providers.
-      serverURL: `${resolveRouterURL(baseURL)}/v1`
-    }),
+    }) => {
+      const routerURL = resolveRouterURL(baseURL);
+      return new mistralai.ChatMistralAI({
+        model: modelName,
+        temperature: defaultTemperature,
+        maxTokens: defaultMaxTokens,
+        apiKey: apiToken || this.resolveApiKey("mistral" /* MISTRAL */),
+        ...routerURL && { serverURL: `${routerURL}/v1` }
+      });
+    },
     ["voyageai" /* VOYAGEAI */]: () => {
       throw new Error("VoyageAI chat models not implemented");
     }
   };
   // Rerank model creators
   rerankModelCreators = {
-    ["cohere" /* COHERE */]: ({ modelName, apiToken, maxDocuments }) => {
-      return new cohere.CohereRerank({
-        apiKey: apiToken || this.resolveApiKey("cohere" /* COHERE */),
+    ["cohere" /* COHERE */]: ({
+      modelName,
+      apiToken,
+      maxDocuments,
+      baseURL
+    }) => {
+      const routerURL = resolveRouterURL(baseURL);
+      const token = apiToken || this.resolveApiKey("cohere" /* COHERE */);
+      return routerURL ? new cohere.CohereRerank({
+        model: modelName,
+        topN: maxDocuments || 20,
+        client: new cohereAi.CohereClient({ token, baseUrl: routerURL })
+      }) : new cohere.CohereRerank({
         model: modelName,
-        topN: maxDocuments || 20
+        topN: maxDocuments || 20,
+        apiKey: token
       });
     },
-    ["voyageai" /* VOYAGEAI */]: ({ modelName, apiToken, maxDocuments }) => {
+    ["voyageai" /* VOYAGEAI */]: ({
+      modelName,
+      apiToken,
+      maxDocuments,
+      baseURL
+    }) => {
+      const routerURL = resolveRouterURL(baseURL);
       return new VoyageAIRerank({
         apiKey: apiToken || this.resolveApiKey("voyageai" /* VOYAGEAI */),
         model: modelName,
-        topN: maxDocuments || 20
+        topN: maxDocuments || 20,
+        ...routerURL && { baseUrl: routerURL }
       });
     },
     // Other providers don't support rerank yet
@@ -6695,10 +6741,16 @@ var ModelInitializer = class _ModelInitializer {
   };
   // Embedding model creators
   embeddingModelCreators = {
-    ["openai" /* OPENAI */]: ({ modelName, apiToken }) => new openai.OpenAIEmbeddings({
-      model: modelName,
-      apiKey: apiToken || this.resolveApiKey("openai" /* OPENAI */)
-    }),
+    ["openai" /* OPENAI */]: ({ modelName, apiToken, baseURL }) => {
+      const routerURL = resolveRouterURL(baseURL);
+      return new openai.OpenAIEmbeddings({
+        model: modelName,
+        apiKey: apiToken || this.resolveApiKey("openai" /* OPENAI */),
+        ...routerURL && {
+          configuration: { baseURL: `${routerURL}/v1` }
+        }
+      });
+    },
     // Other providers not yet implemented for embeddings
     ["anthropic" /* ANTHROPIC */]: void 0,
     ["cohere" /* COHERE */]: void 0,
@@ -6706,7 +6758,82 @@ var ModelInitializer = class _ModelInitializer {
     ["aws" /* AWS */]: void 0,
     ["voyageai" /* VOYAGEAI */]: void 0
   };
-  async initializeChatModel(config) {
+  // ══════════════════════════════════════════════════════════════
+  //  initializeChatModel — overloaded: ModelConfig | ModelByIdConfig
+  // ══════════════════════════════════════════════════════════════
+  async initializeChatModel(config, customTools) {
+    if ("provider" in config && "modelName" in config) {
+      return this.initializeChatModelDirect(config, customTools);
+    }
+    return this.initializeChatModelByIdInternal(config);
+  }
+  /**
+   * Direct initialization by provider + modelName (no DB lookup).
+   */
+  async initializeChatModelDirect(config, customTools) {
+    const toolsConfig = normalizeToolConfigs(config.tools);
+    const modelIdentifier = `${config.provider}:${config.modelName}`;
+    const cacheKey = generateModelCacheKey(
+      modelIdentifier,
+      config.temperature,
+      config.maxTokens,
+      toolsConfig,
+      config.baseURL
+    );
+    const cached = this.modelInstanceCache.get(cacheKey);
+    if (cached) {
+      this.logger.debug(`Using cached chat model instance: ${cacheKey}`);
+      return cached;
+    }
+    const provider = config.provider;
+    if (!Object.values(ModelProvider).includes(provider)) {
+      throw new Error(
+        `Unknown provider "${provider}". Valid: ${Object.values(ModelProvider).join(", ")}`
+      );
+    }
+    const apiToken = this.resolveApiKey(provider);
+    const temperature = config.temperature ?? 0.7;
+    const maxTokens = config.maxTokens ?? 4096;
+    const modelConfig = {
+      modelId: modelIdentifier,
+      modelName: config.modelName,
+      provider,
+      modelType: "chat" /* CHAT */,
+      defaultTemperature: Number(temperature),
+      defaultMaxTokens: Number(maxTokens),
+      apiToken,
+      requiresApiKey: true,
+      baseURL: config.baseURL
+    };
+    this.logger.debug(
+      `Creating chat model: ${modelIdentifier} (apiKeyResolved=${!!apiToken})`
+    );
+    const creator = this.chatModelCreators[provider];
+    if (!creator) {
+      throw new Error(`Chat models not supported for provider: ${provider}`);
+    }
+    const model = creator(modelConfig);
+    model.metadata = {
+      ...model.metadata,
+      modelId: modelIdentifier
+    };
+    if (toolsConfig || customTools) {
+      const boundModel = await this.bindToolsToModel(
+        model,
+        toolsConfig,
+        customTools
+      );
+      this.modelInstanceCache.set(cacheKey, boundModel);
+      return boundModel;
+    }
+    this.modelInstanceCache.set(cacheKey, model);
+    return model;
+  }
+  /**
+   * Legacy initialization by model ID (DB lookup via configFetcher).
+   * @deprecated Pass ModelConfig with provider + modelName instead.
+   */
+  async initializeChatModelByIdInternal(config) {
     const cacheKey = this.generateModelCacheKey(config);
     const cachedModel = this.modelInstanceCache.get(cacheKey);
     if (cachedModel) {
@@ -6732,9 +6859,6 @@ var ModelInitializer = class _ModelInitializer {
     this.logger.debug(`Creating new chat model instance: ${cacheKey}`);
     let model;
     if (finalConfig.useBedrock && finalConfig.bedrockModelId) {
-      this.logger.debug(
-        `Using Bedrock for model ${finalConfig.modelName}, bedrockModelId: ${finalConfig.bedrockModelId}`
-      );
       model = new aws.ChatBedrockConverse({
         model: finalConfig.bedrockModelId,
         region: this.resolveBedrockRegion(),
@@ -6755,29 +6879,12 @@ var ModelInitializer = class _ModelInitializer {
       ...model.metadata,
       modelId: config.modelId
     };
-    this.logger.debug("\u{1F527} Model initialized with metadata", {
-      modelId: config.modelId,
-      metadataKeys: Object.keys(model.metadata || {}),
-      hasModelId: !!model.metadata?.modelId
-    });
-    this.logger.debug(
-      `[TOOLS CHECK] toolsConfig exists: ${!!config.toolsConfig}, customTools exists: ${!!config.customTools}`
-    );
-    if (config.toolsConfig) {
-      this.logger.debug(
-        `[TOOLS CHECK] toolsConfig length: ${config.toolsConfig.length}, content: ${JSON.stringify(config.toolsConfig)}`
-      );
-    }
     if (config.toolsConfig || config.customTools) {
-      this.logger.debug(
-        `[TOOLS] Calling bindToolsToModel with toolsConfig: ${JSON.stringify(config.toolsConfig)}`
-      );
       const boundModel = await this.bindToolsToModel(
         model,
         config.toolsConfig,
         config.customTools
       );
-      this.logger.debug(`[TOOLS] bindToolsToModel returned successfully`);
       this.modelInstanceCache.set(cacheKey, boundModel);
       return boundModel;
     }
@@ -7612,6 +7719,7 @@ exports.CallbackRegistry = CallbackRegistry;
 exports.CallbackStore = CallbackStore;
 exports.ChatFeature = ChatFeature;
 exports.DEFAULT_ATTACHMENT_THRESHOLD = DEFAULT_ATTACHMENT_THRESHOLD;
+exports.DEFAULT_ROUTER_URL = DEFAULT_ROUTER_URL;
 exports.DEFAULT_TRACER_OPTIONS = DEFAULT_TRACER_OPTIONS;
 exports.Endpoint = Endpoint;
 exports.FileTokenStore = FileTokenStore;
@@ -7638,6 +7746,7 @@ exports.WithUIEndpoints = WithUIEndpoints;
 exports._internals = _internals;
 exports.bootstrap = bootstrap;
 exports.buildOAuthAuthorizationUrl = buildOAuthAuthorizationUrl;
+exports.buildOpenAIModelConfig = buildOpenAIModelConfig;
 exports.clearAttachmentDataStore = clearAttachmentDataStore;
 exports.createEndpointDescriptors = createEndpointDescriptors;
 exports.createGraphAttachment = createGraphAttachment;
@@ -7650,6 +7759,7 @@ exports.executeToolWithAttachments = executeToolWithAttachments;
 exports.findCallbackMethod = findCallbackMethod;
 exports.findEndpointMethod = findEndpointMethod;
 exports.generateAttachmentSummary = generateAttachmentSummary;
+exports.generateModelCacheKey = generateModelCacheKey;
 exports.getAttachmentData = getAttachmentData;
 exports.getCallbackMetadata = getCallbackMetadata;
 exports.getEndpointMetadata = getEndpointMetadata;
@@ -7659,10 +7769,14 @@ exports.getUIEndpointClassMetadata = getUIEndpointClassMetadata;
 exports.getUIEndpointMethodsMetadata = getUIEndpointMethodsMetadata;
 exports.hasCallbacks = hasCallbacks;
 exports.hasUIEndpoints = hasUIEndpoints;
+exports.hashToolsConfig = hashToolsConfig;
+exports.isReasoningModel = isReasoningModel;
 exports.loadOAuthProviders = loadOAuthProviders;
+exports.normalizeToolConfigs = normalizeToolConfigs;
 exports.registerFinanceExampleCallback = registerFinanceExampleCallback;
 exports.registerUIEndpointsFromClass = registerUIEndpointsFromClass;
 exports.resolveOAuthProviderConfig = resolveOAuthProviderConfig;
+exports.resolveRouterURL = resolveRouterURL;
 exports.sanitizeTraceData = sanitizeTraceData;
 exports.storeAttachmentData = storeAttachmentData;
 exports.traceApiCall = traceApiCall;