langchain 0.0.127 → 0.0.128

package/dist/llms/openai-chat.js

@@ -134,6 +134,12 @@ export class OpenAIChat extends LLM {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "user", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "streaming", {
             enumerable: true,
             configurable: true,
@@ -222,6 +228,7 @@ export class OpenAIChat extends LLM {
         this.logitBias = fields?.logitBias;
         this.maxTokens = fields?.maxTokens;
         this.stop = fields?.stop;
+        this.user = fields?.user;
         this.streaming = fields?.streaming ?? false;
         if (this.n > 1) {
             throw new Error("Cannot use n > 1 in OpenAIChat LLM. Use ChatOpenAI Chat Model instead.");
@@ -257,6 +264,7 @@ export class OpenAIChat extends LLM {
             logit_bias: this.logitBias,
             max_tokens: this.maxTokens === -1 ? undefined : this.maxTokens,
             stop: options?.stop ?? this.stop,
+            user: this.user,
             stream: this.streaming,
             ...this.modelKwargs,
         };

package/dist/llms/openai.cjs

@@ -147,6 +147,12 @@ class OpenAI extends base_js_1.BaseLLM {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "user", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "streaming", {
             enumerable: true,
             configurable: true,
@@ -236,6 +242,7 @@ class OpenAI extends base_js_1.BaseLLM {
         this.bestOf = fields?.bestOf ?? this.bestOf;
         this.logitBias = fields?.logitBias;
         this.stop = fields?.stop;
+        this.user = fields?.user;
         this.streaming = fields?.streaming ?? false;
         if (this.streaming && this.bestOf && this.bestOf > 1) {
             throw new Error("Cannot stream results when bestOf > 1");
@@ -272,6 +279,7 @@ class OpenAI extends base_js_1.BaseLLM {
             best_of: this.bestOf,
             logit_bias: this.logitBias,
             stop: options?.stop ?? this.stop,
+            user: this.user,
             stream: this.streaming,
             ...this.modelKwargs,
         };

package/dist/llms/openai.d.ts

@@ -43,6 +43,7 @@ export declare class OpenAI extends BaseLLM<OpenAICallOptions> implements OpenAI
     batchSize: number;
     timeout?: number;
     stop?: string[];
+    user?: string;
     streaming: boolean;
     openAIApiKey?: string;
     azureOpenAIApiVersion?: string;

package/dist/llms/openai.js

@@ -141,6 +141,12 @@ export class OpenAI extends BaseLLM {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "user", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "streaming", {
             enumerable: true,
             configurable: true,
@@ -230,6 +236,7 @@ export class OpenAI extends BaseLLM {
         this.bestOf = fields?.bestOf ?? this.bestOf;
         this.logitBias = fields?.logitBias;
         this.stop = fields?.stop;
+        this.user = fields?.user;
         this.streaming = fields?.streaming ?? false;
         if (this.streaming && this.bestOf && this.bestOf > 1) {
             throw new Error("Cannot stream results when bestOf > 1");
@@ -266,6 +273,7 @@ export class OpenAI extends BaseLLM {
             best_of: this.bestOf,
             logit_bias: this.logitBias,
             stop: options?.stop ?? this.stop,
+            user: this.user,
             stream: this.streaming,
             ...this.modelKwargs,
         };

package/dist/load/import_constants.cjs

@@ -28,6 +28,7 @@ exports.optionalImportEntrypoints = [
     "langchain/llms/googlevertexai",
     "langchain/llms/googlepalm",
     "langchain/llms/sagemaker_endpoint",
+    "langchain/llms/bedrock",
     "langchain/prompts/load",
     "langchain/vectorstores/analyticdb",
     "langchain/vectorstores/elasticsearch",
@@ -82,6 +83,7 @@ exports.optionalImportEntrypoints = [
     "langchain/document_loaders/fs/notion",
     "langchain/document_loaders/fs/unstructured",
     "langchain/document_transformers/html_to_text",
+    "langchain/document_transformers/mozilla_readability",
     "langchain/chat_models/googlevertexai",
     "langchain/chat_models/googlepalm",
     "langchain/sql_db",

package/dist/load/import_constants.js

@@ -25,6 +25,7 @@ export const optionalImportEntrypoints = [
     "langchain/llms/googlevertexai",
     "langchain/llms/googlepalm",
     "langchain/llms/sagemaker_endpoint",
+    "langchain/llms/bedrock",
     "langchain/prompts/load",
     "langchain/vectorstores/analyticdb",
     "langchain/vectorstores/elasticsearch",
@@ -79,6 +80,7 @@ export const optionalImportEntrypoints = [
     "langchain/document_loaders/fs/notion",
     "langchain/document_loaders/fs/unstructured",
     "langchain/document_transformers/html_to_text",
+    "langchain/document_transformers/mozilla_readability",
     "langchain/chat_models/googlevertexai",
     "langchain/chat_models/googlepalm",
     "langchain/sql_db",

package/dist/retrievers/self_query/base.cjs

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BasicTranslator = exports.BaseTranslator = void 0;
 const ir_js_1 = require("../../chains/query_constructor/ir.cjs");
+const utils_js_1 = require("./utils.cjs");
 class BaseTranslator extends ir_js_1.Visitor {
 }
 exports.BaseTranslator = BaseTranslator;
@@ -73,5 +74,35 @@ class BasicTranslator extends BaseTranslator {
         }
         return nextArg;
     }
+    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 {
+                $and: [defaultFilter, generatedFilter],
+            };
+        }
+        else if (mergeType === "or") {
+            return {
+                $or: [defaultFilter, generatedFilter],
+            };
+        }
+        else {
+            throw new Error("Unknown merge type");
+        }
+    }
 }
 exports.BasicTranslator = BasicTranslator;

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

@@ -1,12 +1,14 @@
 import { Comparator, Comparison, Operation, Operator, StructuredQuery, Visitor, VisitorComparisonResult, VisitorOperationResult, VisitorStructuredQueryResult } from "../../chains/query_constructor/ir.js";
+import { VectorStore } from "../../vectorstores/base.js";
 export type TranslatorOpts = {
     allowedOperators: Operator[];
     allowedComparators: Comparator[];
 };
-export declare abstract class BaseTranslator extends Visitor {
+export declare abstract class BaseTranslator<T extends VectorStore = VectorStore> extends Visitor<T> {
     abstract formatFunction(func: Operator | Comparator): string;
+    abstract mergeFilters(defaultFilter: this["VisitStructuredQueryOutput"]["filter"] | undefined, generatedFilter: this["VisitStructuredQueryOutput"]["filter"] | undefined, mergeType?: "and" | "or" | "replace"): this["VisitStructuredQueryOutput"]["filter"] | undefined;
 }
-export declare class BasicTranslator extends BaseTranslator {
+export declare class BasicTranslator<T extends VectorStore = VectorStore> extends BaseTranslator<T> {
     VisitOperationOutput: VisitorOperationResult;
     VisitComparisonOutput: VisitorComparisonResult;
     VisitStructuredQueryOutput: VisitorStructuredQueryResult;
@@ -17,4 +19,5 @@ export declare class BasicTranslator extends BaseTranslator {
     visitOperation(operation: Operation): this["VisitOperationOutput"];
     visitComparison(comparison: Comparison): this["VisitComparisonOutput"];
     visitStructuredQuery(query: StructuredQuery): this["VisitStructuredQueryOutput"];
+    mergeFilters(defaultFilter: VisitorStructuredQueryResult["filter"] | undefined, generatedFilter: VisitorStructuredQueryResult["filter"] | undefined, mergeType?: string): VisitorStructuredQueryResult["filter"] | undefined;
 }

package/dist/retrievers/self_query/base.js

@@ -1,4 +1,5 @@
 import { Comparators, Operators, Visitor, } from "../../chains/query_constructor/ir.js";
+import { isFilterEmpty } from "./utils.js";
 export class BaseTranslator extends Visitor {
 }
 export class BasicTranslator extends BaseTranslator {
@@ -69,4 +70,34 @@ export class BasicTranslator extends BaseTranslator {
         }
         return nextArg;
     }
+    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 {
+                $and: [defaultFilter, generatedFilter],
+            };
+        }
+        else if (mergeType === "or") {
+            return {
+                $or: [defaultFilter, generatedFilter],
+            };
+        }
+        else {
+            throw new Error("Unknown merge type");
+        }
+    }
 }

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

@@ -1,4 +1,5 @@
+import { Chroma } from "../../vectorstores/chroma.js";
 import { BasicTranslator } from "./base.js";
-export declare class ChromaTranslator extends BasicTranslator {
+export declare class ChromaTranslator<T extends Chroma> extends BasicTranslator<T> {
     constructor();
 }

package/dist/retrievers/self_query/functional.cjs

@@ -3,6 +3,7 @@ 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");
 class FunctionalTranslator extends base_js_1.BaseTranslator {
     constructor() {
         super(...arguments);
@@ -112,7 +113,7 @@ class FunctionalTranslator extends base_js_1.BaseTranslator {
     }
     visitStructuredQuery(query) {
         if (!query.filter) {
-            return { filter: () => false };
+            return {};
         }
         const filterFunction = query.filter?.accept(this);
         if (typeof filterFunction !== "function") {
@@ -120,5 +121,31 @@ class FunctionalTranslator extends base_js_1.BaseTranslator {
         }
         return { filter: filterFunction };
     }
+    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;

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

@@ -15,6 +15,8 @@ export declare class FunctionalTranslator extends BaseTranslator {
     VisitComparisonOutput: FunctionFilter;
     VisitStructuredQueryOutput: {
         filter: FunctionFilter;
+    } | {
+        [k: string]: never;
     };
     allowedOperators: Operator[];
     allowedComparators: Comparator[];
@@ -24,5 +26,6 @@ export declare class FunctionalTranslator extends BaseTranslator {
     visitOperation(operation: Operation): this["VisitOperationOutput"];
     visitComparison(comparison: Comparison): this["VisitComparisonOutput"];
     visitStructuredQuery(query: StructuredQuery): this["VisitStructuredQueryOutput"];
+    mergeFilters(defaultFilter: FunctionFilter, generatedFilter: FunctionFilter, mergeType?: string): FunctionFilter | undefined;
 }
 export {};

package/dist/retrievers/self_query/functional.js

@@ -1,5 +1,6 @@
 import { Comparators, Operators, } from "../../chains/query_constructor/ir.js";
 import { BaseTranslator } from "./base.js";
+import { isFilterEmpty } from "./utils.js";
 export class FunctionalTranslator extends BaseTranslator {
     constructor() {
         super(...arguments);
@@ -109,7 +110,7 @@ export class FunctionalTranslator extends BaseTranslator {
     }
     visitStructuredQuery(query) {
         if (!query.filter) {
-            return { filter: () => false };
+            return {};
         }
         const filterFunction = query.filter?.accept(this);
         if (typeof filterFunction !== "function") {
@@ -117,4 +118,30 @@ export class FunctionalTranslator extends BaseTranslator {
         }
         return { filter: filterFunction };
     }
+    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");
+        }
+    }
 }

package/dist/retrievers/self_query/index.cjs

@@ -38,6 +38,12 @@ class SelfQueryRetriever extends retriever_js_1.BaseRetriever {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "useOriginalQuery", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         Object.defineProperty(this, "searchParams", {
             enumerable: true,
             configurable: true,
@@ -48,18 +54,26 @@ class SelfQueryRetriever extends retriever_js_1.BaseRetriever {
         this.llmChain = options.llmChain;
         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 nextArg = this.structuredQueryTranslator.visitStructuredQuery(output);
-        if (nextArg.filter) {
-            return this.vectorStore.similaritySearch(query, this.searchParams?.k, nextArg.filter, runManager?.getChild("vectorstore"));
+        const generatedStructuredQuery = output;
+        const nextArg = this.structuredQueryTranslator.visitStructuredQuery(generatedStructuredQuery);
+        const filter = this.structuredQueryTranslator.mergeFilters(this.searchParams?.filter, nextArg.filter, this.searchParams?.mergeFiltersOperator);
+        const generatedQuery = generatedStructuredQuery.query;
+        let myQuery = query;
+        if (!this.useOriginalQuery && generatedQuery && generatedQuery.length > 0) {
+            myQuery = generatedQuery;
+        }
+        if (!filter) {
+            return [];
         }
         else {
-            return this.vectorStore.similaritySearch(query, this.searchParams?.k, this.searchParams?.filter, runManager?.getChild("vectorstore"));
+            return this.vectorStore.similaritySearch(myQuery, this.searchParams?.k, filter, runManager?.getChild("vectorstore"));
         }
     }
     static fromLLM(options) {

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

@@ -7,27 +7,31 @@ import { FunctionalTranslator } from "./functional.js";
 import { BaseTranslator, BasicTranslator } from "./base.js";
 import { CallbackManagerForRetrieverRun } from "../../callbacks/manager.js";
 export { BaseTranslator, BasicTranslator, FunctionalTranslator };
-export interface SelfQueryRetrieverArgs extends BaseRetrieverInput {
-    vectorStore: VectorStore;
-    structuredQueryTranslator: BaseTranslator;
+export interface SelfQueryRetrieverArgs<T extends VectorStore> extends BaseRetrieverInput {
+    vectorStore: T;
+    structuredQueryTranslator: BaseTranslator<T>;
     llmChain: LLMChain;
     verbose?: boolean;
+    useOriginalQuery?: boolean;
     searchParams?: {
         k?: number;
-        filter?: VectorStore["FilterType"];
+        filter?: T["FilterType"];
+        mergeFiltersOperator?: "or" | "and" | "replace";
     };
 }
-export declare class SelfQueryRetriever extends BaseRetriever implements SelfQueryRetrieverArgs {
+export declare class SelfQueryRetriever<T extends VectorStore> extends BaseRetriever implements SelfQueryRetrieverArgs<T> {
     get lc_namespace(): string[];
-    vectorStore: VectorStore;
+    vectorStore: T;
     llmChain: LLMChain;
     verbose?: boolean;
-    structuredQueryTranslator: BaseTranslator;
+    structuredQueryTranslator: BaseTranslator<T>;
+    useOriginalQuery: boolean;
     searchParams?: {
         k?: number;
-        filter?: VectorStore["FilterType"];
+        filter?: T["FilterType"];
+        mergeFiltersOperator?: "or" | "and" | "replace";
     };
-    constructor(options: SelfQueryRetrieverArgs);
+    constructor(options: SelfQueryRetrieverArgs<T>);
     _getRelevantDocuments(query: string, runManager?: CallbackManagerForRetrieverRun): Promise<Document<Record<string, unknown>>[]>;
-    static fromLLM(options: QueryConstructorChainOptions & Omit<SelfQueryRetrieverArgs, "llmChain">): SelfQueryRetriever;
+    static fromLLM<T extends VectorStore>(options: QueryConstructorChainOptions & Omit<SelfQueryRetrieverArgs<T>, "llmChain">): SelfQueryRetriever<T>;
 }

package/dist/retrievers/self_query/index.js

@@ -33,6 +33,12 @@ export class SelfQueryRetriever extends BaseRetriever {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "useOriginalQuery", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
         Object.defineProperty(this, "searchParams", {
             enumerable: true,
             configurable: true,
@@ -43,18 +49,26 @@ export class SelfQueryRetriever extends BaseRetriever {
         this.llmChain = options.llmChain;
         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 nextArg = this.structuredQueryTranslator.visitStructuredQuery(output);
-        if (nextArg.filter) {
-            return this.vectorStore.similaritySearch(query, this.searchParams?.k, nextArg.filter, runManager?.getChild("vectorstore"));
+        const generatedStructuredQuery = output;
+        const nextArg = this.structuredQueryTranslator.visitStructuredQuery(generatedStructuredQuery);
+        const filter = this.structuredQueryTranslator.mergeFilters(this.searchParams?.filter, nextArg.filter, this.searchParams?.mergeFiltersOperator);
+        const generatedQuery = generatedStructuredQuery.query;
+        let myQuery = query;
+        if (!this.useOriginalQuery && generatedQuery && generatedQuery.length > 0) {
+            myQuery = generatedQuery;
+        }
+        if (!filter) {
+            return [];
         }
         else {
-            return this.vectorStore.similaritySearch(query, this.searchParams?.k, this.searchParams?.filter, runManager?.getChild("vectorstore"));
+            return this.vectorStore.similaritySearch(myQuery, this.searchParams?.k, filter, runManager?.getChild("vectorstore"));
         }
     }
     static fromLLM(options) {

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

@@ -1,4 +1,5 @@
+import { PineconeStore } from "../../vectorstores/pinecone.js";
 import { BasicTranslator } from "./base.js";
-export declare class PineconeTranslator extends BasicTranslator {
+export declare class PineconeTranslator<T extends PineconeStore> extends BasicTranslator<T> {
     constructor();
 }

package/dist/retrievers/self_query/supabase.cjs

@@ -3,6 +3,7 @@ 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");
 class SupabaseTranslator extends base_js_1.BaseTranslator {
     constructor() {
         super(...arguments);
@@ -138,8 +139,37 @@ class SupabaseTranslator extends base_js_1.BaseTranslator {
         }
     }
     visitStructuredQuery(query) {
+        if (!query.filter) {
+            return {};
+        }
         const filterFunction = query.filter?.accept(this);
         return { filter: filterFunction ?? {} };
     }
+    mergeFilters(defaultFilter, generatedFilter, mergeType = "and") {
+        if (mergeType === "or") {
+            throw new Error("Supabase self-query filter does not support merging two filters with the OR operator");
+        }
+        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 (rpc) => generatedFilter(defaultFilter(rpc));
+        }
+        else {
+            throw new Error("Unknown merge type");
+        }
+    }
 }
 exports.SupabaseTranslator = SupabaseTranslator;

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

@@ -1,5 +1,5 @@
 import { Comparator, Comparison, Operation, Operator, StructuredQuery } from "../../chains/query_constructor/ir.js";
-import { SupabaseFilterRPCCall } from "../../vectorstores/supabase.js";
+import { SupabaseFilterRPCCall, SupabaseVectorStore } from "../../vectorstores/supabase.js";
 import { BaseTranslator } from "./base.js";
 type ValueType = {
     eq: string | number;
@@ -9,12 +9,9 @@ type ValueType = {
     gt: string | number;
     gte: string | number;
 };
-export declare class SupabaseTranslator extends BaseTranslator {
+export declare class SupabaseTranslator<T extends SupabaseVectorStore> extends BaseTranslator<T> {
     VisitOperationOutput: SupabaseFilterRPCCall;
     VisitComparisonOutput: SupabaseFilterRPCCall;
-    VisitStructuredQueryOutput: {
-        filter: SupabaseFilterRPCCall;
-    };
     allowedOperators: Operator[];
     allowedComparators: Comparator[];
     formatFunction(): string;
@@ -25,5 +22,6 @@ export declare class SupabaseTranslator extends BaseTranslator {
     visitComparisonAsString(comparison: Comparison): string;
     visitComparison(comparison: Comparison): this["VisitComparisonOutput"];
     visitStructuredQuery(query: StructuredQuery): this["VisitStructuredQueryOutput"];
+    mergeFilters(defaultFilter: SupabaseFilterRPCCall | undefined, generatedFilter: SupabaseFilterRPCCall | undefined, mergeType?: string): SupabaseFilterRPCCall | undefined;
 }
 export {};

package/dist/retrievers/self_query/supabase.js

@@ -1,5 +1,6 @@
 import { Comparators, Operators, } from "../../chains/query_constructor/ir.js";
 import { BaseTranslator } from "./base.js";
+import { isFilterEmpty } from "./utils.js";
 export class SupabaseTranslator extends BaseTranslator {
     constructor() {
         super(...arguments);
@@ -135,7 +136,36 @@ export class SupabaseTranslator extends BaseTranslator {
         }
     }
     visitStructuredQuery(query) {
+        if (!query.filter) {
+            return {};
+        }
         const filterFunction = query.filter?.accept(this);
         return { filter: filterFunction ?? {} };
     }
+    mergeFilters(defaultFilter, generatedFilter, mergeType = "and") {
+        if (mergeType === "or") {
+            throw new Error("Supabase self-query filter does not support merging two filters with the OR operator");
+        }
+        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 (rpc) => generatedFilter(defaultFilter(rpc));
+        }
+        else {
+            throw new Error("Unknown merge type");
+        }
+    }
 }

package/dist/retrievers/self_query/utils.cjs

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isFilterEmpty = exports.isObject = void 0;
+/* eslint-disable @typescript-eslint/no-explicit-any */
+function isObject(obj) {
+    return obj && typeof obj === "object" && !Array.isArray(obj);
+}
+exports.isObject = isObject;
+function isFilterEmpty(filter) {
+    if (!filter)
+        return true;
+    // for Milvus
+    if (typeof filter === "string" && filter.length > 0) {
+        return false;
+    }
+    if (typeof filter === "function") {
+        return false;
+    }
+    return isObject(filter) && Object.keys(filter).length === 0;
+}
+exports.isFilterEmpty = isFilterEmpty;

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

@@ -0,0 +1,2 @@
+export declare function isObject(obj: any): obj is object;
+export declare function isFilterEmpty(filter: ((q: any) => any) | object | string | undefined): filter is undefined;

package/dist/retrievers/self_query/utils.js

@@ -0,0 +1,16 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+export function isObject(obj) {
+    return obj && typeof obj === "object" && !Array.isArray(obj);
+}
+export function isFilterEmpty(filter) {
+    if (!filter)
+        return true;
+    // for Milvus
+    if (typeof filter === "string" && filter.length > 0) {
+        return false;
+    }
+    if (typeof filter === "function") {
+        return false;
+    }
+    return isObject(filter) && Object.keys(filter).length === 0;
+}