langchain 0.1.35 → 0.1.37

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 { 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 { BaseTranslator, BasicTranslator, FunctionalTranslator, StructuredQuery } from "@langchain/core/structured_query";
+import { CallbackManagerForRetrieverRun } from "../../callbacks/manager.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,
         });

package/dist/retrievers/self_query/pinecone.cjs

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PineconeTranslator = void 0;
-const ir_js_1 = require("../../chains/query_constructor/ir.cjs");
-const base_js_1 = require("./base.cjs");
+const structured_query_1 = require("@langchain/core/structured_query");
 /**
  * Specialized translator class that extends the BasicTranslator. It is
  * designed to work with PineconeStore, a type of vector store in
@@ -24,17 +23,17 @@ const base_js_1 = require("./base.cjs");
  * );
  * ```
  */
-class PineconeTranslator extends base_js_1.BasicTranslator {
+class PineconeTranslator extends structured_query_1.BasicTranslator {
     constructor() {
         super({
-            allowedOperators: [ir_js_1.Operators.and, ir_js_1.Operators.or],
+            allowedOperators: [structured_query_1.Operators.and, structured_query_1.Operators.or],
             allowedComparators: [
-                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,
+                structured_query_1.Comparators.eq,
+                structured_query_1.Comparators.ne,
+                structured_query_1.Comparators.gt,
+                structured_query_1.Comparators.gte,
+                structured_query_1.Comparators.lt,
+                structured_query_1.Comparators.lte,
             ],
         });
     }

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

@@ -1,5 +1,5 @@
 import type { VectorStoreInterface } from "@langchain/core/vectorstores";
-import { BasicTranslator } from "./base.js";
+import { BasicTranslator } from "@langchain/core/structured_query";
 /**
  * Specialized translator class that extends the BasicTranslator. It is
  * designed to work with PineconeStore, a type of vector store in

package/dist/retrievers/self_query/pinecone.js

@@ -1,5 +1,4 @@
-import { Comparators, Operators } from "../../chains/query_constructor/ir.js";
-import { BasicTranslator } from "./base.js";
+import { BasicTranslator, Comparators, Operators, } from "@langchain/core/structured_query";
 /**
  * Specialized translator class that extends the BasicTranslator. It is
  * designed to work with PineconeStore, a type of vector store in

package/dist/retrievers/self_query/supabase.cjs

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SupabaseTranslator = 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");
 const supabase_utils_js_1 = require("./supabase_utils.cjs");
 /**
  * A specialized translator designed to work with Supabase, extending the
@@ -24,26 +22,26 @@ const supabase_utils_js_1 = require("./supabase_utils.cjs");
  * );
  * ```
  */
-class SupabaseTranslator extends base_js_1.BaseTranslator {
+class SupabaseTranslator 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.gt,
-                ir_js_1.Comparators.gte,
-                ir_js_1.Comparators.lt,
-                ir_js_1.Comparators.lte,
+                structured_query_1.Comparators.eq,
+                structured_query_1.Comparators.ne,
+                structured_query_1.Comparators.gt,
+                structured_query_1.Comparators.gte,
+                structured_query_1.Comparators.lt,
+                structured_query_1.Comparators.lte,
             ]
         });
     }
