langsmith 0.1.20 → 0.1.22

package/dist/utils/atee.js

@@ -0,0 +1,20 @@
+export function atee(iter, length = 2) {
+    const buffers = Array.from({ length }, () => []);
+    return buffers.map(async function* makeIter(buffer) {
+        while (true) {
+            if (buffer.length === 0) {
+                const result = await iter.next();
+                for (const buffer of buffers) {
+                    buffer.push(result);
+                }
+            }
+            else if (buffer[0].done) {
+                return;
+            }
+            else {
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                yield buffer.shift().value;
+            }
+        }
+    });
+}

package/dist/wrappers/openai.cjs

@@ -2,8 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.wrapSDK = exports.wrapOpenAI = void 0;
 const traceable_js_1 = require("../traceable.cjs");
-function _combineChatCompletionChoices(choices) {
+function _combineChatCompletionChoices(choices
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+) {
     const reversedChoices = choices.slice().reverse();
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const message = {
         role: "assistant",
         content: "",
@@ -73,26 +76,43 @@ function _combineChatCompletionChoices(choices) {
         message: message,
     };
 }
-async function extractLangSmithExtraAndCall(openAIMethod, args, defaultRunConfig) {
-    if (args[1]?.langsmithExtra !== undefined) {
-        const { langsmithExtra, ...openAIOptions } = args[1];
-        const wrappedMethod = (0, traceable_js_1.traceable)(openAIMethod, {
-            ...defaultRunConfig,
-            ...langsmithExtra,
-        });
-        const finalArgs = [args[0]];
-        if (args.length > 2) {
-            finalArgs.push(openAIOptions);
-            finalArgs.push(args.slice(2));
+const chatAggregator = (chunks) => {
+    if (!chunks || chunks.length === 0) {
+        return { choices: [{ message: { role: "assistant", content: "" } }] };
+    }
+    const choicesByIndex = {};
+    for (const chunk of chunks) {
+        for (const choice of chunk.choices) {
+            if (choicesByIndex[choice.index] === undefined) {
+                choicesByIndex[choice.index] = [];
+            }
+            choicesByIndex[choice.index].push(choice);
         }
-        else if (Object.keys(openAIOptions).length !== 0) {
-            finalArgs.push(openAIOptions);
+    }
+    const aggregatedOutput = chunks[chunks.length - 1];
+    aggregatedOutput.choices = Object.values(choicesByIndex).map((choices) => _combineChatCompletionChoices(choices));
+    return aggregatedOutput;
+};
+const textAggregator = (allChunks
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+) => {
+    if (allChunks.length === 0) {
+        return { choices: [{ text: "" }] };
+    }
+    const allContent = [];
+    for (const chunk of allChunks) {
+        const content = chunk.choices[0].text;
+        if (content != null) {
+            allContent.push(content);
         }
-        return wrappedMethod(...finalArgs);
     }
-    const wrappedMethod = (0, traceable_js_1.traceable)(openAIMethod, defaultRunConfig);
-    return wrappedMethod(...args);
-}
+    const content = allContent.join("");
+    const aggregatedOutput = allChunks[allChunks.length - 1];
+    aggregatedOutput.choices = [
+        { ...aggregatedOutput.choices[0], text: content },
+    ];
+    return aggregatedOutput;
+};
 /**
  * Wraps an OpenAI client's completion methods, enabling automatic LangSmith
  * tracing. Method signatures are unchanged, with the exception that you can pass
@@ -118,61 +138,20 @@ async function extractLangSmithExtraAndCall(openAIMethod, args, defaultRunConfig
  * ```
  */
 const wrapOpenAI = (openai, options) => {
-    const originalChatCompletionsFn = openai.chat.completions.create.bind(openai.chat.completions);
-    openai.chat.completions.create = async (...args) => {
-        const aggregator = (chunks) => {
-            if (!chunks || chunks.length === 0) {
-                return { choices: [{ message: { role: "assistant", content: "" } }] };
-            }
-            const choicesByIndex = {};
-            for (const chunk of chunks) {
-                for (const choice of chunk.choices) {
-                    if (choicesByIndex[choice.index] === undefined) {
-                        choicesByIndex[choice.index] = [];
-                    }
-                    choicesByIndex[choice.index].push(choice);
-                }
-            }
-            const aggregatedOutput = chunks[chunks.length - 1];
-            aggregatedOutput.choices = Object.values(choicesByIndex).map((choices) => _combineChatCompletionChoices(choices));
-            return aggregatedOutput;
-        };
-        const defaultRunConfig = {
-            name: "ChatOpenAI",
-            run_type: "llm",
-            aggregator,
-            ...options,
-        };
-        return extractLangSmithExtraAndCall(originalChatCompletionsFn, args, defaultRunConfig);
-    };
-    const originalCompletionsFn = openai.completions.create.bind(openai.chat.completions);
-    openai.completions.create = async (...args) => {
-        const aggregator = (allChunks) => {
-            if (allChunks.length === 0) {
-                return { choices: [{ text: "" }] };
-            }
-            const allContent = [];
-            for (const chunk of allChunks) {
-                const content = chunk.choices[0].text;
-                if (content != null) {
-                    allContent.push(content);
-                }
-            }
-            const content = allContent.join("");
-            const aggregatedOutput = allChunks[allChunks.length - 1];
-            aggregatedOutput.choices = [
-                { ...aggregatedOutput.choices[0], text: content },
-            ];
-            return aggregatedOutput;
-        };
-        const defaultRunConfig = {
-            name: "OpenAI",
-            run_type: "llm",
-            aggregator,
-            ...options,
-        };
-        return extractLangSmithExtraAndCall(originalCompletionsFn, args, defaultRunConfig);
-    };
+    openai.chat.completions.create = (0, traceable_js_1.traceable)(openai.chat.completions.create.bind(openai.chat.completions), {
+        name: "ChatOpenAI",
+        run_type: "llm",
+        aggregator: chatAggregator,
+        argsConfigPath: [1, "langsmithExtra"],
+        ...options,
+    });
+    openai.completions.create = (0, traceable_js_1.traceable)(openai.completions.create.bind(openai.completions), {
+        name: "OpenAI",
+        run_type: "llm",
+        aggregator: textAggregator,
+        argsConfigPath: [1, "langsmithExtra"],
+        ...options,
+    });
     return openai;
 };
 exports.wrapOpenAI = wrapOpenAI;
@@ -181,7 +160,7 @@ const _wrapClient = (sdk, runName, options) => {
         get(target, propKey, receiver) {
             const originalValue = target[propKey];
             if (typeof originalValue === "function") {
-                return (0, traceable_js_1.traceable)(originalValue.bind(target), Object.assign({ name: [runName, propKey.toString()].join("."), run_type: "llm" }, options?.client));
+                return (0, traceable_js_1.traceable)(originalValue.bind(target), Object.assign({ name: [runName, propKey.toString()].join("."), run_type: "llm" }, options));
             }
             else if (originalValue != null &&
                 !Array.isArray(originalValue) &&

package/dist/wrappers/openai.d.ts

@@ -1,4 +1,5 @@
-import type { OpenAI } from "openai";
+import { OpenAI } from "openai";
+import type { APIPromise } from "openai/core";
 import type { Client, RunTreeConfig } from "../index.js";
 import { type RunnableConfigLike } from "../run_trees.js";
 import { type RunTreeLike } from "../traceable.js";
@@ -12,31 +13,29 @@ type OpenAIType = {
         create: (...args: any[]) => any;
     };
 };
-type PatchedOpenAIClient<T extends OpenAIType> = {
-    [P in keyof T]: T[P];
-} & {
-    chat: {
-        completions: {
+type PatchedOpenAIClient<T extends OpenAIType> = T & {
+    chat: T["chat"] & {
+        completions: T["chat"]["completions"] & {
             create: {
                 (arg: OpenAI.ChatCompletionCreateParamsStreaming, arg2?: OpenAI.RequestOptions & {
                     langsmithExtra?: RunnableConfigLike | RunTreeLike;
-                }): Promise<AsyncGenerator<OpenAI.ChatCompletionChunk>>;
+                }): APIPromise<AsyncGenerator<OpenAI.ChatCompletionChunk>>;
             } & {
                 (arg: OpenAI.ChatCompletionCreateParamsNonStreaming, arg2?: OpenAI.RequestOptions & {
                     langsmithExtra?: RunnableConfigLike | RunTreeLike;
-                }): Promise<OpenAI.ChatCompletionChunk>;
+                }): APIPromise<OpenAI.ChatCompletionChunk>;
             };
         };
     };
-    completions: {
+    completions: T["completions"] & {
         create: {
             (arg: OpenAI.CompletionCreateParamsStreaming, arg2?: OpenAI.RequestOptions & {
                 langsmithExtra?: RunnableConfigLike | RunTreeLike;
-            }): Promise<AsyncGenerator<OpenAI.Completion>>;
+            }): APIPromise<AsyncGenerator<OpenAI.Completion>>;
         } & {
             (arg: OpenAI.CompletionCreateParamsNonStreaming, arg2?: OpenAI.RequestOptions & {
                 langsmithExtra?: RunnableConfigLike | RunTreeLike;
-            }): Promise<OpenAI.Completion>;
+            }): APIPromise<OpenAI.Completion>;
         };
     };
 };

package/dist/wrappers/openai.js

@@ -1,6 +1,9 @@
 import { traceable } from "../traceable.js";
-function _combineChatCompletionChoices(choices) {
+function _combineChatCompletionChoices(choices
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+) {
     const reversedChoices = choices.slice().reverse();
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const message = {
         role: "assistant",
         content: "",
@@ -70,26 +73,43 @@ function _combineChatCompletionChoices(choices) {
         message: message,
     };
 }
-async function extractLangSmithExtraAndCall(openAIMethod, args, defaultRunConfig) {
-    if (args[1]?.langsmithExtra !== undefined) {
-        const { langsmithExtra, ...openAIOptions } = args[1];
-        const wrappedMethod = traceable(openAIMethod, {
-            ...defaultRunConfig,
-            ...langsmithExtra,
-        });
-        const finalArgs = [args[0]];
-        if (args.length > 2) {
-            finalArgs.push(openAIOptions);
-            finalArgs.push(args.slice(2));
+const chatAggregator = (chunks) => {
+    if (!chunks || chunks.length === 0) {
+        return { choices: [{ message: { role: "assistant", content: "" } }] };
+    }
+    const choicesByIndex = {};
+    for (const chunk of chunks) {
+        for (const choice of chunk.choices) {
+            if (choicesByIndex[choice.index] === undefined) {
+                choicesByIndex[choice.index] = [];
+            }
+            choicesByIndex[choice.index].push(choice);
         }
-        else if (Object.keys(openAIOptions).length !== 0) {
-            finalArgs.push(openAIOptions);
+    }
+    const aggregatedOutput = chunks[chunks.length - 1];
+    aggregatedOutput.choices = Object.values(choicesByIndex).map((choices) => _combineChatCompletionChoices(choices));
+    return aggregatedOutput;
+};
+const textAggregator = (allChunks
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+) => {
+    if (allChunks.length === 0) {
+        return { choices: [{ text: "" }] };
+    }
+    const allContent = [];
+    for (const chunk of allChunks) {
+        const content = chunk.choices[0].text;
+        if (content != null) {
+            allContent.push(content);
         }
-        return wrappedMethod(...finalArgs);
     }
-    const wrappedMethod = traceable(openAIMethod, defaultRunConfig);
-    return wrappedMethod(...args);
-}
+    const content = allContent.join("");
+    const aggregatedOutput = allChunks[allChunks.length - 1];
+    aggregatedOutput.choices = [
+        { ...aggregatedOutput.choices[0], text: content },
+    ];
+    return aggregatedOutput;
+};
 /**
  * Wraps an OpenAI client's completion methods, enabling automatic LangSmith
  * tracing. Method signatures are unchanged, with the exception that you can pass
@@ -115,61 +135,20 @@ async function extractLangSmithExtraAndCall(openAIMethod, args, defaultRunConfig
  * ```
  */
 export const wrapOpenAI = (openai, options) => {
-    const originalChatCompletionsFn = openai.chat.completions.create.bind(openai.chat.completions);
-    openai.chat.completions.create = async (...args) => {
-        const aggregator = (chunks) => {
-            if (!chunks || chunks.length === 0) {
-                return { choices: [{ message: { role: "assistant", content: "" } }] };
-            }
-            const choicesByIndex = {};
-            for (const chunk of chunks) {
-                for (const choice of chunk.choices) {
-                    if (choicesByIndex[choice.index] === undefined) {
-                        choicesByIndex[choice.index] = [];
-                    }
-                    choicesByIndex[choice.index].push(choice);
-                }
-            }
-            const aggregatedOutput = chunks[chunks.length - 1];
-            aggregatedOutput.choices = Object.values(choicesByIndex).map((choices) => _combineChatCompletionChoices(choices));
-            return aggregatedOutput;
-        };
-        const defaultRunConfig = {
-            name: "ChatOpenAI",
-            run_type: "llm",
-            aggregator,
-            ...options,
-        };
-        return extractLangSmithExtraAndCall(originalChatCompletionsFn, args, defaultRunConfig);
-    };
-    const originalCompletionsFn = openai.completions.create.bind(openai.chat.completions);
-    openai.completions.create = async (...args) => {
-        const aggregator = (allChunks) => {
-            if (allChunks.length === 0) {
-                return { choices: [{ text: "" }] };
-            }
-            const allContent = [];
-            for (const chunk of allChunks) {
-                const content = chunk.choices[0].text;
-                if (content != null) {
-                    allContent.push(content);
-                }
-            }
-            const content = allContent.join("");
-            const aggregatedOutput = allChunks[allChunks.length - 1];
-            aggregatedOutput.choices = [
-                { ...aggregatedOutput.choices[0], text: content },
-            ];
-            return aggregatedOutput;
-        };
-        const defaultRunConfig = {
-            name: "OpenAI",
-            run_type: "llm",
-            aggregator,
-            ...options,
-        };
-        return extractLangSmithExtraAndCall(originalCompletionsFn, args, defaultRunConfig);
-    };
+    openai.chat.completions.create = traceable(openai.chat.completions.create.bind(openai.chat.completions), {
+        name: "ChatOpenAI",
+        run_type: "llm",
+        aggregator: chatAggregator,
+        argsConfigPath: [1, "langsmithExtra"],
+        ...options,
+    });
+    openai.completions.create = traceable(openai.completions.create.bind(openai.completions), {
+        name: "OpenAI",
+        run_type: "llm",
+        aggregator: textAggregator,
+        argsConfigPath: [1, "langsmithExtra"],
+        ...options,
+    });
     return openai;
 };
 const _wrapClient = (sdk, runName, options) => {
@@ -177,7 +156,7 @@ const _wrapClient = (sdk, runName, options) => {
         get(target, propKey, receiver) {
             const originalValue = target[propKey];
             if (typeof originalValue === "function") {
-                return traceable(originalValue.bind(target), Object.assign({ name: [runName, propKey.toString()].join("."), run_type: "llm" }, options?.client));
+                return traceable(originalValue.bind(target), Object.assign({ name: [runName, propKey.toString()].join("."), run_type: "llm" }, options));
             }
             else if (originalValue != null &&
                 !Array.isArray(originalValue) &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "langsmith",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "description": "Client library to connect to the LangSmith LLM Tracing and Evaluation Platform.",
   "packageManager": "yarn@1.22.19",
   "files": [
@@ -47,8 +47,8 @@
     "check-version": "node scripts/check-version.js",
     "check-npm-version": "node scripts/check-npm-version.js",
     "clean": "rm -rf dist/ && node scripts/create-entrypoints.js clean",
-    "build:esm": "tsc --outDir dist/ && rm -rf dist/tests dist/**/tests",
-    "build:cjs": "tsc --outDir dist-cjs/ -p tsconfig.cjs.json && node scripts/move-cjs-to-dist.js && rm -r dist-cjs",
+    "build:esm": "rm -f src/package.json && tsc --outDir dist/ && rm -rf dist/tests dist/**/tests",
+    "build:cjs": "echo '{}' > src/package.json && tsc --outDir dist-cjs/ -p tsconfig.cjs.json && node scripts/move-cjs-to-dist.js && rm -r dist-cjs src/package.json",
     "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --passWithNoTests --testPathIgnorePatterns='\\.int\\.test.[tj]s' --testTimeout 30000",
     "test:integration": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --testPathPattern=\\.int\\.test.ts --testTimeout 100000",
     "test:single": "NODE_OPTIONS=--experimental-vm-modules yarn run jest --config jest.config.cjs --testTimeout 100000",
@@ -104,7 +104,7 @@
     "prettier": "^2.8.8",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.4.5"
   },
   "peerDependencies": {
     "openai": "*"