Jacob/core

.github/workflows/test-exports.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Install dependencies
         run: yarn install --immutable
       - name: Build
-        run: yarn workspace langchain build
+        run: yarn workspace langchain-core build && yarn workspace langchain build
         shell: bash
         env:
           SKIP_API_DOCS: true
@@ -54,7 +54,7 @@ jobs:
       - name: Install dependencies
         run: yarn install --immutable
       - name: Build
-        run: yarn workspace langchain build
+        run: yarn workspace langchain-core build && yarn workspace langchain build
         shell: bash
         env:
           SKIP_API_DOCS: true
@@ -74,7 +74,7 @@ jobs:
       - name: Install dependencies
         run: yarn install --immutable
       - name: Build
-        run: yarn workspace langchain build
+        run: yarn workspace langchain-core build && yarn workspace langchain build
         shell: bash
         env:
           SKIP_API_DOCS: true
@@ -94,7 +94,7 @@ jobs:
       - name: Install dependencies
         run: yarn install --immutable
       - name: Build
-        run: yarn workspace langchain build
+        run: yarn workspace langchain-core build && yarn workspace langchain build
         shell: bash
         env:
           SKIP_API_DOCS: true
@@ -114,7 +114,7 @@ jobs:
       - name: Install dependencies
         run: yarn install --immutable
       - name: Build
-        run: yarn workspace langchain build
+        run: yarn workspace langchain-core build && yarn workspace langchain build
         shell: bash
         env:
           SKIP_API_DOCS: true
@@ -134,30 +134,30 @@ jobs:
       - name: Install dependencies
         run: yarn install --immutable
       - name: Build
-        run: yarn workspace langchain build
+        run: yarn workspace langchain-core build && yarn workspace langchain build
         shell: bash
         env:
           SKIP_API_DOCS: true
 
       - name: Test vite exports
         run: docker compose -f docker-compose.yml run test-exports-vite
 
-  exports-bun:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: "yarn"
-      - name: Install dependencies
-        run: yarn install --immutable
-      - name: Build
-        run: yarn workspace langchain build
-        shell: bash
-        env:
-          SKIP_API_DOCS: true
-
-      - name: Test bun exports
-        run: docker compose -f docker-compose.yml run test-exports-bun
+  # exports-bun:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - name: Use Node.js ${{ env.NODE_VERSION }}
+  #       uses: actions/setup-node@v3
+  #       with:
+  #         node-version: ${{ env.NODE_VERSION }}
+  #         cache: "yarn"
+  #     - name: Install dependencies
+  #       run: yarn install --immutable
+  #     - name: Build
+  #       run: yarn workspace langchain-core build && yarn workspace langchain build
+  #       shell: bash
+  #       env:
+  #         SKIP_API_DOCS: true
+
+  #     - name: Test bun exports
+  #       run: docker compose -f docker-compose.yml run test-exports-bun

docker-compose.yml

@@ -10,6 +10,7 @@ services:
       - ./environment_tests/test-exports-esbuild:/package
       - ./environment_tests/scripts:/scripts
       - ./langchain:/langchain
+      - ./langchain-core:/langchain-core
     command: bash /scripts/docker-ci-entrypoint.sh
   test-exports-esm:
     image: node:18
@@ -21,6 +22,7 @@ services:
       - ./environment_tests/test-exports-esm:/package
       - ./environment_tests/scripts:/scripts
       - ./langchain:/langchain
+      - ./langchain-core:/langchain-core
     command: bash /scripts/docker-ci-entrypoint.sh
   test-exports-cjs:
     image: node:18
@@ -32,6 +34,7 @@ services:
       - ./environment_tests/test-exports-cjs:/package
       - ./environment_tests/scripts:/scripts
       - ./langchain:/langchain
+      - ./langchain-core:/langchain-core
     command: bash /scripts/docker-ci-entrypoint.sh
   test-exports-cf:
     image: node:18
@@ -43,6 +46,7 @@ services:
       - ./environment_tests/test-exports-cf:/package
       - ./environment_tests/scripts:/scripts
       - ./langchain:/langchain
+      - ./langchain-core:/langchain-core
     command: bash /scripts/docker-ci-entrypoint.sh
   test-exports-vercel:
     image: node:18
