@usagetap/sdk 1.1.0 → 1.3.1

package/dist/express/index.d.cts

@@ -1,6 +1,6 @@
 import OpenAI from 'openai';
 import { Request, Response, NextFunction } from 'express';
-import { U as UsageTapClient } from '../client-BA-QlnRq.cjs';
+import { U as UsageTapClient } from '../client-BD8O2J8Z.cjs';
 import { WrapOpenAIContext, WrapOpenAIOptions, wrapOpenAI, pipeToResponse } from '../adapters/openai.cjs';
 
 interface ExpressUsageTapContext {

package/dist/express/index.d.ts

@@ -1,6 +1,6 @@
 import OpenAI from 'openai';
 import { Request, Response, NextFunction } from 'express';
-import { U as UsageTapClient } from '../client-BA-QlnRq.js';
+import { U as UsageTapClient } from '../client-BD8O2J8Z.js';
 import { WrapOpenAIContext, WrapOpenAIOptions, wrapOpenAI, pipeToResponse } from '../adapters/openai.js';
 
 interface ExpressUsageTapContext {

package/dist/express/index.mjs

@@ -493,6 +493,24 @@ async function compressChatParams(params, usageTap, compression, signal) {
   if (!messages) {
     return { params, segments: [] };
   }
+  if (isBelowMinContextTokens(
+    { messages, tools: source.tools },
+    compression.minContextTokens
+  )) {
+    return { params, segments: [] };
+  }
+  if (shouldUseUsageTapMessageEndpoint(compression)) {
+    const result = await usageTap.compressPromptMessages(source, {
+      provider: "usagetap",
+      failOpen: compression.failOpen,
+      aggressiveness: resolveMessageEndpointAggressiveness(compression),
+      signal
+    });
+    return {
+      params: result.compressedInput,
+      segments: [{ role: "user", result }]
+    };
+  }
   const messageResults = await Promise.all(
     messages.map(
       (message) => compressOpenAIMessage(message, usageTap, compression, signal)
@@ -512,6 +530,16 @@ async function compressResponsesParams(params, usageTap, compression, signal) {
   }
   const source = cloneRecord(params);
   const segments = [];
+  if (isBelowMinContextTokens(
+    {
+      instructions: source.instructions,
+      input: source.input,
+      tools: source.tools
+    },
+    compression.minContextTokens
+  )) {
+    return { params, segments };
+  }
   if (typeof source.instructions === "string") {
     const compressed = await compressTextForRole(
       source.instructions,
@@ -716,8 +744,11 @@ async function compressTextForRole(text, role, usageTap, compression, signal) {
     provider: roleOptions.provider,
     failOpen: roleOptions.failOpen,
     tokenCompanyModel: roleOptions.tokenCompanyModel,
+    aggressiveness: roleOptions.aggressiveness,
     tokenCompanyAggressiveness: roleOptions.tokenCompanyAggressiveness,
     tokenCompanyAppId: roleOptions.tokenCompanyAppId,
+    usageTapCompressionModel: roleOptions.usageTapCompressionModel,
+    usageTapCompressionAggressiveness: roleOptions.usageTapCompressionAggressiveness,
     signal
   });
   const compressedText = typeof result.compressedInput === "string" ? result.compressedInput : String(result.compressedInput);
@@ -738,6 +769,9 @@ function normalizePromptCompressionOptions(options) {
   }
   return options;
 }
+function isBelowMinContextTokens(context, minContextTokens) {
+  return typeof minContextTokens === "number" && estimatePromptTokens(context) < Math.max(0, minContextTokens);
+}
 function resolveEffectivePromptCompressionOptions(defaults, override) {
   if (override === false) {
     return void 0;
@@ -776,16 +810,67 @@ function resolveRoleCompressionOptions(compression, role) {
     minTokens: roleOptions?.minTokens ?? compression.minTokens,
     failOpen: compression.failOpen,
     tokenCompanyModel: compression.tokenCompanyModel,
+    aggressiveness: roleOptions?.aggressiveness ?? resolveAggressiveness(compression, role),
     tokenCompanyAggressiveness: roleOptions?.tokenCompanyAggressiveness ?? resolveTokenCompanyAggressiveness(compression, role),
-    tokenCompanyAppId: compression.tokenCompanyAppId
+    tokenCompanyAppId: compression.tokenCompanyAppId,
+    usageTapCompressionModel: compression.usageTapCompressionModel,
+    usageTapCompressionAggressiveness: roleOptions?.usageTapCompressionAggressiveness ?? resolveUsageTapCompressionAggressiveness(compression, role)
   };
 }
+function resolveAggressiveness(compression, role) {
+  if (typeof compression.aggressiveness === "number") {
+    return compression.aggressiveness;
+  }
+  return compression.aggressiveness?.[role];
+}
 function resolveTokenCompanyAggressiveness(compression, role) {
   if (typeof compression.tokenCompanyAggressiveness === "number") {
     return compression.tokenCompanyAggressiveness;
   }
   return compression.tokenCompanyAggressiveness?.[role];
 }
+function resolveUsageTapCompressionAggressiveness(compression, role) {
+  if (typeof compression.usageTapCompressionAggressiveness === "number") {
+    return compression.usageTapCompressionAggressiveness;
+  }
+  return compression.usageTapCompressionAggressiveness?.[role];
+}
+function shouldUseUsageTapMessageEndpoint(compression) {
+  if (compression.provider !== "usagetap") {
+    return false;
+  }
+  return Object.values(compression.roles ?? {}).every((setting) => {
+    if (typeof setting !== "object" || setting === null) {
+      return true;
+    }
+    return setting.provider === void 0 || setting.provider === "usagetap";
+  });
+}
+function resolveMessageEndpointAggressiveness(compression) {
+  const base = compression.aggressiveness ?? compression.usageTapCompressionAggressiveness ?? compression.tokenCompanyAggressiveness;
+  if (typeof base === "number" || base === void 0) {
+    return hasExplicitEnabledRoles(compression) ? buildRoleAggressiveness(compression, base) : base;
+  }
+  return buildRoleAggressiveness(compression, void 0, base);
+}
+function hasExplicitEnabledRoles(compression) {
+  return Object.values(compression.roles ?? {}).some((setting) => setting !== false);
+}
+function buildRoleAggressiveness(compression, fallback, base = {}) {
+  const roles = ["system", "user", "tool", "assistant"];
+  const result = {};
+  for (const role of roles) {
+    const roleOptions = resolveRoleCompressionOptions(compression, role);
+    if (!roleOptions) {
+      continue;
+    }
+    const roleAggressiveness = roleOptions.aggressiveness ?? roleOptions.usageTapCompressionAggressiveness ?? roleOptions.tokenCompanyAggressiveness ?? base[role] ?? fallback;
+    if (roleAggressiveness !== void 0) {
+      result[role] = roleAggressiveness;
+    }
+  }
+  return result;
+}
 function buildPromptCompressionTelemetry(segments) {
   if (!segments.length) {
     return void 0;