judgeval 0.2.3 → 0.2.5

package/dist/cjs/common/logger.js

@@ -6,7 +6,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.print = exports.printResults = exports.formatEvaluationResults = exports.withExampleContext = exports.clearExampleContext = exports.setExampleContext = exports.error = exports.warn = exports.warning = exports.info = exports.log = exports.debug = void 0;
+exports.debug = debug;
+exports.log = log;
+exports.info = info;
+exports.warning = warning;
+exports.warn = warn;
+exports.error = error;
+exports.setExampleContext = setExampleContext;
+exports.clearExampleContext = clearExampleContext;
+exports.withExampleContext = withExampleContext;
+exports.formatEvaluationResults = formatEvaluationResults;
+exports.printResults = printResults;
+exports.print = print;
 // Remove fs and path imports if no longer needed
 // import * as fs from 'fs';
 // import * as path from 'path';
@@ -18,49 +29,48 @@ let currentTimestamp = null;
  * Log a debug message
  */
 function debug(message, meta) {
-    logger_instance_js_1.default.debug(message, Object.assign(Object.assign({}, meta), { exampleId: currentExampleId, timestamp: currentTimestamp }));
+    // Prioritize meta.exampleId over currentExampleId
+    const exampleId = (meta === null || meta === void 0 ? void 0 : meta.exampleId) !== undefined ? meta.exampleId : currentExampleId;
+    logger_instance_js_1.default.debug(message, Object.assign(Object.assign({}, meta), { exampleId, timestamp: currentTimestamp }));
 }
-exports.debug = debug;
 /**
  * Log an info message (alias for info)
  */
-function log(message, ...args) {
-    // Simple handling for additional args, could be improved
-    let meta = { args: [] };
-    if (args.length > 0) {
-        meta = { args: args };
-    }
-    logger_instance_js_1.default.info(message, Object.assign(Object.assign({}, meta), { exampleId: currentExampleId, timestamp: currentTimestamp }));
+function log(message, meta) {
+    // Prioritize meta.exampleId over currentExampleId
+    const exampleId = (meta === null || meta === void 0 ? void 0 : meta.exampleId) !== undefined ? meta.exampleId : currentExampleId;
+    logger_instance_js_1.default.info(message, Object.assign(Object.assign({}, meta), { exampleId, timestamp: currentTimestamp }));
 }
-exports.log = log;
 /**
  * Log an info message
  */
 function info(message, meta) {
-    logger_instance_js_1.default.info(message, Object.assign(Object.assign({}, meta), { exampleId: currentExampleId, timestamp: currentTimestamp }));
+    // Prioritize meta.exampleId over currentExampleId
+    const exampleId = (meta === null || meta === void 0 ? void 0 : meta.exampleId) !== undefined ? meta.exampleId : currentExampleId;
+    logger_instance_js_1.default.info(message, Object.assign(Object.assign({}, meta), { exampleId, timestamp: currentTimestamp }));
 }
-exports.info = info;
 /**
  * Log a warning message
  */
 function warning(message, meta) {
-    logger_instance_js_1.default.warn(message, Object.assign(Object.assign({}, meta), { exampleId: currentExampleId, timestamp: currentTimestamp }));
+    // Prioritize meta.exampleId over currentExampleId
+    const exampleId = (meta === null || meta === void 0 ? void 0 : meta.exampleId) !== undefined ? meta.exampleId : currentExampleId;
+    logger_instance_js_1.default.warn(message, Object.assign(Object.assign({}, meta), { exampleId, timestamp: currentTimestamp }));
 }
-exports.warning = warning;
 /**
  * Alias for warning
  */
 function warn(message, meta) {
     warning(message, meta);
 }
-exports.warn = warn;
 /**
  * Log an error message
  */
 function error(message, meta) {
-    logger_instance_js_1.default.error(message, Object.assign(Object.assign({}, meta), { exampleId: currentExampleId, timestamp: currentTimestamp }));
+    // Prioritize meta.exampleId over currentExampleId
+    const exampleId = (meta === null || meta === void 0 ? void 0 : meta.exampleId) !== undefined ? meta.exampleId : currentExampleId;
+    logger_instance_js_1.default.error(message, Object.assign(Object.assign({}, meta), { exampleId, timestamp: currentTimestamp }));
 }
-exports.error = error;
 /**
  * Set the current example context for logging (Keep for potential context integration)
  */
@@ -68,7 +78,6 @@ function setExampleContext(exampleId, timestamp) {
     currentExampleId = exampleId;
     currentTimestamp = timestamp;
 }
-exports.setExampleContext = setExampleContext;
 /**
  * Clear the current example context (Keep for potential context integration)
  */
@@ -76,7 +85,6 @@ function clearExampleContext() {
     currentExampleId = null;
     currentTimestamp = null;
 }
-exports.clearExampleContext = clearExampleContext;
 /**
  * Create a context for example-specific logging (Keep for potential context integration)
  */
@@ -89,7 +97,6 @@ function withExampleContext(exampleId, timestamp, fn) {
         clearExampleContext();
     }
 }