@@ -54,6 +58,7 @@ services:
       - ./environment_tests/test-exports-vercel:/package
       - ./environment_tests/scripts:/scripts
       - ./langchain:/langchain
+      - ./langchain-core:/langchain-core
     command: bash /scripts/docker-ci-entrypoint.sh
   test-exports-vite:
     image: node:18
@@ -65,15 +70,17 @@ services:
       - ./environment_tests/test-exports-vite:/package
       - ./environment_tests/scripts:/scripts
       - ./langchain:/langchain
+      - ./langchain-core:/langchain-core
     command: bash /scripts/docker-ci-entrypoint.sh
-  test-exports-bun:
-    image: oven/bun
-    working_dir: /app
-    volumes:
-      - ./environment_tests/test-exports-bun:/package
-      - ./environment_tests/scripts:/scripts
-      - ./langchain:/langchain-workspace
-    command: bash /scripts/docker-bun-ci-entrypoint.sh
+  # test-exports-bun:
+  #   image: oven/bun
+  #   working_dir: /app
+  #   volumes:
+  #     - ./environment_tests/test-exports-bun:/package
+  #     - ./environment_tests/scripts:/scripts
+  #     - ./langchain:/langchain-workspace
+  #     - ./langchain-core:/langchain-core-workspace
+  #   command: bash /scripts/docker-bun-ci-entrypoint.sh
   success:
     image: alpine:3.14
     command: echo "Success"
@@ -90,5 +97,5 @@ services:
         condition: service_completed_successfully
       test-exports-vite:
         condition: service_completed_successfully
-      test-exports-bun:
-        condition: service_completed_successfully
+      # test-exports-bun:
+      #   condition: service_completed_successfully

docs/api_refs/package.json

@@ -6,7 +6,7 @@
     "dev": "next dev -p 3001",
     "typedoc": "npx typedoc --options typedoc.json",
     "build:scripts": "node ./scripts/generate-api-refs.js && node ./scripts/update-typedoc-css.js",
-    "build": "yarn build:scripts && next build",
+    "build": "yarn workspace langchain-core build && yarn workspace langchain build && yarn build:scripts && next build",
     "start": "yarn build && next start -p 3001",
     "lint": "next lint"
   },
