@flutchai/flutch-sdk 0.2.10 → 0.2.14

package/dist/index.cjs

@@ -2848,8 +2848,8 @@ exports.IdempotencyManager = __decorateClass([
 
 // src/callbacks/smart-callback.router.ts
 exports.SmartCallbackRouter = class SmartCallbackRouter {
-  constructor(registry, store, acl, auditor, metrics, rateLimiter, idempotencyManager, patchService) {
-    this.registry = registry;
+  constructor(registry2, store, acl, auditor, metrics, rateLimiter, idempotencyManager, patchService) {
+    this.registry = registry2;
     this.store = store;
     this.acl = acl;
     this.auditor = auditor;
@@ -3128,8 +3128,8 @@ var UniversalCallbackService = class {
 };
 
 // src/callbacks/example.callback.ts
-function registerFinanceExampleCallback(registry) {
-  registry.register(
+function registerFinanceExampleCallback(registry2) {
+  registry2.register(
     "example",
     async () => ({
       success: true,
@@ -3654,8 +3654,8 @@ exports.CallbackMetrics = class CallbackMetrics {
   activeCallbacks;
   pendingCallbacks;
   queueSize;
-  constructor(registry) {
-    this.registry = registry ?? new promClient.Registry();
+  constructor(registry2) {
+    this.registry = registry2 ?? new promClient.Registry();
     promClient.collectDefaultMetrics({ register: this.registry });
     this.callbacksTotal = new promClient.Counter({
       name: "graph_callbacks_total",
@@ -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,
@@ -5658,7 +5672,7 @@ exports.UniversalGraphModule = class UniversalGraphModule {
       },
       {
         provide: exports.CallbackMetrics,
-        useFactory: (registry) => new exports.CallbackMetrics(registry),
+        useFactory: (registry2) => new exports.CallbackMetrics(registry2),
         inject: ["PROMETHEUS_REGISTRY"]
       },
       {
@@ -5686,8 +5700,8 @@ exports.UniversalGraphModule = class UniversalGraphModule {
       },
       {
         provide: exports.SmartCallbackRouter,
-        useFactory: (registry, store, acl, auditor, metrics, rateLimiter, idempotencyManager, patchService) => new exports.SmartCallbackRouter(
-          registry,
+        useFactory: (registry2, store, acl, auditor, metrics, rateLimiter, idempotencyManager, patchService) => new exports.SmartCallbackRouter(
+          registry2,
           store,
           acl,
           auditor,
@@ -5719,8 +5733,8 @@ exports.UniversalGraphModule = class UniversalGraphModule {
       },
       {
         provide: "CALLBACK_EXAMPLE_REGISTRATION",
-        useFactory: (registry) => {
-          registerFinanceExampleCallback(registry);
+        useFactory: (registry2) => {
+          registerFinanceExampleCallback(registry2);
         },
         inject: [CallbackRegistry]
       },
@@ -5783,8 +5797,8 @@ exports.UniversalGraphModule = class UniversalGraphModule {
       },
       {
         provide: "GRAPH_BUILDERS",
-        useFactory: (registry) => {
-          return registry.getBuilders();
+        useFactory: (registry2) => {
+          return registry2.getBuilders();
         },
         inject: [exports.BuilderRegistryService]
       },
@@ -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;
@@ -7330,11 +7357,7 @@ var ALGORITHM = "aes-256-cbc";
 var IV_LENGTH = 16;
 function encryptTokens(tokens, key) {
   const iv = crypto__namespace.randomBytes(IV_LENGTH);
-  const cipher = crypto__namespace.createCipheriv(
-    ALGORITHM,
-    Buffer.from(key),
-    iv
-  );
+  const cipher = crypto__namespace.createCipheriv(ALGORITHM, Buffer.from(key), iv);
   const json = JSON.stringify(tokens);
   let encrypted = cipher.update(json, "utf8", "hex");
   encrypted += cipher.final("hex");
@@ -7348,11 +7371,7 @@ function decryptTokens(encrypted, key) {
   const ivHex = encrypted.substring(0, separatorIndex);
   const encryptedData = encrypted.substring(separatorIndex + 1);
   const iv = Buffer.from(ivHex, "hex");
-  const decipher = crypto__namespace.createDecipheriv(
-    ALGORITHM,
-    Buffer.from(key),
-    iv
-  );
+  const decipher = crypto__namespace.createDecipheriv(ALGORITHM, Buffer.from(key), iv);
   let decrypted = decipher.update(encryptedData, "hex", "utf8");
   decrypted += decipher.final("utf8");
   return JSON.parse(decrypted);
@@ -7393,7 +7412,10 @@ var OAuthTokenManager = class {
       this.setCache(config.provider, tokens.accessToken, tokens.expiresAt);
       return tokens.accessToken;
     }
-    const refreshed = await this.refreshAccessToken(config, tokens.refreshToken);
+    const refreshed = await this.refreshAccessToken(
+      config,
+      tokens.refreshToken
+    );
     await this.persistTokens(config.provider, refreshed);
     return refreshed.accessToken;
   }
@@ -7457,6 +7479,56 @@ var OAuthTokenManager = class {
     this.cache.set(provider, { token, expiresAt });
   }
 };
+
+// src/oauth/oauth-provider.registry.ts
+var registry = {};
+function loadOAuthProviders(providers) {
+  registry = { ...providers };
+}
+function getOAuthProvider(provider) {
+  const def = registry[provider];
+  if (!def) {
+    throw new Error(`Unknown OAuth provider: ${provider}`);
+  }
+  return def;
+}
+function getOAuthProviderNames() {
+  return Object.keys(registry);
+}
+function resolveOAuthProviderConfig(provider) {
+  const def = getOAuthProvider(provider);
+  const clientId = process.env[def.clientIdEnvVar];
+  const clientSecret = process.env[def.clientSecretEnvVar];
+  if (!clientId) {
+    throw new Error(`Missing env var: ${def.clientIdEnvVar}`);
+  }
+  if (!clientSecret) {
+    throw new Error(`Missing env var: ${def.clientSecretEnvVar}`);
+  }
+  return {
+    provider: def.name,
+    tokenUrl: def.tokenUrl,
+    clientId,
+    clientSecret
+  };
+}
+function buildOAuthAuthorizationUrl(provider, params) {
+  const def = getOAuthProvider(provider);
+  const clientId = process.env[def.clientIdEnvVar];
+  if (!clientId) {
+    throw new Error(`Missing env var: ${def.clientIdEnvVar}`);
+  }
+  const query = new URLSearchParams({
+    client_id: clientId,
+    redirect_uri: params.redirectUri,
+    response_type: "code",
+    state: params.state
+  });
+  if (def.scopes.length > 0) {
+    query.set("scope", def.scopes.join(" "));
+  }
+  return `${def.authorizationUrl}?${query.toString()}`;
+}
 var FileTokenStore = class {
   constructor(filePath) {
     this.filePath = filePath;
@@ -7560,6 +7632,7 @@ exports.WithEndpoints = WithEndpoints;
 exports.WithUIEndpoints = WithUIEndpoints;
 exports._internals = _internals;
 exports.bootstrap = bootstrap;
+exports.buildOAuthAuthorizationUrl = buildOAuthAuthorizationUrl;
 exports.clearAttachmentDataStore = clearAttachmentDataStore;
 exports.createEndpointDescriptors = createEndpointDescriptors;
 exports.createGraphAttachment = createGraphAttachment;
@@ -7575,12 +7648,16 @@ exports.generateAttachmentSummary = generateAttachmentSummary;
 exports.getAttachmentData = getAttachmentData;
 exports.getCallbackMetadata = getCallbackMetadata;
 exports.getEndpointMetadata = getEndpointMetadata;
+exports.getOAuthProvider = getOAuthProvider;
+exports.getOAuthProviderNames = getOAuthProviderNames;
 exports.getUIEndpointClassMetadata = getUIEndpointClassMetadata;
 exports.getUIEndpointMethodsMetadata = getUIEndpointMethodsMetadata;
 exports.hasCallbacks = hasCallbacks;
 exports.hasUIEndpoints = hasUIEndpoints;
+exports.loadOAuthProviders = loadOAuthProviders;
 exports.registerFinanceExampleCallback = registerFinanceExampleCallback;
 exports.registerUIEndpointsFromClass = registerUIEndpointsFromClass;
+exports.resolveOAuthProviderConfig = resolveOAuthProviderConfig;
 exports.sanitizeTraceData = sanitizeTraceData;
 exports.storeAttachmentData = storeAttachmentData;
 exports.traceApiCall = traceApiCall;