@nocobase/plugin-ai 1.9.0-beta.8 → 2.0.0-alpha.10

package/dist/node_modules/@langchain/core/node_modules/langsmith/dist/client.js

@@ -1,4 +1,6 @@
 import * as uuid from "uuid";
+import { LangSmithToOTELTranslator, } from "./experimental/otel/translator.js";
+import { getDefaultOTLPTracerComponents, getOTELTrace, getOTELContext, } from "./singletons/otel.js";
 import { AsyncCaller } from "./utils/async_caller.js";
 import { convertLangChainMessageToExample, isLangChainMessage, } from "./utils/messages.js";
 import { getEnvironmentVariable, getLangChainEnvVarsMetadata, getLangSmithEnvironmentVariable, getRuntimeEnvironment, } from "./utils/env.js";
@@ -7,7 +9,7 @@ import { assertUuid } from "./utils/_uuid.js";
 import { warnOnce } from "./utils/warn.js";
 import { parsePromptIdentifier } from "./utils/prompts.js";
 import { raiseForStatus } from "./utils/error.js";
-import { _getFetchImplementation } from "./singletons/fetch.js";
+import { _globalFetchImplementationIsNodeFetch, _getFetchImplementation, } from "./singletons/fetch.js";
 import { serialize as serializePayloadForTracing } from "./utils/fast-safe-stringify/index.js";
 export function mergeRuntimeEnvIntoRunCreate(run) {
     const runtimeEnv = getRuntimeEnvironment();
@@ -30,8 +32,9 @@ export function mergeRuntimeEnvIntoRunCreate(run) {
     };
     return run;
 }
