langsmith 0.7.4 → 0.7.6

package/dist/utils/profiles.cjs

@@ -38,6 +38,7 @@ exports.hasValue = hasValue;
 exports.loadProfileClientConfig = loadProfileClientConfig;
 const env_js_1 = require("./env.cjs");
 const fsUtils = __importStar(require("./fs.cjs"));
+const profile_lock_js_1 = require("./profile-lock.cjs");
 exports.DEFAULT_API_URL = "https://api.smith.langchain.com";
 const OAUTH_CLIENT_ID = "langsmith-cli";
 const TOKEN_REFRESH_LEEWAY_MS = 60_000;
@@ -227,17 +228,39 @@ class ProfileAuth {
     isProfileAuthorizationHeader(value) {
         return value === this.managedAuthorizationValue;
     }
+    reloadProfile() {
+        try {
+            const config = JSON.parse(fsUtils.readFileSync(this.state.configPath));
+            const profile = config.profiles?.[this.state.profileName];
+            if (!profile) {
+                return undefined;
+            }
+            this.state.config = config;
+            this.state.profile = profile;
+            return profile;
+        }
+        catch {
+            return undefined;
+        }
+    }
     async refreshOAuthToken(fetchImplementation) {
         const refreshToken = this.state.profile.oauth?.refresh_token;
         if (!refreshToken) {
             return;
         }
         const refreshApiUrl = trimConfigValue(this.state.profile.api_url) ?? exports.DEFAULT_API_URL;
+        const deadline = Date.now() + TOKEN_REFRESH_TIMEOUT_MS;
+        let lock;
         try {
+            lock = await (0, profile_lock_js_1.acquireOAuthRefreshLock)(this.state.configPath, deadline);
+            const fresh = this.reloadProfile();
+            if (fresh && !shouldRefreshProfileToken(this.state.profile)) {
+                return;
+            }
             const body = new URLSearchParams({
                 grant_type: "refresh_token",
                 client_id: OAUTH_CLIENT_ID,
-                refresh_token: refreshToken,
+                refresh_token: this.state.profile.oauth?.refresh_token ?? refreshToken,
             });
             const response = await fetchImplementation(`${normalizeConfigUrl(refreshApiUrl)}/oauth/token`, {
                 method: "POST",
@@ -245,7 +268,7 @@ class ProfileAuth {
                     "Content-Type": "application/x-www-form-urlencoded",
                 },
                 body: body.toString(),
-                signal: AbortSignal.timeout(TOKEN_REFRESH_TIMEOUT_MS),
+                signal: AbortSignal.timeout(Math.max(0, deadline - Date.now())),
             });
             if (!response.ok) {
                 return;
@@ -262,6 +285,9 @@ class ProfileAuth {
         catch {
             return;
         }
+        finally {
+            await lock?.release();
+        }
     }
     rememberProfileAuthHeader(header) {
         this.managedAuthorizationValue =

package/dist/utils/profiles.d.ts

@@ -42,6 +42,7 @@ export declare class ProfileAuth {
     currentAuthHeader(): ProfileAuthHeader | undefined;
     getAuthHeader(fetchImplementation: typeof fetch, signal?: AbortSignal | null): Promise<ProfileAuthHeader | undefined>;
     isProfileAuthorizationHeader(value: string): boolean;
+    private reloadProfile;
     private refreshOAuthToken;
     private rememberProfileAuthHeader;
 }

package/dist/utils/profiles.js

@@ -1,5 +1,6 @@
 import { getEnv, getEnvironmentVariable } from "./env.js";
 import * as fsUtils from "./fs.js";
+import { acquireOAuthRefreshLock } from "./profile-lock.js";
 export const DEFAULT_API_URL = "https://api.smith.langchain.com";
 const OAUTH_CLIENT_ID = "langsmith-cli";
 const TOKEN_REFRESH_LEEWAY_MS = 60_000;
@@ -189,17 +190,39 @@ export class ProfileAuth {
     isProfileAuthorizationHeader(value) {
         return value === this.managedAuthorizationValue;
     }
+    reloadProfile() {
+        try {
+            const config = JSON.parse(fsUtils.readFileSync(this.state.configPath));
+            const profile = config.profiles?.[this.state.profileName];
+            if (!profile) {
+                return undefined;
+            }
+            this.state.config = config;
+            this.state.profile = profile;
+            return profile;
+        }
+        catch {
+            return undefined;
+        }
+    }
     async refreshOAuthToken(fetchImplementation) {
         const refreshToken = this.state.profile.oauth?.refresh_token;
         if (!refreshToken) {
             return;
         }
         const refreshApiUrl = trimConfigValue(this.state.profile.api_url) ?? DEFAULT_API_URL;
+        const deadline = Date.now() + TOKEN_REFRESH_TIMEOUT_MS;
+        let lock;
         try {
+            lock = await acquireOAuthRefreshLock(this.state.configPath, deadline);
+            const fresh = this.reloadProfile();
+            if (fresh && !shouldRefreshProfileToken(this.state.profile)) {
+                return;
+            }
             const body = new URLSearchParams({
                 grant_type: "refresh_token",
                 client_id: OAUTH_CLIENT_ID,
-                refresh_token: refreshToken,
+                refresh_token: this.state.profile.oauth?.refresh_token ?? refreshToken,
             });
             const response = await fetchImplementation(`${normalizeConfigUrl(refreshApiUrl)}/oauth/token`, {
                 method: "POST",
@@ -207,7 +230,7 @@ export class ProfileAuth {
                     "Content-Type": "application/x-www-form-urlencoded",
                 },
                 body: body.toString(),
-                signal: AbortSignal.timeout(TOKEN_REFRESH_TIMEOUT_MS),
+                signal: AbortSignal.timeout(Math.max(0, deadline - Date.now())),
             });
             if (!response.ok) {
                 return;
@@ -224,6 +247,9 @@ export class ProfileAuth {
         catch {
             return;
         }
+        finally {
+            await lock?.release();
+        }
     }
     rememberProfileAuthHeader(header) {
         this.managedAuthorizationValue =

package/dist/wrappers/gemini.cjs

@@ -2,44 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.wrapGemini = wrapGemini;
 const traceable_js_1 = require("../traceable.cjs");
-const _createUsageMetadata = (usage) => {
-    const usageMetadata = {
-        input_tokens: usage.promptTokenCount || 0,
-        output_tokens: (() => {
-            if ("responseTokenCount" in usage) {
-                return usage.responseTokenCount || 0;
-            }
-            if ("candidatesTokenCount" in usage) {
-                return usage.candidatesTokenCount || 0;
-            }
-            return 0;
-        })(),
-        total_tokens: usage.totalTokenCount || 0,
-    };
-    // Add input token details if available
-    usageMetadata.input_token_details = {
-        ...(usage.cachedContentTokenCount && {
-            cache_read_over_200k: Math.max(0, usage.cachedContentTokenCount - 200000),
-        }),
-        ...(usage.promptTokenCount && {
-            over_200k: Math.max(0, usage.promptTokenCount - 200000),
-        }),
-        ...(usage.cachedContentTokenCount && {
-            cache_read: usage.cachedContentTokenCount,
-        }),
-    };
-    // Add output token details if available
-    usageMetadata.output_token_details = {
-        ...("candidatesTokenCount" in usage &&
-            usage.candidatesTokenCount != null && {
-            over_200k: Math.max(0, usage.candidatesTokenCount - 200000),
-        }),
-        ...(usage.thoughtsTokenCount && {
-            reasoning: usage.thoughtsTokenCount,
-        }),
-    };
-    return usageMetadata;
-};
+const gemini_utils_js_1 = require("./gemini.utils.cjs");
 const chatAggregator = (input) => {
     const chunks = Array.isArray(input) &&
         input.every((item) => typeof item === "object" && item !== null)
@@ -161,7 +124,7 @@ const chatAggregator = (input) => {
         result.safety_ratings = safetyRatings;
     }
     if (usageMetadata) {
-        result.usage_metadata = _createUsageMetadata(usageMetadata);
+        result.usage_metadata = (0, gemini_utils_js_1.createGeminiUsageMetadata)(usageMetadata);
     }
     return result;
 };
@@ -354,7 +317,7 @@ function processGeminiOutputs(outputs) {
         result.safety_ratings = safetyRatings;
     }
     if ("usageMetadata" in response && response.usageMetadata) {
-        result.usage_metadata = _createUsageMetadata(response.usageMetadata);
+        result.usage_metadata = (0, gemini_utils_js_1.createGeminiUsageMetadata)(response.usageMetadata);
     }
     return result;
 }

package/dist/wrappers/gemini.js

@@ -1,42 +1,5 @@
 import { isTraceableFunction, traceable, } from "../traceable.js";
-const _createUsageMetadata = (usage) => {
-    const usageMetadata = {
-        input_tokens: usage.promptTokenCount || 0,
-        output_tokens: (() => {
-            if ("responseTokenCount" in usage) {
-                return usage.responseTokenCount || 0;
-            }
-            if ("candidatesTokenCount" in usage) {
-                return usage.candidatesTokenCount || 0;
-            }
-            return 0;
-        })(),
-        total_tokens: usage.totalTokenCount || 0,
-    };
-    // Add input token details if available
-    usageMetadata.input_token_details = {
-        ...(usage.cachedContentTokenCount && {
-            cache_read_over_200k: Math.max(0, usage.cachedContentTokenCount - 200000),
-        }),
-        ...(usage.promptTokenCount && {
-            over_200k: Math.max(0, usage.promptTokenCount - 200000),
-        }),
-        ...(usage.cachedContentTokenCount && {
-            cache_read: usage.cachedContentTokenCount,
-        }),
-    };
-    // Add output token details if available
-    usageMetadata.output_token_details = {
-        ...("candidatesTokenCount" in usage &&
-            usage.candidatesTokenCount != null && {
-            over_200k: Math.max(0, usage.candidatesTokenCount - 200000),
-        }),
-        ...(usage.thoughtsTokenCount && {
-            reasoning: usage.thoughtsTokenCount,
-        }),
-    };
-    return usageMetadata;
-};
+import { createGeminiUsageMetadata } from "./gemini.utils.js";
 const chatAggregator = (input) => {
     const chunks = Array.isArray(input) &&
         input.every((item) => typeof item === "object" && item !== null)
@@ -158,7 +121,7 @@ const chatAggregator = (input) => {
         result.safety_ratings = safetyRatings;
     }
     if (usageMetadata) {
-        result.usage_metadata = _createUsageMetadata(usageMetadata);
+        result.usage_metadata = createGeminiUsageMetadata(usageMetadata);
     }
     return result;
 };
@@ -351,7 +314,7 @@ function processGeminiOutputs(outputs) {
         result.safety_ratings = safetyRatings;
     }
     if ("usageMetadata" in response && response.usageMetadata) {
-        result.usage_metadata = _createUsageMetadata(response.usageMetadata);
+        result.usage_metadata = createGeminiUsageMetadata(response.usageMetadata);
     }
     return result;
 }

package/dist/wrappers/gemini.utils.cjs

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createGeminiUsageMetadata = void 0;
+const createGeminiUsageMetadata = (usage) => {
+    const usageMetadata = {
+        input_tokens: usage.promptTokenCount || 0,
+        output_tokens: (() => {
+            if ("responseTokenCount" in usage) {
+                return usage.responseTokenCount || 0;
+            }
+            if ("candidatesTokenCount" in usage) {
+                return usage.candidatesTokenCount || 0;
+            }
+            return 0;
+        })(),
+        total_tokens: usage.totalTokenCount || 0,
+    };
+    // Add input token details if available
+    usageMetadata.input_token_details = {
+        cache_read: usage.cachedContentTokenCount != null
+            ? Math.min(usage.cachedContentTokenCount, 200_000)
+            : undefined,
+        cache_read_over_200k: usage.cachedContentTokenCount != null
+            ? Math.max(0, usage.cachedContentTokenCount - 200_000)
+            : undefined,
+        over_200k: usage.promptTokenCount != null
+            ? Math.max(0, usage.promptTokenCount -
+                (usage.cachedContentTokenCount || 0) -
+                200_000)
+            : undefined,
+    };
+    // Add output token details if available
+    usageMetadata.output_token_details = {
+        over_200k: "candidatesTokenCount" in usage && usage.candidatesTokenCount != null
+            ? Math.max(0, usage.candidatesTokenCount - 200_000)
+            : undefined,
+        reasoning: usage.thoughtsTokenCount ?? undefined,
+    };
+    return usageMetadata;
+};
+exports.createGeminiUsageMetadata = createGeminiUsageMetadata;

package/dist/wrappers/gemini.utils.d.ts

@@ -0,0 +1,3 @@
+import type { GenerateContentResponseUsageMetadata, UsageMetadata } from "@google/genai";
+import { KVMap } from "../schemas.js";
+export declare const createGeminiUsageMetadata: (usage: UsageMetadata | GenerateContentResponseUsageMetadata) => KVMap;

package/dist/wrappers/gemini.utils.js

@@ -0,0 +1,37 @@
+export const createGeminiUsageMetadata = (usage) => {
+    const usageMetadata = {
+        input_tokens: usage.promptTokenCount || 0,
+        output_tokens: (() => {
+            if ("responseTokenCount" in usage) {
+                return usage.responseTokenCount || 0;
+            }
+            if ("candidatesTokenCount" in usage) {
+                return usage.candidatesTokenCount || 0;
+            }
+            return 0;
+        })(),
+        total_tokens: usage.totalTokenCount || 0,
+    };
+    // Add input token details if available
+    usageMetadata.input_token_details = {
+        cache_read: usage.cachedContentTokenCount != null
+            ? Math.min(usage.cachedContentTokenCount, 200_000)
+            : undefined,
+        cache_read_over_200k: usage.cachedContentTokenCount != null
+            ? Math.max(0, usage.cachedContentTokenCount - 200_000)
+            : undefined,
+        over_200k: usage.promptTokenCount != null
+            ? Math.max(0, usage.promptTokenCount -
+                (usage.cachedContentTokenCount || 0) -
+                200_000)
+            : undefined,
+    };
+    // Add output token details if available
+    usageMetadata.output_token_details = {
+        over_200k: "candidatesTokenCount" in usage && usage.candidatesTokenCount != null
+            ? Math.max(0, usage.candidatesTokenCount - 200_000)
+            : undefined,
+        reasoning: usage.thoughtsTokenCount ?? undefined,
+    };
+    return usageMetadata;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "langsmith",
-  "version": "0.7.4",
+  "version": "0.7.6",
   "description": "Client library to connect to the LangSmith Observability and Evaluation Platform.",
   "packageManager": "pnpm@10.33.0",
   "files": [
@@ -164,7 +164,7 @@
     "@babel/preset-env": "^7.22.4",
     "@faker-js/faker": "^8.4.1",
     "@google/genai": "^2.0.1",
-    "@jest/globals": "^29.5.0",
+    "@jest/globals": "^30.4.1",
     "@jest/reporters": "^30.2.0",
     "@langchain/core": "^0.3.72",
     "@langchain/langgraph": "^0.3.6",