diff --git a/.evergreen/config.yml b/.evergreen/config.yml index c13402a..ee21f91 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -306,28 +306,30 @@ buildvariants: - name: test-langgraph-python-remote batchtime: 10080 # 1 week - - name: test-chatgpt-retrieval-plugin-rhel - display_name: ChatGPT Retrieval Plugin - expansions: - DIR: chatgpt-retrieval-plugin - run_on: - - rhel87-small - tasks: - - name: test-chatgpt-retrieval-plugin-local - - name: test-chatgpt-retrieval-plugin-remote - batchtime: 10080 # 1 week - - - name: test-llama-index-vectorstore-rhel - display_name: LlamaIndex RHEL Vector Store - expansions: - DIR: llama-index-python-vectorstore - run_on: - - rhel87-small - tasks: - - name: test-llama-index-local - # TODO: INTPYTHON-440 - # - name: test-llama-index-remote - # batchtime: 10080 # 1 week + # TODO: INTPYTHON-668 + # - name: test-chatgpt-retrieval-plugin-rhel + # display_name: ChatGPT Retrieval Plugin + # expansions: + # DIR: chatgpt-retrieval-plugin + # run_on: + # - rhel87-small + # tasks: + # - name: test-chatgpt-retrieval-plugin-local + # - name: test-chatgpt-retrieval-plugin-remote + # batchtime: 10080 # 1 week + + # TODO: INTPYTHON-669 + # - name: test-llama-index-vectorstore-rhel + # display_name: LlamaIndex RHEL Vector Store + # expansions: + # DIR: llama-index-python-vectorstore + # run_on: + # - rhel87-small + # tasks: + # - name: test-llama-index-local + # # TODO: INTPYTHON-440 + # # - name: test-llama-index-remote + # # batchtime: 10080 # 1 week - name: test-docarray-rhel display_name: DocArray RHEL @@ -380,12 +382,13 @@ buildvariants: tasks: - name: test-langchaingo-local - - name: test-langchain-js-ubuntu - display_name: LangchainJS Ubuntu2204 - expansions: - DIR: langchain-js - run_on: - - ubuntu2204-small - tasks: - - name: test-langchain-js-local - - name: test-langchain-js-remote + # TODO: INTPYTHON-667 + # - name: test-langchain-js-ubuntu + # display_name: LangchainJS Ubuntu2204 + # expansions: + # DIR: langchain-js + # run_on: + # - ubuntu2204-small + # tasks: + # - name: test-langchain-js-local + # - name: test-langchain-js-remote diff --git a/.evergreen/execute-tests.sh b/.evergreen/execute-tests.sh index 130d680..950bad0 100644 --- a/.evergreen/execute-tests.sh +++ b/.evergreen/execute-tests.sh @@ -5,7 +5,6 @@ set -eu SCRIPT_DIR=$(realpath "$(dirname ${BASH_SOURCE[0]})") ROOT_DIR=$(dirname $SCRIPT_DIR) - # Source the configuration. cd ${ROOT_DIR}/${DIR} set -a @@ -13,4 +12,5 @@ source config.env set +a cd ${REPO_NAME} + bash ${ROOT_DIR}/${DIR}/run.sh diff --git a/.evergreen/provision-atlas.sh b/.evergreen/provision-atlas.sh index 5e4093e..7619a2b 100644 --- a/.evergreen/provision-atlas.sh +++ b/.evergreen/provision-atlas.sh @@ -18,6 +18,8 @@ source secrets-export.sh # Create the env file echo "export VOYAGEAI_S3_BUCKET=$VOYAGEAI_S3_BUCKET" >> env.sh -echo "export OPENAI_API_KEY=$OPENAI_API_KEY" >> env.sh +echo "export AZURE_OPENAI_ENDPOINT=$AZURE_OPENAI_ENDPOINT" >> env.sh +echo "export AZURE_OPENAI_API_KEY=$AZURE_OPENAI_API_KEY" >> env.sh +echo "export OPENAI_API_VERSION=$OPENAI_API_VERSION" >> env.sh echo "export MONGODB_URI=$CONN_STRING" >> env.sh echo "export VOYAGEAI_API_KEY=$VOYAGEAI_API_KEY" >> env.sh diff --git a/.evergreen/setup-remote.sh b/.evergreen/setup-remote.sh index 10691d3..15d8d0d 100644 --- a/.evergreen/setup-remote.sh +++ b/.evergreen/setup-remote.sh @@ -53,9 +53,11 @@ export MONGODB_URI # Create the env file echo "export VOYAGEAI_S3_BUCKET=$VOYAGEAI_S3_BUCKET" >> env.sh +echo "export AZURE_OPENAI_ENDPOINT=$AZURE_OPENAI_ENDPOINT" >> env.sh +echo "export AZURE_OPENAI_API_KEY=$AZURE_OPENAI_API_KEY" >> env.sh +echo "export OPENAI_API_VERSION=$OPENAI_API_VERSION" >> env.sh +echo "export MONGODB_URI=$CONN_STRING" >> env.sh echo "export VOYAGEAI_API_KEY=$VOYAGEAI_API_KEY" >> env.sh -echo "export OPENAI_API_KEY=$OPENAI_API_KEY" >> env.sh -echo "export MONGODB_URI=$MONGODB_URI" >> env.sh # Ensure the remote database is populated. . .evergreen/utils.sh diff --git a/langchain-python/config.env b/langchain-python/config.env index 18baa54..63fad76 100644 --- a/langchain-python/config.env +++ b/langchain-python/config.env @@ -1,3 +1,5 @@ REPO_NAME=langchain-mongodb REPO_ORG=langchain-ai DATABASE=langchain_test_db +REPO_ORG=blink1073 +REPO_BRANCH=INTPYTHON-667 diff --git a/langchain-python/run.sh b/langchain-python/run.sh index 74974f2..5cd6fb9 100644 --- a/langchain-python/run.sh +++ b/langchain-python/run.sh @@ -22,9 +22,6 @@ pip install uv rust-just just install -export MONGODB_URI=$MONGODB_URI -export OPENAI_API_KEY=$OPENAI_API_KEY - -just tests +just unit_tests just integration_tests diff --git a/langgraph-python/config.env b/langgraph-python/config.env index 568abf1..168a9f6 100644 --- a/langgraph-python/config.env +++ b/langgraph-python/config.env @@ -1,3 +1,5 @@ REPO_NAME=langchain-mongodb REPO_ORG=langchain-ai DATABASE=langgraph-test +REPO_ORG=blink1073 +REPO_BRANCH=INTPYTHON-667 diff --git a/langgraph-python/run.sh b/langgraph-python/run.sh index 501a8ab..2bba020 100644 --- a/langgraph-python/run.sh +++ b/langgraph-python/run.sh @@ -22,9 +22,6 @@ pip install uv rust-just just install -export MONGODB_URI=$MONGODB_URI -export OPENAI_API_KEY=$OPENAI_API_KEY - -just tests +just unit_tests just integration_tests diff --git a/semantic-kernel-python/run.sh b/semantic-kernel-python/run.sh index 6923e67..2ec5a5d 100644 --- a/semantic-kernel-python/run.sh +++ b/semantic-kernel-python/run.sh @@ -27,21 +27,21 @@ make install-pre-commit cp $SCRIPT_DIR/test_mongodb_atlas_memory_store.py . # shellcheck disable=SC2154 -OPENAI_API_KEY="$OPENAI_API_KEY" \ +OPENAI_API_KEY="" \ OPENAI_ORG_ID="" \ AZURE_OPENAI_DEPLOYMENT_NAME="" \ AZURE_OPENAI_ENDPOINT="" \ AZURE_OPENAI_API_KEY="" \ MONGODB_ATLAS_CONNECTION_STRING=$MONGODB_URI \ Python_Integration_Tests=1 \ - uv run pytest test_mongodb_atlas_memory_store.py -k test_collection_knn + uv run pytest -rav test_mongodb_atlas_memory_store.py -k test_collection_knn # shellcheck disable=SC2154 -OPENAI_API_KEY="$OPENAI_API_KEY" \ +OPENAI_API_KEY="" \ OPENAI_ORG_ID="" \ AZURE_OPENAI_DEPLOYMENT_NAME="" \ AZURE_OPENAI_ENDPOINT="" \ AZURE_OPENAI_API_KEY="" \ MONGODB_ATLAS_CONNECTION_STRING=$MONGODB_URI \ Python_Integration_Tests=1 \ - uv run pytest test_mongodb_atlas_memory_store.py + uv run pytest -rav test_mongodb_atlas_memory_store.py