cohere[minor]: Fix token counts, add usage_metadata (#5732)

* cohere[minor]: Fix token counts, add usage_metadata * chore: lint files * remove skipped token usage tests from cohere standard int test * bump min core version to usage_metadata update * add streamUsage * added cohere to latest/lowest dep tests * conditionally run latest/lowest * nit * cr * cr * cr * revert * test * try just pr * cr * cr * only log files * more tests * toJson * use git to access changed files * fix if statements * fix test * unfocus jest tests and add eslint rule * add eslint-plugin-jest
langchain-ai · Jun 12, 2024 · 75dd790 · 75dd790
1 parent ac204f8
commit 75dd790
Show file tree

Hide file tree

Showing 13 changed files with 1,158 additions and 46 deletions.
diff --git a/.github/workflows/compatibility.yml b/.github/workflows/compatibility.yml
@@ -221,3 +221,40 @@ jobs:
         run: yarn build --filter=@langchain/standard-tests
       - name: Test `@langchain/google-vertexai` with lowest deps
         run: docker compose -f dependency_range_tests/docker-compose.yml run google-vertexai-lowest-deps
+
+  # Cohere
+  cohere-latest-deps:
+    runs-on: ubuntu-latest
+    needs: get-changed-files
+    if: contains(needs.get-changed-files.outputs.changed_files, 'langchain-core/') || contains(needs.get-changed-files.outputs.changed_files, 'libs/langchain-cohere/')
+    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 `@langchain/standard-tests`
+        run: yarn build --filter=@langchain/standard-tests
+      - name: Test `@langchain/cohere` with latest deps
+        run: docker compose -f dependency_range_tests/docker-compose.yml run cohere-latest-deps
+
+  cohere-lowest-deps:
+    runs-on: ubuntu-latest
+    needs: get-changed-files
+    if: contains(needs.get-changed-files.outputs.changed_files, 'libs/langchain-cohere/')
+    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 `@langchain/standard-tests`
+        run: yarn build --filter=@langchain/standard-tests
+      - name: Test `@langchain/cohere` with lowest deps
+        run: docker compose -f dependency_range_tests/docker-compose.yml run cohere-lowest-deps
diff --git a/dependency_range_tests/docker-compose.yml b/dependency_range_tests/docker-compose.yml
@@ -142,4 +142,34 @@ services:
       - ../libs/langchain-standard-tests:/libs/langchain-standard-tests
       - ../libs/langchain-google-vertexai:/libs/langchain-google-vertexai
       - ./scripts:/scripts
-    command: bash /scripts/with_standard_tests/google-vertexai/test-with-lowest-deps.sh
+    command: bash /scripts/with_standard_tests/google-vertexai/test-with-lowest-deps.sh
+
+  # Cohere
+  cohere-latest-deps:
+    image: node:18
+    environment:
+      PUPPETEER_SKIP_DOWNLOAD: "true"
+      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: "true"
+      COHERE_API_KEY: ${COHERE_API_KEY}
+    working_dir: /app
+    volumes:
+      - ../turbo.json:/turbo.json
+      - ../package.json:/package.json
+      - ../libs/langchain-standard-tests:/libs/langchain-standard-tests
+      - ../libs/langchain-cohere:/libs/langchain-cohere
+      - ./scripts:/scripts
+    command: bash /scripts/with_standard_tests/cohere/test-with-latest-deps.sh
+  cohere-lowest-deps:
+    image: node:18
+    environment:
+      PUPPETEER_SKIP_DOWNLOAD: "true"
+      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: "true"
+      COHERE_API_KEY: ${COHERE_API_KEY}
+    working_dir: /app
+    volumes:
+      - ../turbo.json:/turbo.json
+      - ../package.json:/package.json
+      - ../libs/langchain-standard-tests:/libs/langchain-standard-tests
+      - ../libs/langchain-cohere:/libs/langchain-cohere
+      - ./scripts:/scripts
+    command: bash /scripts/with_standard_tests/cohere/test-with-lowest-deps.sh
diff --git a/dependency_range_tests/scripts/with_standard_tests/cohere/node/package.json b/dependency_range_tests/scripts/with_standard_tests/cohere/node/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "dependency-range-tests",
+  "version": "0.0.0",
+  "private": true,
+  "description": "Tests dependency ranges for LangChain.",
+  "dependencies": {
+    "semver": "^7.5.4"
+  }
+}
diff --git a/dependency_range_tests/scripts/with_standard_tests/cohere/node/update_resolutions_lowest.js b/dependency_range_tests/scripts/with_standard_tests/cohere/node/update_resolutions_lowest.js
@@ -0,0 +1,22 @@
+const fs = require("fs");
+const semver = require("semver");
+
+const communityPackageJsonPath = "/app/monorepo/libs/langchain-cohere/package.json";
+
+const currentPackageJson = JSON.parse(fs.readFileSync(communityPackageJsonPath));
+
+if (currentPackageJson.dependencies["@langchain/core"] && !currentPackageJson.dependencies["@langchain/core"].includes("rc")) {
+  const minVersion = semver.minVersion(
+    currentPackageJson.dependencies["@langchain/core"]
+  ).version;
+  currentPackageJson.overrides = {
+    ...currentPackageJson.overrides,
+    "@langchain/core": minVersion,
+  };
+  currentPackageJson.dependencies = {
+    ...currentPackageJson.dependencies,
+    "@langchain/core": minVersion,
+  };
+}
+
+fs.writeFileSync(communityPackageJsonPath, JSON.stringify(currentPackageJson, null, 2));
diff --git a/dependency_range_tests/scripts/with_standard_tests/cohere/node/yarn.lock b/dependency_range_tests/scripts/with_standard_tests/cohere/node/yarn.lock
@@ -0,0 +1,22 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+semver@^7.5.4:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+  dependencies:
+    lru-cache "^6.0.0"
+
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
diff --git a/dependency_range_tests/scripts/with_standard_tests/cohere/test-with-latest-deps.sh b/dependency_range_tests/scripts/with_standard_tests/cohere/test-with-latest-deps.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+set -euxo pipefail
+
+export CI=true
+
+# New monorepo directory paths
+monorepo_dir="/app/monorepo"
+monorepo_openai_dir="/app/monorepo/libs/langchain-cohere"
+
+# Run the shared script to copy all necessary folders/files
+bash /scripts/with_standard_tests/shared.sh cohere
+
+# Navigate back to monorepo root and install dependencies
+cd "$monorepo_dir"
+yarn
+
+# Navigate into `@langchain/cohere` to build and run tests
+# We need to run inside the cohere directory so turbo repo does
+# not try to build the package/its workspace dependencies.
+cd "$monorepo_openai_dir"
+yarn test
diff --git a/dependency_range_tests/scripts/with_standard_tests/cohere/test-with-lowest-deps.sh b/dependency_range_tests/scripts/with_standard_tests/cohere/test-with-lowest-deps.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+set -euxo pipefail
+
+export CI=true
+
+monorepo_dir="/app/monorepo"
+monorepo_cohere_dir="/app/monorepo/libs/langchain-cohere"
+updater_script_dir="/app/updater_script"
+updater_script_dir="/app/updater_script"
+original_updater_script_dir="/scripts/with_standard_tests/cohere/node"
+
+# Run the shared script to copy all necessary folders/files
+bash /scripts/with_standard_tests/shared.sh cohere
+
+# Copy the updater script to the monorepo
+mkdir -p "$updater_script_dir"
+cp "$original_updater_script_dir"/* "$updater_script_dir/"
+
+# Install deps (e.g semver) for the updater script
+cd "$updater_script_dir"
+yarn
+# Run the updater script
+node "update_resolutions_lowest.js"
+
+
+# Navigate back to monorepo root and install dependencies
+cd "$monorepo_dir"
+yarn
+
+# Navigate into `@langchain/cohere` to build and run tests
+# We need to run inside the cohere directory so turbo repo does
+# not try to build the package/its workspace dependencies.
+cd "$monorepo_cohere_dir"
+yarn test
diff --git a/libs/langchain-cohere/.eslintrc.cjs b/libs/langchain-cohere/.eslintrc.cjs
@@ -11,7 +11,7 @@ module.exports = {
     project: "./tsconfig.json",
     sourceType: "module",
   },
-  plugins: ["@typescript-eslint", "no-instanceof"],
+  plugins: ["@typescript-eslint", "no-instanceof", "eslint-plugin-jest"],
   ignorePatterns: [
     ".eslintrc.cjs",
     "scripts",
@@ -61,6 +61,7 @@ module.exports = {
     "func-names": 0,
     "no-lonely-if": 0,
     "prefer-rest-params": 0,
+    'jest/no-focused-tests': 'error',
     "new-cap": ["error", { properties: false, capIsNew: false }],
   },
   overrides: [

diff --git a/libs/langchain-cohere/package.json b/libs/langchain-cohere/package.json
@@ -35,8 +35,8 @@
   "author": "LangChain",
   "license": "MIT",
   "dependencies": {
-    "@langchain/core": ">0.1.58 <0.3.0",
-    "cohere-ai": "^7.9.3"
+    "@langchain/core": ">=0.2.5 <0.3.0",
+    "cohere-ai": "^7.10.5"
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",
@@ -53,6 +53,7 @@
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-jest": "^27.6.0",
     "eslint-plugin-no-instanceof": "^1.0.1",
     "eslint-plugin-prettier": "^4.2.1",
     "jest": "^29.5.0",