-exports.withExampleContext = withExampleContext;
 /**
  * Format evaluation results for display
  * This matches the Python SDK's output format with clickable links
@@ -127,7 +134,6 @@ function formatEvaluationResults(results, projectName, evalName) {
     }
     return output;
 }
-exports.formatEvaluationResults = formatEvaluationResults;
 /**
  * Print evaluation results to the console
  * This matches the Python SDK's output format exactly
@@ -150,7 +156,6 @@ function printResults(results, projectName, evalName) {
     // Print raw results in the same format as Python SDK
     console.log(JSON.stringify(results, null, 2));
 }
-exports.printResults = printResults;
 /**
  * Simplified print function for results - matches Python SDK's print(results) behavior
  * This is the preferred way to print results
@@ -217,5 +222,4 @@ function print(data) {
         console.log(JSON.stringify(data, null, 2));
     }
 }
-exports.print = print;
 //# sourceMappingURL=logger.js.map

package/dist/cjs/common/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/common/logger.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;AAEH,iDAAiD;AACjD,4BAA4B;AAC5B,gCAAgC;AAChC,8EAA0C,CAAC,uCAAuC;AAElF,sEAAsE;AACtE,IAAI,gBAAgB,GAAkB,IAAI,CAAC;AAC3C,IAAI,gBAAgB,GAAkB,IAAI,CAAC;AAE3C;;GAEG;AACH,SAAgB,KAAK,CAAC,OAAe,EAAE,IAA0B;IAC/D,4BAAM,CAAC,KAAK,CAAC,OAAO,kCAAO,IAAI,KAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,IAAG,CAAC;AAC/F,CAAC;AAFD,sBAEC;AAED;;GAEG;AACH,SAAgB,GAAG,CAAC,OAAe,EAAE,GAAG,IAAW;IACjD,yDAAyD;IACzD,IAAI,IAAI,GAAwB,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;IAC7C,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,IAAI,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxB,CAAC;IACD,4BAAM,CAAC,IAAI,CAAC,OAAO,kCAAO,IAAI,KAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,IAAG,CAAC;AAC9F,CAAC;AAPD,kBAOC;AAED;;GAEG;AACH,SAAgB,IAAI,CAAC,OAAe,EAAE,IAA0B;IAC9D,4BAAM,CAAC,IAAI,CAAC,OAAO,kCAAO,IAAI,KAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,IAAG,CAAC;AAC9F,CAAC;AAFD,oBAEC;AAED;;GAEG;AACH,SAAgB,OAAO,CAAC,OAAe,EAAE,IAA0B;IACjE,4BAAM,CAAC,IAAI,CAAC,OAAO,kCAAO,IAAI,KAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,IAAG,CAAC;AAC9F,CAAC;AAFD,0BAEC;AAED;;GAEG;AACH,SAAgB,IAAI,CAAC,OAAe,EAAE,IAA0B;IAC9D,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AACzB,CAAC;AAFD,oBAEC;AAED;;GAEG;AACH,SAAgB,KAAK,CAAC,OAAe,EAAE,IAA0B;IAC/D,4BAAM,CAAC,KAAK,CAAC,OAAO,kCAAO,IAAI,KAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,IAAG,CAAC;AAC/F,CAAC;AAFD,sBAEC;AAED;;GAEG;AACH,SAAgB,iBAAiB,CAAC,SAAiB,EAAE,SAAiB;IACpE,gBAAgB,GAAG,SAAS,CAAC;IAC7B,gBAAgB,GAAG,SAAS,CAAC;AAC/B,CAAC;AAHD,8CAGC;AAED;;GAEG;AACH,SAAgB,mBAAmB;IACjC,gBAAgB,GAAG,IAAI,CAAC;IACxB,gBAAgB,GAAG,IAAI,CAAC;AAC1B,CAAC;AAHD,kDAGC;AAED;;GAEG;AACH,SAAgB,kBAAkB,CAAI,SAAiB,EAAE,SAAiB,EAAE,EAAW;IACrF,iBAAiB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IACxC,IAAI,CAAC;QACH,OAAO,EAAE,EAAE,CAAC;IACd,CAAC;YAAS,CAAC;QACT,mBAAmB,EAAE,CAAC;IACxB,CAAC;AACH,CAAC;AAPD,gDAOC;AAED;;;GAGG;AACH,SAAgB,uBAAuB,CAAC,OAAc,EAAE,WAAoB,EAAE,QAAiB;;IAC7F,IAAI,MAAM,GAAG,EAAE,CAAC;IAEhB,4BAA4B;IAC5B,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,6BAA6B,OAAO,CAAC,MAAM,oBAAoB,CAAC;QAE1E,yBAAyB;QACzB,MAAM,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,eAC5C,OAAA,CAAC,CAAC,OAAO,IAAI,CAAC,MAAA,MAAA,CAAC,CAAC,WAAW,0CAAE,KAAK,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,mCAAI,KAAK,CAAC,CAAA,EAAA,CACpE,CAAC,MAAM,CAAC;QAET,MAAM,WAAW,GAAG,CAAC,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC;QAChE,MAAM,IAAI,iBAAiB,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,kBAAkB,IAAI,OAAO,CAAC,MAAM,OAAO,CAAC;QAEnG,wBAAwB;QACxB,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,eAClC,OAAA,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,MAAA,MAAA,CAAC,CAAC,WAAW,0CAAE,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,mCAAI,KAAK,CAAC,CAAA,EAAA,CACrE,CAAC;QAEF,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,aAAa,QAAQ,CAAC,MAAM,MAAM,CAAC;YAE7C,KAAK,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;gBAClD,MAAM,IAAI,aAAa,KAAK,GAAG,CAAC,KAAK,CAAC;gBACtC,MAAM,IAAI,UAAU,CAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,KAAI,KAAK,IAAI,CAAC;gBAExD,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;oBACxB,MAAM,IAAI,oBAAoB,CAAC;oBAE/B,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;wBACzC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;4BACpB,MAAM,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,KAAK,IAAI,eAAe,IAAI,CAAC;wBACvE,CAAC;oBACH,CAAC;gBACH,CAAC;qBAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;oBAC5B,MAAM,IAAI,UAAU,OAAO,CAAC,KAAK,IAAI,eAAe,IAAI,CAAC;gBAC3D,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AA3CD,0DA2CC;AAED;;;GAGG;AACH,SAAgB,YAAY,CAAC,OAAc,EAAE,WAAoB,EAAE,QAAiB;IAClF,8DAA8D;IAC9D,IAAI,WAAW,IAAI,QAAQ,EAAE,CAAC;QAC5B,MAAM,OAAO,GAAG,4CAA4C,CAAC;QAC7D,MAAM,SAAS,GAAG,iBAAiB,WAAW,kBAAkB,QAAQ,EAAE,CAAC;QAC3E,MAAM,UAAU,GAAG,GAAG,OAAO,GAAG,SAAS,EAAE,CAAC;QAE5C,gBAAgB;QAChB,OAAO,CAAC,GAAG,CAAC,sBAAsB,UAAU,IAAI,CAAC,CAAC;IACpD,CAAC;IAED,qDAAqD;IACrD,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,OAAO,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;IAEjF,4CAA4C;IAC5C,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAChC,CAAC;IAED,qDAAqD;IACrD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AAChD,CAAC;AArBD,oCAqBC;AAED;;;GAGG;AACH,SAAgB,KAAK,CAAC,IAAS;IAC7B,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,+CAA+C;QAC/C,IAAI,WAAW,EAAE,QAAQ,CAAC;QAE1B,kEAAkE;QAClE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YACxC,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC;YAC5C,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC;QACxC,CAAC;QAED,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC5C,CAAC;SAAM,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QAC5D,sBAAsB;QACtB,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,IAAI,IAAI,SAAS,SAAS,IAAI,CAAC,OAAO,OAAO,CAAC,CAAC;QAChF,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,MAAM,QAAQ,GAAG,wDAAwD,IAAI,CAAC,WAAW,aAAa,IAAI,CAAC,OAAO,eAAe,IAAI,CAAC,IAAI,IAAI,OAAO,kBAAkB,CAAC;YACxK,OAAO,CAAC,GAAG,CAAC,oBAAoB,QAAQ,IAAI,CAAC,CAAC;QAChD,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC;SAAM,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,KAAK,KAAK,2BAA2B,EAAE,CAAC;QAC1F,mCAAmC;QACnC,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,KAAK,QAAQ,CAAC,CAAC;QAEzC,2BAA2B;QAC3B,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;QAC5C,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAC1C,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAW,EAAE,EAAE;gBAC7C,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;YACzF,CAAC,CAAC,CAAC;QACL,CAAC;QAED,8BAA8B;QAC9B,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,IAAI,CAAC,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnF,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;YACxC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;YACtC,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,KAAa,EAAE,EAAE;gBAC/D,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;YACvC,CAAC,CAAC,CAAC;QACL,CAAC;QAED,kBAAkB;QAClB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/D,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAC1B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAgB,EAAE,KAAa,EAAE,EAAE;gBACzD,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,KAAK,QAAQ,EAAE,CAAC,CAAC;YAC3C,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;SAAM,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;QAClF,yBAAyB;QACzB,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,KAAK,MAAM,CAAC,CAAC;QAEvC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,GAAW,EAAE,KAAa,EAAE,EAAE;gBAC1D,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;YACtC,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;SAAM,CAAC;QACN,0BAA0B;QAC1B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC;AACH,CAAC;AA/DD,sBA+DC"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/common/logger.ts"],"names":[],"mappings":"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"}

package/dist/cjs/common/tracer.js

@@ -12,7 +12,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TraceManagerClient = exports.TraceClient = exports.Tracer = exports.wrap = void 0;
+exports.TraceManagerClient = exports.TraceClient = exports.Tracer = void 0;
+exports.wrap = wrap;
 // Core Node.js imports
 const uuid_1 = require("uuid");
 const async_hooks_1 = require("async_hooks");
@@ -49,6 +50,10 @@ function asyncFunctionWrapper(func) {
         }
         const result = yield traceClientContextAsyncLocalStorage
             .run(traceClientContext, () => func(...args));
+        if (traceClientContext.entries.length > parentTraceClientContext.entries.length) {
+            [traceClientContext.entries, parentTraceClientContext.entries] =
+                [parentTraceClientContext.entries, traceClientContext.entries];
+        }
         parentTraceClientContext.entries.push(...traceClientContext.entries);
         return result;
     });
@@ -380,6 +385,26 @@ class TraceClient {
             this.endSpan();
         }
     }
+    /**
+     * Retrieves the ID of the currently active span in this trace context.
+     * Relies on AsyncLocalStorage context established by observe/span.
+     * @returns {string | undefined} The ID of the current span, or undefined if none is active.
+     */
+    getCurrentSpanId() {
+        const traceClientContext = getTraceClientContext(); // Internal function using AsyncLocalStorage
+        if (!traceClientContext) {
+            // Should ideally not happen if called within an observe/trace context
+            console.warn("[Judgeval] getCurrentSpanId called outside of an active trace context.");
+            return undefined;
+        }
+        const currentEntry = traceClientContext.entryStack.at(-1); // Get the latest 'enter' entry
+        if (!currentEntry) {
+            // This might happen if called right at the start of a trace before the first span
+            // console.warn("[Judgeval] getCurrentSpanId called but span stack is empty.");
+            return undefined;
+        }
+        return currentEntry.span_id;
+    }
     getDuration() {
         return (Date.now() / 1000) - this.startTime;
     }
