langchain 0.1.35 → 0.2.0-rc.0

package/dist/retrievers/self_query/functional.cjs

@@ -1,198 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FunctionalTranslator = 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");
-/**
- * A class that extends `BaseTranslator` to translate structured queries
- * into functional filters.
- * @example
- * ```typescript
- * const functionalTranslator = new FunctionalTranslator();
- * const relevantDocuments = await functionalTranslator.getRelevantDocuments(
- *   "Which movies are rated higher than 8.5?",
- * );
- * ```
- */
-class FunctionalTranslator extends base_js_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]
-        });
-        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.gt,
-                ir_js_1.Comparators.gte,
-                ir_js_1.Comparators.lt,
-                ir_js_1.Comparators.lte,
-            ]
-        });
-    }
-    formatFunction() {
-        throw new Error("Not implemented");
-    }
-    /**
-     * Returns a function that performs a comparison based on the provided
-     * comparator.
-     * @param comparator The comparator to base the comparison function on.
-     * @returns A function that takes two arguments and returns a boolean based on the comparison.
-     */
-    getComparatorFunction(comparator) {
-        switch (comparator) {
-            case ir_js_1.Comparators.eq: {
-                return (a, b) => a === b;
-            }
-            case ir_js_1.Comparators.ne: {
-                return (a, b) => a !== b;
-            }
-            case ir_js_1.Comparators.gt: {
-                return (a, b) => a > b;
-            }
-            case ir_js_1.Comparators.gte: {
-                return (a, b) => a >= b;
-            }
-            case ir_js_1.Comparators.lt: {
-                return (a, b) => a < b;
-            }
-            case ir_js_1.Comparators.lte: {
-                return (a, b) => a <= b;
-            }
-            default: {
-                throw new Error("Unknown comparator");
-            }
-        }
-    }
-    /**
-     * Returns a function that performs an operation based on the provided
-     * operator.
-     * @param operator The operator to base the operation function on.
-     * @returns A function that takes two boolean arguments and returns a boolean based on the operation.
-     */
-    getOperatorFunction(operator) {
-        switch (operator) {
-            case ir_js_1.Operators.and: {
-                return (a, b) => a && b;
-            }
-            case ir_js_1.Operators.or: {
-                return (a, b) => a || b;
-            }
-            default: {
-                throw new Error("Unknown operator");
-            }
-        }
-    }
-    /**
-     * Visits the operation part of a structured query and translates it into
-     * a functional filter.
-     * @param operation The operation part of a structured query.
-     * @returns A function that takes a `Document` as an argument and returns a boolean based on the operation.
-     */
-    visitOperation(operation) {
-        const { operator, args } = operation;
-        if (this.allowedOperators.includes(operator)) {
-            const operatorFunction = this.getOperatorFunction(operator);
-            return (document) => {
-                if (!args) {
-                    return true;
-                }
-                return args.reduce((acc, arg) => {
-                    const result = arg.accept(this);
-                    if (typeof result === "function") {
-                        return operatorFunction(acc, result(document));
-                    }
-                    else {
-                        throw new Error("Filter is not a function");
-                    }
-                }, true);
-            };
-        }
-        else {
-            throw new Error("Operator not allowed");
-        }
-    }
-    /**
-     * Visits the comparison part of a structured query and translates it into
-     * a functional filter.
-     * @param comparison The comparison part of a structured query.
-     * @returns A function that takes a `Document` as an argument and returns a boolean based on the comparison.
-     */
-    visitComparison(comparison) {
-        const { comparator, attribute, value } = comparison;
-        const undefinedTrue = [ir_js_1.Comparators.ne];
-        if (this.allowedComparators.includes(comparator)) {
-            const comparatorFunction = this.getComparatorFunction(comparator);
-            return (document) => {
-                const documentValue = document.metadata[attribute];
-                if (documentValue === undefined) {
-                    if (undefinedTrue.includes(comparator)) {
-                        return true;
-                    }
-                    return false;
-                }
-                return comparatorFunction(documentValue, (0, utils_js_1.castValue)(value));
-            };
-        }
-        else {
-            throw new Error("Comparator not allowed");
-        }
-    }
-    /**
-     * Visits a structured query and translates it into a functional filter.
-     * @param query The structured query to translate.
-     * @returns An object containing a `filter` property, which is a function that takes a `Document` as an argument and returns a boolean based on the structured query.
-     */
-    visitStructuredQuery(query) {
-        if (!query.filter) {
-            return {};
-        }
-        const filterFunction = query.filter?.accept(this);
-        if (typeof filterFunction !== "function") {
-            throw new Error("Structured query filter is not a function");
-        }
-        return { filter: filterFunction };
-    }
-    /**
-     * Merges two filters into one, based on the specified merge type.
-     * @param defaultFilter The default filter function.
-     * @param generatedFilter The generated filter function.
-     * @param mergeType The type of merge to perform. Can be 'and', 'or', or 'replace'. Default is 'and'.
-     * @returns A function that takes a `Document` as an argument and returns a boolean based on the merged filters, or `undefined` if both filters are empty.
-     */
-    mergeFilters(defaultFilter, generatedFilter, mergeType = "and") {
-        if ((0, utils_js_1.isFilterEmpty)(defaultFilter) && (0, utils_js_1.isFilterEmpty)(generatedFilter)) {
-            return undefined;
-        }
-        if ((0, utils_js_1.isFilterEmpty)(defaultFilter) || mergeType === "replace") {
-            if ((0, utils_js_1.isFilterEmpty)(generatedFilter)) {
-                return undefined;
-            }
-            return generatedFilter;
-        }
-        if ((0, utils_js_1.isFilterEmpty)(generatedFilter)) {
-            if (mergeType === "and") {
-                return undefined;
-            }
-            return defaultFilter;
-        }
-        if (mergeType === "and") {
-            return (document) => defaultFilter(document) && generatedFilter(document);
-        }
-        else if (mergeType === "or") {
-            return (document) => defaultFilter(document) || generatedFilter(document);
-        }
-        else {
-            throw new Error("Unknown merge type");
-        }
-    }
-}
-exports.FunctionalTranslator = FunctionalTranslator;
+var structured_query_1 = require("@langchain/core/structured_query");
+Object.defineProperty(exports, "FunctionalTranslator", { enumerable: true, get: function () { return structured_query_1.FunctionalTranslator; } });

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

