langchain 0.1.35 → 0.2.0-rc.0

package/dist/retrievers/self_query/pinecone.cjs

@@ -1,8 +1,13 @@
 "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");
+const entrypoint_deprecation_js_1 = require("../../util/entrypoint_deprecation.cjs");
+/* #__PURE__ */ (0, entrypoint_deprecation_js_1.logVersion020MigrationWarning)({
+    oldEntrypointName: "retrievers/self_query/pinecone",
+    newEntrypointName: "",
+    newPackageName: "@langchain/pinecone",
+});
 /**
  * Specialized translator class that extends the BasicTranslator. It is
  * designed to work with PineconeStore, a type of vector store in
@@ -24,17 +29,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,10 @@
-import { Comparators, Operators } from "../../chains/query_constructor/ir.js";
-import { BasicTranslator } from "./base.js";
+import { BasicTranslator, Comparators, Operators, } from "@langchain/core/structured_query";
+import { logVersion020MigrationWarning } from "../../util/entrypoint_deprecation.js";
+/* #__PURE__ */ logVersion020MigrationWarning({
+    oldEntrypointName: "retrievers/self_query/pinecone",
+    newEntrypointName: "",
+    newPackageName: "@langchain/pinecone",
+});
 /**
  * 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,10 +1,15 @@
 "use strict";
+/* eslint-disable @typescript-eslint/no-explicit-any */
 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");
+const entrypoint_deprecation_js_1 = require("../../util/entrypoint_deprecation.cjs");
+/* #__PURE__ */ (0, entrypoint_deprecation_js_1.logVersion020MigrationWarning)({
+    oldEntrypointName: "retrievers/self_query/supabase",
+    newEntrypointName: "structured_query/supabase",
+    newPackageName: "@langchain/community",
+});
 /**
  * A specialized translator designed to work with Supabase, extending the
  * BaseTranslator class. It translates structured queries into a format
@@ -24,26 +29,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 +64,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 +97,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 +146,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 +156,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 +178,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 +232,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";
+import { VectorStore } from "@langchain/core/vectorstores";
 /**
  * Represents the possible values that can be used in a comparison in a
  * structured query. It can be a string or a number.
@@ -13,6 +12,8 @@ type ValueType = {
     gt: string | number;
     gte: string | number;
 };
+type SupabaseFilterRPCCall = any;
+type SupabaseMetadata = any;
 /**
  * A specialized translator designed to work with Supabase, extending the
  * BaseTranslator class. It translates structured queries into a format
@@ -32,7 +33,7 @@ type ValueType = {
  * );
  * ```
  */