@@ -59,22 +57,22 @@ class SupabaseTranslator extends base_js_1.BaseTranslator {
      */
     getComparatorFunction(comparator) {
         switch (comparator) {
-            case ir_js_1.Comparators.eq: {
+            case structured_query_1.Comparators.eq: {
                 return (attr, value) => (rpc) => rpc.eq(this.buildColumnName(attr, value), value);
             }
-            case ir_js_1.Comparators.ne: {
+            case structured_query_1.Comparators.ne: {
                 return (attr, value) => (rpc) => rpc.neq(this.buildColumnName(attr, value), value);
             }
-            case ir_js_1.Comparators.gt: {
+            case structured_query_1.Comparators.gt: {
                 return (attr, value) => (rpc) => rpc.gt(this.buildColumnName(attr, value), value);
             }
-            case ir_js_1.Comparators.gte: {
+            case structured_query_1.Comparators.gte: {
                 return (attr, value) => (rpc) => rpc.gte(this.buildColumnName(attr, value), value);
             }
-            case ir_js_1.Comparators.lt: {
+            case structured_query_1.Comparators.lt: {
                 return (attr, value) => (rpc) => rpc.lt(this.buildColumnName(attr, value), value);
             }
-            case ir_js_1.Comparators.lte: {
+            case structured_query_1.Comparators.lte: {
                 return (attr, value) => (rpc) => rpc.lte(this.buildColumnName(attr, value), value);
             }
             default: {
@@ -92,13 +90,13 @@ class SupabaseTranslator extends base_js_1.BaseTranslator {
      */
     buildColumnName(attr, value, includeType = true) {
         let column = "";
-        if ((0, utils_js_1.isString)(value)) {
+        if ((0, structured_query_1.isString)(value)) {
             column = `metadata->>${attr}`;
         }
-        else if ((0, utils_js_1.isInt)(value)) {
+        else if ((0, structured_query_1.isInt)(value)) {
             column = `metadata->${attr}${includeType ? "::int" : ""}`;
         }
-        else if ((0, utils_js_1.isFloat)(value)) {
+        else if ((0, structured_query_1.isFloat)(value)) {
             column = `metadata->${attr}${includeType ? "::float" : ""}`;
         }
         else {
@@ -141,7 +139,7 @@ class SupabaseTranslator extends base_js_1.BaseTranslator {
     visitOperation(operation) {
         const { operator, args } = operation;
         if (this.allowedOperators.includes(operator)) {
-            if (operator === ir_js_1.Operators.and) {
+            if (operator === structured_query_1.Operators.and) {
                 if (!args) {
                     return (rpc) => rpc;
                 }
@@ -151,7 +149,7 @@ class SupabaseTranslator extends base_js_1.BaseTranslator {
                 }, rpc);
                 return filter;
             }
-            else if (operator === ir_js_1.Operators.or) {
+            else if (operator === structured_query_1.Operators.or) {
                 return (rpc) => rpc.or(this.visitOperationAsString(operation));
             }
             else {
@@ -173,7 +171,7 @@ class SupabaseTranslator extends base_js_1.BaseTranslator {
         let { value } = comparison;
         const { comparator: _comparator, attribute } = comparison;
         let comparator = _comparator;
-        if (comparator === ir_js_1.Comparators.ne) {
+        if (comparator === structured_query_1.Comparators.ne) {
             comparator = "neq";
         }
         if (Array.isArray(value)) {
@@ -227,27 +225,27 @@ class SupabaseTranslator extends base_js_1.BaseTranslator {
      * @returns The merged filter.
      */
     mergeFilters(defaultFilter, generatedFilter, mergeType = "and") {
-        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 (mergeType === "and") {
                 return undefined;
             }
             return defaultFilter;
         }
         let myDefaultFilter = defaultFilter;
-        if ((0, utils_js_1.isObject)(defaultFilter)) {
+        if ((0, structured_query_1.isObject)(defaultFilter)) {
             const { filter } = this.visitStructuredQuery((0, supabase_utils_js_1.convertObjectFilterToStructuredQuery)(defaultFilter));
             // just in case the built filter is empty somehow
-            if ((0, utils_js_1.isFilterEmpty)(filter)) {
-                if ((0, utils_js_1.isFilterEmpty)(generatedFilter)) {
+            if ((0, structured_query_1.isFilterEmpty)(filter)) {
+                if ((0, structured_query_1.isFilterEmpty)(generatedFilter)) {
                     return undefined;
                 }
                 return generatedFilter;

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

@@ -1,6 +1,5 @@
 import type { SupabaseFilterRPCCall, SupabaseMetadata, SupabaseVectorStore } from "@langchain/community/vectorstores/supabase";
-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";
 /**
  * Represents the possible values that can be used in a comparison in a
  * structured query. It can be a string or a number.

package/dist/retrievers/self_query/supabase.js

@@ -1,6 +1,4 @@
-import { Comparators, Operators, } from "../../chains/query_constructor/ir.js";
-import { BaseTranslator } from "./base.js";
-import { isFilterEmpty, isFloat, isInt, isObject, isString } from "./utils.js";
+import { isFilterEmpty, isFloat, isInt, isObject, isString, BaseTranslator, Comparators, Operators, } from "@langchain/core/structured_query";
 import { ProxyParamsDuplicator, convertObjectFilterToStructuredQuery, } from "./supabase_utils.js";
 /**
  * A specialized translator designed to work with Supabase, extending the

package/dist/retrievers/self_query/supabase_utils.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertObjectFilterToStructuredQuery = exports.ProxyParamsDuplicator = void 0;
-const ir_js_1 = require("../../chains/query_constructor/ir.cjs");
+const structured_query_1 = require("@langchain/core/structured_query");
 /**
  * Utility class used to duplicate parameters for a proxy object,
  * specifically designed to work with `SupabaseFilter` objects. It
@@ -250,6 +250,6 @@ exports.ProxyParamsDuplicator = ProxyParamsDuplicator;
  * `Operation` and `Comparison` classes to build the query.
  */
 function convertObjectFilterToStructuredQuery(objFilter) {
-    return new ir_js_1.StructuredQuery("", new ir_js_1.Operation(ir_js_1.Operators.and, Object.entries(objFilter).map(([column, value]) => new ir_js_1.Comparison(ir_js_1.Comparators.eq, column, value))));
+    return new structured_query_1.StructuredQuery("", new structured_query_1.Operation(structured_query_1.Operators.and, Object.entries(objFilter).map(([column, value]) => new structured_query_1.Comparison(structured_query_1.Comparators.eq, column, value))));
 }
 exports.convertObjectFilterToStructuredQuery = convertObjectFilterToStructuredQuery;

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

@@ -1,5 +1,5 @@
 import type { SupabaseFilter, SupabaseFilterRPCCall, SupabaseMetadata } from "@langchain/community/vectorstores/supabase";
-import { StructuredQuery } from "../../chains/query_constructor/ir.js";
+import { StructuredQuery } from "@langchain/core/structured_query";
 /**
  * Utility class used to duplicate parameters for a proxy object,
  * specifically designed to work with `SupabaseFilter` objects. It

package/dist/retrievers/self_query/supabase_utils.js

@@ -1,4 +1,4 @@
-import { Comparators, Comparison, Operation, Operators, StructuredQuery, } from "../../chains/query_constructor/ir.js";
+import { Comparators, Comparison, Operation, Operators, StructuredQuery, } from "@langchain/core/structured_query";
 /**
  * Utility class used to duplicate parameters for a proxy object,
  * specifically designed to work with `SupabaseFilter` objects. It

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;