@@ -1,87 +1 @@
-import { Document } from "@langchain/core/documents";
-import { Comparator, Comparison, Operation, Operator, StructuredQuery } from "../../chains/query_constructor/ir.js";
-import { BaseTranslator } from "./base.js";
-/**
- * A type alias for an object that maps comparison operators to string or
- * number values. This is used in the comparison functions to determine
- * the result of a comparison operation.
- */
-type ValueType = {
-    eq: string | number;
-    ne: string | number;
-    lt: string | number;
-    lte: string | number;
-    gt: string | number;
-    gte: string | number;
-};
-/**
- * A type alias for a function that takes a `Document` as an argument and
- * returns a boolean. This function is used as a filter for documents.
- */
-export type FunctionFilter = (document: Document) => boolean;
-/**
- * A class that extends `BaseTranslator` to translate structured queries
- * into functional filters.
- * @example
- * ```typescript
- * const functionalTranslator = new FunctionalTranslator();
- * const relevantDocuments = await functionalTranslator.getRelevantDocuments(
- *   "Which movies are rated higher than 8.5?",
- * );
- * ```
- */
-export declare class FunctionalTranslator extends BaseTranslator {
-    VisitOperationOutput: FunctionFilter;
-    VisitComparisonOutput: FunctionFilter;
-    VisitStructuredQueryOutput: {
-        filter: FunctionFilter;
-    } | {
-        [k: string]: never;
-    };
-    allowedOperators: Operator[];
-    allowedComparators: Comparator[];
-    formatFunction(): string;
-    /**
-     * Returns a function that performs a comparison based on the provided
-     * comparator.
-     * @param comparator The comparator to base the comparison function on.
-     * @returns A function that takes two arguments and returns a boolean based on the comparison.
-     */
-    getComparatorFunction<C extends Comparator>(comparator: Comparator): (a: string | number, b: ValueType[C]) => boolean;
-    /**
-     * Returns a function that performs an operation based on the provided
-     * operator.
-     * @param operator The operator to base the operation function on.
-     * @returns A function that takes two boolean arguments and returns a boolean based on the operation.
-     */
-    getOperatorFunction(operator: Operator): (a: boolean, b: boolean) => boolean;
-    /**
-     * Visits the operation part of a structured query and translates it into
-     * a functional filter.
-     * @param operation The operation part of a structured query.
-     * @returns A function that takes a `Document` as an argument and returns a boolean based on the operation.
-     */
-    visitOperation(operation: Operation): this["VisitOperationOutput"];
-    /**
-     * Visits the comparison part of a structured query and translates it into
-     * a functional filter.
-     * @param comparison The comparison part of a structured query.
-     * @returns A function that takes a `Document` as an argument and returns a boolean based on the comparison.
-     */
-    visitComparison(comparison: Comparison): this["VisitComparisonOutput"];
-    /**
-     * Visits a structured query and translates it into a functional filter.
-     * @param query The structured query to translate.
-     * @returns An object containing a `filter` property, which is a function that takes a `Document` as an argument and returns a boolean based on the structured query.
-     */
-    visitStructuredQuery(query: StructuredQuery): this["VisitStructuredQueryOutput"];
-    /**
-     * Merges two filters into one, based on the specified merge type.
-     * @param defaultFilter The default filter function.
-     * @param generatedFilter The generated filter function.
-     * @param mergeType The type of merge to perform. Can be 'and', 'or', or 'replace'. Default is 'and'.
-     * @returns A function that takes a `Document` as an argument and returns a boolean based on the merged filters, or `undefined` if both filters are empty.
-     */
-    mergeFilters(defaultFilter: FunctionFilter, generatedFilter: FunctionFilter, mergeType?: string): FunctionFilter | undefined;
-}
-export {};
+export { FunctionFilter, FunctionalTranslator, } from "@langchain/core/structured_query";

