@sisu-ai/mw-usage-tracker 9.0.1 → 9.0.3

package/README.md

@@ -1,3 +1,9 @@
+<div align="right">
+  <a href="https://github.com/finger-gun/sisu"><img src="https://github.com/finger-gun/sisu/raw/main/sisu-light.svg" alt="ProjectSpecs" width="100" /></a>
+</div>
+
+---
+
 # @sisu-ai/mw-usage-tracker
 
 Track token usage across your pipeline and estimate cost.
@@ -62,3 +68,78 @@ Discover what you can do through examples or documentation. Check it out at http
 - [License](https://github.com/finger-gun/sisu/blob/main/LICENSE)
 - [Report a Bug](https://github.com/finger-gun/sisu/issues/new?template=bug_report.md)
 - [Request a Feature](https://github.com/finger-gun/sisu/issues/new?template=feature_request.md)
+
+---
+
+## Documentation
+
+**Core** — [Package docs](packages/core/README.md) · [Error types](packages/core/ERROR_TYPES.md)
+
+**Adapters** — [OpenAI](packages/adapters/openai/README.md) · [Anthropic](packages/adapters/anthropic/README.md) · [Ollama](packages/adapters/ollama/README.md)
+
+<details>
+<summary>All middleware packages</summary>
+
+- [@sisu-ai/mw-agent-run-api](packages/middleware/agent-run-api/README.md)
+- [@sisu-ai/mw-context-compressor](packages/middleware/context-compressor/README.md)
+- [@sisu-ai/mw-control-flow](packages/middleware/control-flow/README.md)
+- [@sisu-ai/mw-conversation-buffer](packages/middleware/conversation-buffer/README.md)
+- [@sisu-ai/mw-cors](packages/middleware/cors/README.md)
+- [@sisu-ai/mw-error-boundary](packages/middleware/error-boundary/README.md)
+- [@sisu-ai/mw-guardrails](packages/middleware/guardrails/README.md)
+- [@sisu-ai/mw-invariants](packages/middleware/invariants/README.md)
+- [@sisu-ai/mw-orchestration](packages/middleware/orchestration/README.md)
+- [@sisu-ai/mw-rag](packages/middleware/rag/README.md)
+- [@sisu-ai/mw-react-parser](packages/middleware/react-parser/README.md)
+- [@sisu-ai/mw-register-tools](packages/middleware/register-tools/README.md)
+- [@sisu-ai/mw-tool-calling](packages/middleware/tool-calling/README.md)
+- [@sisu-ai/mw-trace-viewer](packages/middleware/trace-viewer/README.md)
+- [@sisu-ai/mw-usage-tracker](packages/middleware/usage-tracker/README.md)
+</details>
+
+<details>
+<summary>All tool packages</summary>
+
+- [@sisu-ai/tool-aws-s3](packages/tools/aws-s3/README.md)
+- [@sisu-ai/tool-azure-blob](packages/tools/azure-blob/README.md)
+- [@sisu-ai/tool-extract-urls](packages/tools/extract-urls/README.md)
+- [@sisu-ai/tool-github-projects](packages/tools/github-projects/README.md)
+- [@sisu-ai/tool-summarize-text](packages/tools/summarize-text/README.md)
+- [@sisu-ai/tool-terminal](packages/tools/terminal/README.md)
+- [@sisu-ai/tool-vec-chroma](packages/tools/vec-chroma/README.md)
+- [@sisu-ai/tool-web-fetch](packages/tools/web-fetch/README.md)
+- [@sisu-ai/tool-web-search-duckduckgo](packages/tools/web-search-duckduckgo/README.md)
+- [@sisu-ai/tool-web-search-google](packages/tools/web-search-google/README.md)
+- [@sisu-ai/tool-web-search-openai](packages/tools/web-search-openai/README.md)
+- [@sisu-ai/tool-wikipedia](packages/tools/wikipedia/README.md)
+</details>
+
+<details>
+<summary>All examples</summary>
+
+**Anthropic** — [hello](examples/anthropic-hello/README.md) · [control-flow](examples/anthropic-control-flow/README.md) · [stream](examples/anthropic-stream/README.md) · [weather](examples/anthropic-weather/README.md)
+
+**Ollama** — [hello](examples/ollama-hello/README.md) · [stream](examples/ollama-stream/README.md) · [vision](examples/ollama-vision/README.md) · [weather](examples/ollama-weather/README.md) · [web-search](examples/ollama-web-search/README.md)
+
+**OpenAI** — [hello](examples/openai-hello/README.md) · [weather](examples/openai-weather/README.md) · [stream](examples/openai-stream/README.md) · [vision](examples/openai-vision/README.md) · [reasoning](examples/openai-reasoning/README.md) · [react](examples/openai-react/README.md) · [control-flow](examples/openai-control-flow/README.md) · [branch](examples/openai-branch/README.md) · [parallel](examples/openai-parallel/README.md) · [graph](examples/openai-graph/README.md) · [orchestration](examples/openai-orchestration/README.md) · [orchestration-adaptive](examples/openai-orchestration-adaptive/README.md) · [guardrails](examples/openai-guardrails/README.md) · [error-handling](examples/openai-error-handling/README.md) · [rag-chroma](examples/openai-rag-chroma/README.md) · [web-search](examples/openai-web-search/README.md) · [web-fetch](examples/openai-web-fetch/README.md) · [wikipedia](examples/openai-wikipedia/README.md) · [terminal](examples/openai-terminal/README.md) · [github-projects](examples/openai-github-projects/README.md) · [server](examples/openai-server/README.md) · [aws-s3](examples/openai-aws-s3/README.md) · [azure-blob](examples/openai-azure-blob/README.md)
+</details>
+
+---
+
+## Contributing
+
+We build Sisu in the open. Contributions welcome.
+
+[Contributing Guide](CONTRIBUTING.md) · [Report a Bug](https://github.com/finger-gun/sisu/issues/new?template=bug_report.md) · [Request a Feature](https://github.com/finger-gun/sisu/issues/new?template=feature_request.md) · [Code of Conduct](CODE_OF_CONDUCT.md)
+
+---
+
+<div align="center">
+
+**[Star on GitHub](https://github.com/finger-gun/sisu)** if Sisu helps you build better agents.
+
+*Quiet, determined, relentlessly useful.*
+
+[Apache 2.0 License](LICENSE)
+
+</div>

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import type { Middleware } from '@sisu-ai/core';
+import type { Middleware } from "@sisu-ai/core";
 export type PriceTable = Record<string, {
     inputPer1M?: number;
     outputPer1M?: number;

package/dist/index.js

@@ -2,36 +2,39 @@ export function usageTracker(prices, opts = {}) {
     return async (ctx, next) => {
         // Wrap model.generate to intercept responses
         const orig = ctx.model.generate.bind(ctx.model);
-        const price = prices[ctx.model.name] ?? prices['*'];
+        const price = prices[ctx.model.name] ?? prices["*"];
+        const state = ctx.state;
         const totals = {
-            promptTokens: Number(ctx.state?.usage?.promptTokens ?? 0),
-            completionTokens: Number(ctx.state?.usage?.completionTokens ?? 0),
-            totalTokens: Number(ctx.state?.usage?.totalTokens ?? 0),
-            costUSD: Number(ctx.state?.usage?.costUSD ?? 0),
+            promptTokens: Number(state.usage?.promptTokens ?? 0),
+            completionTokens: Number(state.usage?.completionTokens ?? 0),
+            totalTokens: Number(state.usage?.totalTokens ?? 0),
+            costUSD: Number(state.usage?.costUSD ?? 0),
         };
-        async function withUsage(...args) {
-            // Inspect request messages to estimate image inputs
-            const reqMessages = args?.[0];
-            const imageCount = countImageInputs(reqMessages);
-            const imageTokens = imageCount * Number(price?.imageTokenPerImage ?? 1000);
-            const out = await orig(...args);
+        function applyUsage(out, imageCount, imageTokens) {
             const u = out.usage;
             if (u) {
                 const p = Number(u.promptTokens ?? 0);
                 const c = Number(u.completionTokens ?? 0);
-                const t = Number(u.totalTokens ?? (p + c));
+                const t = Number(u.totalTokens ?? p + c);
                 totals.promptTokens += p;
                 totals.completionTokens += c;
                 totals.totalTokens += t;
                 if (price) {
-                    // Resolve effective per-1K pricing from provided per-1M or per-1K fields
-                    const inPer1K = price.inputPer1K ?? (price.inputPer1M != null ? price.inputPer1M / 1000 : undefined) ?? 0;
-                    const outPer1K = price.outputPer1K ?? (price.outputPer1M != null ? price.outputPer1M / 1000 : undefined) ?? 0;
-                    // Base text+completion token cost
+                    const inPer1K = price.inputPer1K ??
+                        (price.inputPer1M != null ? price.inputPer1M / 1000 : undefined) ??
+                        0;
+                    const outPer1K = price.outputPer1K ??
+                        (price.outputPer1M != null
+                            ? price.outputPer1M / 1000
+                            : undefined) ??
+                        0;
                     const textPromptTokens = Math.max(0, p - (price.imageInputPer1K ? imageTokens : 0));
                     const tokenCost = (textPromptTokens / 1000) * inPer1K + (c / 1000) * outPer1K;
-                    // Image cost (prefer per-image if provided)
-                    const perImage = price.imagePerImage != null ? price.imagePerImage : (price.imagePer1K != null ? price.imagePer1K / 1000 : undefined);
+                    const perImage = price.imagePerImage != null
+                        ? price.imagePerImage
+                        : price.imagePer1K != null
+                            ? price.imagePer1K / 1000
+                            : undefined;
                     const imageCost = perImage != null
                         ? imageCount * perImage
                         : price.imageInputPer1K
@@ -45,43 +48,95 @@ export function usageTracker(prices, opts = {}) {
                     }
                 }
                 if (opts.logPerCall)
-                    ctx.log.info?.('[usage] call', {
-                        promptTokens: p, completionTokens: c, totalTokens: t,
-                        imageTokens: (imageCount > 0 && price?.imageInputPer1K) ? imageTokens : undefined,
+                    ctx.log.info?.("[usage] call", {
+                        promptTokens: p,
+                        completionTokens: c,
+                        totalTokens: t,
+                        imageTokens: imageCount > 0 && price?.imageInputPer1K
+                            ? imageTokens
+                            : undefined,
                         imageCount: imageCount > 0 ? imageCount : undefined,
-                        estCostUSD: price ? (() => {
-                            const inPer1K = price.inputPer1K ?? (price.inputPer1M != null ? price.inputPer1M / 1000 : 0);
-                            const outPer1K = price.outputPer1K ?? (price.outputPer1M != null ? price.outputPer1M / 1000 : 0);
-                            const textPromptTokens = Math.max(0, p - (price?.imageInputPer1K ? imageTokens : 0));
-                            const perImage = price?.imagePerImage != null ? price.imagePerImage : (price?.imagePer1K != null ? price.imagePer1K / 1000 : undefined);
-                            const tokenCost = (textPromptTokens / 1000) * inPer1K + (c / 1000) * outPer1K;
-                            const imageCost = perImage != null ? (imageCount * perImage) : (price?.imageInputPer1K ? (imageTokens / 1000) * price.imageInputPer1K : 0);
-                            return roundUSD(tokenCost + imageCost);
-                        })() : undefined,
+                        estCostUSD: price
+                            ? (() => {
+                                const inPer1K = price.inputPer1K ??
+                                    (price.inputPer1M != null ? price.inputPer1M / 1000 : 0);
+                                const outPer1K = price.outputPer1K ??
+                                    (price.outputPer1M != null ? price.outputPer1M / 1000 : 0);
+                                const textPromptTokens = Math.max(0, p - (price?.imageInputPer1K ? imageTokens : 0));
+                                const perImage = price?.imagePerImage != null
+                                    ? price.imagePerImage
+                                    : price?.imagePer1K != null
+                                        ? price.imagePer1K / 1000
+                                        : undefined;
+                                const tokenCost = (textPromptTokens / 1000) * inPer1K + (c / 1000) * outPer1K;
+                                const imageCost = perImage != null
+                                    ? imageCount * perImage
+                                    : price?.imageInputPer1K
+                                        ? (imageTokens / 1000) * price.imageInputPer1K
+                                        : 0;
+                                return roundUSD(tokenCost + imageCost);
+                            })()
+                            : undefined,
                     });
             }
-            return out;
         }
-        ctx.state._origGenerate = orig;
-        ctx.model.generate = withUsage;
+        const isAsyncIterable = (val) => !!val &&
+            typeof val[Symbol.asyncIterator] ===
+                "function";
+        function withUsage(...args) {
+            const reqMessages = args?.[0];
+            const imageCount = countImageInputs(reqMessages);
+            const imageTokens = imageCount * Number(price?.imageTokenPerImage ?? 1000);
+            const out = orig(...args);
+            if (isAsyncIterable(out)) {
+                const iter = async function* () {
+                    let final;
+                    for await (const ev of out) {
+                        if (ev.type === "assistant_message") {
+                            final = { message: ev.message };
+                        }
+                        else if (ev.type === "usage") {
+                            final = {
+                                message: { role: "assistant", content: "" },
+                                usage: ev.usage,
+                            };
+                        }
+                        yield ev;
+                    }
+                    if (final)
+                        applyUsage(final, imageCount, imageTokens);
+                };
+                return iter();
+            }
+            return (async () => {
+                const resolved = await out;
+                applyUsage(resolved, imageCount, imageTokens);
+                return resolved;
+            })();
+        }
+        state._origGenerate = orig;
+        ctx.model.generate =
+            withUsage;
         await next();
         // Restore
         ctx.model.generate = orig;
-        if (!ctx.state.usage)
-            ctx.state.usage = {};
-        ctx.state.usage.promptTokens = totals.promptTokens;
-        ctx.state.usage.completionTokens = totals.completionTokens;
-        ctx.state.usage.totalTokens = totals.totalTokens;
+        if (!state.usage)
+            state.usage = {};
+        state.usage.promptTokens = totals.promptTokens;
+        state.usage.completionTokens = totals.completionTokens;
+        state.usage.totalTokens = totals.totalTokens;
         if (price)
-            ctx.state.usage.costUSD = roundUSD(totals.costUSD ?? 0);
+            state.usage.costUSD = roundUSD(totals.costUSD ?? 0);
         if (totals.imageTokens)
-            ctx.state.usage.imageTokens = totals.imageTokens;
+            state.usage.imageTokens = totals.imageTokens;
         if (totals.imageCount)
-            ctx.state.usage.imageCount = totals.imageCount;
-        ctx.log.info?.('[usage] totals', ctx.state.usage);
+            state.usage.imageCount = totals.imageCount;
+        ctx.log.info?.("[usage] totals", state.usage);
     };
 }
-function roundUSD(n) { return Math.round(n * 1e6) / 1e6; }
+function roundUSD(n) {
+    return Math.round(n * 1e6) / 1e6;
+}
 function countImageInputs(msgs) {
     if (!Array.isArray(msgs))
         return 0;
@@ -90,16 +145,20 @@ function countImageInputs(msgs) {
         const c = m?.content;
         if (Array.isArray(c)) {
             for (const part of c) {
-                if (part && typeof part === 'object' && (part.type === 'image_url' || part.type === 'image'))
+                const partType = part?.type;
+                if (part &&
+                    typeof part === "object" &&
+                    (partType === "image_url" || partType === "image"))
                     count += 1;
             }
         }
         // Convenience shapes supported by adapters (count regardless of content presence)
-        if (Array.isArray(m?.images))
-            count += m.images.length;
-        if (typeof m?.image_url === 'string')
+        const anyMsg = m;
+        if (Array.isArray(anyMsg.images))
+            count += anyMsg.images.length;
+        if (typeof anyMsg.image_url === "string")
             count += 1;
-        if (typeof m?.image === 'string')
+        if (typeof anyMsg.image === "string")
             count += 1;
     }
     return count;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sisu-ai/mw-usage-tracker",
-  "version": "9.0.1",
+  "version": "9.0.3",
   "license": "Apache-2.0",
   "type": "module",
   "main": "dist/index.js",
@@ -12,7 +12,7 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@sisu-ai/core": "^2.3.1"
+    "@sisu-ai/core": "^2.3.2"
   },
   "repository": {
     "type": "git",