@@ -16,14 +16,12 @@
     "react-dom": "^18"
   },
   "devDependencies": {
-    "@types/fs-extra": "^11",
     "@types/node": "^20",
     "@types/react": "^18",
     "@types/react-dom": "^18",
     "autoprefixer": "^10.0.1",
     "eslint": "^8",
     "eslint-config-next": "14.0.1",
-    "fs-extra": "^11.1.1",
     "postcss": "^8",
     "tailwindcss": "^3.3.0",
     "ts-morph": "^20.0.0",

docs/api_refs/scripts/generate-api-refs.js

@@ -1,6 +1,5 @@
 const { Project, SyntaxKind } = require("ts-morph");
 const { exec } = require("child_process");
-const fse = require("fs-extra");
 
 async function updateCodeWithIgnoreTags(tsConfigFilePath) {
   const project = new Project({
@@ -70,7 +69,7 @@ async function updateCodeWithIgnoreTags(tsConfigFilePath) {
 async function copyLangChain(pathToLangChain) {
   // copy the entire langchain dir to .
 
-  await fse.copy(pathToLangChain, "./langchain", { overwrite: false });
+  await execAsync(`cp -r ${pathToLangChain} ./langchain`);
   return {
     rootPath: `${process.cwd()}/langchain`,
     tsConfigPath: `${process.cwd()}/langchain/tsconfig.json`,
@@ -79,7 +78,7 @@ async function copyLangChain(pathToLangChain) {
 
 async function deleteLangChain(pathToLangChain) {
   // delete the langchain dir
-  await fse.remove(pathToLangChain);
+  await execAsync(`rm -rf ${pathToLangChain}`);
 }
 
 const execAsync = async (command, options) => new Promise((resolve, reject) => {

docs/api_refs/typedoc.json

@@ -283,6 +283,7 @@
     "./langchain/src/experimental/hubs/makersuite/googlemakersuitehub.ts",
     "./langchain/src/experimental/chains/violation_of_expectations/index.ts",
     "./langchain/src/evaluation/index.ts",
+    "./langchain/src/runnables/index.ts",
     "./langchain/src/runnables/remote.ts"
   ]
 }

environment_tests/scripts/docker-bun-ci-entrypoint.sh

@@ -10,11 +10,22 @@ shopt -s extglob
 # avoid copying build artifacts from the host
 cp -r ../package/!(node_modules|dist|dist-cjs|dist-esm|build|.next|.turbo) .
 
+mkdir ../langchain-core
+cp -r ../langchain-core-workspace/!(node_modules|build|.next|.turbo) ../langchain-core
+
 mkdir ../langchain
 cp -r ../langchain-workspace/!(node_modules|build|.next|.turbo) ../langchain
 
+# Link the package locally
+cd ../langchain-core
+bun link
+
+# Reinstall deps with bun because bun doesn't install deps of linked deps
+bun install --no-save
+
 # Link the package locally
 cd ../langchain
+sed -i 's/"langchain-core": "[^\"]*"/"langchain-core": "link:langchain-core"/g' package.json
 bun link
 
 # Reinstall deps with bun because bun doesn't install deps of linked deps
@@ -23,6 +34,7 @@ bun install --no-save
 cd ../app
 
 # Replace the workspace dependency with the local copy, and install all others
+sed -i 's/"langchain-core": "workspace:\*"/"langchain-core": "link:langchain-core"/g' package.json
 sed -i 's/"langchain": "workspace:\*"/"langchain": "link:langchain"/g' package.json
 bun install --no-save
 

environment_tests/scripts/docker-ci-entrypoint.sh

@@ -18,6 +18,7 @@ cp ../root/yarn.lock ../root/.yarnrc.yml .
 # Replace the workspace dependency with the local copy, and install all others
 # Avoid calling "yarn add ../langchain" as yarn berry does seem to hang for ~30s
 # before installation actually occurs
+sed -i 's/"langchain-core": "workspace:\*"/"langchain-core": "..\/langchain-core"/g' package.json
 sed -i 's/"langchain": "workspace:\*"/"langchain": "..\/langchain"/g' package.json
 yarn install --no-immutable
 

environment_tests/test-exports-bun/package.json

@@ -19,7 +19,8 @@
   "dependencies": {
     "d3-dsv": "2",
     "hnswlib-node": "^1.4.2",
-    "langchain": "workspace:*"
+    "langchain": "workspace:*",
+    "langchain-core": "workspace:*"
   },
   "devDependencies": {
     "@tsconfig/recommended": "^1.0.2",

environment_tests/test-exports-bun/src/entrypoints.js

@@ -100,4 +100,5 @@ export * from "langchain/experimental/chat_models/bittensor";
 export * from "langchain/experimental/chat_models/ollama_functions";
 export * from "langchain/experimental/chains/violation_of_expectations";
 export * from "langchain/evaluation";
+export * from "langchain/runnables";
 export * from "langchain/runnables/remote";

environment_tests/test-exports-cf/package.json

@@ -8,7 +8,8 @@
     "wrangler": "3.7.0"
   },
   "dependencies": {
-    "langchain": "workspace:*"
+    "langchain": "workspace:*",
+    "langchain-core": "workspace:*"
   },
   "private": true,
   "scripts": {

environment_tests/test-exports-cf/src/entrypoints.js

@@ -100,4 +100,5 @@ export * from "langchain/experimental/chat_models/bittensor";
 export * from "langchain/experimental/chat_models/ollama_functions";
 export * from "langchain/experimental/chains/violation_of_expectations";
 export * from "langchain/evaluation";
+export * from "langchain/runnables";
 export * from "langchain/runnables/remote";

environment_tests/test-exports-cjs/package.json

@@ -20,7 +20,8 @@
   "dependencies": {
     "d3-dsv": "2",
     "hnswlib-node": "^1.4.2",
-    "langchain": "workspace:*"
+    "langchain": "workspace:*",
+    "langchain-core": "workspace:*"
   },
   "devDependencies": {
     "@tsconfig/recommended": "^1.0.2",

environment_tests/test-exports-cjs/src/entrypoints.js

@@ -100,4 +100,5 @@ const experimental_chat_models_bittensor = require("langchain/experimental/chat_
 const experimental_chat_models_ollama_functions = require("langchain/experimental/chat_models/ollama_functions");
 const experimental_chains_violation_of_expectations = require("langchain/experimental/chains/violation_of_expectations");
 const evaluation = require("langchain/evaluation");
+const runnables = require("langchain/runnables");
 const runnables_remote = require("langchain/runnables/remote");

environment_tests/test-exports-esbuild/package.json

@@ -18,7 +18,8 @@
   "dependencies": {
     "d3-dsv": "2",
     "hnswlib-node": "^1.4.2",
-    "langchain": "workspace:*"
+    "langchain": "workspace:*",
+    "langchain-core": "workspace:*"
   },
   "devDependencies": {
     "@tsconfig/recommended": "^1.0.2",

environment_tests/test-exports-esbuild/src/entrypoints.js

@@ -100,4 +100,5 @@ import * as experimental_chat_models_bittensor from "langchain/experimental/chat
 import * as experimental_chat_models_ollama_functions from "langchain/experimental/chat_models/ollama_functions";
 import * as experimental_chains_violation_of_expectations from "langchain/experimental/chains/violation_of_expectations";
 import * as evaluation from "langchain/evaluation";
+import * as runnables from "langchain/runnables";
 import * as runnables_remote from "langchain/runnables/remote";

environment_tests/test-exports-esm/package.json

@@ -21,7 +21,8 @@
   "dependencies": {
     "d3-dsv": "2",
     "hnswlib-node": "^1.4.2",
-    "langchain": "workspace:*"
+    "langchain": "workspace:*",
+    "langchain-core": "workspace:*"
   },
   "devDependencies": {
     "@tsconfig/recommended": "^1.0.2",

environment_tests/test-exports-esm/src/entrypoints.js

@@ -100,4 +100,5 @@ import * as experimental_chat_models_bittensor from "langchain/experimental/chat
 import * as experimental_chat_models_ollama_functions from "langchain/experimental/chat_models/ollama_functions";
 import * as experimental_chains_violation_of_expectations from "langchain/experimental/chains/violation_of_expectations";
 import * as evaluation from "langchain/evaluation";
+import * as runnables from "langchain/runnables";
 import * as runnables_remote from "langchain/runnables/remote";

environment_tests/test-exports-vercel/package.json

@@ -15,6 +15,7 @@
     "eslint": "8.37.0",
     "eslint-config-next": "13.3.0",
     "langchain": "workspace:*",
+    "langchain-core": "workspace:*",
     "next": "13.4.9",
     "react": "18.2.0",
     "react-dom": "18.2.0",

environment_tests/test-exports-vercel/src/entrypoints.js

@@ -100,4 +100,5 @@ export * from "langchain/experimental/chat_models/bittensor";
 export * from "langchain/experimental/chat_models/ollama_functions";
 export * from "langchain/experimental/chains/violation_of_expectations";
 export * from "langchain/evaluation";
+export * from "langchain/runnables";
 export * from "langchain/runnables/remote";

environment_tests/test-exports-vite/package.json

@@ -10,7 +10,8 @@
     "test": "tsc"
   },
   "dependencies": {
-    "langchain": "workspace:*"
+    "langchain": "workspace:*",
+    "langchain-core": "workspace:*"
   },
   "devDependencies": {
     "typescript": "^5.0.0",

environment_tests/test-exports-vite/src/entrypoints.js

@@ -100,4 +100,5 @@ export * from "langchain/experimental/chat_models/bittensor";
 export * from "langchain/experimental/chat_models/ollama_functions";
 export * from "langchain/experimental/chains/violation_of_expectations";
 export * from "langchain/evaluation";
+export * from "langchain/runnables";
 export * from "langchain/runnables/remote";

examples/src/indexes/vector_stores/prisma_vectorstore/prisma.ts

@@ -57,15 +57,4 @@ export const run = async () => {
   // Use the default filter a.k.a {"content": "default"}
   const resultTwo = await vectorStore.similaritySearch("Hello world", 1);
   console.log(resultTwo);
-
-  // Override the local filter
-  const resultThree = await vectorStore.similaritySearchWithScore(
-    "Hello world",
-    1,
-    {
-      content: { equals: "different_content" },
-      customForeignKey: { in: ["<id1>", "<id2>", "<id3>"] },
-    }
-  );
-  console.log(resultThree);
 };