@openai/agents-core 0.3.2 → 0.3.4

package/dist/usage.js

@@ -1,8 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UsageData = exports.Usage = void 0;
+exports.UsageData = exports.RequestUsageData = exports.Usage = exports.RequestUsage = void 0;
 const protocol_1 = require("./types/protocol.js");
+Object.defineProperty(exports, "RequestUsageData", { enumerable: true, get: function () { return protocol_1.RequestUsageData; } });
 Object.defineProperty(exports, "UsageData", { enumerable: true, get: function () { return protocol_1.UsageData; } });
+/**
+ * Usage details for a single API request.
+ */
+class RequestUsage {
+    /**
+     * The number of input tokens used for this request.
+     */
+    inputTokens;
+    /**
+     * The number of output tokens used for this request.
+     */
+    outputTokens;
+    /**
+     * The total number of tokens sent and received for this request.
+     */
+    totalTokens;
+    /**
+     * Details about the input tokens used for this request.
+     */
+    inputTokensDetails;
+    /**
+     * Details about the output tokens used for this request.
+     */
+    outputTokensDetails;
+    constructor(input) {
+        this.inputTokens = input?.inputTokens ?? input?.input_tokens ?? 0;
+        this.outputTokens = input?.outputTokens ?? input?.output_tokens ?? 0;
+        this.totalTokens =
+            input?.totalTokens ??
+                input?.total_tokens ??
+                this.inputTokens + this.outputTokens;
+        const inputTokensDetails = input?.inputTokensDetails ?? input?.input_tokens_details;
+        this.inputTokensDetails = inputTokensDetails
+            ? inputTokensDetails
+            : {};
+        const outputTokensDetails = input?.outputTokensDetails ?? input?.output_tokens_details;
+        this.outputTokensDetails = outputTokensDetails
+            ? outputTokensDetails
+            : {};
+    }
+}
+exports.RequestUsage = RequestUsage;
 /**
  * Tracks token usage and request counts for an agent run.
  */
