From 124e3d4ddb68da4b91a9aae17a9b2f9a4acc7463 Mon Sep 17 00:00:00 2001 From: jacoblee93 Date: Tue, 3 Dec 2024 10:30:40 -0800 Subject: [PATCH] Fix --- dependency_range_tests/docker-compose.yml | 22 +++++++++---------- .../anthropic/node/package.json | 5 ++++- .../cohere/node/package.json | 5 ++++- .../community/node/package.json | 5 ++++- .../google-vertexai/node/package.json | 8 +++++-- .../google-vertexai/test-with-latest-deps.sh | 1 + .../with_standard_tests/node/package.json | 5 ++++- .../openai/node/package.json | 5 ++++- .../scripts/with_standard_tests/shared.sh | 2 -- 9 files changed, 38 insertions(+), 20 deletions(-) diff --git a/dependency_range_tests/docker-compose.yml b/dependency_range_tests/docker-compose.yml index 567641632d97..579707fbe1ad 100644 --- a/dependency_range_tests/docker-compose.yml +++ b/dependency_range_tests/docker-compose.yml @@ -34,7 +34,7 @@ services: working_dir: /app volumes: - ../turbo.json:/turbo.json - - ../package.json:/package.json + - ./scripts/with_standard_tests/community/node/package.json:/package.json - ../libs/langchain-standard-tests:/libs/langchain-standard-tests - ../libs/langchain-community:/libs/langchain-community - ./scripts:/scripts @@ -48,7 +48,7 @@ services: working_dir: /app volumes: - ../turbo.json:/turbo.json - - ../package.json:/package.json + - ./scripts/with_standard_tests/community/node/package.json:/package.json - ../libs/langchain-standard-tests:/libs/langchain-standard-tests - ../libs/langchain-community:/libs/langchain-community - ./scripts:/scripts @@ -61,7 +61,7 @@ services: working_dir: /app volumes: - ../turbo.json:/turbo.json - - ../package.json:/package.json + - ./scripts/with_standard_tests/community/node/package.json:/package.json - ../libs/langchain-standard-tests:/libs/langchain-standard-tests - ../libs/langchain-community:/libs/langchain-community - ./scripts:/scripts @@ -77,7 +77,7 @@ services: working_dir: /app volumes: - ../turbo.json:/turbo.json - - ../package.json:/package.json + - ./scripts/with_standard_tests/openai/node/package.json:/package.json - ../libs/langchain-standard-tests:/libs/langchain-standard-tests - ../libs/langchain-openai:/libs/langchain-openai - ./scripts:/scripts @@ -91,7 +91,7 @@ services: working_dir: /app volumes: - ../turbo.json:/turbo.json - - ../package.json:/package.json + - ./scripts/with_standard_tests/openai/node/package.json:/package.json - ../libs/langchain-standard-tests:/libs/langchain-standard-tests - ../libs/langchain-openai:/libs/langchain-openai - ./scripts:/scripts @@ -107,7 +107,7 @@ services: working_dir: /app volumes: - ../turbo.json:/turbo.json - - ../package.json:/package.json + - ./scripts/with_standard_tests/anthropic/node/package.json:/package.json - ../libs/langchain-standard-tests:/libs/langchain-standard-tests - ../libs/langchain-anthropic:/libs/langchain-anthropic - ./scripts:/scripts @@ -121,7 +121,7 @@ services: working_dir: /app volumes: - ../turbo.json:/turbo.json - - ../package.json:/package.json + - ./scripts/with_standard_tests/anthropic/node/package.json:/package.json - ../libs/langchain-standard-tests:/libs/langchain-standard-tests - ../libs/langchain-anthropic:/libs/langchain-anthropic - ./scripts:/scripts @@ -137,7 +137,7 @@ services: working_dir: /app volumes: - ../turbo.json:/turbo.json - - ../package.json:/package.json + - ./scripts/with_standard_tests/google-vertexai/node/package.json:/package.json - ../libs/langchain-standard-tests:/libs/langchain-standard-tests - ../libs/langchain-google-vertexai:/libs/langchain-google-vertexai - ./scripts:/scripts @@ -151,7 +151,7 @@ services: working_dir: /app volumes: - ../turbo.json:/turbo.json - - ../package.json:/package.json + - ./scripts/with_standard_tests/google-vertexai/node/package.json:/package.json - ../libs/langchain-standard-tests:/libs/langchain-standard-tests - ../libs/langchain-google-vertexai:/libs/langchain-google-vertexai - ./scripts:/scripts @@ -167,7 +167,7 @@ services: working_dir: /app volumes: - ../turbo.json:/turbo.json - - ../package.json:/package.json + - ./scripts/with_standard_tests/cohere/node/package.json:/package.json - ../libs/langchain-standard-tests:/libs/langchain-standard-tests - ../libs/langchain-cohere:/libs/langchain-cohere - ./scripts:/scripts @@ -181,7 +181,7 @@ services: working_dir: /app volumes: - ../turbo.json:/turbo.json - - ../package.json:/package.json + - ./scripts/with_standard_tests/cohere/node/package.json:/package.json - ../libs/langchain-standard-tests:/libs/langchain-standard-tests - ../libs/langchain-cohere:/libs/langchain-cohere - ./scripts:/scripts diff --git a/dependency_range_tests/scripts/with_standard_tests/anthropic/node/package.json b/dependency_range_tests/scripts/with_standard_tests/anthropic/node/package.json index a4622fc74597..472405f4ca22 100644 --- a/dependency_range_tests/scripts/with_standard_tests/anthropic/node/package.json +++ b/dependency_range_tests/scripts/with_standard_tests/anthropic/node/package.json @@ -2,8 +2,11 @@ "name": "dependency-range-tests", "version": "0.0.0", "private": true, + "workspaces": [ + "libs/*" + ], "description": "Tests dependency ranges for LangChain.", "dependencies": { "semver": "^7.5.4" } -} \ No newline at end of file +} 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 index a4622fc74597..472405f4ca22 100644 --- a/dependency_range_tests/scripts/with_standard_tests/cohere/node/package.json +++ b/dependency_range_tests/scripts/with_standard_tests/cohere/node/package.json @@ -2,8 +2,11 @@ "name": "dependency-range-tests", "version": "0.0.0", "private": true, + "workspaces": [ + "libs/*" + ], "description": "Tests dependency ranges for LangChain.", "dependencies": { "semver": "^7.5.4" } -} \ No newline at end of file +} diff --git a/dependency_range_tests/scripts/with_standard_tests/community/node/package.json b/dependency_range_tests/scripts/with_standard_tests/community/node/package.json index a4622fc74597..472405f4ca22 100644 --- a/dependency_range_tests/scripts/with_standard_tests/community/node/package.json +++ b/dependency_range_tests/scripts/with_standard_tests/community/node/package.json @@ -2,8 +2,11 @@ "name": "dependency-range-tests", "version": "0.0.0", "private": true, + "workspaces": [ + "libs/*" + ], "description": "Tests dependency ranges for LangChain.", "dependencies": { "semver": "^7.5.4" } -} \ No newline at end of file +} diff --git a/dependency_range_tests/scripts/with_standard_tests/google-vertexai/node/package.json b/dependency_range_tests/scripts/with_standard_tests/google-vertexai/node/package.json index a4622fc74597..268de13087d8 100644 --- a/dependency_range_tests/scripts/with_standard_tests/google-vertexai/node/package.json +++ b/dependency_range_tests/scripts/with_standard_tests/google-vertexai/node/package.json @@ -2,8 +2,12 @@ "name": "dependency-range-tests", "version": "0.0.0", "private": true, + "workspaces": [ + "libs/*" + ], "description": "Tests dependency ranges for LangChain.", "dependencies": { "semver": "^7.5.4" - } -} \ No newline at end of file + }, + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" +} diff --git a/dependency_range_tests/scripts/with_standard_tests/google-vertexai/test-with-latest-deps.sh b/dependency_range_tests/scripts/with_standard_tests/google-vertexai/test-with-latest-deps.sh index 7f2b30d3ca8e..00d5cb3e983b 100644 --- a/dependency_range_tests/scripts/with_standard_tests/google-vertexai/test-with-latest-deps.sh +++ b/dependency_range_tests/scripts/with_standard_tests/google-vertexai/test-with-latest-deps.sh @@ -27,6 +27,7 @@ node "update_resolutions_latest.js" # Navigate back to monorepo root and install dependencies cd "$monorepo_dir" touch yarn.lock +cat ./package.json yarn # Navigate into `@langchain/google-vertexai` to build and run tests diff --git a/dependency_range_tests/scripts/with_standard_tests/node/package.json b/dependency_range_tests/scripts/with_standard_tests/node/package.json index ba8b482e7515..3b53ce354167 100644 --- a/dependency_range_tests/scripts/with_standard_tests/node/package.json +++ b/dependency_range_tests/scripts/with_standard_tests/node/package.json @@ -2,6 +2,9 @@ "name": "dependency-range-tests", "version": "0.0.0", "private": true, + "workspaces": [ + "libs/*" + ], "description": "Tests dependency ranges for LangChain.", "dependencies": {} -} \ No newline at end of file +} diff --git a/dependency_range_tests/scripts/with_standard_tests/openai/node/package.json b/dependency_range_tests/scripts/with_standard_tests/openai/node/package.json index a4622fc74597..472405f4ca22 100644 --- a/dependency_range_tests/scripts/with_standard_tests/openai/node/package.json +++ b/dependency_range_tests/scripts/with_standard_tests/openai/node/package.json @@ -2,8 +2,11 @@ "name": "dependency-range-tests", "version": "0.0.0", "private": true, + "workspaces": [ + "libs/*" + ], "description": "Tests dependency ranges for LangChain.", "dependencies": { "semver": "^7.5.4" } -} \ No newline at end of file +} diff --git a/dependency_range_tests/scripts/with_standard_tests/shared.sh b/dependency_range_tests/scripts/with_standard_tests/shared.sh index 07568aeb5aa0..3a3eda1edb46 100644 --- a/dependency_range_tests/scripts/with_standard_tests/shared.sh +++ b/dependency_range_tests/scripts/with_standard_tests/shared.sh @@ -19,8 +19,6 @@ original_package_json_dir="/package.json" original_turbo_json_dir="/turbo.json" original_standard_tests_updater_script_dir="/scripts/with_standard_tests/node" -corepack enable - # enable extended globbing for omitting build artifacts shopt -s extglob