package/dist/retrievers/self_query/functional.js

@@ -1,194 +1 @@
-import { Comparators, Operators, } from "../../chains/query_constructor/ir.js";
-import { BaseTranslator } from "./base.js";
-import { castValue, isFilterEmpty } from "./utils.js";
-/**
- * A class that extends `BaseTranslator` to translate structured queries
- * into functional filters.
- * @example
- * ```typescript
- * const functionalTranslator = new FunctionalTranslator();
- * const relevantDocuments = await functionalTranslator.getRelevantDocuments(
- *   "Which movies are rated higher than 8.5?",
- * );
- * ```
- */
-export class FunctionalTranslator extends BaseTranslator {
-    constructor() {
-        super(...arguments);
-        Object.defineProperty(this, "allowedOperators", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: [Operators.and, Operators.or]
-        });
-        Object.defineProperty(this, "allowedComparators", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: [
-                Comparators.eq,
-                Comparators.ne,
-                Comparators.gt,
-                Comparators.gte,
-                Comparators.lt,
-                Comparators.lte,
-            ]
-        });
-    }
-    formatFunction() {
-        throw new Error("Not implemented");
-    }
-    /**
-     * Returns a function that performs a comparison based on the provided
-     * comparator.
-     * @param comparator The comparator to base the comparison function on.
-     * @returns A function that takes two arguments and returns a boolean based on the comparison.
-     */
-    getComparatorFunction(comparator) {
-        switch (comparator) {
-            case Comparators.eq: {
-                return (a, b) => a === b;
-            }
-            case Comparators.ne: {
-                return (a, b) => a !== b;
-            }
-            case Comparators.gt: {
-                return (a, b) => a > b;
-            }
-            case Comparators.gte: {
-                return (a, b) => a >= b;
-            }
-            case Comparators.lt: {
-                return (a, b) => a < b;
-            }
-            case Comparators.lte: {
-                return (a, b) => a <= b;
-            }
-            default: {
-                throw new Error("Unknown comparator");
-            }
-        }
-    }
-    /**
-     * Returns a function that performs an operation based on the provided
-     * operator.
-     * @param operator The operator to base the operation function on.
-     * @returns A function that takes two boolean arguments and returns a boolean based on the operation.
-     */
-    getOperatorFunction(operator) {
-        switch (operator) {
-            case Operators.and: {
-                return (a, b) => a && b;
-            }
-            case Operators.or: {
-                return (a, b) => a || b;
-            }
-            default: {
-                throw new Error("Unknown operator");
-            }
-        }
-    }
-    /**
-     * Visits the operation part of a structured query and translates it into
-     * a functional filter.
-     * @param operation The operation part of a structured query.
-     * @returns A function that takes a `Document` as an argument and returns a boolean based on the operation.
-     */
-    visitOperation(operation) {
-        const { operator, args } = operation;
-        if (this.allowedOperators.includes(operator)) {
-            const operatorFunction = this.getOperatorFunction(operator);
-            return (document) => {
-                if (!args) {
-                    return true;
-                }
-                return args.reduce((acc, arg) => {
-                    const result = arg.accept(this);
-                    if (typeof result === "function") {
-                        return operatorFunction(acc, result(document));
-                    }
-                    else {
-                        throw new Error("Filter is not a function");
-                    }
-                }, true);
-            };
-        }
-        else {
-            throw new Error("Operator not allowed");
-        }
-    }
-    /**
-     * Visits the comparison part of a structured query and translates it into
-     * a functional filter.
-     * @param comparison The comparison part of a structured query.
-     * @returns A function that takes a `Document` as an argument and returns a boolean based on the comparison.
-     */
-    visitComparison(comparison) {
-        const { comparator, attribute, value } = comparison;
-        const undefinedTrue = [Comparators.ne];
-        if (this.allowedComparators.includes(comparator)) {
-            const comparatorFunction = this.getComparatorFunction(comparator);
-            return (document) => {
-                const documentValue = document.metadata[attribute];
-                if (documentValue === undefined) {
-                    if (undefinedTrue.includes(comparator)) {
-                        return true;
-                    }
-                    return false;
-                }
-                return comparatorFunction(documentValue, castValue(value));
-            };
-        }
-        else {
-            throw new Error("Comparator not allowed");
-        }
-    }
-    /**
-     * Visits a structured query and translates it into a functional filter.
-     * @param query The structured query to translate.
-     * @returns An object containing a `filter` property, which is a function that takes a `Document` as an argument and returns a boolean based on the structured query.
-     */
-    visitStructuredQuery(query) {
-        if (!query.filter) {
-            return {};
-        }
-        const filterFunction = query.filter?.accept(this);
-        if (typeof filterFunction !== "function") {
-            throw new Error("Structured query filter is not a function");
-        }
-        return { filter: filterFunction };
-    }
-    /**
-     * Merges two filters into one, based on the specified merge type.
-     * @param defaultFilter The default filter function.
-     * @param generatedFilter The generated filter function.
-     * @param mergeType The type of merge to perform. Can be 'and', 'or', or 'replace'. Default is 'and'.
-     * @returns A function that takes a `Document` as an argument and returns a boolean based on the merged filters, or `undefined` if both filters are empty.
-     */
-    mergeFilters(defaultFilter, generatedFilter, mergeType = "and") {
-        if (isFilterEmpty(defaultFilter) && isFilterEmpty(generatedFilter)) {
-            return undefined;
-        }
-        if (isFilterEmpty(defaultFilter) || mergeType === "replace") {
-            if (isFilterEmpty(generatedFilter)) {
-                return undefined;
-            }
-            return generatedFilter;
-        }
-        if (isFilterEmpty(generatedFilter)) {
-            if (mergeType === "and") {
-                return undefined;
-            }
-            return defaultFilter;
-        }
-        if (mergeType === "and") {
-            return (document) => defaultFilter(document) && generatedFilter(document);
-        }
-        else if (mergeType === "or") {
-            return (document) => defaultFilter(document) || generatedFilter(document);
-        }
-        else {
-            throw new Error("Unknown merge type");
-        }
-    }
-}
+export { FunctionalTranslator, } from "@langchain/core/structured_query";