-export declare class SupabaseTranslator<T extends SupabaseVectorStore> extends BaseTranslator<T> {
+export declare class SupabaseTranslator<T extends VectorStore> extends BaseTranslator<T> {
     VisitOperationOutput: SupabaseFilterRPCCall;
     VisitComparisonOutput: SupabaseFilterRPCCall;
     allowedOperators: Operator[];

package/dist/retrievers/self_query/supabase.js

@@ -1,7 +1,12 @@
-import { Comparators, Operators, } from "../../chains/query_constructor/ir.js";
-import { BaseTranslator } from "./base.js";
-import { isFilterEmpty, isFloat, isInt, isObject, isString } from "./utils.js";
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { isFilterEmpty, isFloat, isInt, isObject, isString, BaseTranslator, Comparators, Operators, } from "@langchain/core/structured_query";
 import { ProxyParamsDuplicator, convertObjectFilterToStructuredQuery, } from "./supabase_utils.js";
+import { logVersion020MigrationWarning } from "../../util/entrypoint_deprecation.js";
+/* #__PURE__ */ logVersion020MigrationWarning({
+    oldEntrypointName: "retrievers/self_query/supabase",
+    newEntrypointName: "structured_query/supabase",
+    newPackageName: "@langchain/community",
+});
 /**
  * A specialized translator designed to work with Supabase, extending the
  * BaseTranslator class. It translates structured queries into a format

package/dist/retrievers/self_query/supabase_utils.cjs

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertObjectFilterToStructuredQuery = exports.ProxyParamsDuplicator = void 0;
-const ir_js_1 = require("../../chains/query_constructor/ir.cjs");
+/* eslint-disable @typescript-eslint/no-explicit-any */
+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
@@ -236,7 +237,11 @@ class ProxyParamsDuplicator {
      * @param filter The `SupabaseFilterRPCCall` object.
      * @returns The flattened parameters as a string.
      */
-    static getFlattenedParams(rpc, filter) {
+    static getFlattenedParams(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    rpc, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    filter) {
         const proxiedDuplicator = new ProxyParamsDuplicator();
         const proxiedRpc = new Proxy(rpc, proxiedDuplicator.buildProxyHandler());
         void filter(proxiedRpc);
@@ -249,7 +254,11 @@ exports.ProxyParamsDuplicator = ProxyParamsDuplicator;
  * The function creates a new `StructuredQuery` object and uses the
  * `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))));
+function convertObjectFilterToStructuredQuery(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+objFilter) {
+    return new structured_query_1.StructuredQuery("", new structured_query_1.Operation(structured_query_1.Operators.and, Object.entries(objFilter).map(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ([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,4 @@
-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
@@ -16,7 +15,7 @@ export declare class ProxyParamsDuplicator {
      * property being accessed.
      * @returns A proxy handler for a `SupabaseFilter` object.
      */
-    buildProxyHandler(): ProxyHandler<SupabaseFilter>;
+    buildProxyHandler(): ProxyHandler<any>;
     /**
      * Removes type annotations from a value string.
      * @param value The value string to clean.
@@ -92,11 +91,11 @@ export declare class ProxyParamsDuplicator {
      * @param filter The `SupabaseFilterRPCCall` object.
      * @returns The flattened parameters as a string.
      */
-    static getFlattenedParams(rpc: SupabaseFilter, filter: SupabaseFilterRPCCall): string;
+    static getFlattenedParams(rpc: any, filter: any): string;
 }
 /**
  * Converts a `SupabaseMetadata` object into a `StructuredQuery` object.
  * The function creates a new `StructuredQuery` object and uses the
  * `Operation` and `Comparison` classes to build the query.
  */
-export declare function convertObjectFilterToStructuredQuery(objFilter: SupabaseMetadata): StructuredQuery;
+export declare function convertObjectFilterToStructuredQuery(objFilter: any): StructuredQuery;

package/dist/retrievers/self_query/supabase_utils.js

@@ -1,4 +1,5 @@
-import { Comparators, Comparison, Operation, Operators, StructuredQuery, } from "../../chains/query_constructor/ir.js";
+/* eslint-disable @typescript-eslint/no-explicit-any */
+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
@@ -233,7 +234,11 @@ export class ProxyParamsDuplicator {
      * @param filter The `SupabaseFilterRPCCall` object.
      * @returns The flattened parameters as a string.
      */
-    static getFlattenedParams(rpc, filter) {
+    static getFlattenedParams(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    rpc, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    filter) {
         const proxiedDuplicator = new ProxyParamsDuplicator();
         const proxiedRpc = new Proxy(rpc, proxiedDuplicator.buildProxyHandler());
         void filter(proxiedRpc);
@@ -245,6 +250,10 @@ export class ProxyParamsDuplicator {
  * The function creates a new `StructuredQuery` object and uses the
  * `Operation` and `Comparison` classes to build the query.
  */
-export function convertObjectFilterToStructuredQuery(objFilter) {
-    return new StructuredQuery("", new Operation(Operators.and, Object.entries(objFilter).map(([column, value]) => new Comparison(Comparators.eq, column, value))));
+export function convertObjectFilterToStructuredQuery(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+objFilter) {
+    return new StructuredQuery("", new Operation(Operators.and, Object.entries(objFilter).map(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ([column, value]) => new Comparison(Comparators.eq, column, value))));
 }

package/dist/retrievers/self_query/vectara.cjs

@@ -1,9 +1,14 @@
 "use strict";
+/* eslint-disable @typescript-eslint/no-explicit-any */
 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");
+const entrypoint_deprecation_js_1 = require("../../util/entrypoint_deprecation.cjs");
+/* #__PURE__ */ (0, entrypoint_deprecation_js_1.logVersion020MigrationWarning)({
+    oldEntrypointName: "retrievers/self_query/vectara",
+    newEntrypointName: "structured_query/vectara",
+    newPackageName: "@langchain/community",
+});
 function processValue(value) {
     /** Convert a value to a string and add single quotes if it is a string. */
     if (typeof value === "string") {
@@ -13,37 +18,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 +107,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";
+import { VectorStore } from "@langchain/core/vectorstores";
 export type VectaraVisitorResult = VectaraOperationResult | VectaraComparisonResult | VectaraVisitorStructuredQueryResult;
 export type VectaraOperationResult = String;
 export type VectaraComparisonResult = String;
@@ -9,7 +8,8 @@ export type VectaraVisitorStructuredQueryResult = {
         filter?: VectaraOperationResult | VectaraComparisonResult;
     };
 };
-export declare class VectaraTranslator<T extends VectaraStore> extends BaseTranslator<T> {
+type VectaraFilter = any;
+export declare class VectaraTranslator<T extends VectorStore> extends BaseTranslator<T> {
     VisitOperationOutput: VectaraOperationResult;
     VisitComparisonOutput: VectaraComparisonResult;
     allowedOperators: Operator[];
@@ -39,3 +39,4 @@ export declare class VectaraTranslator<T extends VectaraStore> extends BaseTrans
     visitStructuredQuery(query: StructuredQuery): this["VisitStructuredQueryOutput"];
     mergeFilters(defaultFilter: VectaraFilter | undefined, generatedFilter: VectaraFilter | undefined, mergeType?: string, forceDefaultFilter?: boolean): VectaraFilter | undefined;
 }
+export {};

package/dist/retrievers/self_query/vectara.js

@@ -1,6 +1,11 @@
-import { Comparators, Operators, } from "../../chains/query_constructor/ir.js";
-import { BaseTranslator } from "./base.js";
-import { isFilterEmpty } from "./utils.js";
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { BaseTranslator, isFilterEmpty, Comparators, Operators, } from "@langchain/core/structured_query";
+import { logVersion020MigrationWarning } from "../../util/entrypoint_deprecation.js";
+/* #__PURE__ */ logVersion020MigrationWarning({
+    oldEntrypointName: "retrievers/self_query/vectara",
+    newEntrypointName: "structured_query/vectara",
+    newPackageName: "@langchain/community",
+});
 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,14 @@
 "use strict";
+/* eslint-disable @typescript-eslint/no-explicit-any */
 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");
+const entrypoint_deprecation_js_1 = require("../../util/entrypoint_deprecation.cjs");
+/* #__PURE__ */ (0, entrypoint_deprecation_js_1.logVersion020MigrationWarning)({
+    oldEntrypointName: "retrievers/self_query/weaviate",
+    newEntrypointName: "",
+    newPackageName: "@langchain/weaviate",
+});
 /**
  * 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 +28,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 +59,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 +107,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 +157,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,12 +1,12 @@
-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";
+import { VectorStore } from "@langchain/core/vectorstores";
 type WeaviateOperatorValues = {
     valueText: string;
     valueInt: number;
     valueNumber: number;
     valueBoolean: boolean;
 };
+type WeaviateFilter = any;
 type WeaviateOperatorKeys = keyof WeaviateOperatorValues;
 type ExclusiveOperatorValue = {
     [L in WeaviateOperatorKeys]: {
@@ -48,7 +48,7 @@ export type WeaviateStructuredQueryResult = {
  * );
  * ```
  */
-export declare class WeaviateTranslator<T extends WeaviateStore> extends BaseTranslator<T> {
+export declare class WeaviateTranslator<T extends VectorStore> extends BaseTranslator<T> {
     VisitOperationOutput: WeaviateOperationResult;
     VisitComparisonOutput: WeaviateComparisonResult;
     allowedOperators: Operator[];