@@ -495,14 +520,16 @@ class TraceClient {
     }
     save() {
         return __awaiter(this, arguments, void 0, function* (emptySave = false) {
-            var _a, _b, _c, _d, _e;
-            if (!this.enableMonitoring || !this.traceManager) {
+            var _a, _b;
+            // If monitoring is disabled or trace hasn't started, don't save
+            if (!this.enableMonitoring || this.startTime === -1 || !this.traceManager) {
+                logger_instance_js_1.default.info(`[TraceClient ${this.traceId}] Monitoring disabled or trace not started. Not saving.`);
                 return null;
             }
-            const traceClientContext = getTraceClientContext();
-            const totalDuration = this.getDuration();
-            // Use the tuple returned by condenseTrace
-            const [condensedEntries, evaluationRuns] = this.condenseTrace(traceClientContext.entries);
+            const endTime = Date.now() / 1000; // Current time in seconds
+            const duration = endTime - this.startTime;
+            const [condensedEntries, evalRuns] = this.condenseTrace(getTraceClientContext().entries);
+            // Calculate token counts and costs
             const tokenCounts = {
                 prompt_tokens: 0,
                 completion_tokens: 0,
@@ -511,146 +538,94 @@ class TraceClient {
                 completion_tokens_cost_usd: 0.0,
                 total_cost_usd: 0.0
             };
-            // First pass: collect all LLM calls with their token counts
-            const llmCalls = [];
-            let index = 0;
-            for (const entry of condensedEntries) {
+            // Flatten the condensed entries for iteration
+            const flatEntries = [];
+            function flatten(entry) {
+                flatEntries.push(entry);
+                if (entry.children) {
+                    entry.children.forEach(flatten);
+                }
+            }
+            condensedEntries.forEach(flatten);
+            // Use a Set to avoid double-counting tokens from nested calls if structure is complex
+            // Note: Assuming span_ids are unique across the trace 
+            const processedSpanIds = new Set();
+            let firstModel = null;
+            for (const entry of flatEntries) {
+                if (processedSpanIds.has(entry.span_id))
+                    continue;
+                processedSpanIds.add(entry.span_id);
                 if (entry.span_type === 'llm' && ((_a = entry.output) === null || _a === void 0 ? void 0 : _a.usage)) {
-                    const usage = entry.output.usage;
-                    const modelName = ((_b = entry.inputs) === null || _b === void 0 ? void 0 : _b.model) || "";
-                    let promptTokens = 0;
-                    let completionTokens = 0;
-                    // Handle different token naming conventions
-                    if (usage.prompt_tokens !== undefined || usage.completion_tokens !== undefined) {
-                        promptTokens = usage.prompt_tokens || 0;
-                        completionTokens = usage.completion_tokens || 0;
-                    }
-                    else if (usage.input_tokens !== undefined || usage.output_tokens !== undefined) {
-                        promptTokens = usage.input_tokens || 0;
-                        completionTokens = usage.output_tokens || 0;
-                        // Standardize naming
-                        usage.prompt_tokens = promptTokens;
-                        usage.completion_tokens = completionTokens;
-                        delete usage.input_tokens;
-                        delete usage.output_tokens;
-                    }
-                    tokenCounts.prompt_tokens += promptTokens;
-                    tokenCounts.completion_tokens += completionTokens;
-                    tokenCounts.total_tokens += usage.total_tokens || (promptTokens + completionTokens);
-                    // Add to list of calls for cost calculation
-                    if (modelName) {
-                        llmCalls.push({
-                            modelName,
-                            promptTokens,
-                            completionTokens,
-                            entryIndex: index
-                        });
+                    tokenCounts.prompt_tokens += entry.output.usage.prompt_tokens || 0;
+                    tokenCounts.completion_tokens += entry.output.usage.completion_tokens || 0;
+                    // Total tokens are often directly provided, otherwise sum
+                    tokenCounts.total_tokens += entry.output.usage.total_tokens ||
+                        ((entry.output.usage.prompt_tokens || 0) +
+                            (entry.output.usage.completion_tokens || 0));
+                    // Capture the first model encountered in LLM spans
+                    if (!firstModel && ((_b = entry.inputs) === null || _b === void 0 ? void 0 : _b.model)) {
+                        firstModel = entry.inputs.model;
                     }
                 }
-                index++;
             }
-            // Second pass: calculate costs for each LLM call using the API
-            if (this.traceManager && llmCalls.length > 0) {
-                // Process each LLM call
-                for (const call of llmCalls) {
-                    try {
-                        // Get costs from the API
-                        const costs = yield this.traceManager.calculateTokenCosts(call.modelName, call.promptTokens, call.completionTokens);
-                        if (costs) {
-                            // Update the entry with the costs
-                            const entry = condensedEntries[call.entryIndex];
-                            // Ensure output and usage objects exist before assigning costs
-                            if (entry.output && entry.output.usage) {
-                                // --- This part assigns costs to the individual span ---
-                                entry.output.usage.prompt_tokens_cost_usd = costs.prompt_tokens_cost_usd;
-                                entry.output.usage.completion_tokens_cost_usd = costs.completion_tokens_cost_usd;
-                                entry.output.usage.total_cost_usd = costs.total_cost_usd;
-                                logger_instance_js_1.default.debug(`Assigned costs to span ${entry.span_id} (model: ${call.modelName})`, { costs }); // Added debug log
-                                // -----------------------------------------------------
-                            }
-                            else {
-                                logger_instance_js_1.default.warn(`Could not assign costs to span ${entry.span_id} (model: ${call.modelName}): Missing 'output' or 'output.usage' object.`, { output: entry.output }); // Log if structure is missing
-                            }
-                            // Add to the total costs for the trace
-                            tokenCounts.prompt_tokens_cost_usd += (_c = costs.prompt_tokens_cost_usd) !== null && _c !== void 0 ? _c : 0.0;
-                            tokenCounts.completion_tokens_cost_usd += (_d = costs.completion_tokens_cost_usd) !== null && _d !== void 0 ? _d : 0.0;
-                            tokenCounts.total_cost_usd += (_e = costs.total_cost_usd) !== null && _e !== void 0 ? _e : 0.0;
-                        }
-                        else {
-                            // If calculation failed, set costs to null in the entry (matching Python behavior)
-                            const entry = condensedEntries[call.entryIndex];
-                            // Ensure output and usage objects exist before assigning null costs
-                            if (entry.output && entry.output.usage) {
-                                // --- Sets null costs on the individual span ---
-                                entry.output.usage.prompt_tokens_cost_usd = null;
-                                entry.output.usage.completion_tokens_cost_usd = null;
-                                entry.output.usage.total_cost_usd = null;
-                                // ------------------------------------------
-                            }
-                            else {
-                                // Log if we can't even assign null because the structure is missing
-                                logger_instance_js_1.default.warn(`Could not assign null costs to span ${entry.span_id} (model: ${call.modelName}): Missing 'output' or 'output.usage' object.`, { output: entry.output });
-                            }
-                            logger_instance_js_1.default.warn(`Token cost calculation failed for model '${call.modelName}'. Cost information will be null for this span.`); // More specific warning
-                        }
+            // <<< NEW: Fetch costs from backend if a model was found and tokens exist >>>
+            if (firstModel && (tokenCounts.prompt_tokens > 0 || tokenCounts.completion_tokens > 0)) {
+                try {
+                    const costResponse = yield this.traceManager.calculateTokenCosts(firstModel, tokenCounts.prompt_tokens, tokenCounts.completion_tokens);
+                    if (costResponse) {
+                        tokenCounts.prompt_tokens_cost_usd = costResponse.prompt_tokens_cost_usd;
+                        tokenCounts.completion_tokens_cost_usd = costResponse.completion_tokens_cost_usd;
+                        tokenCounts.total_cost_usd = costResponse.total_cost_usd;
+                        logger_instance_js_1.default.info(`[TraceClient ${this.traceId}] Calculated costs for model ${firstModel}: $${tokenCounts.total_cost_usd.toFixed(6)}`);
                     }
-                    catch (e) {
-                        logger_instance_js_1.default.warn(`Error during cost calculation loop for model '${call.modelName}':`, e); // Adjusted logging
-                        // Set costs to null in the entry if an error occurs during the loop iteration
-                        const entry = condensedEntries[call.entryIndex];
-                        // Ensure output and usage objects exist before assigning null costs on error
-                        if (entry.output && entry.output.usage) {
-                            // --- Sets null costs on the individual span on error ---
-                            entry.output.usage.prompt_tokens_cost_usd = null;
-                            entry.output.usage.completion_tokens_cost_usd = null;
-                            entry.output.usage.total_cost_usd = null;
-                            // ----------------------------------------------------
-                        }
-                        else {
-                            // Log if we can't assign null on error because the structure is missing
-                            logger_instance_js_1.default.warn(`Could not assign null costs to span ${entry.span_id} (model: ${call.modelName}) on error: Missing 'output' or 'output.usage' object.`, { output: entry.output });
-                        }
+                    else {
+                        logger_instance_js_1.default.warn(`[TraceClient ${this.traceId}] Could not fetch token costs for model ${firstModel}. Costs will be 0.`);
                     }
                 }
+                catch (error) {
+                    logger_instance_js_1.default.error(`[TraceClient ${this.traceId}] Error fetching token costs: ${error}`);
+                    // Costs remain 0.0
+                }
             }
-            // Convert rules array to a dictionary (Record<string, Rule>)
-            const rulesDict = {};
-            this.rules.forEach(rule => {
-                var _a;
-                // Use rule_id if available, otherwise fallback to name
-                const key = (_a = rule.rule_id) !== null && _a !== void 0 ? _a : rule.name;
-                rulesDict[key] = rule;
-            });
+            // <<< END NEW >>>
             const traceData = {
                 trace_id: this.traceId,
-                name: this.name,
+                name: this.name, // Use the sanitized name
                 project_name: this.projectName,
-                created_at: new Date(this.startTime * 1000).toISOString(),
-                duration: totalDuration,
+                created_at: new Date(this.startTime * 1000).toISOString(), // Convert start time to ISO string
+                duration: duration < 0 ? 0 : duration,
                 token_counts: tokenCounts,
-                entries: condensedEntries,
-                evaluation_runs: evaluationRuns,
+                entries: condensedEntries, // Send the potentially nested structure from condenseTrace
+                evaluation_runs: evalRuns, // Send evaluation runs collected
                 overwrite: this.overwrite,
                 parent_trace_id: this.parentTraceId,
-                parent_name: this.parentName
+                parent_name: this.parentName,
             };
-            try {
-                yield this.traceManager.saveTrace(traceData);
-                logger_instance_js_1.default.info(`Trace ${this.traceId} saved successfully.`);
-                if (this.enableEvaluations) {
-                    try {
-                        yield this.traceManager.addTraceToEvalQueue(traceData);
-                        logger_instance_js_1.default.info(`Trace ${this.traceId} added to evaluation queue.`);
-                    }
-                    catch (evalError) {
-                        logger_instance_js_1.default.warn(`Failed to add trace ${this.traceId} to evaluation queue.`, { error: evalError instanceof Error ? evalError.message : String(evalError) });
-                    }
-                }
+            // <<< ADD LOGGING HERE >>>
+            logger_instance_js_1.default.info(`[TraceClient ${this.traceId}] Payload to be saved:`, JSON.stringify(traceData, null, 2));
+            // <<< END LOGGING >>>
+            if (emptySave) {
+                // Skip actual saving if emptySave is true (used for context management in generators)
+                logger_instance_js_1.default.info(`[TraceClient ${this.traceId}] emptySave=true, skipping actual save call.`);
                 return { traceId: this.traceId, traceData };
             }
+            try {
+                logger_instance_js_1.default.info(`[TraceClient ${this.traceId}] Calling traceManager.saveTrace...`);
+                const response = yield this.traceManager.saveTrace(traceData);
+                logger_instance_js_1.default.info(`[TraceClient ${this.traceId}] Trace saved successfully. Response:`, response);
+                // Reset trace context after successful save
+                getTraceClientContext().entries = [];
+                getTraceClientContext().entryStack = [];
+                this.startTime = -1; // Reset start time
+                return { traceId: this.traceId, traceData: traceData }; // Return payload on success
+            }
             catch (error) {
-                logger_instance_js_1.default.error(`Failed to save trace ${this.traceId}.`, { error: error instanceof Error ? error.message : String(error) });
-                return null;
+                logger_instance_js_1.default.error(`[TraceClient ${this.traceId}] Error saving trace:`, error);
+                // Optionally reset context even on error?
+                // getTraceClientContext().entries = [];
+                // getTraceClientContext().entryStack = [];
+                // this.startTime = -1;
+                return null; // Indicate save failure
             }
         });
     }
@@ -1106,5 +1081,4 @@ function wrap(client) {
     }
     return client;
 }
-exports.wrap = wrap;
 //# sourceMappingURL=tracer.js.map