package/dist/retrievers/self_query/index.cjs

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SelfQueryRetriever = exports.FunctionalTranslator = exports.BasicTranslator = exports.BaseTranslator = void 0;
 const retrievers_1 = require("@langchain/core/retrievers");
+const structured_query_1 = require("@langchain/core/structured_query");
+Object.defineProperty(exports, "BaseTranslator", { enumerable: true, get: function () { return structured_query_1.BaseTranslator; } });
+Object.defineProperty(exports, "BasicTranslator", { enumerable: true, get: function () { return structured_query_1.BasicTranslator; } });
+Object.defineProperty(exports, "FunctionalTranslator", { enumerable: true, get: function () { return structured_query_1.FunctionalTranslator; } });
 const index_js_1 = require("../../chains/query_constructor/index.cjs");
-const functional_js_1 = require("./functional.cjs");
-Object.defineProperty(exports, "FunctionalTranslator", { enumerable: true, get: function () { return functional_js_1.FunctionalTranslator; } });
-const base_js_1 = require("./base.cjs");
-Object.defineProperty(exports, "BaseTranslator", { enumerable: true, get: function () { return base_js_1.BaseTranslator; } });
-Object.defineProperty(exports, "BasicTranslator", { enumerable: true, get: function () { return base_js_1.BasicTranslator; } });
 /**
  * Class for question answering over an index. It retrieves relevant
  * documents based on a query. It extends the BaseRetriever class and
@@ -41,7 +40,7 @@ class SelfQueryRetriever extends retrievers_1.BaseRetriever {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "llmChain", {
+        Object.defineProperty(this, "queryConstructor", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -72,17 +71,14 @@ class SelfQueryRetriever extends retrievers_1.BaseRetriever {
             value: { k: 4, forceDefaultFilter: false }
         });
         this.vectorStore = options.vectorStore;
-        this.llmChain = options.llmChain;
+        this.queryConstructor = options.queryConstructor;
         this.verbose = options.verbose ?? false;
         this.searchParams = options.searchParams ?? this.searchParams;
         this.useOriginalQuery = options.useOriginalQuery ?? this.useOriginalQuery;
         this.structuredQueryTranslator = options.structuredQueryTranslator;
     }
     async _getRelevantDocuments(query, runManager) {
-        const { [this.llmChain.outputKey]: output } = await this.llmChain.call({
-            [this.llmChain.inputKeys[0]]: query,
-        }, runManager?.getChild("llm_chain"));
-        const generatedStructuredQuery = output;
+        const generatedStructuredQuery = await this.queryConstructor.invoke({ query }, runManager?.getChild("query_constructor"));
         const nextArg = this.structuredQueryTranslator.visitStructuredQuery(generatedStructuredQuery);
         const filter = this.structuredQueryTranslator.mergeFilters(this.searchParams?.filter, nextArg.filter, this.searchParams?.mergeFiltersOperator, this.searchParams?.forceDefaultFilter);
         const generatedQuery = generatedStructuredQuery.query;
@@ -103,7 +99,7 @@ class SelfQueryRetriever extends retrievers_1.BaseRetriever {
      */
     static fromLLM(options) {
         const { structuredQueryTranslator, allowedComparators, allowedOperators, llm, documentContents, attributeInfo, examples, vectorStore, ...rest } = options;
-        const llmChain = (0, index_js_1.loadQueryConstructorChain)({
+        const queryConstructor = (0, index_js_1.loadQueryConstructorRunnable)({
             llm,
             documentContents,
             attributeInfo,
@@ -113,7 +109,7 @@ class SelfQueryRetriever extends retrievers_1.BaseRetriever {
         });
         return new SelfQueryRetriever({
             ...rest,
-            llmChain,
+            queryConstructor,
             vectorStore,
             structuredQueryTranslator,
         });

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

@@ -1,11 +1,10 @@
+import { RunnableInterface } from "@langchain/core/runnables";
 import { BaseRetriever, type BaseRetrieverInput } from "@langchain/core/retrievers";
 import { Document } from "@langchain/core/documents";
 import { VectorStore } from "@langchain/core/vectorstores";
+import { BaseTranslator, BasicTranslator, FunctionalTranslator, StructuredQuery } from "@langchain/core/structured_query";
 import { CallbackManagerForRetrieverRun } from "@langchain/core/callbacks/manager";
-import { LLMChain } from "../../chains/llm_chain.js";
-import { QueryConstructorChainOptions } from "../../chains/query_constructor/index.js";
-import { FunctionalTranslator } from "./functional.js";
-import { BaseTranslator, BasicTranslator } from "./base.js";
+import { QueryConstructorRunnableOptions } from "../../chains/query_constructor/index.js";
 export { BaseTranslator, BasicTranslator, FunctionalTranslator };
 /**
  * Interface for the arguments required to create a SelfQueryRetriever
@@ -14,7 +13,9 @@ export { BaseTranslator, BasicTranslator, FunctionalTranslator };
 export interface SelfQueryRetrieverArgs<T extends VectorStore> extends BaseRetrieverInput {
     vectorStore: T;
     structuredQueryTranslator: BaseTranslator<T>;
-    llmChain: LLMChain;
+    queryConstructor: RunnableInterface<{
+        query: string;
+    }, StructuredQuery>;
     verbose?: boolean;
     useOriginalQuery?: boolean;
     searchParams?: {
@@ -46,7 +47,9 @@ export declare class SelfQueryRetriever<T extends VectorStore> extends BaseRetri
     static lc_name(): string;
     get lc_namespace(): string[];
     vectorStore: T;
-    llmChain: LLMChain;
+    queryConstructor: RunnableInterface<{
+        query: string;
+    }, StructuredQuery>;
     verbose?: boolean;
     structuredQueryTranslator: BaseTranslator<T>;
     useOriginalQuery: boolean;
@@ -67,5 +70,5 @@ export declare class SelfQueryRetriever<T extends VectorStore> extends BaseRetri
      * @param options The options used to create the SelfQueryRetriever instance. It includes the QueryConstructorChainOptions and all the SelfQueryRetrieverArgs except 'llmChain'.
      * @returns A new instance of SelfQueryRetriever.
      */
-    static fromLLM<T extends VectorStore>(options: QueryConstructorChainOptions & Omit<SelfQueryRetrieverArgs<T>, "llmChain">): SelfQueryRetriever<T>;
+    static fromLLM<T extends VectorStore>(options: QueryConstructorRunnableOptions & Omit<SelfQueryRetrieverArgs<T>, "queryConstructor">): SelfQueryRetriever<T>;
 }

package/dist/retrievers/self_query/index.js

@@ -1,7 +1,6 @@
 import { BaseRetriever, } from "@langchain/core/retrievers";
-import { loadQueryConstructorChain, } from "../../chains/query_constructor/index.js";
-import { FunctionalTranslator } from "./functional.js";
-import { BaseTranslator, BasicTranslator } from "./base.js";
+import { BaseTranslator, BasicTranslator, FunctionalTranslator, } from "@langchain/core/structured_query";
+import { loadQueryConstructorRunnable, } from "../../chains/query_constructor/index.js";
 export { BaseTranslator, BasicTranslator, FunctionalTranslator };
 /**
  * Class for question answering over an index. It retrieves relevant
@@ -36,7 +35,7 @@ export class SelfQueryRetriever extends BaseRetriever {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "llmChain", {
+        Object.defineProperty(this, "queryConstructor", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -67,17 +66,14 @@ export class SelfQueryRetriever extends BaseRetriever {
             value: { k: 4, forceDefaultFilter: false }
         });
         this.vectorStore = options.vectorStore;
-        this.llmChain = options.llmChain;
+        this.queryConstructor = options.queryConstructor;
         this.verbose = options.verbose ?? false;
         this.searchParams = options.searchParams ?? this.searchParams;
         this.useOriginalQuery = options.useOriginalQuery ?? this.useOriginalQuery;
         this.structuredQueryTranslator = options.structuredQueryTranslator;
     }
     async _getRelevantDocuments(query, runManager) {
-        const { [this.llmChain.outputKey]: output } = await this.llmChain.call({
-            [this.llmChain.inputKeys[0]]: query,
-        }, runManager?.getChild("llm_chain"));
-        const generatedStructuredQuery = output;
+        const generatedStructuredQuery = await this.queryConstructor.invoke({ query }, runManager?.getChild("query_constructor"));
         const nextArg = this.structuredQueryTranslator.visitStructuredQuery(generatedStructuredQuery);
         const filter = this.structuredQueryTranslator.mergeFilters(this.searchParams?.filter, nextArg.filter, this.searchParams?.mergeFiltersOperator, this.searchParams?.forceDefaultFilter);
         const generatedQuery = generatedStructuredQuery.query;
@@ -98,7 +94,7 @@ export class SelfQueryRetriever extends BaseRetriever {
      */
     static fromLLM(options) {
         const { structuredQueryTranslator, allowedComparators, allowedOperators, llm, documentContents, attributeInfo, examples, vectorStore, ...rest } = options;
-        const llmChain = loadQueryConstructorChain({
+        const queryConstructor = loadQueryConstructorRunnable({
             llm,
             documentContents,
             attributeInfo,
@@ -108,7 +104,7 @@ export class SelfQueryRetriever extends BaseRetriever {
         });
         return new SelfQueryRetriever({
             ...rest,
-            llmChain,
+            queryConstructor,
             vectorStore,
             structuredQueryTranslator,
         });