Move /retrievers to granular endpoints

examples/src/chains/retrieval_qa_with_remote.ts

@@ -1,6 +1,6 @@
 import { OpenAI } from "langchain/llms/openai";
 import { RetrievalQAChain } from "langchain/chains";
-import { RemoteLangChainRetriever } from "langchain/retrievers";
+import { RemoteLangChainRetriever } from "langchain/retrievers/remote";
 
 export const run = async () => {
   // Initialize the LLM to use to answer the question.

examples/src/retrievers/chatgpt-plugin.ts

@@ -1,4 +1,4 @@
-import { ChatGPTPluginRetriever } from "langchain/retrievers";
+import { ChatGPTPluginRetriever } from "langchain/retrievers/remote";
 
 export const run = async () => {
   const retriever = new ChatGPTPluginRetriever({

examples/src/retrievers/metal.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import Metal from "@getmetal/metal-sdk";
-import { MetalRetriever } from "langchain/retrievers";
+import { MetalRetriever } from "langchain/retrievers/metal";
 
 export const run = async () => {
   const MetalSDK = Metal.default;

examples/src/retrievers/supabase_hybrid.ts

@@ -1,6 +1,6 @@
 import { OpenAIEmbeddings } from "langchain/embeddings/openai";
 import { createClient } from "@supabase/supabase-js";
-import { SupabaseHybridSearch } from "langchain/retrievers";
+import { SupabaseHybridSearch } from "langchain/retrievers/supabase";
 
 export const run = async () => {
   const client = createClient(

langchain/.gitignore

@@ -121,6 +121,15 @@ output_parsers.d.ts
 retrievers.cjs
 retrievers.js
 retrievers.d.ts
+retrievers/remote.cjs
+retrievers/remote.js
+retrievers/remote.d.ts
+retrievers/supabase.cjs
+retrievers/supabase.js
+retrievers/supabase.d.ts
+retrievers/metal.cjs
+retrievers/metal.js
+retrievers/metal.d.ts
 cache.cjs
 cache.js
 cache.d.ts

langchain/package.json

@@ -133,6 +133,15 @@
     "retrievers.cjs",
     "retrievers.js",
     "retrievers.d.ts",
+    "retrievers/remote.cjs",
+    "retrievers/remote.js",
+    "retrievers/remote.d.ts",
+    "retrievers/supabase.cjs",
+    "retrievers/supabase.js",
+    "retrievers/supabase.d.ts",
+    "retrievers/metal.cjs",
+    "retrievers/metal.js",
+    "retrievers/metal.d.ts",
     "cache.cjs",
     "cache.js",
     "cache.d.ts",
@@ -544,9 +553,26 @@
       "require": "./output_parsers.cjs"
     },
     "./retrievers": {
-      "types": "./retrievers.d.ts",
-      "import": "./retrievers.js",
-      "require": "./retrievers.cjs"
+      "node": {
+        "types": "./retrievers.d.ts",
+        "import": "./retrievers.js",
+        "require": "./retrievers.cjs"
+      }
+    },
+    "./retrievers/remote": {
+      "types": "./retrievers/remote.d.ts",
+      "import": "./retrievers/remote.js",
+      "require": "./retrievers/remote.cjs"
+    },
+    "./retrievers/supabase": {
+      "types": "./retrievers/supabase.d.ts",
+      "import": "./retrievers/supabase.js",
+      "require": "./retrievers/supabase.cjs"
+    },
+    "./retrievers/metal": {
+      "types": "./retrievers/metal.d.ts",
+      "import": "./retrievers/metal.js",
+      "require": "./retrievers/metal.cjs"
     },
     "./cache": {
       "types": "./cache.d.ts",

langchain/retrievers/base.cjs

@@ -0,0 +1 @@
+module.exports = require('../dist/retrievers/base.cjs');

langchain/retrievers/base.d.ts

@@ -0,0 +1 @@
+export * from '../dist/retrievers/base.js'

langchain/retrievers/base.js

@@ -0,0 +1 @@
+export * from '../dist/retrievers/base.js'

langchain/scripts/create-entrypoints.js

@@ -67,6 +67,9 @@ const entrypoints = {
   output_parsers: "output_parsers/index",
   // retrievers
   retrievers: "retrievers/index",
+  "retrievers/remote": "retrievers/remote/index",
+  "retrievers/supabase": "retrievers/supabase",
+  "retrievers/metal": "retrievers/metal",
   // cache
   cache: "cache",
 };
@@ -79,6 +82,7 @@ const deprecatedNodeOnly = [
   "llms",
   "chat_models",
   "vectorstores",
+  "retrievers",
 ];
 
 // Entrypoints in this list require an optional dependency to be installed.
@@ -97,6 +101,8 @@ const requiresOptionalDependency = [
   "vectorstores/pinecone",
   "vectorstores/supabase",
   "sql_db",
+  "retrievers/supabase",
+  "retrievers/metal",
 ];
 
 // List of test-exports-* packages which we use to test that the exports field

langchain/src/retrievers/index.ts

@@ -3,6 +3,6 @@ export { ChatGPTPluginRetriever } from "./remote/chatgpt-plugin.js";
 export {
   SupabaseHybridSearch,
   SupabaseHybridSearchParams,
-} from "./supabase-hybrid-search.js";
+} from "./supabase.js";
 export { RemoteLangChainRetriever } from "./remote/remote-retriever.js";
 export { MetalRetriever } from "./metal.js";

langchain/src/retrievers/metal.ts

@@ -1,10 +1,8 @@
-import type MetalSDK from "@getmetal/metal-sdk";
-
 import { BaseRetriever } from "../schema/index.js";
 import { Document } from "../document.js";
 
 export interface MetalRetrieverFields {
-  client: MetalSDK.default;
+  client: import("@getmetal/metal-sdk").default;
 }
 
 interface ResponseItem {
@@ -13,7 +11,7 @@ interface ResponseItem {
 }
 
 export class MetalRetriever extends BaseRetriever {
-  client: MetalSDK.default;
+  private client: import("@getmetal/metal-sdk").default;
 
   constructor(fields: MetalRetrieverFields) {
     super();

langchain/src/retrievers/remote/index.ts

@@ -0,0 +1,3 @@
+export { RemoteRetriever } from "./base.js";
+export { ChatGPTPluginRetriever } from "./chatgpt-plugin.js";
+export { RemoteLangChainRetriever } from "./remote-retriever.js";

langchain/src/retrievers/tests/supabase-hybrid-search.int.test.ts → langchain/src/retrievers/tests/supabase.int.test.ts

@@ -3,7 +3,7 @@
 import { test, expect } from "@jest/globals";
 import { createClient } from "@supabase/supabase-js";
 import { OpenAIEmbeddings } from "../../embeddings/index.js";
-import { SupabaseHybridSearch } from "../supabase-hybrid-search.js";
+import { SupabaseHybridSearch } from "../supabase.js";
 
 test("Supabase hybrid keyword search", async () => {
   const client = createClient(

langchain/tsconfig.json

@@ -70,7 +70,9 @@
       "src/sql_db.ts",
       "src/callbacks/index.ts",
       "src/output_parsers/index.ts",
-      "src/retrievers/index.ts",
+      "src/retrievers/remote/index.ts",
+      "src/retrievers/supabase.ts",
+      "src/retrievers/metal.ts",
       "src/cache.ts"
     ],
     "excludePrivate": true,

test-exports-cf/src/entrypoints.js

@@ -21,5 +21,5 @@ export * from "langchain/chat_models/anthropic";
 export * from "langchain/schema";
 export * from "langchain/callbacks";
 export * from "langchain/output_parsers";
-export * from "langchain/retrievers";
+export * from "langchain/retrievers/remote";
 export * from "langchain/cache";

test-exports-cjs/src/entrypoints.js

@@ -21,5 +21,5 @@ const chat_models_anthropic = require("langchain/chat_models/anthropic");
 const schema = require("langchain/schema");
 const callbacks = require("langchain/callbacks");
 const output_parsers = require("langchain/output_parsers");
-const retrievers = require("langchain/retrievers");
+const retrievers_remote = require("langchain/retrievers/remote");
 const cache = require("langchain/cache");

test-exports-cra/src/entrypoints.js

@@ -21,5 +21,5 @@ export * from "langchain/chat_models/anthropic";
 export * from "langchain/schema";
 export * from "langchain/callbacks";
 export * from "langchain/output_parsers";
-export * from "langchain/retrievers";
+export * from "langchain/retrievers/remote";
 export * from "langchain/cache";

test-exports-esm/src/entrypoints.js

@@ -21,5 +21,5 @@ import * as chat_models_anthropic from "langchain/chat_models/anthropic";
 import * as schema from "langchain/schema";
 import * as callbacks from "langchain/callbacks";
 import * as output_parsers from "langchain/output_parsers";
-import * as retrievers from "langchain/retrievers";
+import * as retrievers_remote from "langchain/retrievers/remote";
 import * as cache from "langchain/cache";