langsmith 0.3.62-rc.2 → 0.3.63

package/dist/client.js

@@ -164,11 +164,13 @@ export class AutoBatchQueue {
         ];
     }
 }
-// 20 MB
-export const DEFAULT_BATCH_SIZE_LIMIT_BYTES = 20_971_520;
-const SERVER_INFO_REQUEST_TIMEOUT = 2500;
+export const DEFAULT_UNCOMPRESSED_BATCH_SIZE_LIMIT_BYTES = 24 * 1024 * 1024;
+const SERVER_INFO_REQUEST_TIMEOUT_MS = 10000;
 const DEFAULT_API_URL = "https://api.smith.langchain.com";
 export class Client {
+    get _fetch() {
+        return this.fetchImplementation || _getFetchImplementation(this.debug);
+    }
     constructor(config = {}) {
         Object.defineProperty(this, "apiKey", {
             enumerable: true,
@@ -315,6 +317,12 @@ export class Client {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "fetchImplementation", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "multipartStreamingDisabled", {
             enumerable: true,
             configurable: true,
@@ -341,6 +349,7 @@ export class Client {
         this.timeout_ms = config.timeout_ms ?? 90_000;
         this.caller = new AsyncCaller({
             ...(config.callerOptions ?? {}),
+            maxRetries: 4,
             debug: config.debug ?? this.debug,
         });
         this.traceBatchConcurrency =
@@ -349,6 +358,7 @@ export class Client {
             throw new Error("Trace batch concurrency must be positive.");
         }
         this.debug = config.debug ?? this.debug;
+        this.fetchImplementation = config.fetchImplementation;
         this.batchIngestCaller = new AsyncCaller({
             maxRetries: 2,
             maxConcurrency: this.traceBatchConcurrency,
@@ -468,13 +478,16 @@ export class Client {
     async _getResponse(path, queryParams) {
         const paramsString = queryParams?.toString() ?? "";
         const url = `${this.apiUrl}${path}?${paramsString}`;
-        const response = await this.caller.call(_getFetchImplementation(this.debug), url, {
-            method: "GET",
-            headers: this.headers,
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(url, {
+                method: "GET",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, `Failed to fetch ${path}`);
+            return res;
         });
-        await raiseForStatus(response, `Failed to fetch ${path}`);
         return response;
     }
     async _get(path, queryParams) {
@@ -488,13 +501,16 @@ 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(this.debug), url, {
-                method: "GET",
-                headers: this.headers,
-                signal: AbortSignal.timeout(this.timeout_ms),
-                ...this.fetchOptions,
+            const response = await this.caller.call(async () => {
+                const res = await this._fetch(url, {
+                    method: "GET",
+                    headers: this.headers,
+                    signal: AbortSignal.timeout(this.timeout_ms),
+                    ...this.fetchOptions,
+                });
+                await raiseForStatus(res, `Failed to fetch ${path}`);
+                return res;
             });
-            await raiseForStatus(response, `Failed to fetch ${path}`);
             const items = transform
                 ? transform(await response.json())
                 : await response.json();
@@ -511,12 +527,17 @@ 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.debug), `${this.apiUrl}${path}`, {
-                method: requestMethod,
-                headers: { ...this.headers, "Content-Type": "application/json" },
-                signal: AbortSignal.timeout(this.timeout_ms),
-                ...this.fetchOptions,
-                body: JSON.stringify(bodyParams),
+            const body = JSON.stringify(bodyParams);
+            const response = await this.caller.call(async () => {
+                const res = await this._fetch(`${this.apiUrl}${path}`, {
+                    method: requestMethod,
+                    headers: { ...this.headers, "Content-Type": "application/json" },
+                    signal: AbortSignal.timeout(this.timeout_ms),
+                    ...this.fetchOptions,
+                    body,
+                });
+                await raiseForStatus(res, `Failed to fetch ${path}`);
+                return res;
             });
             const responseBody = await response.json();
             if (!responseBody) {
@@ -589,7 +610,7 @@ export class Client {
         const serverInfo = await this._ensureServerInfo();
         return (this.batchSizeBytesLimit ??
             serverInfo.batch_ingest_config?.size_limit_bytes ??
-            DEFAULT_BATCH_SIZE_LIMIT_BYTES);
+            DEFAULT_UNCOMPRESSED_BATCH_SIZE_LIMIT_BYTES);
     }
     async _getDatasetExamplesMultiPartSupport() {
         const serverInfo = await this._ensureServerInfo();
@@ -647,7 +668,7 @@ export class Client {
                 };
                 const serverInfo = await this._ensureServerInfo();
                 if (serverInfo?.batch_ingest_config?.use_multipart_endpoint) {
-                    const useGzip = serverInfo?.batch_ingest_config?.gzip_body_enabled;
+                    const useGzip = serverInfo?.instance_flags?.gzip_body_enabled;
                     await this.multipartIngestRuns(ingestParams, { ...options, useGzip });
                 }
                 else {
@@ -710,10 +731,10 @@ export class Client {
     }
     async _getServerInfo() {
         const response = await this.caller.call(async () => {
-            const res = await _getFetchImplementation(this.debug)(`${this.apiUrl}/info`, {
+            const res = await this._fetch(`${this.apiUrl}/info`, {
                 method: "GET",
                 headers: { Accept: "application/json" },
-                signal: AbortSignal.timeout(SERVER_INFO_REQUEST_TIMEOUT),
+                signal: AbortSignal.timeout(SERVER_INFO_REQUEST_TIMEOUT_MS),
                 ...this.fetchOptions,
             });
             await raiseForStatus(res, "get server info");
@@ -735,7 +756,7 @@ export class Client {
                         this._serverInfo = await this._getServerInfo();
                     }
                     catch (e) {
-                        console.warn(`[WARNING]: LangSmith failed to fetch info on supported operations with status code ${e.status}. Falling back to batch operations and default limits.`);
+                        console.warn(`[LANGSMITH]: Failed to fetch info on supported operations. Falling back to batch operations and default limits. Info: ${e.status ?? "Unspecified status code"} ${e.message}`);
                     }
                 }
                 return this._serverInfo ?? {};
@@ -804,14 +825,18 @@ export class Client {
         if (options?.apiKey !== undefined) {
             headers["x-api-key"] = options.apiKey;
         }
-        const response = await this.caller.call(_getFetchImplementation(this.debug), `${options?.apiUrl ?? this.apiUrl}/runs`, {
-            method: "POST",
-            headers,
-            body: serializePayloadForTracing(mergedRunCreateParam, `Creating run with id: ${mergedRunCreateParam.id}`),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        const body = serializePayloadForTracing(mergedRunCreateParam, `Creating run with id: ${mergedRunCreateParam.id}`);
+        await this.caller.call(async () => {
+            const res = await this._fetch(`${options?.apiUrl ?? this.apiUrl}/runs`, {
+                method: "POST",
+                headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body,
+            });
+            await raiseForStatus(res, "create run", true);
+            return res;
         });
-        await raiseForStatus(response, "create run", true);
     }
     /**
      * Batch ingest/upsert multiple runs in the Langsmith system.
@@ -884,14 +909,17 @@ export class Client {
         if (options?.apiKey !== undefined) {
             headers["x-api-key"] = options.apiKey;
         }
-        const response = await this.batchIngestCaller.call(_getFetchImplementation(this.debug), `${options?.apiUrl ?? this.apiUrl}/runs/batch`, {
-            method: "POST",
-            headers,
-            body: body,
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        await this.batchIngestCaller.call(async () => {
+            const res = await this._fetch(`${options?.apiUrl ?? this.apiUrl}/runs/batch`, {
+                method: "POST",
+                headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body,
+            });
+            await raiseForStatus(res, "batch create run", true);
+            return res;
         });
-        await raiseForStatus(response, "batch create run", true);
     }
     /**
      * Batch ingest/upsert multiple runs in the Langsmith system.
@@ -1095,27 +1123,33 @@ export class Client {
         const isNodeFetch = _globalFetchImplementationIsNodeFetch();
         const buildBuffered = () => this._createNodeFetchBody(parts, boundary);
         const buildStream = () => this._createMultipartStream(parts, boundary);
-        const send = async (body) => {
-            const headers = {
-                ...this.headers,
-                "Content-Type": `multipart/form-data; boundary=${boundary}`,
-            };
-            if (options?.apiKey !== undefined) {
-                headers["x-api-key"] = options.apiKey;
-            }
-            let transformedBody = body;
-            if (options?.useGzip &&
-                typeof body === "object" &&
-                "pipeThrough" in body) {
-                transformedBody = body.pipeThrough(new CompressionStream("gzip"));
-            }
-            return this.batchIngestCaller.call(_getFetchImplementation(this.debug), `${options?.apiUrl ?? this.apiUrl}/runs/multipart`, {
-                method: "POST",
-                headers,
-                body: transformedBody,
-                duplex: "half",
-                signal: AbortSignal.timeout(this.timeout_ms),
-                ...this.fetchOptions,
+        const sendWithRetry = async (bodyFactory) => {
+            return this.batchIngestCaller.call(async () => {
+                const body = await bodyFactory();
+                const headers = {
+                    ...this.headers,
+                    "Content-Type": `multipart/form-data; boundary=${boundary}`,
+                };
+                if (options?.apiKey !== undefined) {
+                    headers["x-api-key"] = options.apiKey;
+                }
+                let transformedBody = body;
+                if (options?.useGzip &&
+                    typeof body === "object" &&
+                    "pipeThrough" in body) {
+                    transformedBody = body.pipeThrough(new CompressionStream("gzip"));
+                    headers["Content-Encoding"] = "gzip";
+                }
+                const response = await this._fetch(`${options?.apiUrl ?? this.apiUrl}/runs/multipart`, {
+                    method: "POST",
+                    headers,
+                    body: transformedBody,
+                    duplex: "half",
+                    signal: AbortSignal.timeout(this.timeout_ms),
+                    ...this.fetchOptions,
+                });
+                await raiseForStatus(response, `Failed to send multipart request`, true);
+                return response;
             });
         };
         try {
@@ -1124,10 +1158,10 @@ export class Client {
             // attempt stream only if not disabled and not using node-fetch
             if (!isNodeFetch && !this.multipartStreamingDisabled) {
                 streamedAttempt = true;
-                res = await send(await buildStream());
+                res = await sendWithRetry(buildStream);
             }
             else {
-                res = await send(await buildBuffered());
+                res = await sendWithRetry(buildBuffered);
             }
             // if stream fails, fallback to buffered body
             if ((!this.multipartStreamingDisabled || streamedAttempt) &&
@@ -1139,10 +1173,8 @@ export class Client {
                 // Disable streaming for future requests
                 this.multipartStreamingDisabled = true;
                 // retry with fully-buffered body
-                res = await send(await buildBuffered());
+                res = await sendWithRetry(buildBuffered);
             }
-            // raise if still failing
-            await raiseForStatus(res, "ingest multipart runs", true);
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
         }
         catch (e) {
@@ -1199,14 +1231,18 @@ export class Client {
         if (options?.apiKey !== undefined) {
             headers["x-api-key"] = options.apiKey;
         }
-        const response = await this.caller.call(_getFetchImplementation(this.debug), `${options?.apiUrl ?? this.apiUrl}/runs/${runId}`, {
-            method: "PATCH",
-            headers,
-            body: serializePayloadForTracing(run, `Serializing payload to update run with id: ${runId}`),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        const body = serializePayloadForTracing(run, `Serializing payload to update run with id: ${runId}`);
+        await this.caller.call(async () => {
+            const res = await this._fetch(`${options?.apiUrl ?? this.apiUrl}/runs/${runId}`, {
+                method: "PATCH",
+                headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body,
+            });
+            await raiseForStatus(res, "update run", true);
+            return res;
         });
-        await raiseForStatus(response, "update run", true);
     }
     async readRun(runId, { loadChildRuns } = { loadChildRuns: false }) {
         assertUuid(runId);
@@ -1464,14 +1500,18 @@ export class Client {
             };
             // 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,
+            const body = JSON.stringify(filteredPayload);
+            const response = await this.caller.call(async () => {
+                const res = await this._fetch(url, {
+                    method: "POST",
+                    headers: { ...this.headers, "Content-Type": "application/json" },
+                    signal: AbortSignal.timeout(this.timeout_ms),
+                    ...this.fetchOptions,
+                    body,
+                });
+                await raiseForStatus(res, `Failed to fetch ${path}`);
+                return res;
             });
-            await raiseForStatus(response, `Failed to fetch ${path}`);
             const items = await response.json();
             const { groups, total } = items;
             if (groups.length === 0) {
@@ -1513,12 +1553,17 @@ 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.debug), `${this.apiUrl}/runs/stats`, {
-            method: "POST",
-            headers: this.headers,
-            body: JSON.stringify(filteredPayload),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        const body = JSON.stringify(filteredPayload);
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/runs/stats`, {
+                method: "POST",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body,
+            });
+            await raiseForStatus(res, "get run stats");
+            return res;
         });
         const result = await response.json();
         return result;
@@ -1529,12 +1574,17 @@ export class Client {
             share_token: shareId || uuid.v4(),
         };
         assertUuid(runId);
-        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/runs/${runId}/share`, {
-            method: "PUT",
-            headers: this.headers,
-            body: JSON.stringify(data),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        const body = JSON.stringify(data);
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/runs/${runId}/share`, {
+                method: "PUT",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body,
+            });
+            await raiseForStatus(res, "share run");
+            return res;
         });
         const result = await response.json();
         if (result === null || !("share_token" in result)) {
@@ -1544,21 +1594,28 @@ export class Client {
     }
     async unshareRun(runId) {
         assertUuid(runId);
-        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),
-            ...this.fetchOptions,
+        await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/runs/${runId}/share`, {
+                method: "DELETE",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, "unshare run", true);
+            return res;
         });
-        await raiseForStatus(response, "unshare run", true);
     }
     async readRunSharedLink(runId) {
         assertUuid(runId);
-        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),
-            ...this.fetchOptions,
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/runs/${runId}/share`, {
+                method: "GET",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, "read run shared link");
+            return res;
         });
         const result = await response.json();
         if (result === null || !("share_token" in result)) {
@@ -1576,11 +1633,15 @@ export class Client {
             }
         }
         assertUuid(shareToken);
-        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),
-            ...this.fetchOptions,
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/public/${shareToken}/runs${queryParams}`, {
+                method: "GET",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, "list shared runs");
+            return res;
         });
         const runs = await response.json();
         return runs;
@@ -1594,11 +1655,15 @@ export class Client {
             datasetId = dataset.id;
         }
         assertUuid(datasetId);
-        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),
-            ...this.fetchOptions,
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/datasets/${datasetId}/share`, {
+                method: "GET",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, "read dataset shared schema");
+            return res;
         });
         const shareSchema = await response.json();
         shareSchema.url = `${this.getHostUrl()}/public/${shareSchema.share_token}/d`;
@@ -1616,12 +1681,17 @@ export class Client {
             dataset_id: datasetId,
         };
         assertUuid(datasetId);
-        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}/datasets/${datasetId}/share`, {
-            method: "PUT",
-            headers: this.headers,
-            body: JSON.stringify(data),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        const body = JSON.stringify(data);
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/datasets/${datasetId}/share`, {
+                method: "PUT",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body,
+            });
+            await raiseForStatus(res, "share dataset");
+            return res;
         });
         const shareSchema = await response.json();
         shareSchema.url = `${this.getHostUrl()}/public/${shareSchema.share_token}/d`;
@@ -1629,21 +1699,28 @@ export class Client {
     }
     async unshareDataset(datasetId) {
         assertUuid(datasetId);
-        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),
-            ...this.fetchOptions,
+        await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/datasets/${datasetId}/share`, {
+                method: "DELETE",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, "unshare dataset", true);
+            return res;
         });
-        await raiseForStatus(response, "unshare dataset", true);
     }
     async readSharedDataset(shareToken) {
         assertUuid(shareToken);
-        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),
-            ...this.fetchOptions,
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/public/${shareToken}/datasets`, {
+                method: "GET",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, "read shared dataset");
+            return res;
         });
         const dataset = await response.json();
         return dataset;
@@ -1670,11 +1747,15 @@ export class Client {
                 urlParams.append(key, value);
             }
         });
-        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),
-            ...this.fetchOptions,
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/public/${shareToken}/examples?${urlParams.toString()}`, {
+                method: "GET",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, "list shared examples");
+            return res;
         });
         const result = await response.json();
         if (!response.ok) {
@@ -1705,14 +1786,18 @@ export class Client {
         if (referenceDatasetId !== null) {
             body["reference_dataset_id"] = referenceDatasetId;
         }
-        const response = await this.caller.call(_getFetchImplementation(this.debug), endpoint, {
-            method: "POST",
-            headers: { ...this.headers, "Content-Type": "application/json" },
-            body: JSON.stringify(body),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        const serializedBody = JSON.stringify(body);
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(endpoint, {
+                method: "POST",
+                headers: { ...this.headers, "Content-Type": "application/json" },
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body: serializedBody,
+            });
+            await raiseForStatus(res, "create project");
+            return res;
         });
-        await raiseForStatus(response, "create project");
         const result = await response.json();
         return result;
     }
@@ -1722,20 +1807,23 @@ export class Client {
         if (metadata) {
             extra = { ...(extra || {}), metadata };
         }
-        const body = {
+        const body = JSON.stringify({
             name,
             extra,
             description,
             end_time: endTime ? new Date(endTime).toISOString() : null,
-        };
-        const response = await this.caller.call(_getFetchImplementation(this.debug), endpoint, {
-            method: "PATCH",
-            headers: { ...this.headers, "Content-Type": "application/json" },
-            body: JSON.stringify(body),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
-        });
-        await raiseForStatus(response, "update project");
+        });
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(endpoint, {
+                method: "PATCH",
+                headers: { ...this.headers, "Content-Type": "application/json" },
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body,
+            });
+            await raiseForStatus(res, "update project");
+            return res;
+        });
         const result = await response.json();
         return result;
     }
@@ -1756,11 +1844,15 @@ export class Client {
         else {
             throw new Error("Must provide projectName or projectId");
         }
-        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}${path}?${params}`, {
-            method: "GET",
-            headers: this.headers,
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}${path}?${params}`, {
+                method: "GET",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, "has project");
+            return res;
         });
         // consume the response body to release the connection
         // https://undici.nodejs.org/#/?id=garbage-collection
@@ -1886,13 +1978,16 @@ export class Client {
             projectId_ = projectId;
         }
         assertUuid(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),
-            ...this.fetchOptions,
+        await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/sessions/${projectId_}`, {
+                method: "DELETE",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, `delete session ${projectId_} (${projectName})`, true);
+            return res;
         });
-        await raiseForStatus(response, `delete session ${projectId_} (${projectName})`, true);
     }
     async uploadCsv({ csvFile, fileName, inputKeys, outputKeys, description, dataType, name, }) {
         const url = `${this.apiUrl}/datasets/upload`;
@@ -1913,14 +2008,17 @@ export class Client {
         if (name) {
             formData.append("name", name);
         }
-        const response = await this.caller.call(_getFetchImplementation(this.debug), url, {
-            method: "POST",
-            headers: this.headers,
-            body: formData,
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(url, {
+                method: "POST",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body: formData,
+            });
+            await raiseForStatus(res, "upload CSV");
+            return res;
         });
-        await raiseForStatus(response, "upload CSV");
         const result = await response.json();
         return result;
     }
@@ -1939,14 +2037,18 @@ export class Client {
         if (outputsSchema) {
             body.outputs_schema_definition = outputsSchema;
         }
-        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),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        const serializedBody = JSON.stringify(body);
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/datasets`, {
+                method: "POST",
+                headers: { ...this.headers, "Content-Type": "application/json" },
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body: serializedBody,
+            });
+            await raiseForStatus(res, "create dataset");
+            return res;
         });
-        await raiseForStatus(response, "create dataset");
         const result = await response.json();
         return result;
     }
@@ -2071,14 +2173,18 @@ export class Client {
         }
         const _datasetId = datasetId ?? (await this.readDataset({ datasetName })).id;
         assertUuid(_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),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
-        });
-        await raiseForStatus(response, "update dataset");
+        const body = JSON.stringify(update);
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/datasets/${_datasetId}`, {
+                method: "PATCH",
+                headers: { ...this.headers, "Content-Type": "application/json" },
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body,
+            });
+            await raiseForStatus(res, "update dataset");
+            return res;
+        });
         return (await response.json());
     }
     /**
@@ -2103,17 +2209,21 @@ export class Client {
         }
         const _datasetId = datasetId ?? (await this.readDataset({ datasetName })).id;
         assertUuid(_datasetId);
-        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({
-                as_of: typeof asOf === "string" ? asOf : asOf.toISOString(),
-                tag,
-            }),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        const body = JSON.stringify({
+            as_of: typeof asOf === "string" ? asOf : asOf.toISOString(),
+            tag,
+        });
+        await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/datasets/${_datasetId}/tags`, {
+                method: "PUT",
+                headers: { ...this.headers, "Content-Type": "application/json" },
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body,
+            });
+            await raiseForStatus(res, "update dataset tags", true);
+            return res;
         });
-        await raiseForStatus(response, "update dataset tags");
     }
     async deleteDataset({ datasetId, datasetName, }) {
         let path = "/datasets";
@@ -2132,14 +2242,16 @@ export class Client {
         else {
             throw new Error("Must provide datasetName or datasetId");
         }
-        const response = await this.caller.call(_getFetchImplementation(this.debug), this.apiUrl + path, {
-            method: "DELETE",
-            headers: this.headers,
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        await this.caller.call(async () => {
+            const res = await this._fetch(this.apiUrl + path, {
+                method: "DELETE",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, `delete ${path}`, true);
+            return res;
         });
-        await raiseForStatus(response, `delete ${path}`);
-        await response.json();
     }
     async indexDataset({ datasetId, datasetName, tag, }) {
         let datasetId_ = datasetId;
@@ -2157,14 +2269,18 @@ export class Client {
         const data = {
             tag: tag,
         };
-        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),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
-        });
-        await raiseForStatus(response, "index dataset");
+        const body = JSON.stringify(data);
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/datasets/${datasetId_}/index`, {
+                method: "POST",
+                headers: { ...this.headers, "Content-Type": "application/json" },
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body,
+            });
+            await raiseForStatus(res, "index dataset");
+            return res;
+        });
         await response.json();
     }
     /**
@@ -2206,14 +2322,18 @@ export class Client {
             data["filter"] = filter;
         }
         assertUuid(datasetId);
-        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),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
-        });
-        await raiseForStatus(response, "fetch similar examples");
+        const body = JSON.stringify(data);
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/datasets/${datasetId}/search`, {
+                headers: { ...this.headers, "Content-Type": "application/json" },
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                method: "POST",
+                body,
+            });
+            await raiseForStatus(res, "fetch similar examples");
+            return res;
+        });
         const result = await response.json();
         return result["examples"];
     }
@@ -2425,14 +2545,16 @@ export class Client {
     async deleteExample(exampleId) {
         assertUuid(exampleId);
         const path = `/examples/${exampleId}`;
-        const response = await this.caller.call(_getFetchImplementation(this.debug), this.apiUrl + path, {
-            method: "DELETE",
-            headers: this.headers,
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        await this.caller.call(async () => {
+            const res = await this._fetch(this.apiUrl + path, {
+                method: "DELETE",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, `delete ${path}`, true);
+            return res;
         });
-        await raiseForStatus(response, `delete ${path}`);
-        await response.json();
     }
     async updateExample(exampleIdOrUpdate, update) {
         let exampleId;
@@ -2504,13 +2626,16 @@ export class Client {
         if (tag !== undefined) {
             params.append("tag", tag);
         }
-        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),
-            ...this.fetchOptions,
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/datasets/${resolvedDatasetId}/version?${params.toString()}`, {
+                method: "GET",
+                headers: { ...this.headers },
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, "read dataset version");
+            return res;
         });
-        await raiseForStatus(response, "read dataset version");
         return await response.json();
     }
     async listDatasetSplits({ datasetId, datasetName, asOf, }) {
@@ -2565,14 +2690,18 @@ export class Client {
             }),
             remove,
         };
-        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),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        const body = JSON.stringify(data);
+        await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/datasets/${datasetId_}/splits`, {
+                method: "PUT",
+                headers: { ...this.headers, "Content-Type": "application/json" },
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body,
+            });
+            await raiseForStatus(res, "update dataset splits", true);
+            return res;
         });
-        await raiseForStatus(response, "update dataset splits", true);
     }
     /**
      * @deprecated This method is deprecated and will be removed in future LangSmith versions, use `evaluate` from `langsmith/evaluation` instead.
@@ -2630,15 +2759,19 @@ export class Client {
             feedbackConfig,
             session_id: projectId,
         };
+        const body = JSON.stringify(feedback);
         const url = `${this.apiUrl}/feedback`;
-        const response = await this.caller.call(_getFetchImplementation(this.debug), url, {
-            method: "POST",
-            headers: { ...this.headers, "Content-Type": "application/json" },
-            body: JSON.stringify(feedback),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
-        });
-        await raiseForStatus(response, "create feedback", true);
+        await this.caller.call(async () => {
+            const res = await this._fetch(url, {
+                method: "POST",
+                headers: { ...this.headers, "Content-Type": "application/json" },
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body,
+            });
+            await raiseForStatus(res, "create feedback", true);
+            return res;
+        });
         return feedback;
     }
     async updateFeedback(feedbackId, { score, value, correction, comment, }) {
@@ -2656,14 +2789,18 @@ export class Client {
             feedbackUpdate["comment"] = comment;
         }
         assertUuid(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),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        const body = JSON.stringify(feedbackUpdate);
+        await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/feedback/${feedbackId}`, {
+                method: "PATCH",
+                headers: { ...this.headers, "Content-Type": "application/json" },
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body,
+            });
+            await raiseForStatus(res, "update feedback", true);
+            return res;
         });
-        await raiseForStatus(response, "update feedback", true);
     }
     async readFeedback(feedbackId) {
         assertUuid(feedbackId);
@@ -2674,14 +2811,16 @@ export class Client {
     async deleteFeedback(feedbackId) {
         assertUuid(feedbackId);
         const path = `/feedback/${feedbackId}`;
-        const response = await this.caller.call(_getFetchImplementation(this.debug), this.apiUrl + path, {
-            method: "DELETE",
-            headers: this.headers,
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        await this.caller.call(async () => {
+            const res = await this._fetch(this.apiUrl + path, {
+                method: "DELETE",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, `delete ${path}`, true);
+            return res;
         });
-        await raiseForStatus(response, `delete ${path}`);
-        await response.json();
     }
     async *listFeedback({ runIds, feedbackKeys, feedbackSourceTypes, } = {}) {
         const queryParams = new URLSearchParams();
@@ -2736,15 +2875,19 @@ export class Client {
                 hours: 3,
             };
         }
-        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),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        const serializedBody = JSON.stringify(body);
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/feedback/tokens`, {
+                method: "POST",
+                headers: { ...this.headers, "Content-Type": "application/json" },
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body: serializedBody,
+            });
+            await raiseForStatus(res, "create presigned feedback token");
+            return res;
         });
-        const result = await response.json();
-        return result;
+        return await response.json();
     }
     async createComparativeExperiment({ name, experimentIds, referenceDatasetId, createdAt, description, metadata, id, }) {
         if (experimentIds.length === 0) {
@@ -2769,14 +2912,19 @@ export class Client {
         };
         if (metadata)
             body.extra["metadata"] = metadata;
-        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),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        const serializedBody = JSON.stringify(body);
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/datasets/comparative`, {
+                method: "POST",
+                headers: { ...this.headers, "Content-Type": "application/json" },
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body: serializedBody,
+            });
+            await raiseForStatus(res, "create comparative experiment");
+            return res;
         });
-        return await response.json();
+        return response.json();
     }
     /**
      * Retrieves a list of presigned feedback tokens for a given run ID.
@@ -2885,16 +3033,19 @@ export class Client {
             id: queueId || uuid.v4(),
             rubric_instructions: rubricInstructions,
         };
-        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))),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        const serializedBody = JSON.stringify(Object.fromEntries(Object.entries(body).filter(([_, v]) => v !== undefined)));
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/annotation-queues`, {
+                method: "POST",
+                headers: { ...this.headers, "Content-Type": "application/json" },
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body: serializedBody,
+            });
+            await raiseForStatus(res, "create annotation queue");
+            return res;
         });
-        await raiseForStatus(response, "create annotation queue");
-        const data = await response.json();
-        return data;
+        return response.json();
     }
     /**
      * Read an annotation queue with the specified queue ID.
@@ -2902,15 +3053,17 @@ export class Client {
      * @returns The AnnotationQueueWithDetails object
      */
     async readAnnotationQueue(queueId) {
-        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,
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/annotation-queues/${assertUuid(queueId, "queueId")}`, {
+                method: "GET",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, "read annotation queue");
+            return res;
         });
-        await raiseForStatus(response, "read annotation queue");
-        const data = await response.json();
-        return data;
+        return response.json();
     }
     /**
      * Update an annotation queue with the specified queue ID.
@@ -2921,31 +3074,38 @@ export class Client {
      */
     async updateAnnotationQueue(queueId, options) {
         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,
-                rubric_instructions: rubricInstructions,
-            }),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        const body = JSON.stringify({
+            name,
+            description,
+            rubric_instructions: rubricInstructions,
+        });
+        await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/annotation-queues/${assertUuid(queueId, "queueId")}`, {
+                method: "PATCH",
+                headers: { ...this.headers, "Content-Type": "application/json" },
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body,
+            });
+            await raiseForStatus(res, "update annotation queue", true);
+            return res;
         });
-        await raiseForStatus(response, "update annotation queue");
     }
     /**
      * Delete an annotation queue with the specified queue ID.
      * @param queueId - The ID of the annotation queue to delete
      */
     async deleteAnnotationQueue(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),
-            ...this.fetchOptions,
+        await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/annotation-queues/${assertUuid(queueId, "queueId")}`, {
+                method: "DELETE",
+                headers: { ...this.headers, Accept: "application/json" },
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, "delete annotation queue", true);
+            return res;
         });
-        await raiseForStatus(response, "delete annotation queue");
     }
     /**
      * Add runs to an annotation queue with the specified queue ID.
@@ -2953,14 +3113,18 @@ 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.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())),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        const body = JSON.stringify(runIds.map((id, i) => assertUuid(id, `runIds[${i}]`).toString()));
+        await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/annotation-queues/${assertUuid(queueId, "queueId")}/runs`, {
+                method: "POST",
+                headers: { ...this.headers, "Content-Type": "application/json" },
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body,
+            });
+            await raiseForStatus(res, "add runs to annotation queue", true);
+            return res;
         });
-        await raiseForStatus(response, "add runs to annotation queue");
     }
     /**
      * Get a run from an annotation queue at the specified index.
@@ -2971,14 +3135,17 @@ export class Client {
      */
     async getRunFromAnnotationQueue(queueId, index) {
         const baseUrl = `/annotation-queues/${assertUuid(queueId, "queueId")}/run`;
-        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}${baseUrl}/${index}`, {
-            method: "GET",
-            headers: this.headers,
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}${baseUrl}/${index}`, {
+                method: "GET",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, "get run from annotation queue");
+            return res;
         });
-        await raiseForStatus(response, "get run from annotation queue");
-        return await response.json();
+        return response.json();
     }
     /**
      * Delete a run from an an annotation queue.
@@ -2986,27 +3153,33 @@ 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.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),
-            ...this.fetchOptions,
+        await this.caller.call(async () => {
+            const res = await this._fetch(`${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),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, "delete run from annotation queue", true);
+            return res;
         });
-        await raiseForStatus(response, "delete run from annotation queue");
     }
     /**
      * Get the size of an annotation queue.
      * @param queueId - The ID of the annotation queue
      */
     async getSizeFromAnnotationQueue(queueId) {
-        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),
-            ...this.fetchOptions,
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/annotation-queues/${assertUuid(queueId, "queueId")}/size`, {
+                method: "GET",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, "get size from annotation queue");
+            return res;
         });
-        await raiseForStatus(response, "get size from annotation queue");
-        return await response.json();
+        return response.json();
     }
     async _currentTenantIsOwner(owner) {
         const settings = await this._getSettings();
@@ -3019,22 +3192,17 @@ export class Client {
       Requested tenant: ${owner}`);
     }
     async _getLatestCommitHash(promptOwnerAndName) {
-        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),
-            ...this.fetchOptions,
-        });
-        const json = await res.json();
-        if (!res.ok) {
-            const detail = typeof json.detail === "string"
-                ? json.detail
-                : JSON.stringify(json.detail);
-            const error = new Error(`Error ${res.status}: ${res.statusText}\n${detail}`);
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            error.statusCode = res.status;
-            throw error;
-        }
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/commits/${promptOwnerAndName}/?limit=${1}&offset=${0}`, {
+                method: "GET",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, "get latest commit hash");
+            return res;
+        });
+        const json = await response.json();
         if (json.commits.length === 0) {
             return undefined;
         }
@@ -3042,15 +3210,19 @@ export class Client {
     }
     async _likeOrUnlikePrompt(promptIdentifier, like) {
         const [owner, promptName, _] = parsePromptIdentifier(promptIdentifier);
-        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" },
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
-        });
-        await raiseForStatus(response, `${like ? "like" : "unlike"} prompt`);
-        return await response.json();
+        const body = JSON.stringify({ like: like });
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/likes/${owner}/${promptName}`, {
+                method: "POST",
+                headers: { ...this.headers, "Content-Type": "application/json" },
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body,
+            });
+            await raiseForStatus(res, `${like ? "like" : "unlike"} prompt`);
+            return res;
+        });
+        return response.json();
     }
     async _getPromptUrl(promptIdentifier) {
         const [owner, promptName, commitHash] = parsePromptIdentifier(promptIdentifier);
@@ -3104,18 +3276,21 @@ export class Client {
     }
     async getPrompt(promptIdentifier) {
         const [owner, promptName, _] = parsePromptIdentifier(promptIdentifier);
-        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),
-            ...this.fetchOptions,
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/repos/${owner}/${promptName}`, {
+                method: "GET",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            if (res?.status === 404) {
+                return null;
+            }
+            await raiseForStatus(res, "get prompt");
+            return res;
         });
-        if (response.status === 404) {
-            return null;
-        }
-        await raiseForStatus(response, "get prompt");
-        const result = await response.json();
-        if (result.repo) {
+        const result = await response?.json();
+        if (result?.repo) {
             return result.repo;
         }
         else {
@@ -3141,14 +3316,18 @@ export class Client {
             ...(options?.tags && { tags: options.tags }),
             is_public: !!options?.isPublic,
         };
-        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),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
-        });
-        await raiseForStatus(response, "create prompt");
+        const body = JSON.stringify(data);
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/repos/`, {
+                method: "POST",
+                headers: { ...this.headers, "Content-Type": "application/json" },
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body,
+            });
+            await raiseForStatus(res, "create prompt");
+            return res;
+        });
         const { repo } = await response.json();
         return repo;
     }
