@flutchai/flutch-sdk 0.2.16 → 0.2.17

package/dist/index.cjs

@@ -6475,7 +6475,10 @@ function normalizeToolConfigs(tools) {
 }
 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 = [
@@ -6582,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;
   }
@@ -6633,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 */]: ({
@@ -6647,7 +6656,9 @@ 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,
@@ -6655,30 +6666,35 @@ var ModelInitializer = class _ModelInitializer {
       defaultMaxTokens,
       apiToken,
       baseURL
-    }) => new cohere.ChatCohere({
-      model: modelName,
-      temperature: defaultTemperature,
-      client: new cohereAi.CohereClient({
-        token: apiToken || this.resolveApiKey("cohere" /* COHERE */),
-        baseUrl: resolveRouterURL(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");
     }
@@ -6691,13 +6707,16 @@ var ModelInitializer = class _ModelInitializer {
       maxDocuments,
       baseURL
     }) => {
-      return new cohere.CohereRerank({
+      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: apiToken || this.resolveApiKey("cohere" /* COHERE */),
-          baseUrl: resolveRouterURL(baseURL)
-        })
+        client: new cohereAi.CohereClient({ token, baseUrl: routerURL })
+      }) : new cohere.CohereRerank({
+        model: modelName,
+        topN: maxDocuments || 20,
+        apiKey: token
       });
     },
     ["voyageai" /* VOYAGEAI */]: ({
@@ -6706,11 +6725,12 @@ var ModelInitializer = class _ModelInitializer {
       maxDocuments,
       baseURL
     }) => {
+      const routerURL = resolveRouterURL(baseURL);
       return new VoyageAIRerank({
         apiKey: apiToken || this.resolveApiKey("voyageai" /* VOYAGEAI */),
         model: modelName,
         topN: maxDocuments || 20,
-        baseUrl: resolveRouterURL(baseURL)
+        ...routerURL && { baseUrl: routerURL }
       });
     },
     // Other providers don't support rerank yet
@@ -6721,11 +6741,16 @@ var ModelInitializer = class _ModelInitializer {
   };
   // Embedding model creators
   embeddingModelCreators = {
-    ["openai" /* OPENAI */]: ({ modelName, apiToken, baseURL }) => new openai.OpenAIEmbeddings({
-      model: modelName,
-      apiKey: apiToken || this.resolveApiKey("openai" /* OPENAI */),
-      configuration: { baseURL: `${resolveRouterURL(baseURL)}/v1` }
-    }),
+    ["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,