langchain 0.1.34 → 0.1.36

package/dist/retrievers/self_query/vectara.cjs

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VectaraTranslator = void 0;
-const ir_js_1 = require("../../chains/query_constructor/ir.cjs");
-const base_js_1 = require("./base.cjs");
-const utils_js_1 = require("./utils.cjs");
+const structured_query_1 = require("@langchain/core/structured_query");
 function processValue(value) {
     /** Convert a value to a string and add single quotes if it is a string. */
     if (typeof value === "string") {
@@ -13,37 +11,37 @@ function processValue(value) {
         return String(value);
     }
 }
-class VectaraTranslator extends base_js_1.BaseTranslator {
+class VectaraTranslator extends structured_query_1.BaseTranslator {
     constructor() {
         super(...arguments);
         Object.defineProperty(this, "allowedOperators", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: [ir_js_1.Operators.and, ir_js_1.Operators.or]
+            value: [structured_query_1.Operators.and, structured_query_1.Operators.or]
         });
         Object.defineProperty(this, "allowedComparators", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: [
-                ir_js_1.Comparators.eq,
-                ir_js_1.Comparators.ne,
-                ir_js_1.Comparators.lt,
-                ir_js_1.Comparators.lte,
-                ir_js_1.Comparators.gt,
-                ir_js_1.Comparators.gte,
+                structured_query_1.Comparators.eq,
+                structured_query_1.Comparators.ne,
+                structured_query_1.Comparators.lt,
+                structured_query_1.Comparators.lte,
+                structured_query_1.Comparators.gt,
+                structured_query_1.Comparators.gte,
             ]
         });
     }
     formatFunction(func) {
-        if (func in ir_js_1.Comparators) {
+        if (func in structured_query_1.Comparators) {
             if (this.allowedComparators.length > 0 &&
                 this.allowedComparators.indexOf(func) === -1) {
                 throw new Error(`Comparator ${func} not allowed. Allowed operators: ${this.allowedComparators.join(", ")}`);
             }
         }
-        else if (func in ir_js_1.Operators) {
+        else if (func in structured_query_1.Operators) {
             if (this.allowedOperators.length > 0 &&
                 this.allowedOperators.indexOf(func) === -1) {
                 throw new Error(`Operator ${func} not allowed. Allowed operators: ${this.allowedOperators.join(", ")}`);
@@ -102,16 +100,16 @@ class VectaraTranslator extends base_js_1.BaseTranslator {
         return nextArg;
     }
     mergeFilters(defaultFilter, generatedFilter, mergeType = "and", forceDefaultFilter = false) {
-        if ((0, utils_js_1.isFilterEmpty)(defaultFilter) && (0, utils_js_1.isFilterEmpty)(generatedFilter)) {
+        if ((0, structured_query_1.isFilterEmpty)(defaultFilter) && (0, structured_query_1.isFilterEmpty)(generatedFilter)) {
             return undefined;
         }
-        if ((0, utils_js_1.isFilterEmpty)(defaultFilter) || mergeType === "replace") {
-            if ((0, utils_js_1.isFilterEmpty)(generatedFilter)) {
+        if ((0, structured_query_1.isFilterEmpty)(defaultFilter) || mergeType === "replace") {
+            if ((0, structured_query_1.isFilterEmpty)(generatedFilter)) {
                 return undefined;
             }
             return generatedFilter;
         }
-        if ((0, utils_js_1.isFilterEmpty)(generatedFilter)) {
+        if ((0, structured_query_1.isFilterEmpty)(generatedFilter)) {
             if (forceDefaultFilter) {
                 return defaultFilter;
             }

package/dist/retrievers/self_query/vectara.d.ts

@@ -1,6 +1,5 @@
 import { VectaraFilter, VectaraStore } from "@langchain/community/vectorstores/vectara";
-import { Comparator, Comparison, Operation, Operator, StructuredQuery } from "../../chains/query_constructor/ir.js";
-import { BaseTranslator } from "./base.js";
+import { BaseTranslator, Comparator, Comparison, Operation, Operator, StructuredQuery } from "@langchain/core/structured_query";
 export type VectaraVisitorResult = VectaraOperationResult | VectaraComparisonResult | VectaraVisitorStructuredQueryResult;
 export type VectaraOperationResult = String;
 export type VectaraComparisonResult = String;

package/dist/retrievers/self_query/vectara.js

@@ -1,6 +1,4 @@
-import { Comparators, Operators, } from "../../chains/query_constructor/ir.js";
-import { BaseTranslator } from "./base.js";
-import { isFilterEmpty } from "./utils.js";
+import { BaseTranslator, isFilterEmpty, Comparators, Operators, } from "@langchain/core/structured_query";
 function processValue(value) {
     /** Convert a value to a string and add single quotes if it is a string. */
     if (typeof value === "string") {

package/dist/retrievers/self_query/weaviate.cjs

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WeaviateTranslator = void 0;
-const ir_js_1 = require("../../chains/query_constructor/ir.cjs");
-const base_js_1 = require("./base.cjs");
-const utils_js_1 = require("./utils.cjs");
+const structured_query_1 = require("@langchain/core/structured_query");
 /**
  * A class that translates or converts data into a format that can be used
  * with Weaviate, a vector search engine. It extends the `BaseTranslator`
@@ -23,26 +21,26 @@ const utils_js_1 = require("./utils.cjs");
  * );
  * ```
  */
-class WeaviateTranslator extends base_js_1.BaseTranslator {
+class WeaviateTranslator extends structured_query_1.BaseTranslator {
     constructor() {
         super(...arguments);
         Object.defineProperty(this, "allowedOperators", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: [ir_js_1.Operators.and, ir_js_1.Operators.or]
+            value: [structured_query_1.Operators.and, structured_query_1.Operators.or]
         });
         Object.defineProperty(this, "allowedComparators", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: [
-                ir_js_1.Comparators.eq,
-                ir_js_1.Comparators.ne,
-                ir_js_1.Comparators.lt,
-                ir_js_1.Comparators.lte,
-                ir_js_1.Comparators.gt,
-                ir_js_1.Comparators.gte,
+                structured_query_1.Comparators.eq,
+                structured_query_1.Comparators.ne,
+                structured_query_1.Comparators.lt,
+                structured_query_1.Comparators.lte,
+                structured_query_1.Comparators.gt,
+                structured_query_1.Comparators.gte,
             ]
         });
     }
@@ -54,13 +52,13 @@ class WeaviateTranslator extends base_js_1.BaseTranslator {
      * @returns A string representation of the function.
      */
     formatFunction(func) {
-        if (func in ir_js_1.Comparators) {
+        if (func in structured_query_1.Comparators) {
             if (this.allowedComparators.length > 0 &&
                 this.allowedComparators.indexOf(func) === -1) {
                 throw new Error(`Comparator ${func} not allowed. Allowed operators: ${this.allowedComparators.join(", ")}`);
             }
         }
-        else if (func in ir_js_1.Operators) {
+        else if (func in structured_query_1.Operators) {
             if (this.allowedOperators.length > 0 &&
                 this.allowedOperators.indexOf(func) === -1) {
                 throw new Error(`Operator ${func} not allowed. Allowed operators: ${this.allowedOperators.join(", ")}`);
@@ -102,21 +100,21 @@ class WeaviateTranslator extends base_js_1.BaseTranslator {
      * @returns A WeaviateComparisonResult.
      */
     visitComparison(comparison) {
-        if ((0, utils_js_1.isString)(comparison.value)) {
+        if ((0, structured_query_1.isString)(comparison.value)) {
             return {
                 path: [comparison.attribute],
                 operator: this.formatFunction(comparison.comparator),
                 valueText: comparison.value,
             };
         }
-        if ((0, utils_js_1.isInt)(comparison.value)) {
+        if ((0, structured_query_1.isInt)(comparison.value)) {
             return {
                 path: [comparison.attribute],
                 operator: this.formatFunction(comparison.comparator),
                 valueInt: parseInt(comparison.value, 10),
             };
         }
-        if ((0, utils_js_1.isFloat)(comparison.value)) {
+        if ((0, structured_query_1.isFloat)(comparison.value)) {
             return {
                 path: [comparison.attribute],
                 operator: this.formatFunction(comparison.comparator),
@@ -152,17 +150,17 @@ class WeaviateTranslator extends base_js_1.BaseTranslator {
      * @returns A merged WeaviateFilter, or undefined if both filters are empty.
      */
     mergeFilters(defaultFilter, generatedFilter, mergeType = "and") {
-        if ((0, utils_js_1.isFilterEmpty)(defaultFilter?.where) &&
-            (0, utils_js_1.isFilterEmpty)(generatedFilter?.where)) {
+        if ((0, structured_query_1.isFilterEmpty)(defaultFilter?.where) &&
+            (0, structured_query_1.isFilterEmpty)(generatedFilter?.where)) {
             return undefined;
         }
-        if ((0, utils_js_1.isFilterEmpty)(defaultFilter?.where) || mergeType === "replace") {
-            if ((0, utils_js_1.isFilterEmpty)(generatedFilter?.where)) {
+        if ((0, structured_query_1.isFilterEmpty)(defaultFilter?.where) || mergeType === "replace") {
+            if ((0, structured_query_1.isFilterEmpty)(generatedFilter?.where)) {
                 return undefined;
             }
             return generatedFilter;
         }
-        if ((0, utils_js_1.isFilterEmpty)(generatedFilter?.where)) {
+        if ((0, structured_query_1.isFilterEmpty)(generatedFilter?.where)) {
             if (mergeType === "and") {
                 return undefined;
             }

package/dist/retrievers/self_query/weaviate.d.ts

@@ -1,6 +1,5 @@
 import { WeaviateFilter, WeaviateStore } from "@langchain/community/vectorstores/weaviate";
-import { Comparator, Comparison, Operation, Operator, StructuredQuery } from "../../chains/query_constructor/ir.js";
-import { BaseTranslator } from "./base.js";
+import { BaseTranslator, Comparator, Comparison, Operation, Operator, StructuredQuery } from "@langchain/core/structured_query";
 type WeaviateOperatorValues = {
     valueText: string;
     valueInt: number;

package/dist/retrievers/self_query/weaviate.js

@@ -1,6 +1,4 @@
-import { Comparators, Operators, } from "../../chains/query_constructor/ir.js";
-import { BaseTranslator } from "./base.js";
-import { isFilterEmpty, isString, isInt, isFloat } from "./utils.js";
+import { isFilterEmpty, isString, isInt, isFloat, BaseTranslator, Comparators, Operators, } from "@langchain/core/structured_query";
 /**
  * A class that translates or converts data into a format that can be used
  * with Weaviate, a vector search engine. It extends the `BaseTranslator`

package/dist/smith/runner_utils.cjs

@@ -5,6 +5,7 @@ const messages_1 = require("@langchain/core/messages");
 const runnables_1 = require("@langchain/core/runnables");
 const tracer_langchain_1 = require("@langchain/core/tracers/tracer_langchain");
 const base_1 = require("@langchain/core/tracers/base");
+const async_caller_1 = require("@langchain/core/utils/async_caller");
 const langsmith_1 = require("langsmith");
 const loader_js_1 = require("../evaluation/loader.cjs");
 const config_js_1 = require("./config.cjs");
@@ -403,31 +404,37 @@ const loadExamples = async ({ datasetName, client, projectName, }) => {
         runExtractors,
     };
 };
-const applyEvaluators = async ({ evaluation, runs, examples, client, }) => {
+const applyEvaluators = async ({ evaluation, runs, examples, client, maxConcurrency, }) => {
     // TODO: Parallelize and/or put in callbacks to speed up evals.
     const { evaluators } = evaluation;
     const progress = new progress_js_1.ProgressBar({
         total: examples.length,
         format: "Running Evaluators: {bar} {percentage}% | {value}/{total}\n",
     });
-    const results = {};
-    for (let i = 0; i < runs.length; i += 1) {
-        const run = runs[i];
-        const example = examples[i];
+    const caller = new async_caller_1.AsyncCaller({
+        maxConcurrency,
+    });
+    const requests = runs.map(async (run, i) => caller.call(async () => {
         const evaluatorResults = await Promise.allSettled(evaluators.map((evaluator) => client.evaluateRun(run, evaluator, {
-            referenceExample: example,
+            referenceExample: examples[i],
             loadChildRuns: false,
         })));
         progress.increment();
-        results[example.id] = {
+        return {
             execution_time: run?.end_time && run.start_time
                 ? run.end_time - run.start_time
                 : undefined,
-            feedback: evaluatorResults.map((evalResult) => evalResult.status === "fulfilled" ? evalResult.value : evalResult.reason),
+            feedback: evaluatorResults.map((evalResult) => evalResult.status === "fulfilled"
+                ? evalResult.value
+                : evalResult.reason),
             run_id: run.id,
         };
-    }
-    return results;
+    }));
+    const results = await Promise.all(requests);
+    return results.reduce((acc, result, i) => ({
+        ...acc,
+        [examples[i].id]: result,
+    }), {});
 };
 const getExamplesInputs = (examples, chainOrFactory, dataType) => {
     if (dataType === "chat") {
@@ -553,6 +560,7 @@ async function runOnDataset(chainOrFactory, datasetName, options) {
             runs,
             examples,
             client: testClient,
+            maxConcurrency: testConcurrency,
         });
     }
     const results = {

package/dist/smith/runner_utils.js

@@ -2,6 +2,7 @@ import { mapStoredMessagesToChatMessages } from "@langchain/core/messages";
 import { Runnable, RunnableLambda, getCallbackManagerForConfig, } from "@langchain/core/runnables";
 import { LangChainTracer } from "@langchain/core/tracers/tracer_langchain";
 import { BaseTracer } from "@langchain/core/tracers/base";
+import { AsyncCaller } from "@langchain/core/utils/async_caller";
 import { Client, RunTree, } from "langsmith";
 import { loadEvaluator } from "../evaluation/loader.js";
 import { isOffTheShelfEvaluator, isCustomEvaluator, } from "./config.js";
@@ -400,31 +401,37 @@ const loadExamples = async ({ datasetName, client, projectName, }) => {
         runExtractors,
     };
 };
-const applyEvaluators = async ({ evaluation, runs, examples, client, }) => {
+const applyEvaluators = async ({ evaluation, runs, examples, client, maxConcurrency, }) => {
     // TODO: Parallelize and/or put in callbacks to speed up evals.
     const { evaluators } = evaluation;
     const progress = new ProgressBar({
         total: examples.length,
         format: "Running Evaluators: {bar} {percentage}% | {value}/{total}\n",
     });
-    const results = {};
-    for (let i = 0; i < runs.length; i += 1) {
-        const run = runs[i];
-        const example = examples[i];
+    const caller = new AsyncCaller({
+        maxConcurrency,
+    });
+    const requests = runs.map(async (run, i) => caller.call(async () => {
         const evaluatorResults = await Promise.allSettled(evaluators.map((evaluator) => client.evaluateRun(run, evaluator, {
-            referenceExample: example,
+            referenceExample: examples[i],
             loadChildRuns: false,
         })));
         progress.increment();
-        results[example.id] = {
+        return {
             execution_time: run?.end_time && run.start_time
                 ? run.end_time - run.start_time
                 : undefined,
-            feedback: evaluatorResults.map((evalResult) => evalResult.status === "fulfilled" ? evalResult.value : evalResult.reason),
+            feedback: evaluatorResults.map((evalResult) => evalResult.status === "fulfilled"
+                ? evalResult.value
+                : evalResult.reason),
             run_id: run.id,
         };
-    }
-    return results;
+    }));
+    const results = await Promise.all(requests);
+    return results.reduce((acc, result, i) => ({
+        ...acc,
+        [examples[i].id]: result,
+    }), {});
 };
 const getExamplesInputs = (examples, chainOrFactory, dataType) => {
     if (dataType === "chat") {
@@ -550,6 +557,7 @@ export async function runOnDataset(chainOrFactory, datasetName, options) {
             runs,
             examples,
             client: testClient,
+            maxConcurrency: testConcurrency,
         });
     }
     const results = {

package/dist/storage/in_memory.cjs

@@ -1,84 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InMemoryStore = void 0;
-const stores_1 = require("@langchain/core/stores");
-/**
- * In-memory implementation of the BaseStore using a dictionary. Used for
- * storing key-value pairs in memory.
- * @example
- * ```typescript
- * const store = new InMemoryStore<BaseMessage>();
- * await store.mset(
- *   Array.from({ length: 5 }).map((_, index) => [
- *     `message:id:${index}`,
- *     index % 2 === 0
- *       ? new AIMessage("ai stuff...")
- *       : new HumanMessage("human stuff..."),
- *   ]),
- * );
- *
- * const retrievedMessages = await store.mget(["message:id:0", "message:id:1"]);
- * await store.mdelete(await store.yieldKeys("message:id:").toArray());
- * ```
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-class InMemoryStore extends stores_1.BaseStore {
-    constructor() {
-        super(...arguments);
-        Object.defineProperty(this, "lc_namespace", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: ["langchain", "storage"]
-        });
-        Object.defineProperty(this, "store", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: {}
-        });
-    }
-    /**
-     * Retrieves the values associated with the given keys from the store.
-     * @param keys Keys to retrieve values for.
-     * @returns Array of values associated with the given keys.
-     */
-    async mget(keys) {
-        return keys.map((key) => this.store[key]);
-    }
-    /**
-     * Sets the values for the given keys in the store.
-     * @param keyValuePairs Array of key-value pairs to set in the store.
-     * @returns Promise that resolves when all key-value pairs have been set.
-     */
-    async mset(keyValuePairs) {
-        for (const [key, value] of keyValuePairs) {
-            this.store[key] = value;
-        }
-    }
-    /**
-     * Deletes the given keys and their associated values from the store.
-     * @param keys Keys to delete from the store.
-     * @returns Promise that resolves when all keys have been deleted.
-     */
-    async mdelete(keys) {
-        for (const key of keys) {
-            delete this.store[key];
-        }
-    }
-    /**
-     * Asynchronous generator that yields keys from the store. If a prefix is
-     * provided, it only yields keys that start with the prefix.
-     * @param prefix Optional prefix to filter keys.
-     * @returns AsyncGenerator that yields keys from the store.
-     */
-    async *yieldKeys(prefix) {
-        const keys = Object.keys(this.store);
-        for (const key of keys) {
-            if (prefix === undefined || key.startsWith(prefix)) {
-                yield key;
-            }
-        }
-    }
-}
-exports.InMemoryStore = InMemoryStore;
+var stores_1 = require("@langchain/core/stores");
+Object.defineProperty(exports, "InMemoryStore", { enumerable: true, get: function () { return stores_1.InMemoryStore; } });

package/dist/storage/in_memory.d.ts

@@ -1,49 +1 @@
-import { BaseStore } from "@langchain/core/stores";
-/**
- * In-memory implementation of the BaseStore using a dictionary. Used for
- * storing key-value pairs in memory.
- * @example
- * ```typescript
- * const store = new InMemoryStore<BaseMessage>();
- * await store.mset(
- *   Array.from({ length: 5 }).map((_, index) => [
- *     `message:id:${index}`,
- *     index % 2 === 0
- *       ? new AIMessage("ai stuff...")
- *       : new HumanMessage("human stuff..."),
- *   ]),
- * );
- *
- * const retrievedMessages = await store.mget(["message:id:0", "message:id:1"]);
- * await store.mdelete(await store.yieldKeys("message:id:").toArray());
- * ```
- */
-export declare class InMemoryStore<T = any> extends BaseStore<string, T> {
-    lc_namespace: string[];
-    protected store: Record<string, T>;
-    /**
-     * Retrieves the values associated with the given keys from the store.
-     * @param keys Keys to retrieve values for.
-     * @returns Array of values associated with the given keys.
-     */
-    mget(keys: string[]): Promise<T[]>;
-    /**
-     * Sets the values for the given keys in the store.
-     * @param keyValuePairs Array of key-value pairs to set in the store.
-     * @returns Promise that resolves when all key-value pairs have been set.
-     */
-    mset(keyValuePairs: [string, T][]): Promise<void>;
-    /**
-     * Deletes the given keys and their associated values from the store.
-     * @param keys Keys to delete from the store.
-     * @returns Promise that resolves when all keys have been deleted.
-     */
-    mdelete(keys: string[]): Promise<void>;
-    /**
-     * Asynchronous generator that yields keys from the store. If a prefix is
-     * provided, it only yields keys that start with the prefix.
-     * @param prefix Optional prefix to filter keys.
-     * @returns AsyncGenerator that yields keys from the store.
-     */
-    yieldKeys(prefix?: string | undefined): AsyncGenerator<string>;
-}
+export { InMemoryStore } from "@langchain/core/stores";

package/dist/storage/in_memory.js

@@ -1,80 +1 @@
-import { BaseStore } from "@langchain/core/stores";
-/**
- * In-memory implementation of the BaseStore using a dictionary. Used for
- * storing key-value pairs in memory.
- * @example
- * ```typescript
- * const store = new InMemoryStore<BaseMessage>();
- * await store.mset(
- *   Array.from({ length: 5 }).map((_, index) => [
- *     `message:id:${index}`,
- *     index % 2 === 0
- *       ? new AIMessage("ai stuff...")
- *       : new HumanMessage("human stuff..."),
- *   ]),
- * );
- *
- * const retrievedMessages = await store.mget(["message:id:0", "message:id:1"]);
- * await store.mdelete(await store.yieldKeys("message:id:").toArray());
- * ```
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export class InMemoryStore extends BaseStore {
-    constructor() {
-        super(...arguments);
-        Object.defineProperty(this, "lc_namespace", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: ["langchain", "storage"]
-        });
-        Object.defineProperty(this, "store", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: {}
-        });
-    }
-    /**
-     * Retrieves the values associated with the given keys from the store.
-     * @param keys Keys to retrieve values for.
-     * @returns Array of values associated with the given keys.
-     */
-    async mget(keys) {
-        return keys.map((key) => this.store[key]);
-    }
-    /**
-     * Sets the values for the given keys in the store.
-     * @param keyValuePairs Array of key-value pairs to set in the store.
-     * @returns Promise that resolves when all key-value pairs have been set.
-     */
-    async mset(keyValuePairs) {
-        for (const [key, value] of keyValuePairs) {
-            this.store[key] = value;
-        }
-    }
-    /**
-     * Deletes the given keys and their associated values from the store.
-     * @param keys Keys to delete from the store.
-     * @returns Promise that resolves when all keys have been deleted.
-     */
-    async mdelete(keys) {
-        for (const key of keys) {
-            delete this.store[key];
-        }
-    }
-    /**
-     * Asynchronous generator that yields keys from the store. If a prefix is
-     * provided, it only yields keys that start with the prefix.
-     * @param prefix Optional prefix to filter keys.
-     * @returns AsyncGenerator that yields keys from the store.
-     */
-    async *yieldKeys(prefix) {
-        const keys = Object.keys(this.store);
-        for (const key of keys) {
-            if (prefix === undefined || key.startsWith(prefix)) {
-                yield key;
-            }
-        }
-    }
-}
+export { InMemoryStore } from "@langchain/core/stores";