@@ -3164,14 +3343,18 @@ export class Client {
             manifest: JSON.parse(JSON.stringify(object)),
             parent_commit: resolvedParentCommitHash,
         };
-        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),
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
-        });
-        await raiseForStatus(response, "create commit");
+        const body = JSON.stringify(payload);
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/commits/${owner}/${promptName}`, {
+                method: "POST",
+                headers: { ...this.headers, "Content-Type": "application/json" },
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body,
+            });
+            await raiseForStatus(res, "create commit");
+            return res;
+        });
         const result = await response.json();
         return this._getPromptUrl(`${owner}/${promptName}${result.commit_hash ? `:${result.commit_hash}` : ""}`);
     }
@@ -3244,13 +3427,18 @@ export class Client {
             }
         }
         const datasetIdToUse = datasetId ?? updates[0]?.dataset_id;
-        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}${this._getPlatformEndpointPath(`datasets/${datasetIdToUse}/examples`)}`, {
-            method: "PATCH",
-            headers: this.headers,
-            body: formData,
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}${this._getPlatformEndpointPath(`datasets/${datasetIdToUse}/examples`)}`, {
+                method: "PATCH",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body: formData,
+            });
+            await raiseForStatus(res, "update examples");
+            return res;
         });
-        const result = await response.json();
-        return result;
+        return response.json();
     }
     /**
      * Upload examples with attachments using multipart form data.
@@ -3322,14 +3510,18 @@ export class Client {
                 }
             }
         }
-        const response = await this.caller.call(_getFetchImplementation(this.debug), `${this.apiUrl}${this._getPlatformEndpointPath(`datasets/${datasetId}/examples`)}`, {
-            method: "POST",
-            headers: this.headers,
-            body: formData,
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}${this._getPlatformEndpointPath(`datasets/${datasetId}/examples`)}`, {
+                method: "POST",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body: formData,
+            });
+            await raiseForStatus(res, "upload examples");
+            return res;
         });