-const getTracingSamplingRate = () => {
-    const samplingRateStr = getLangSmithEnvironmentVariable("TRACING_SAMPLING_RATE");
+const getTracingSamplingRate = (configRate) => {
+    const samplingRateStr = configRate?.toString() ??
+        getLangSmithEnvironmentVariable("TRACING_SAMPLING_RATE");
     if (samplingRateStr === undefined) {
         return undefined;
     }
@@ -75,6 +78,13 @@ const handle429 = async (response) => {
     // Fall back to existing status checks
     return false;
 };
+function _formatFeedbackScore(score) {
+    if (typeof score === "number") {
+        // Truncate at 4 decimal places
+        return Number(score.toFixed(4));
+    }
+    return score;
+}
 export class AutoBatchQueue {
     constructor() {
         Object.defineProperty(this, "items", {
@@ -100,10 +110,11 @@ export class AutoBatchQueue {
             // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/Promise
             itemPromiseResolve = resolve;
         });
-        const size = serializePayloadForTracing(item.item).length;
+        const size = serializePayloadForTracing(item.item, `Serializing run with id: ${item.item.id}`).length;
         this.items.push({
             action: item.action,
             payload: item.item,
+            otelContext: item.otelContext,
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             itemPromiseResolve: itemPromiseResolve,
             itemPromise,
@@ -137,7 +148,11 @@ export class AutoBatchQueue {
             this.sizeBytes -= item.size;
         }
         return [
-            popped.map((it) => ({ action: it.action, item: it.payload })),
+            popped.map((it) => ({
+                action: it.action,
+                item: it.payload,
+                otelContext: it.otelContext,
+            })),
             () => popped.forEach((it) => it.itemPromiseResolve()),
         ];
     }
@@ -286,8 +301,20 @@ export class Client {
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "langSmithToOTELTranslator", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "debug", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: getEnvironmentVariable("LANGSMITH_DEBUG") === "true"
+        });
         const defaultConfig = Client.getDefaultClientConfig();
-        this.tracingSampleRate = getTracingSamplingRate();
+        this.tracingSampleRate = getTracingSamplingRate(config.tracingSamplingRate);
         this.apiUrl = trimQuotes(config.apiUrl ?? defaultConfig.apiUrl) ?? "";
         if (this.apiUrl.endsWith("/")) {
             this.apiUrl = this.apiUrl.slice(0, -1);
@@ -298,17 +325,22 @@ export class Client {
             this.webUrl = this.webUrl.slice(0, -1);
         }
         this.timeout_ms = config.timeout_ms ?? 90_000;
-        this.caller = new AsyncCaller(config.callerOptions ?? {});
+        this.caller = new AsyncCaller({
+            ...(config.callerOptions ?? {}),
+            debug: config.debug ?? this.debug,
+        });
         this.traceBatchConcurrency =
             config.traceBatchConcurrency ?? this.traceBatchConcurrency;
         if (this.traceBatchConcurrency < 1) {
             throw new Error("Trace batch concurrency must be positive.");
         }
+        this.debug = config.debug ?? this.debug;
         this.batchIngestCaller = new AsyncCaller({
             maxRetries: 2,
             maxConcurrency: this.traceBatchConcurrency,
             ...(config.callerOptions ?? {}),
             onFailedResponseHook: handle429,
+            debug: config.debug ?? this.debug,
         });
         this.hideInputs =
             config.hideInputs ?? config.anonymizer ?? defaultConfig.hideInputs;
@@ -320,6 +352,9 @@ export class Client {
         this.batchSizeBytesLimit = config.batchSizeBytesLimit;
         this.fetchOptions = config.fetchOptions || {};
         this.manualFlushMode = config.manualFlushMode ?? this.manualFlushMode;
+        if (getEnvironmentVariable("OTEL_ENABLED") === "true") {
+            this.langSmithToOTELTranslator = new LangSmithToOTELTranslator();
+        }
     }
     static getDefaultClientConfig() {
         const apiKey = getLangSmithEnvironmentVariable("API_KEY");
@@ -378,7 +413,7 @@ export class Client {
         }
         return headers;
     }
-    processInputs(inputs) {
+    async processInputs(inputs) {
         if (this.hideInputs === false) {
             return inputs;
         }
@@ -390,7 +425,7 @@ export class Client {
         }
         return inputs;
     }
-    processOutputs(outputs) {
+    async processOutputs(outputs) {
         if (this.hideOutputs === false) {
             return outputs;
         }
@@ -402,20 +437,20 @@ export class Client {
         }
         return outputs;
     }
-    prepareRunCreateOrUpdateInputs(run) {
+    async prepareRunCreateOrUpdateInputs(run) {
         const runParams = { ...run };
         if (runParams.inputs !== undefined) {
-            runParams.inputs = this.processInputs(runParams.inputs);
+            runParams.inputs = await this.processInputs(runParams.inputs);
         }
         if (runParams.outputs !== undefined) {
-            runParams.outputs = this.processOutputs(runParams.outputs);
+            runParams.outputs = await this.processOutputs(runParams.outputs);
         }
         return runParams;
     }
     async _getResponse(path, queryParams) {
         const paramsString = queryParams?.toString() ?? "";
         const url = `${this.apiUrl}${path}?${paramsString}`;
-        const response = await this.caller.call(_getFetchImplementation(), url, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), url, {
             method: "GET",
             headers: this.headers,
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -435,7 +470,7 @@ export class Client {
             queryParams.set("offset", String(offset));
             queryParams.set("limit", String(limit));
             const url = `${this.apiUrl}${path}?${queryParams}`;
-            const response = await this.caller.call(_getFetchImplementation(), url, {
+            const response = await this.caller.call(_getFetchImplementation(this.debug), url, {
                 method: "GET",
                 headers: this.headers,
                 signal: AbortSignal.timeout(this.timeout_ms),
@@ -458,7 +493,7 @@ export class Client {
     async *_getCursorPaginatedList(path, body = null, requestMethod = "POST", dataKey = "runs") {
         const bodyParams = body ? { ...body } : {};
         while (true) {
-            const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}${path}`, {
+            const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}${path}`, {
                 method: requestMethod,
                 headers: { ...this.headers, "Content-Type": "application/json" },
                 signal: AbortSignal.timeout(this.timeout_ms),
@@ -483,6 +518,13 @@ export class Client {
             bodyParams.cursor = cursors.next;
         }
     }
+    // Allows mocking for tests
+    _shouldSample() {
+        if (this.tracingSampleRate === undefined) {
+            return true;
+        }
+        return Math.random() < this.tracingSampleRate;
+    }
     _filterForSampling(runs, patch = false) {
         if (this.tracingSampleRate === undefined) {
             return runs;
@@ -500,15 +542,26 @@ export class Client {
             return sampled;
         }
         else {
+            // For new runs, sample at trace level to maintain consistency
             const sampled = [];
             for (const run of runs) {
-                if ((run.id !== run.trace_id &&
-                    !this.filteredPostUuids.has(run.trace_id)) ||
-                    Math.random() < this.tracingSampleRate) {
-                    sampled.push(run);
+                const traceId = run.trace_id ?? run.id;
+                // If we've already made a decision about this trace, follow it
+                if (this.filteredPostUuids.has(traceId)) {
+                    continue;
+                }
+                // For new traces, apply sampling
+                if (run.id === traceId) {
+                    if (this._shouldSample()) {
+                        sampled.push(run);
+                    }
+                    else {
+                        this.filteredPostUuids.add(traceId);
+                    }
                 }
                 else {
-                    this.filteredPostUuids.add(run.id);
+                    // Child runs follow their trace's sampling decision
+                    sampled.push(run);
                 }
             }
             return sampled;
@@ -543,26 +596,62 @@ export class Client {
             return;
         }
         try {
-            const ingestParams = {
-                runCreates: batch
-                    .filter((item) => item.action === "create")
-                    .map((item) => item.item),
-                runUpdates: batch
-                    .filter((item) => item.action === "update")
-                    .map((item) => item.item),
-            };
-            const serverInfo = await this._ensureServerInfo();
-            if (serverInfo?.batch_ingest_config?.use_multipart_endpoint) {
-                await this.multipartIngestRuns(ingestParams);
+            if (this.langSmithToOTELTranslator !== undefined) {
+                this._sendBatchToOTELTranslator(batch);
             }
             else {
-                await this.batchIngestRuns(ingestParams);
+                const ingestParams = {
+                    runCreates: batch
+                        .filter((item) => item.action === "create")
+                        .map((item) => item.item),
+                    runUpdates: batch
+                        .filter((item) => item.action === "update")
+                        .map((item) => item.item),
+                };
+                const serverInfo = await this._ensureServerInfo();
+                if (serverInfo?.batch_ingest_config?.use_multipart_endpoint) {
+                    await this.multipartIngestRuns(ingestParams);
+                }
+                else {
+                    await this.batchIngestRuns(ingestParams);
+                }
             }
         }
+        catch (e) {
+            console.error("Error exporting batch:", e);
+        }
         finally {
             done();
         }
     }
+    _sendBatchToOTELTranslator(batch) {
+        if (this.langSmithToOTELTranslator !== undefined) {
+            const otelContextMap = new Map();
+            const operations = [];
+            for (const item of batch) {
+                if (item.item.id && item.otelContext) {
+                    otelContextMap.set(item.item.id, item.otelContext);
+                    if (item.action === "create") {
+                        operations.push({
+                            operation: "post",
+                            id: item.item.id,
+                            trace_id: item.item.trace_id ?? item.item.id,
+                            run: item.item,
+                        });
+                    }
+                    else {
+                        operations.push({
+                            operation: "patch",
+                            id: item.item.id,
+                            trace_id: item.item.trace_id ?? item.item.id,
+                            run: item.item,
+                        });
+                    }
+                }
+            }
+            this.langSmithToOTELTranslator.exportBatch(operations, otelContextMap);
+        }
+    }
     async processRunOperation(item) {
         clearTimeout(this.autoBatchTimeout);
         this.autoBatchTimeout = undefined;
@@ -587,14 +676,20 @@ export class Client {
         return itemPromise;
     }
     async _getServerInfo() {
-        const response = await _getFetchImplementation()(`${this.apiUrl}/info`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/info`, {
             method: "GET",
             headers: { Accept: "application/json" },
             signal: AbortSignal.timeout(SERVER_INFO_REQUEST_TIMEOUT),
             ...this.fetchOptions,
         });
         await raiseForStatus(response, "get server info");
-        return response.json();
+        const json = await response.json();
+        if (this.debug) {
+            console.log("\n=== LangSmith Server Configuration ===\n" +
+                JSON.stringify(json, null, 2) +
+                "\n");
+        }
+        return json;
     }
     async _ensureServerInfo() {
         if (this._getServerInfoPromise === undefined) {
@@ -604,7 +699,7 @@ export class Client {
                         this._serverInfo = await this._getServerInfo();
                     }
                     catch (e) {
-                        console.warn(`[WARNING]: LangSmith failed to fetch info on supported operations. Falling back to batch operations and default limits.`);
+                        console.warn(`[WARNING]: LangSmith failed to fetch info on supported operations with status code ${e.status}. Falling back to batch operations and default limits.`);
                     }
                 }
                 return this._serverInfo ?? {};
@@ -630,6 +725,17 @@ export class Client {
         const sizeLimitBytes = await this._getBatchSizeLimitBytes();
         await this.drainAutoBatchQueue(sizeLimitBytes);
     }
+    _cloneCurrentOTELContext() {
+        const otel_trace = getOTELTrace();
+        const otel_context = getOTELContext();
+        if (this.langSmithToOTELTranslator !== undefined) {
+            const currentSpan = otel_trace.getActiveSpan();
+            if (currentSpan) {
+                return otel_trace.setSpan(otel_context.active(), currentSpan);
+            }
+        }
+        return undefined;
+    }
     async createRun(run) {
         if (!this._filterForSampling([run]).length) {
             return;
@@ -637,7 +743,7 @@ export class Client {
         const headers = { ...this.headers, "Content-Type": "application/json" };
         const session_name = run.project_name;
         delete run.project_name;
-        const runCreate = this.prepareRunCreateOrUpdateInputs({
+        const runCreate = await this.prepareRunCreateOrUpdateInputs({
             session_name,
             ...run,
             start_time: run.start_time ?? Date.now(),
@@ -645,17 +751,19 @@ export class Client {
         if (this.autoBatchTracing &&
             runCreate.trace_id !== undefined &&
             runCreate.dotted_order !== undefined) {
+            const otelContext = this._cloneCurrentOTELContext();
             void this.processRunOperation({
                 action: "create",
                 item: runCreate,
+                otelContext,
             }).catch(console.error);
             return;
         }
         const mergedRunCreateParam = mergeRuntimeEnvIntoRunCreate(runCreate);
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/runs`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/runs`, {
             method: "POST",
             headers,
-            body: serializePayloadForTracing(mergedRunCreateParam),
+            body: serializePayloadForTracing(mergedRunCreateParam, `Creating run with id: ${mergedRunCreateParam.id}`),
             signal: AbortSignal.timeout(this.timeout_ms),
             ...this.fetchOptions,
         });
@@ -669,8 +777,8 @@ export class Client {
         if (runCreates === undefined && runUpdates === undefined) {
             return;
         }
-        let preparedCreateParams = runCreates?.map((create) => this.prepareRunCreateOrUpdateInputs(create)) ?? [];
-        let preparedUpdateParams = runUpdates?.map((update) => this.prepareRunCreateOrUpdateInputs(update)) ?? [];
+        let preparedCreateParams = await Promise.all(runCreates?.map((create) => this.prepareRunCreateOrUpdateInputs(create)) ?? []);
+        let preparedUpdateParams = await Promise.all(runUpdates?.map((update) => this.prepareRunCreateOrUpdateInputs(update)) ?? []);
         if (preparedCreateParams.length > 0 && preparedUpdateParams.length > 0) {
             const createById = preparedCreateParams.reduce((params, run) => {
                 if (!run.id) {
@@ -695,8 +803,8 @@ export class Client {
             preparedUpdateParams = standaloneUpdates;
         }
         const rawBatch = {
-            post: this._filterForSampling(preparedCreateParams),
-            patch: this._filterForSampling(preparedUpdateParams, true),
+            post: preparedCreateParams,
+            patch: preparedUpdateParams,
         };
         if (!rawBatch.post.length && !rawBatch.patch.length) {
             return;
@@ -710,12 +818,17 @@ export class Client {
             const batchItems = rawBatch[key].reverse();
             let batchItem = batchItems.pop();
             while (batchItem !== undefined) {
+                // Type is wrong but this is a deprecated code path anyway
                 batchChunks[key].push(batchItem);
                 batchItem = batchItems.pop();
             }
         }
         if (batchChunks.post.length > 0 || batchChunks.patch.length > 0) {
-            await this._postBatchIngestRuns(serializePayloadForTracing(batchChunks));
+            const runIds = batchChunks.post
+                .map((item) => item.id)
+                .concat(batchChunks.patch.map((item) => item.id))
+                .join(",");
+            await this._postBatchIngestRuns(serializePayloadForTracing(batchChunks, `Ingesting runs with ids: ${runIds}`));
         }
     }
     async _postBatchIngestRuns(body) {
@@ -724,7 +837,7 @@ export class Client {
             "Content-Type": "application/json",
             Accept: "application/json",
         };
-        const response = await this.batchIngestCaller.call(_getFetchImplementation(), `${this.apiUrl}/runs/batch`, {
+        const response = await this.batchIngestCaller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/runs/batch`, {
             method: "POST",
             headers,
             body: body,
@@ -745,7 +858,7 @@ export class Client {
         const allAttachments = {};
         let preparedCreateParams = [];
         for (const create of runCreates ?? []) {
-            const preparedCreate = this.prepareRunCreateOrUpdateInputs(create);
+            const preparedCreate = await this.prepareRunCreateOrUpdateInputs(create);
             if (preparedCreate.id !== undefined &&
                 preparedCreate.attachments !== undefined) {
                 allAttachments[preparedCreate.id] = preparedCreate.attachments;
@@ -755,7 +868,7 @@ export class Client {
         }
         let preparedUpdateParams = [];
         for (const update of runUpdates ?? []) {
-            preparedUpdateParams.push(this.prepareRunCreateOrUpdateInputs(update));
+            preparedUpdateParams.push(await this.prepareRunCreateOrUpdateInputs(update));
         }
         // require trace_id and dotted_order
         const invalidRunCreate = preparedCreateParams.find((runCreate) => {
@@ -810,7 +923,7 @@ export class Client {
                 const { inputs, outputs, events, attachments, ...payload } = originalPayload;
                 const fields = { inputs, outputs, events };
                 // encode the main run payload
-                const stringifiedPayload = serializePayloadForTracing(payload);
+                const stringifiedPayload = serializePayloadForTracing(payload, `Serializing for multipart ingestion of run with id: ${payload.id}`);
                 accumulatedParts.push({
                     name: `${method}.${payload.id}`,
                     payload: new Blob([stringifiedPayload], {
@@ -822,7 +935,7 @@ export class Client {
                     if (value === undefined) {
                         continue;
                     }
-                    const stringifiedValue = serializePayloadForTracing(value);
+                    const stringifiedValue = serializePayloadForTracing(value, `Serializing ${key} for multipart ingestion of run with id: ${payload.id}`);
                     accumulatedParts.push({
                         name: `${method}.${payload.id}.${key}`,
                         payload: new Blob([stringifiedValue], {
@@ -866,34 +979,84 @@ export class Client {
         }
         await this._sendMultipartRequest(accumulatedParts, accumulatedContext.join("; "));
     }
+    async _createNodeFetchBody(parts, boundary) {
+        // Create multipart form data manually using Blobs
+        const chunks = [];
+        for (const part of parts) {
+            // Add field boundary
+            chunks.push(new Blob([`--${boundary}\r\n`]));
+            chunks.push(new Blob([
+                `Content-Disposition: form-data; name="${part.name}"\r\n`,
+                `Content-Type: ${part.payload.type}\r\n\r\n`,
+            ]));
+            chunks.push(part.payload);
+            chunks.push(new Blob(["\r\n"]));
+        }
+        // Add final boundary
+        chunks.push(new Blob([`--${boundary}--\r\n`]));
+        // Combine all chunks into a single Blob
+        const body = new Blob(chunks);
+        // Convert Blob to ArrayBuffer for compatibility
+        const arrayBuffer = await body.arrayBuffer();
+        return arrayBuffer;
+    }
+    async _createMultipartStream(parts, boundary) {
+        const encoder = new TextEncoder();
+        // Create a ReadableStream for streaming the multipart data
+        // Only do special handling if we're using node-fetch
+        const stream = new ReadableStream({
+            async start(controller) {
+                // Helper function to write a chunk to the stream
+                const writeChunk = async (chunk) => {
+                    if (typeof chunk === "string") {
+                        controller.enqueue(encoder.encode(chunk));
+                    }
+                    else {
+                        controller.enqueue(chunk);
+                    }
+                };
+                // Write each part to the stream
+                for (const part of parts) {
+                    // Write boundary and headers
+                    await writeChunk(`--${boundary}\r\n`);
+                    await writeChunk(`Content-Disposition: form-data; name="${part.name}"\r\n`);
+                    await writeChunk(`Content-Type: ${part.payload.type}\r\n\r\n`);
+                    // Write the payload
+                    const payloadStream = part.payload.stream();
+                    const reader = payloadStream.getReader();
+                    try {
+                        let result;
+                        while (!(result = await reader.read()).done) {
+                            controller.enqueue(result.value);
+                        }
+                    }
+                    finally {
+                        reader.releaseLock();
+                    }
+                    await writeChunk("\r\n");
+                }
+                // Write final boundary
+                await writeChunk(`--${boundary}--\r\n`);
+                controller.close();
+            },
+        });
+        return stream;
+    }
     async _sendMultipartRequest(parts, context) {
         try {
-            // Create multipart form data manually using Blobs
+            // Create multipart form data boundary
             const boundary = "----LangSmithFormBoundary" + Math.random().toString(36).slice(2);
-            const chunks = [];
-            for (const part of parts) {
-                // Add field boundary
-                chunks.push(new Blob([`--${boundary}\r\n`]));
-                chunks.push(new Blob([
-                    `Content-Disposition: form-data; name="${part.name}"\r\n`,
-                    `Content-Type: ${part.payload.type}\r\n\r\n`,
-                ]));
-                chunks.push(part.payload);
-                chunks.push(new Blob(["\r\n"]));
-            }
-            // Add final boundary
-            chunks.push(new Blob([`--${boundary}--\r\n`]));
-            // Combine all chunks into a single Blob
-            const body = new Blob(chunks);
-            // Convert Blob to ArrayBuffer for compatibility
-            const arrayBuffer = await body.arrayBuffer();
-            const res = await this.batchIngestCaller.call(_getFetchImplementation(), `${this.apiUrl}/runs/multipart`, {
+            const body = await (_globalFetchImplementationIsNodeFetch()
+                ? this._createNodeFetchBody(parts, boundary)
+                : this._createMultipartStream(parts, boundary));
+            const res = await this.batchIngestCaller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/runs/multipart`, {
                 method: "POST",
                 headers: {
                     ...this.headers,
                     "Content-Type": `multipart/form-data; boundary=${boundary}`,
                 },
-                body: arrayBuffer,
+                body,
+                duplex: "half",
                 signal: AbortSignal.timeout(this.timeout_ms),
                 ...this.fetchOptions,
             });
@@ -907,10 +1070,10 @@ export class Client {
     async updateRun(runId, run) {
         assertUuid(runId);
         if (run.inputs) {
-            run.inputs = this.processInputs(run.inputs);
+            run.inputs = await this.processInputs(run.inputs);
         }
         if (run.outputs) {
-            run.outputs = this.processOutputs(run.outputs);
+            run.outputs = await this.processOutputs(run.outputs);
         }
         // TODO: Untangle types
         const data = { ...run, id: runId };
@@ -920,25 +1083,34 @@ export class Client {
         if (this.autoBatchTracing &&
             data.trace_id !== undefined &&
             data.dotted_order !== undefined) {
+            const otelContext = this._cloneCurrentOTELContext();
             if (run.end_time !== undefined &&
                 data.parent_run_id === undefined &&
                 this.blockOnRootRunFinalization &&
                 !this.manualFlushMode) {
                 // Trigger batches as soon as a root trace ends and wait to ensure trace finishes
                 // in serverless environments.
-                await this.processRunOperation({ action: "update", item: data }).catch(console.error);
+                await this.processRunOperation({
+                    action: "update",
+                    item: data,
+                    otelContext,
+                }).catch(console.error);
                 return;
             }
             else {
-                void this.processRunOperation({ action: "update", item: data }).catch(console.error);
+                void this.processRunOperation({
+                    action: "update",
+                    item: data,
+                    otelContext,
+                }).catch(console.error);
             }
             return;
         }
         const headers = { ...this.headers, "Content-Type": "application/json" };
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/runs/${runId}`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/runs/${runId}`, {
             method: "PATCH",
             headers,
-            body: serializePayloadForTracing(run),
+            body: serializePayloadForTracing(run, `Serializing payload to update run with id: ${runId}`),
             signal: AbortSignal.timeout(this.timeout_ms),
             ...this.fetchOptions,
         });
@@ -947,7 +1119,7 @@ export class Client {
     async readRun(runId, { loadChildRuns } = { loadChildRuns: false }) {
         assertUuid(runId);
         let run = await this._get(`/runs/${runId}`);
-        if (loadChildRuns && run.child_run_ids) {
+        if (loadChildRuns) {
             run = await this._loadChildRuns(run);
         }
         return run;
@@ -986,7 +1158,11 @@ export class Client {
         }
     }
     async _loadChildRuns(run) {
-        const childRuns = await toArray(this.listRuns({ id: run.child_run_ids }));
+        const childRuns = await toArray(this.listRuns({
+            isRoot: false,
+            projectId: run.session_id,
+            traceId: run.trace_id,
+        }));
         const treemap = {};
         const runs = {};
         // TODO: make dotted order required when the migration finishes
@@ -996,11 +1172,14 @@ export class Client {
                 childRun.parent_run_id === undefined) {
                 throw new Error(`Child run ${childRun.id} has no parent`);
             }
-            if (!(childRun.parent_run_id in treemap)) {
-                treemap[childRun.parent_run_id] = [];
+            if (childRun.dotted_order?.startsWith(run.dotted_order ?? "") &&
+                childRun.id !== run.id) {
+                if (!(childRun.parent_run_id in treemap)) {
+                    treemap[childRun.parent_run_id] = [];
+                }
+                treemap[childRun.parent_run_id].push(childRun);
+                runs[childRun.id] = childRun;
             }
-            treemap[childRun.parent_run_id].push(childRun);
-            runs[childRun.id] = childRun;
         }
         run.child_runs = treemap[run.id] || [];
         for (const runId in treemap) {
@@ -1093,7 +1272,7 @@ export class Client {
      * });
      */
     async *listRuns(props) {
-        const { projectId, projectName, parentRunId, traceId, referenceExampleId, startTime, executionOrder, isRoot, runType, error, id, query, filter, traceFilter, treeFilter, limit, select, } = props;
+        const { projectId, projectName, parentRunId, traceId, referenceExampleId, startTime, executionOrder, isRoot, runType, error, id, query, filter, traceFilter, treeFilter, limit, select, order, } = props;
         let projectIds = [];
         if (projectId) {
             projectIds = Array.isArray(projectId) ? projectId : [projectId];
@@ -1107,7 +1286,6 @@ export class Client {
         }
         const default_select = [
             "app_path",
-            "child_run_ids",
             "completion_cost",
             "completion_tokens",
             "dotted_order",
@@ -1152,6 +1330,7 @@ export class Client {
             trace: traceId,
             select: select ? select : default_select,
             is_root: isRoot,
+            order,
         };
         let runsYielded = 0;
         for await (const runs of this._getCursorPaginatedList("/runs/query", body)) {
@@ -1172,6 +1351,49 @@ export class Client {
             }
         }
     }
+    async *listGroupRuns(props) {
+        const { projectId, projectName, groupBy, filter, startTime, endTime, limit, offset, } = props;
+        const sessionId = projectId || (await this.readProject({ projectName })).id;
+        const baseBody = {
+            session_id: sessionId,
+            group_by: groupBy,
+            filter,
+            start_time: startTime ? startTime.toISOString() : null,
+            end_time: endTime ? endTime.toISOString() : null,
+            limit: Number(limit) || 100,
+        };
+        let currentOffset = Number(offset) || 0;
+        const path = "/runs/group";
+        const url = `${this.apiUrl}${path}`;
+        while (true) {
+            const currentBody = {
+                ...baseBody,
+                offset: currentOffset,
+            };
+            // Remove undefined values from the payload
+            const filteredPayload = Object.fromEntries(Object.entries(currentBody).filter(([_, value]) => value !== undefined));
+            const response = await this.caller.call(_getFetchImplementation(), url, {
+                method: "POST",
+                headers: { ...this.headers, "Content-Type": "application/json" },
+                body: JSON.stringify(filteredPayload),
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(response, `Failed to fetch ${path}`);
+            const items = await response.json();
+            const { groups, total } = items;
+            if (groups.length === 0) {
+                break;
+            }
+            for (const thread of groups) {
+                yield thread;
+            }
+            currentOffset += groups.length;
+            if (currentOffset >= total) {
+                break;
+            }
+        }
+    }
     async getRunStats({ id, trace, parentRun, runType, projectNames, projectIds, referenceExampleIds, startTime, endTime, error, query, filter, traceFilter, treeFilter, isRoot, dataSourceType, }) {
         let projectIds_ = projectIds || [];
         if (projectNames) {
@@ -1199,7 +1421,7 @@ export class Client {
         };
         // Remove undefined values from the payload
         const filteredPayload = Object.fromEntries(Object.entries(payload).filter(([_, value]) => value !== undefined));
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/runs/stats`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/runs/stats`, {
             method: "POST",
             headers: this.headers,
             body: JSON.stringify(filteredPayload),
@@ -1215,7 +1437,7 @@ export class Client {
             share_token: shareId || uuid.v4(),
         };
         assertUuid(runId);
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/runs/${runId}/share`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/runs/${runId}/share`, {
             method: "PUT",
             headers: this.headers,
             body: JSON.stringify(data),
@@ -1230,7 +1452,7 @@ export class Client {
     }
     async unshareRun(runId) {
         assertUuid(runId);
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/runs/${runId}/share`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/runs/${runId}/share`, {
             method: "DELETE",
             headers: this.headers,
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -1240,7 +1462,7 @@ export class Client {
     }
     async readRunSharedLink(runId) {
         assertUuid(runId);
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/runs/${runId}/share`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/runs/${runId}/share`, {
             method: "GET",
             headers: this.headers,
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -1262,7 +1484,7 @@ export class Client {
             }
         }
         assertUuid(shareToken);
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/public/${shareToken}/runs${queryParams}`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/public/${shareToken}/runs${queryParams}`, {
             method: "GET",
             headers: this.headers,
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -1280,7 +1502,7 @@ export class Client {
             datasetId = dataset.id;
         }
         assertUuid(datasetId);
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/datasets/${datasetId}/share`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/datasets/${datasetId}/share`, {
             method: "GET",
             headers: this.headers,
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -1302,7 +1524,7 @@ export class Client {
             dataset_id: datasetId,
         };
         assertUuid(datasetId);
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/datasets/${datasetId}/share`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/datasets/${datasetId}/share`, {
             method: "PUT",
             headers: this.headers,
             body: JSON.stringify(data),
@@ -1315,7 +1537,7 @@ export class Client {
     }
     async unshareDataset(datasetId) {
         assertUuid(datasetId);
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/datasets/${datasetId}/share`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/datasets/${datasetId}/share`, {
             method: "DELETE",
             headers: this.headers,
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -1325,7 +1547,7 @@ export class Client {
     }
     async readSharedDataset(shareToken) {
         assertUuid(shareToken);
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/public/${shareToken}/datasets`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/public/${shareToken}/datasets`, {
             method: "GET",
             headers: this.headers,
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -1356,7 +1578,7 @@ export class Client {
                 urlParams.append(key, value);
             }
         });
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/public/${shareToken}/examples?${urlParams.toString()}`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/public/${shareToken}/examples?${urlParams.toString()}`, {
             method: "GET",
             headers: this.headers,
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -1365,7 +1587,9 @@ export class Client {
         const result = await response.json();
         if (!response.ok) {
             if ("detail" in result) {
-                throw new Error(`Failed to list shared examples.\nStatus: ${response.status}\nMessage: ${result.detail.join("\n")}`);
+                throw new Error(`Failed to list shared examples.\nStatus: ${response.status}\nMessage: ${Array.isArray(result.detail)
+                    ? result.detail.join("\n")
+                    : "Unspecified error"}`);
             }
             throw new Error(`Failed to list shared examples: ${response.status} ${response.statusText}`);
         }
@@ -1389,7 +1613,7 @@ export class Client {
         if (referenceDatasetId !== null) {
             body["reference_dataset_id"] = referenceDatasetId;
         }
-        const response = await this.caller.call(_getFetchImplementation(), endpoint, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), endpoint, {
             method: "POST",
             headers: { ...this.headers, "Content-Type": "application/json" },
             body: JSON.stringify(body),
@@ -1412,7 +1636,7 @@ export class Client {
             description,
             end_time: endTime ? new Date(endTime).toISOString() : null,
         };
-        const response = await this.caller.call(_getFetchImplementation(), endpoint, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), endpoint, {
             method: "PATCH",
             headers: { ...this.headers, "Content-Type": "application/json" },
             body: JSON.stringify(body),
@@ -1440,7 +1664,7 @@ export class Client {
         else {
             throw new Error("Must provide projectName or projectId");
         }
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}${path}?${params}`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}${path}?${params}`, {
             method: "GET",
             headers: this.headers,
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -1570,7 +1794,7 @@ export class Client {
             projectId_ = projectId;
         }
         assertUuid(projectId_);
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/sessions/${projectId_}`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/sessions/${projectId_}`, {
             method: "DELETE",
             headers: this.headers,
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -1597,7 +1821,7 @@ export class Client {
         if (name) {
             formData.append("name", name);
         }
-        const response = await this.caller.call(_getFetchImplementation(), url, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), url, {
             method: "POST",
             headers: this.headers,
             body: formData,
@@ -1623,7 +1847,7 @@ export class Client {
         if (outputsSchema) {
             body.outputs_schema_definition = outputsSchema;
         }
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/datasets`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/datasets`, {
             method: "POST",
             headers: { ...this.headers, "Content-Type": "application/json" },
             body: JSON.stringify(body),
@@ -1755,7 +1979,7 @@ export class Client {
         }
         const _datasetId = datasetId ?? (await this.readDataset({ datasetName })).id;
         assertUuid(_datasetId);
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/datasets/${_datasetId}`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/datasets/${_datasetId}`, {
             method: "PATCH",
             headers: { ...this.headers, "Content-Type": "application/json" },
             body: JSON.stringify(update),
@@ -1787,7 +2011,7 @@ export class Client {
         }
         const _datasetId = datasetId ?? (await this.readDataset({ datasetName })).id;
         assertUuid(_datasetId);
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/datasets/${_datasetId}/tags`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/datasets/${_datasetId}/tags`, {
             method: "PUT",
             headers: { ...this.headers, "Content-Type": "application/json" },
             body: JSON.stringify({
@@ -1816,7 +2040,7 @@ export class Client {
         else {
             throw new Error("Must provide datasetName or datasetId");
         }
-        const response = await this.caller.call(_getFetchImplementation(), this.apiUrl + path, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), this.apiUrl + path, {
             method: "DELETE",
             headers: this.headers,
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -1841,7 +2065,7 @@ export class Client {
         const data = {
             tag: tag,
         };
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/datasets/${datasetId_}/index`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/datasets/${datasetId_}/index`, {
             method: "POST",
             headers: { ...this.headers, "Content-Type": "application/json" },
             body: JSON.stringify(data),
@@ -1890,7 +2114,7 @@ export class Client {
             data["filter"] = filter;
         }
         assertUuid(datasetId);
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/datasets/${datasetId}/search`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/datasets/${datasetId}/search`, {
             method: "POST",
             headers: { ...this.headers, "Content-Type": "application/json" },
             body: JSON.stringify(data),
@@ -2109,7 +2333,7 @@ export class Client {
     async deleteExample(exampleId) {
         assertUuid(exampleId);
         const path = `/examples/${exampleId}`;
-        const response = await this.caller.call(_getFetchImplementation(), this.apiUrl + path, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), this.apiUrl + path, {
             method: "DELETE",
             headers: this.headers,
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -2188,7 +2412,7 @@ export class Client {
         if (tag !== undefined) {
             params.append("tag", tag);
         }
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/datasets/${resolvedDatasetId}/version?${params.toString()}`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/datasets/${resolvedDatasetId}/version?${params.toString()}`, {
             method: "GET",
             headers: { ...this.headers },
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -2249,7 +2473,7 @@ export class Client {
             }),
             remove,
         };
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/datasets/${datasetId_}/splits`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/datasets/${datasetId_}/splits`, {
             method: "PUT",
             headers: { ...this.headers, "Content-Type": "application/json" },
             body: JSON.stringify(data),
@@ -2305,7 +2529,7 @@ export class Client {
             id: feedbackId ?? uuid.v4(),
             run_id: runId,
             key,
-            score,
+            score: _formatFeedbackScore(score),
             value,
             correction,
             comment,
@@ -2315,7 +2539,7 @@ export class Client {
             session_id: projectId,
         };
         const url = `${this.apiUrl}/feedback`;
-        const response = await this.caller.call(_getFetchImplementation(), url, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), url, {
             method: "POST",
             headers: { ...this.headers, "Content-Type": "application/json" },
             body: JSON.stringify(feedback),
@@ -2328,7 +2552,7 @@ export class Client {
     async updateFeedback(feedbackId, { score, value, correction, comment, }) {
         const feedbackUpdate = {};
         if (score !== undefined && score !== null) {
-            feedbackUpdate["score"] = score;
+            feedbackUpdate["score"] = _formatFeedbackScore(score);
         }
         if (value !== undefined && value !== null) {
             feedbackUpdate["value"] = value;
@@ -2340,7 +2564,7 @@ export class Client {
             feedbackUpdate["comment"] = comment;
         }
         assertUuid(feedbackId);
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/feedback/${feedbackId}`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/feedback/${feedbackId}`, {
             method: "PATCH",
             headers: { ...this.headers, "Content-Type": "application/json" },
             body: JSON.stringify(feedbackUpdate),
@@ -2358,7 +2582,7 @@ export class Client {
     async deleteFeedback(feedbackId) {
         assertUuid(feedbackId);
         const path = `/feedback/${feedbackId}`;
-        const response = await this.caller.call(_getFetchImplementation(), this.apiUrl + path, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), this.apiUrl + path, {
             method: "DELETE",
             headers: this.headers,
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -2420,7 +2644,7 @@ export class Client {
                 hours: 3,
             };
         }
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/feedback/tokens`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/feedback/tokens`, {
             method: "POST",
             headers: { ...this.headers, "Content-Type": "application/json" },
             body: JSON.stringify(body),
@@ -2453,7 +2677,7 @@ export class Client {
         };
         if (metadata)
             body.extra["metadata"] = metadata;
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/datasets/comparative`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/datasets/comparative`, {
             method: "POST",
             headers: { ...this.headers, "Content-Type": "application/json" },
             body: JSON.stringify(body),
@@ -2562,13 +2786,14 @@ export class Client {
      * @returns The created AnnotationQueue object
      */
     async createAnnotationQueue(options) {
-        const { name, description, queueId } = options;
+        const { name, description, queueId, rubricInstructions } = options;
         const body = {
             name,
             description,
             id: queueId || uuid.v4(),
+            rubric_instructions: rubricInstructions,
         };
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/annotation-queues`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/annotation-queues`, {
             method: "POST",
             headers: { ...this.headers, "Content-Type": "application/json" },
             body: JSON.stringify(Object.fromEntries(Object.entries(body).filter(([_, v]) => v !== undefined))),
@@ -2582,17 +2807,18 @@ export class Client {
     /**
      * Read an annotation queue with the specified queue ID.
      * @param queueId - The ID of the annotation queue to read
-     * @returns The AnnotationQueue object
+     * @returns The AnnotationQueueWithDetails object
      */
     async readAnnotationQueue(queueId) {
-        // TODO: Replace when actual endpoint is added
-        const queueIteratorResult = await this.listAnnotationQueues({
-            queueIds: [queueId],
-        }).next();
-        if (queueIteratorResult.done) {
-            throw new Error(`Annotation queue with ID ${queueId} not found`);
-        }
-        return queueIteratorResult.value;
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/annotation-queues/${assertUuid(queueId, "queueId")}`, {
+            method: "GET",
+            headers: this.headers,
+            signal: AbortSignal.timeout(this.timeout_ms),
+            ...this.fetchOptions,
+        });
+        await raiseForStatus(response, "read annotation queue");
+        const data = await response.json();
+        return data;
     }
     /**
      * Update an annotation queue with the specified queue ID.
@@ -2602,11 +2828,15 @@ export class Client {
      * @param options.description - The new description for the annotation queue
      */
     async updateAnnotationQueue(queueId, options) {
-        const { name, description } = options;
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/annotation-queues/${assertUuid(queueId, "queueId")}`, {
+        const { name, description, rubricInstructions } = options;
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/annotation-queues/${assertUuid(queueId, "queueId")}`, {
             method: "PATCH",
             headers: { ...this.headers, "Content-Type": "application/json" },
-            body: JSON.stringify({ name, description }),
+            body: JSON.stringify({
+                name,
+                description,
+                rubric_instructions: rubricInstructions,
+            }),
             signal: AbortSignal.timeout(this.timeout_ms),
             ...this.fetchOptions,
         });
@@ -2617,7 +2847,7 @@ export class Client {
      * @param queueId - The ID of the annotation queue to delete
      */
     async deleteAnnotationQueue(queueId) {
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/annotation-queues/${assertUuid(queueId, "queueId")}`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/annotation-queues/${assertUuid(queueId, "queueId")}`, {
             method: "DELETE",
             headers: { ...this.headers, Accept: "application/json" },
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -2631,7 +2861,7 @@ export class Client {
      * @param runIds - The IDs of the runs to be added to the annotation queue
      */
     async addRunsToAnnotationQueue(queueId, runIds) {
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/annotation-queues/${assertUuid(queueId, "queueId")}/runs`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/annotation-queues/${assertUuid(queueId, "queueId")}/runs`, {
             method: "POST",
             headers: { ...this.headers, "Content-Type": "application/json" },
             body: JSON.stringify(runIds.map((id, i) => assertUuid(id, `runIds[${i}]`).toString())),
@@ -2649,7 +2879,7 @@ export class Client {
      */
     async getRunFromAnnotationQueue(queueId, index) {
         const baseUrl = `/annotation-queues/${assertUuid(queueId, "queueId")}/run`;
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}${baseUrl}/${index}`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}${baseUrl}/${index}`, {
             method: "GET",
             headers: this.headers,
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -2664,7 +2894,7 @@ export class Client {
      * @param queueRunId - The ID of the run to delete from the annotation queue
      */
     async deleteRunFromAnnotationQueue(queueId, queueRunId) {
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/annotation-queues/${assertUuid(queueId, "queueId")}/runs/${assertUuid(queueRunId, "queueRunId")}`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/annotation-queues/${assertUuid(queueId, "queueId")}/runs/${assertUuid(queueRunId, "queueRunId")}`, {
             method: "DELETE",
             headers: { ...this.headers, Accept: "application/json" },
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -2677,7 +2907,7 @@ export class Client {
      * @param queueId - The ID of the annotation queue
      */
     async getSizeFromAnnotationQueue(queueId) {
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/annotation-queues/${assertUuid(queueId, "queueId")}/size`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/annotation-queues/${assertUuid(queueId, "queueId")}/size`, {
             method: "GET",
             headers: this.headers,
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -2697,7 +2927,7 @@ export class Client {
       Requested tenant: ${owner}`);
     }
     async _getLatestCommitHash(promptOwnerAndName) {
-        const res = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/commits/${promptOwnerAndName}/?limit=${1}&offset=${0}`, {
+        const res = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/commits/${promptOwnerAndName}/?limit=${1}&offset=${0}`, {
             method: "GET",
             headers: this.headers,
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -2720,7 +2950,7 @@ export class Client {
     }
     async _likeOrUnlikePrompt(promptIdentifier, like) {
         const [owner, promptName, _] = parsePromptIdentifier(promptIdentifier);
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/likes/${owner}/${promptName}`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/likes/${owner}/${promptName}`, {
             method: "POST",
             body: JSON.stringify({ like: like }),
             headers: { ...this.headers, "Content-Type": "application/json" },
@@ -2782,7 +3012,7 @@ export class Client {
     }
     async getPrompt(promptIdentifier) {
         const [owner, promptName, _] = parsePromptIdentifier(promptIdentifier);
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/repos/${owner}/${promptName}`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/repos/${owner}/${promptName}`, {
             method: "GET",
             headers: this.headers,
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -2819,7 +3049,7 @@ export class Client {
             ...(options?.tags && { tags: options.tags }),
             is_public: !!options?.isPublic,
         };
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/repos/`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/repos/`, {
             method: "POST",
             headers: { ...this.headers, "Content-Type": "application/json" },
             body: JSON.stringify(data),
@@ -2842,7 +3072,7 @@ export class Client {
             manifest: JSON.parse(JSON.stringify(object)),
             parent_commit: resolvedParentCommitHash,
         };
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/commits/${owner}/${promptName}`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/commits/${owner}/${promptName}`, {
             method: "POST",
             headers: { ...this.headers, "Content-Type": "application/json" },
             body: JSON.stringify(payload),
@@ -2863,7 +3093,7 @@ export class Client {
     }
     async _updateExamplesMultipart(datasetId, updates = []) {
         if (!(await this._getMultiPartSupport())) {
-            throw new Error("Your LangSmith version does not allow using the multipart examples endpoint, please update to the latest version.");
+            throw new Error("Your LangSmith deployment does not allow using the multipart examples endpoint, please upgrade your deployment to the latest version.");
         }
         const formData = new FormData();
         for (const example of updates) {
@@ -2874,14 +3104,14 @@ export class Client {
                 ...(example.split && { split: example.split }),
             };
             // Add main example data
-            const stringifiedExample = serializePayloadForTracing(exampleBody);
+            const stringifiedExample = serializePayloadForTracing(exampleBody, `Serializing body for example with id: ${exampleId}`);
             const exampleBlob = new Blob([stringifiedExample], {
                 type: "application/json",
             });
             formData.append(exampleId, exampleBlob);
             // Add inputs if present
             if (example.inputs) {
-                const stringifiedInputs = serializePayloadForTracing(example.inputs);
+                const stringifiedInputs = serializePayloadForTracing(example.inputs, `Serializing inputs for example with id: ${exampleId}`);
                 const inputsBlob = new Blob([stringifiedInputs], {
                     type: "application/json",
                 });
@@ -2889,7 +3119,7 @@ export class Client {
             }
             // Add outputs if present
             if (example.outputs) {
-                const stringifiedOutputs = serializePayloadForTracing(example.outputs);
+                const stringifiedOutputs = serializePayloadForTracing(example.outputs, `Serializing outputs whle updating example with id: ${exampleId}`);
                 const outputsBlob = new Blob([stringifiedOutputs], {
                     type: "application/json",
                 });
@@ -2914,7 +3144,7 @@ export class Client {
                 }
             }
             if (example.attachments_operations) {
-                const stringifiedAttachmentsOperations = serializePayloadForTracing(example.attachments_operations);
+                const stringifiedAttachmentsOperations = serializePayloadForTracing(example.attachments_operations, `Serializing attachments while updating example with id: ${exampleId}`);
                 const attachmentsOperationsBlob = new Blob([stringifiedAttachmentsOperations], {
                     type: "application/json",
                 });
@@ -2922,7 +3152,7 @@ export class Client {
             }
         }
         const datasetIdToUse = datasetId ?? updates[0]?.dataset_id;
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/v1/platform/datasets/${datasetIdToUse}/examples`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/v1/platform/datasets/${datasetIdToUse}/examples`, {
             method: "PATCH",
             headers: this.headers,
             body: formData,
@@ -2941,7 +3171,7 @@ export class Client {
     }
     async _uploadExamplesMultipart(datasetId, uploads = []) {
         if (!(await this._getMultiPartSupport())) {
-            throw new Error("Your LangSmith version does not allow using the multipart examples endpoint, please update to the latest version.");
+            throw new Error("Your LangSmith deployment does not allow using the multipart examples endpoint, please upgrade your deployment to the latest version.");
         }
         const formData = new FormData();
         for (const example of uploads) {
@@ -2960,14 +3190,14 @@ export class Client {
                 }),
             };
             // Add main example data
-            const stringifiedExample = serializePayloadForTracing(exampleBody);
+            const stringifiedExample = serializePayloadForTracing(exampleBody, `Serializing body for uploaded example with id: ${exampleId}`);
             const exampleBlob = new Blob([stringifiedExample], {
                 type: "application/json",
             });
             formData.append(exampleId, exampleBlob);
             // Add inputs if present
             if (example.inputs) {
-                const stringifiedInputs = serializePayloadForTracing(example.inputs);
+                const stringifiedInputs = serializePayloadForTracing(example.inputs, `Serializing inputs for uploaded example with id: ${exampleId}`);
                 const inputsBlob = new Blob([stringifiedInputs], {
                     type: "application/json",
                 });
@@ -2975,7 +3205,7 @@ export class Client {
             }
             // Add outputs if present
             if (example.outputs) {
-                const stringifiedOutputs = serializePayloadForTracing(example.outputs);
+                const stringifiedOutputs = serializePayloadForTracing(example.outputs, `Serializing outputs for uploaded example with id: ${exampleId}`);
                 const outputsBlob = new Blob([stringifiedOutputs], {
                     type: "application/json",
                 });
@@ -3000,11 +3230,12 @@ export class Client {
                 }
             }
         }
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/v1/platform/datasets/${datasetId}/examples`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/v1/platform/datasets/${datasetId}/examples`, {
             method: "POST",
             headers: this.headers,
             body: formData,
         });
+        await raiseForStatus(response, "upload examples");
         const result = await response.json();
         return result;
     }
@@ -3031,7 +3262,7 @@ export class Client {
         if (Object.keys(payload).length === 0) {
             throw new Error("No valid update options provided");
         }
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/repos/${owner}/${promptName}`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/repos/${owner}/${promptName}`, {
             method: "PATCH",
             body: JSON.stringify(payload),
             headers: {
@@ -3052,7 +3283,7 @@ export class Client {
         if (!(await this._currentTenantIsOwner(owner))) {
             throw await this._ownerConflictError("delete a prompt", owner);
         }
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/repos/${owner}/${promptName}`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/repos/${owner}/${promptName}`, {
             method: "DELETE",
             headers: this.headers,
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -3062,7 +3293,7 @@ export class Client {
     }
     async pullPromptCommit(promptIdentifier, options) {
         const [owner, promptName, commitHash] = parsePromptIdentifier(promptIdentifier);
-        const response = await this.caller.call(_getFetchImplementation(), `${this.apiUrl}/commits/${owner}/${promptName}/${commitHash}${options?.includeModel ? "?include_model=true" : ""}`, {
+        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/commits/${owner}/${promptName}/${commitHash}${options?.includeModel ? "?include_model=true" : ""}`, {
             method: "GET",
             headers: this.headers,
             signal: AbortSignal.timeout(this.timeout_ms),
@@ -3221,15 +3452,18 @@ export class Client {
      *
      * @returns A promise that resolves once all currently pending traces have sent.
      */
-    awaitPendingTraceBatches() {
+    async awaitPendingTraceBatches() {
         if (this.manualFlushMode) {
             console.warn("[WARNING]: When tracing in manual flush mode, you must call `await client.flush()` manually to submit trace batches.");
             return Promise.resolve();
         }
-        return Promise.all([
+        await Promise.all([
             ...this.autoBatchQueue.items.map(({ itemPromise }) => itemPromise),
             this.batchIngestCaller.queue.onIdle(),
         ]);
+        if (this.langSmithToOTELTranslator !== undefined) {
+            await getDefaultOTLPTracerComponents()?.DEFAULT_LANGSMITH_SPAN_PROCESSOR?.forceFlush();
+        }
     }
 }
 function isExampleCreate(input) {