@@ -31,6 +74,10 @@ class Usage {
      * Details about the output tokens used across all requests.
      */
     outputTokensDetails = [];
+    /**
+     * List of per-request usage entries for detailed cost calculations.
+     */
+    requestUsageEntries;
     constructor(input) {
         if (typeof input === 'undefined') {
             this.requests = 0;
@@ -39,27 +86,50 @@ class Usage {
             this.totalTokens = 0;
             this.inputTokensDetails = [];
             this.outputTokensDetails = [];
+            this.requestUsageEntries = undefined;
         }
         else {
             this.requests = input?.requests ?? 1;
             this.inputTokens = input?.inputTokens ?? input?.input_tokens ?? 0;
             this.outputTokens = input?.outputTokens ?? input?.output_tokens ?? 0;
-            this.totalTokens = input?.totalTokens ?? input?.total_tokens ?? 0;
+            this.totalTokens =
+                input?.totalTokens ??
+                    input?.total_tokens ??
+                    this.inputTokens + this.outputTokens;
             const inputTokensDetails = input?.inputTokensDetails ?? input?.input_tokens_details;
-            this.inputTokensDetails = inputTokensDetails
-                ? [inputTokensDetails]
-                : [];
+            if (Array.isArray(inputTokensDetails)) {
+                this.inputTokensDetails = inputTokensDetails;
+            }
+            else {
+                this.inputTokensDetails = inputTokensDetails
+                    ? [inputTokensDetails]
+                    : [];
+            }
             const outputTokensDetails = input?.outputTokensDetails ?? input?.output_tokens_details;
-            this.outputTokensDetails = outputTokensDetails
-                ? [outputTokensDetails]
-                : [];
+            if (Array.isArray(outputTokensDetails)) {
+                this.outputTokensDetails = outputTokensDetails;
+            }
+            else {
+                this.outputTokensDetails = outputTokensDetails
+                    ? [outputTokensDetails]
+                    : [];
+            }
+            const requestUsageEntries = input?.requestUsageEntries ?? input?.request_usage_entries;
+            const normalizedRequestUsageEntries = Array.isArray(requestUsageEntries)
+                ? requestUsageEntries.map((entry) => entry instanceof RequestUsage ? entry : new RequestUsage(entry))
+                : undefined;
+            this.requestUsageEntries =
+                normalizedRequestUsageEntries &&
+                    normalizedRequestUsageEntries.length > 0
+                    ? normalizedRequestUsageEntries
+                    : undefined;
         }
     }
     add(newUsage) {
-        this.requests += newUsage.requests;
-        this.inputTokens += newUsage.inputTokens;
-        this.outputTokens += newUsage.outputTokens;
-        this.totalTokens += newUsage.totalTokens;
+        this.requests += newUsage.requests ?? 0;
+        this.inputTokens += newUsage.inputTokens ?? 0;
+        this.outputTokens += newUsage.outputTokens ?? 0;
+        this.totalTokens += newUsage.totalTokens ?? 0;
         if (newUsage.inputTokensDetails) {
             // The type does not allow undefined, but it could happen runtime
             this.inputTokensDetails.push(...newUsage.inputTokensDetails);
@@ -68,6 +138,21 @@ class Usage {
             // The type does not allow undefined, but it could happen runtime
             this.outputTokensDetails.push(...newUsage.outputTokensDetails);
         }
+        if (Array.isArray(newUsage.requestUsageEntries) &&
+            newUsage.requestUsageEntries.length > 0) {
+            this.requestUsageEntries ??= [];
+            this.requestUsageEntries.push(...newUsage.requestUsageEntries.map((entry) => entry instanceof RequestUsage ? entry : new RequestUsage(entry)));
+        }
+        else if (newUsage.requests === 1 && newUsage.totalTokens > 0) {
+            this.requestUsageEntries ??= [];
+            this.requestUsageEntries.push(new RequestUsage({
+                inputTokens: newUsage.inputTokens,
+                outputTokens: newUsage.outputTokens,
+                totalTokens: newUsage.totalTokens,
+                inputTokensDetails: newUsage.inputTokensDetails?.[0],
+                outputTokensDetails: newUsage.outputTokensDetails?.[0],
+            }));
+        }
     }
 }
 exports.Usage = Usage;

package/dist/usage.js.map

@@ -1 +1 @@
-{"version":3,"file":"usage.js","sourceRoot":"","sources":["../src/usage.ts"],"names":[],"mappings":";;;AAAA,kDAA6C;AAwFpC,0FAxFA,oBAAS,OAwFA;AA5ElB;;GAEG;AACH,MAAa,KAAK;IAChB;;OAEG;IACI,QAAQ,CAAS;IAExB;;OAEG;IACI,WAAW,CAAS;IAE3B;;OAEG;IACI,YAAY,CAAS;IAE5B;;OAEG;IACI,WAAW,CAAS;IAE3B;;OAEG;IACI,kBAAkB,GAAkC,EAAE,CAAC;IAE9D;;OAEG;IACI,mBAAmB,GAAkC,EAAE,CAAC;IAE/D,YAAY,KAAkB;QAC5B,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE,CAAC;YACjC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;YAClB,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;YACrB,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;YACtB,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;YACrB,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;YAC7B,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,QAAQ,GAAG,KAAK,EAAE,QAAQ,IAAI,CAAC,CAAC;YACrC,IAAI,CAAC,WAAW,GAAG,KAAK,EAAE,WAAW,IAAI,KAAK,EAAE,YAAY,IAAI,CAAC,CAAC;YAClE,IAAI,CAAC,YAAY,GAAG,KAAK,EAAE,YAAY,IAAI,KAAK,EAAE,aAAa,IAAI,CAAC,CAAC;YACrE,IAAI,CAAC,WAAW,GAAG,KAAK,EAAE,WAAW,IAAI,KAAK,EAAE,YAAY,IAAI,CAAC,CAAC;YAClE,MAAM,kBAAkB,GACtB,KAAK,EAAE,kBAAkB,IAAI,KAAK,EAAE,oBAAoB,CAAC;YAC3D,IAAI,CAAC,kBAAkB,GAAG,kBAAkB;gBAC1C,CAAC,CAAC,CAAC,kBAA4C,CAAC;gBAChD,CAAC,CAAC,EAAE,CAAC;YACP,MAAM,mBAAmB,GACvB,KAAK,EAAE,mBAAmB,IAAI,KAAK,EAAE,qBAAqB,CAAC;YAC7D,IAAI,CAAC,mBAAmB,GAAG,mBAAmB;gBAC5C,CAAC,CAAC,CAAC,mBAA6C,CAAC;gBACjD,CAAC,CAAC,EAAE,CAAC;QACT,CAAC;IACH,CAAC;IAED,GAAG,CAAC,QAAe;QACjB,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,QAAQ,CAAC;QACnC,IAAI,CAAC,WAAW,IAAI,QAAQ,CAAC,WAAW,CAAC;QACzC,IAAI,CAAC,YAAY,IAAI,QAAQ,CAAC,YAAY,CAAC;QAC3C,IAAI,CAAC,WAAW,IAAI,QAAQ,CAAC,WAAW,CAAC;QACzC,IAAI,QAAQ,CAAC,kBAAkB,EAAE,CAAC;YAChC,iEAAiE;YACjE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CAAC;QAC/D,CAAC;QACD,IAAI,QAAQ,CAAC,mBAAmB,EAAE,CAAC;YACjC,iEAAiE;YACjE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,mBAAmB,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;CACF;AAvED,sBAuEC"}
+{"version":3,"file":"usage.js","sourceRoot":"","sources":["../src/usage.ts"],"names":[],"mappings":"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"}

package/dist/usage.mjs

@@ -1,4 +1,45 @@
-import { UsageData } from "./types/protocol.mjs";
+import { RequestUsageData, UsageData } from "./types/protocol.mjs";
+/**
+ * Usage details for a single API request.
+ */
+export class RequestUsage {
+    /**
+     * The number of input tokens used for this request.
+     */
+    inputTokens;
+    /**
+     * The number of output tokens used for this request.
+     */
+    outputTokens;
+    /**
+     * The total number of tokens sent and received for this request.
+     */
+    totalTokens;
+    /**
+     * Details about the input tokens used for this request.
+     */
+    inputTokensDetails;
+    /**
+     * Details about the output tokens used for this request.
+     */
+    outputTokensDetails;
+    constructor(input) {
+        this.inputTokens = input?.inputTokens ?? input?.input_tokens ?? 0;
+        this.outputTokens = input?.outputTokens ?? input?.output_tokens ?? 0;
+        this.totalTokens =
+            input?.totalTokens ??
+                input?.total_tokens ??
+                this.inputTokens + this.outputTokens;
+        const inputTokensDetails = input?.inputTokensDetails ?? input?.input_tokens_details;
+        this.inputTokensDetails = inputTokensDetails
+            ? inputTokensDetails
+            : {};
+        const outputTokensDetails = input?.outputTokensDetails ?? input?.output_tokens_details;
+        this.outputTokensDetails = outputTokensDetails
+            ? outputTokensDetails
+            : {};
+    }
+}
 /**
  * Tracks token usage and request counts for an agent run.
  */
@@ -27,6 +68,10 @@ export class Usage {
      * Details about the output tokens used across all requests.
      */
     outputTokensDetails = [];
+    /**
+     * List of per-request usage entries for detailed cost calculations.
+     */
+    requestUsageEntries;
     constructor(input) {
         if (typeof input === 'undefined') {
             this.requests = 0;
@@ -35,27 +80,50 @@ export class Usage {
             this.totalTokens = 0;
             this.inputTokensDetails = [];
             this.outputTokensDetails = [];
+            this.requestUsageEntries = undefined;
         }
         else {
             this.requests = input?.requests ?? 1;
             this.inputTokens = input?.inputTokens ?? input?.input_tokens ?? 0;
             this.outputTokens = input?.outputTokens ?? input?.output_tokens ?? 0;
-            this.totalTokens = input?.totalTokens ?? input?.total_tokens ?? 0;
+            this.totalTokens =
+                input?.totalTokens ??
+                    input?.total_tokens ??
+                    this.inputTokens + this.outputTokens;
             const inputTokensDetails = input?.inputTokensDetails ?? input?.input_tokens_details;
-            this.inputTokensDetails = inputTokensDetails
-                ? [inputTokensDetails]
-                : [];
+            if (Array.isArray(inputTokensDetails)) {
+                this.inputTokensDetails = inputTokensDetails;
+            }
+            else {
+                this.inputTokensDetails = inputTokensDetails
+                    ? [inputTokensDetails]
+                    : [];
+            }
             const outputTokensDetails = input?.outputTokensDetails ?? input?.output_tokens_details;
-            this.outputTokensDetails = outputTokensDetails
-                ? [outputTokensDetails]
-                : [];
+            if (Array.isArray(outputTokensDetails)) {
+                this.outputTokensDetails = outputTokensDetails;
+            }
+            else {
+                this.outputTokensDetails = outputTokensDetails
+                    ? [outputTokensDetails]
+                    : [];
+            }
+            const requestUsageEntries = input?.requestUsageEntries ?? input?.request_usage_entries;
+            const normalizedRequestUsageEntries = Array.isArray(requestUsageEntries)
+                ? requestUsageEntries.map((entry) => entry instanceof RequestUsage ? entry : new RequestUsage(entry))
+                : undefined;
+            this.requestUsageEntries =
+                normalizedRequestUsageEntries &&
+                    normalizedRequestUsageEntries.length > 0
+                    ? normalizedRequestUsageEntries
+                    : undefined;
         }
     }
     add(newUsage) {
-        this.requests += newUsage.requests;
-        this.inputTokens += newUsage.inputTokens;
-        this.outputTokens += newUsage.outputTokens;
-        this.totalTokens += newUsage.totalTokens;
+        this.requests += newUsage.requests ?? 0;
+        this.inputTokens += newUsage.inputTokens ?? 0;
+        this.outputTokens += newUsage.outputTokens ?? 0;
+        this.totalTokens += newUsage.totalTokens ?? 0;
         if (newUsage.inputTokensDetails) {
             // The type does not allow undefined, but it could happen runtime
             this.inputTokensDetails.push(...newUsage.inputTokensDetails);
@@ -64,7 +132,22 @@ export class Usage {
             // The type does not allow undefined, but it could happen runtime
             this.outputTokensDetails.push(...newUsage.outputTokensDetails);
         }
+        if (Array.isArray(newUsage.requestUsageEntries) &&
+            newUsage.requestUsageEntries.length > 0) {
+            this.requestUsageEntries ??= [];
+            this.requestUsageEntries.push(...newUsage.requestUsageEntries.map((entry) => entry instanceof RequestUsage ? entry : new RequestUsage(entry)));
+        }
+        else if (newUsage.requests === 1 && newUsage.totalTokens > 0) {
+            this.requestUsageEntries ??= [];
+            this.requestUsageEntries.push(new RequestUsage({
+                inputTokens: newUsage.inputTokens,
+                outputTokens: newUsage.outputTokens,
+                totalTokens: newUsage.totalTokens,
+                inputTokensDetails: newUsage.inputTokensDetails?.[0],
+                outputTokensDetails: newUsage.outputTokensDetails?.[0],
+            }));
+        }
     }
 }
-export { UsageData };
+export { RequestUsageData, UsageData };
 //# sourceMappingURL=usage.mjs.map

package/dist/usage.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"usage.mjs","sourceRoot":"","sources":["../src/usage.ts"],"names":[],"mappings":"OAAO,EAAE,SAAS,EAAE;AAYpB;;GAEG;AACH,MAAM,OAAO,KAAK;IAChB;;OAEG;IACI,QAAQ,CAAS;IAExB;;OAEG;IACI,WAAW,CAAS;IAE3B;;OAEG;IACI,YAAY,CAAS;IAE5B;;OAEG;IACI,WAAW,CAAS;IAE3B;;OAEG;IACI,kBAAkB,GAAkC,EAAE,CAAC;IAE9D;;OAEG;IACI,mBAAmB,GAAkC,EAAE,CAAC;IAE/D,YAAY,KAAkB;QAC5B,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE,CAAC;YACjC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;YAClB,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;YACrB,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;YACtB,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;YACrB,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;YAC7B,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,QAAQ,GAAG,KAAK,EAAE,QAAQ,IAAI,CAAC,CAAC;YACrC,IAAI,CAAC,WAAW,GAAG,KAAK,EAAE,WAAW,IAAI,KAAK,EAAE,YAAY,IAAI,CAAC,CAAC;YAClE,IAAI,CAAC,YAAY,GAAG,KAAK,EAAE,YAAY,IAAI,KAAK,EAAE,aAAa,IAAI,CAAC,CAAC;YACrE,IAAI,CAAC,WAAW,GAAG,KAAK,EAAE,WAAW,IAAI,KAAK,EAAE,YAAY,IAAI,CAAC,CAAC;YAClE,MAAM,kBAAkB,GACtB,KAAK,EAAE,kBAAkB,IAAI,KAAK,EAAE,oBAAoB,CAAC;YAC3D,IAAI,CAAC,kBAAkB,GAAG,kBAAkB;gBAC1C,CAAC,CAAC,CAAC,kBAA4C,CAAC;gBAChD,CAAC,CAAC,EAAE,CAAC;YACP,MAAM,mBAAmB,GACvB,KAAK,EAAE,mBAAmB,IAAI,KAAK,EAAE,qBAAqB,CAAC;YAC7D,IAAI,CAAC,mBAAmB,GAAG,mBAAmB;gBAC5C,CAAC,CAAC,CAAC,mBAA6C,CAAC;gBACjD,CAAC,CAAC,EAAE,CAAC;QACT,CAAC;IACH,CAAC;IAED,GAAG,CAAC,QAAe;QACjB,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,QAAQ,CAAC;QACnC,IAAI,CAAC,WAAW,IAAI,QAAQ,CAAC,WAAW,CAAC;QACzC,IAAI,CAAC,YAAY,IAAI,QAAQ,CAAC,YAAY,CAAC;QAC3C,IAAI,CAAC,WAAW,IAAI,QAAQ,CAAC,WAAW,CAAC;QACzC,IAAI,QAAQ,CAAC,kBAAkB,EAAE,CAAC;YAChC,iEAAiE;YACjE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CAAC;QAC/D,CAAC;QACD,IAAI,QAAQ,CAAC,mBAAmB,EAAE,CAAC;YACjC,iEAAiE;YACjE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,mBAAmB,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;CACF;AAED,OAAO,EAAE,SAAS,EAAE,CAAC"}
+{"version":3,"file":"usage.mjs","sourceRoot":"","sources":["../src/usage.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@openai/agents-core",
   "repository": "https://github.com/openai/openai-agents-js",
   "homepage": "https://openai.github.io/openai-agents-js/",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "The OpenAI Agents SDK is a lightweight yet powerful framework for building multi-agent workflows.",
   "author": "OpenAI <support@openai.com>",
   "main": "dist/index.js",