-        await raiseForStatus(response, "upload examples");
-        const result = await response.json();
-        return result;
+        return response.json();
     }
     async updatePrompt(promptIdentifier, options) {
         if (!(await this.promptExists(promptIdentifier))) {
@@ -3354,17 +3546,21 @@ 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.debug), `${this.apiUrl}/repos/${owner}/${promptName}`, {
-            method: "PATCH",
-            body: JSON.stringify(payload),
-            headers: {
-                ...this.headers,
-                "Content-Type": "application/json",
-            },
-            signal: AbortSignal.timeout(this.timeout_ms),
-            ...this.fetchOptions,
+        const body = JSON.stringify(payload);
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/repos/${owner}/${promptName}`, {
+                method: "PATCH",
+                headers: {
+                    ...this.headers,
+                    "Content-Type": "application/json",
+                },
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+                body,
+            });
+            await raiseForStatus(res, "update prompt");
+            return res;
         });
-        await raiseForStatus(response, "update prompt");
         return response.json();
     }
     async deletePrompt(promptIdentifier) {
@@ -3375,23 +3571,30 @@ export class Client {
         if (!(await this._currentTenantIsOwner(owner))) {
             throw await this._ownerConflictError("delete a prompt", owner);
         }
-        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),
-            ...this.fetchOptions,
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/repos/${owner}/${promptName}`, {
+                method: "DELETE",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, "delete prompt");
+            return res;
         });
-        return await response.json();
+        return response.json();
     }
     async pullPromptCommit(promptIdentifier, options) {
         const [owner, promptName, commitHash] = parsePromptIdentifier(promptIdentifier);
-        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),
-            ...this.fetchOptions,
+        const response = await this.caller.call(async () => {
+            const res = await this._fetch(`${this.apiUrl}/commits/${owner}/${promptName}/${commitHash}${options?.includeModel ? "?include_model=true" : ""}`, {
+                method: "GET",
+                headers: this.headers,
+                signal: AbortSignal.timeout(this.timeout_ms),
+                ...this.fetchOptions,
+            });
+            await raiseForStatus(res, "pull prompt commit");
+            return res;
         });
-        await raiseForStatus(response, "pull prompt commit");
         const result = await response.json();
         return {
             owner,