@tanstack-ai-browser/apfel 0.2.0 → 0.2.1

package/dist/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAA;AAGjF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAErD,MAAM,MAAM,WAAW,GAAG;IACxB,0FAA0F;IAC1F,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,qEAAqE;IACrE,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACxC,CAAA;AAED,mGAAmG;AACnG,MAAM,MAAM,qBAAqB,GAAG;IAClC,+BAA+B;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,2FAA2F;AAC3F,MAAM,MAAM,YAAY,GAAG,aAAa,GAAG,cAAc,GAAG,aAAa,GAAG,WAAW,CAAA;AAEvF,iFAAiF;AACjF,MAAM,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,UAAU,EAAE,qBAAqB,CAAC,GAAG;IAC9F,sEAAsE;IACtE,QAAQ,CAAC,eAAe,EAAE,aAAa,CAAC,MAAM,GAAG,OAAO,CAAC,GAAG,SAAS,CAAA;IACrE,6EAA6E;IAC7E,YAAY,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;IACzD,uFAAuF;IACvF,MAAM,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;CACtE,CAAA;AAID,+FAA+F;AAC/F,MAAM,MAAM,UAAU,GAAG,cAAc,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;AAEvD;;;;;;;;;;GAUG;AACH,wBAAgB,SAAS,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,gBAAgB,CAAA;AACjE,wBAAgB,SAAS,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,gBAAgB,CAAA"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAA;AAIjF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAErD,MAAM,MAAM,WAAW,GAAG;IACxB,0FAA0F;IAC1F,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,qEAAqE;IACrE,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACxC,CAAA;AAED,mGAAmG;AACnG,MAAM,MAAM,qBAAqB,GAAG;IAClC,+BAA+B;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,2FAA2F;AAC3F,MAAM,MAAM,YAAY,GAAG,aAAa,GAAG,cAAc,GAAG,aAAa,GAAG,WAAW,CAAA;AAEvF,iFAAiF;AACjF,MAAM,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,UAAU,EAAE,qBAAqB,CAAC,GAAG;IAC9F,sEAAsE;IACtE,QAAQ,CAAC,eAAe,EAAE,aAAa,CAAC,MAAM,GAAG,OAAO,CAAC,GAAG,SAAS,CAAA;IACrE,6EAA6E;IAC7E,YAAY,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;IACzD,uFAAuF;IACvF,MAAM,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;CACtE,CAAA;AAID,+FAA+F;AAC/F,MAAM,MAAM,UAAU,GAAG,cAAc,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;AAEvD;;;;;;;;;;GAUG;AACH,wBAAgB,SAAS,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,gBAAgB,CAAA;AACjE,wBAAgB,SAAS,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,gBAAgB,CAAA"}

package/dist/adapter.js

@@ -24,6 +24,15 @@ export function apfelText(modelOrConfig, maybeConfig = {}) {
         // apfel runs on the user's own machine: there's no secret key to expose.
         dangerouslyAllowBrowser: true
     });
+    const hooks = adapter;
+    const convert = hooks.chatCompletionsTokenUsage.bind(adapter);
+    hooks.chatCompletionsTokenUsage = (usage, source) => {
+        const result = convert(usage, source);
+        if (!result)
+            return result;
+        const cachedTokens = usage?.prompt_tokens_details?.cached_tokens ?? 0;
+        return { ...result, promptTokensDetails: { ...result.promptTokensDetails, cachedTokens } };
+    };
     const availability = async (signal) => {
         try {
             const timeout = AbortSignal.timeout(10_000);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack-ai-browser/apfel",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "TanStack AI adapter for Apple's on-device Foundation Model, served by apfel",
   "license": "MIT",
   "author": "daveycodez",
@@ -47,6 +47,9 @@
   "nx": {
     "name": "apfel"
   },
+  "scripts": {
+    "test": "node --import @swc-node/register/esm-register --test \"src/**/*.test.ts\""
+  },
   "dependencies": {
     "@tanstack/ai-openai": "^1.1.1"
   },
@@ -56,8 +59,5 @@
   "devDependencies": {
     "@tanstack/ai": "1.4.0",
     "esbuild": "0.28.2"
-  },
-  "scripts": {
-    "test": "node --import @swc-node/register/esm-register --test \"src/**/*.test.ts\""
   }
-}
+}

package/src/adapter.ts

@@ -8,6 +8,7 @@
  */
 import { openaiCompatibleText } from "@tanstack/ai-openai/compatible"
 import type { OpenAICompatibleChatAdapter } from "@tanstack/ai-openai/compatible"
+import type { TokenUsage } from "@tanstack/ai"
 
 import { APFEL_MODEL_META } from "./model-meta.js"
 import type { ApfelChatModel } from "./model-meta.js"
@@ -75,6 +76,19 @@ export function apfelText(modelOrConfig?: ApfelModel | ApfelConfig, maybeConfig:
     dangerouslyAllowBrowser: true
   }) as OpenAICompatibleChatAdapter<ApfelModel, ApfelTextModelOptions>
 
+  // apfel answers each request from a new session holding its messages, so
+  // the whole prompt is read every time, and nothing is cached (apfel reports
+  // no count): cachedTokens 0, unless apfel counts some itself.
+  type Usage = (usage: { prompt_tokens_details?: { cached_tokens?: number } | null } | null | undefined, source?: unknown) => TokenUsage | undefined
+  const hooks = adapter as unknown as { chatCompletionsTokenUsage: Usage }
+  const convert = hooks.chatCompletionsTokenUsage.bind(adapter)
+  hooks.chatCompletionsTokenUsage = (usage, source) => {
+    const result = convert(usage, source)
+    if (!result) return result
+    const cachedTokens = usage?.prompt_tokens_details?.cached_tokens ?? 0
+    return { ...result, promptTokensDetails: { ...result.promptTokensDetails, cachedTokens } }
+  }
+
   const availability = async (signal?: AbortSignal): Promise<Availability> => {
     try {
       const timeout = AbortSignal.timeout(10_000)