From 81844439510b8a72ebf5f588973af6b99c0bc519 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 7 Jan 2025 09:11:44 -0600 Subject: [PATCH 1/7] Pin poetry<2 --- chatgpt-retrieval-plugin/run.sh | 2 +- docarray/run.sh | 2 +- langchain-python/run.sh | 2 +- llama-index-python-kvstore/run.sh | 2 +- llama-index-python-vectorstore/run.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/chatgpt-retrieval-plugin/run.sh b/chatgpt-retrieval-plugin/run.sh index 5ddd7bf..ed4b349 100644 --- a/chatgpt-retrieval-plugin/run.sh +++ b/chatgpt-retrieval-plugin/run.sh @@ -18,7 +18,7 @@ $PYTHON_BINARY -c "import sys; print(f'Python version found: {sys.version_info}' $PYTHON_BINARY -m venv .venv . .venv/bin/activate PYTHON_BINARY=$(which python) -$PYTHON_BINARY -m pip install -U pip poetry +$PYTHON_BINARY -m pip install -U pip "poetry<2" # Create a package specific poetry environment $PYTHON_BINARY -m poetry env use $PYTHON_BINARY # Activate the poetry env, which itself does not include poetry diff --git a/docarray/run.sh b/docarray/run.sh index 7db31b9..517aee7 100644 --- a/docarray/run.sh +++ b/docarray/run.sh @@ -20,7 +20,7 @@ $PYTHON_BINARY -c "import sys; print(f'Python version found: {sys.version_info}' $PYTHON_BINARY -m venv venv . venv/bin/activate # Install Poetry -pip install -U pip poetry +pip install -U pip "poetry<2" # Recreate the poetry lock file poetry lock --no-update # Install from pyproject.toml into package specific environment diff --git a/langchain-python/run.sh b/langchain-python/run.sh index 3e8bb31..a6a7968 100644 --- a/langchain-python/run.sh +++ b/langchain-python/run.sh @@ -18,7 +18,7 @@ cd libs/langchain-mongodb $PYTHON_BINARY -m venv venv_pipeline source venv_pipeline/bin/activate -pip install poetry +pip install "poetry<2" poetry lock --no-update diff --git a/llama-index-python-kvstore/run.sh b/llama-index-python-kvstore/run.sh index 1f31df4..67bf0d2 100644 --- a/llama-index-python-kvstore/run.sh +++ b/llama-index-python-kvstore/run.sh @@ -20,7 +20,7 @@ cd llama-index-integrations/storage/kvstore/llama-index-storage-kvstore-mongodb $PYTHON_BINARY -m venv .venv . .venv/bin/activate PYTHON_BINARY=$(which python) -$PYTHON_BINARY -m pip install -U pip poetry +$PYTHON_BINARY -m pip install -U pip "poetry<2" # Create a package specific poetry environment $PYTHON_BINARY -m poetry env use $PYTHON_BINARY # Activate the poetry env, which itself does not include poetry diff --git a/llama-index-python-vectorstore/run.sh b/llama-index-python-vectorstore/run.sh index 524ba5c..6ae03c6 100644 --- a/llama-index-python-vectorstore/run.sh +++ b/llama-index-python-vectorstore/run.sh @@ -20,7 +20,7 @@ cd llama-index-integrations/vector_stores/llama-index-vector-stores-mongodb $PYTHON_BINARY -m venv .venv . .venv/bin/activate PYTHON_BINARY=$(which python) -$PYTHON_BINARY -m pip install -U pip poetry +$PYTHON_BINARY -m pip install -U pip "poetry<2" # Create a package specific poetry environment $PYTHON_BINARY -m poetry env use $PYTHON_BINARY # Activate the poetry env, which itself does not include poetry From 7fa93c7de2dab3f25d96af7f183b159ac13c5932 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 7 Jan 2025 09:22:06 -0600 Subject: [PATCH 2/7] Revert "Pin poetry<2" This reverts commit 81844439510b8a72ebf5f588973af6b99c0bc519. --- chatgpt-retrieval-plugin/run.sh | 2 +- docarray/run.sh | 2 +- langchain-python/run.sh | 2 +- llama-index-python-kvstore/run.sh | 2 +- llama-index-python-vectorstore/run.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/chatgpt-retrieval-plugin/run.sh b/chatgpt-retrieval-plugin/run.sh index ed4b349..5ddd7bf 100644 --- a/chatgpt-retrieval-plugin/run.sh +++ b/chatgpt-retrieval-plugin/run.sh @@ -18,7 +18,7 @@ $PYTHON_BINARY -c "import sys; print(f'Python version found: {sys.version_info}' $PYTHON_BINARY -m venv .venv . .venv/bin/activate PYTHON_BINARY=$(which python) -$PYTHON_BINARY -m pip install -U pip "poetry<2" +$PYTHON_BINARY -m pip install -U pip poetry # Create a package specific poetry environment $PYTHON_BINARY -m poetry env use $PYTHON_BINARY # Activate the poetry env, which itself does not include poetry diff --git a/docarray/run.sh b/docarray/run.sh index 517aee7..7db31b9 100644 --- a/docarray/run.sh +++ b/docarray/run.sh @@ -20,7 +20,7 @@ $PYTHON_BINARY -c "import sys; print(f'Python version found: {sys.version_info}' $PYTHON_BINARY -m venv venv . venv/bin/activate # Install Poetry -pip install -U pip "poetry<2" +pip install -U pip poetry # Recreate the poetry lock file poetry lock --no-update # Install from pyproject.toml into package specific environment diff --git a/langchain-python/run.sh b/langchain-python/run.sh index a6a7968..3e8bb31 100644 --- a/langchain-python/run.sh +++ b/langchain-python/run.sh @@ -18,7 +18,7 @@ cd libs/langchain-mongodb $PYTHON_BINARY -m venv venv_pipeline source venv_pipeline/bin/activate -pip install "poetry<2" +pip install poetry poetry lock --no-update diff --git a/llama-index-python-kvstore/run.sh b/llama-index-python-kvstore/run.sh index 67bf0d2..1f31df4 100644 --- a/llama-index-python-kvstore/run.sh +++ b/llama-index-python-kvstore/run.sh @@ -20,7 +20,7 @@ cd llama-index-integrations/storage/kvstore/llama-index-storage-kvstore-mongodb $PYTHON_BINARY -m venv .venv . .venv/bin/activate PYTHON_BINARY=$(which python) -$PYTHON_BINARY -m pip install -U pip "poetry<2" +$PYTHON_BINARY -m pip install -U pip poetry # Create a package specific poetry environment $PYTHON_BINARY -m poetry env use $PYTHON_BINARY # Activate the poetry env, which itself does not include poetry diff --git a/llama-index-python-vectorstore/run.sh b/llama-index-python-vectorstore/run.sh index 6ae03c6..524ba5c 100644 --- a/llama-index-python-vectorstore/run.sh +++ b/llama-index-python-vectorstore/run.sh @@ -20,7 +20,7 @@ cd llama-index-integrations/vector_stores/llama-index-vector-stores-mongodb $PYTHON_BINARY -m venv .venv . .venv/bin/activate PYTHON_BINARY=$(which python) -$PYTHON_BINARY -m pip install -U pip "poetry<2" +$PYTHON_BINARY -m pip install -U pip poetry # Create a package specific poetry environment $PYTHON_BINARY -m poetry env use $PYTHON_BINARY # Activate the poetry env, which itself does not include poetry From 3e91e7ecc8ae4a34c03c883b27fb904b023cf584 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 7 Jan 2025 09:23:25 -0600 Subject: [PATCH 3/7] try for poetry 2.0 support --- chatgpt-retrieval-plugin/run.sh | 2 +- docarray/run.sh | 2 +- llama-index-python-kvstore/run.sh | 2 +- llama-index-python-vectorstore/run.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/chatgpt-retrieval-plugin/run.sh b/chatgpt-retrieval-plugin/run.sh index 5ddd7bf..b4902c8 100644 --- a/chatgpt-retrieval-plugin/run.sh +++ b/chatgpt-retrieval-plugin/run.sh @@ -24,7 +24,7 @@ $PYTHON_BINARY -m poetry env use $PYTHON_BINARY # Activate the poetry env, which itself does not include poetry . "$($PYTHON_BINARY -m poetry env info --path)/bin/activate" # Recreate the poetry lock file -$PYTHON_BINARY -m poetry lock --no-update +$PYTHON_BINARY -m poetry lock # Install from pyproject.toml into package specific environment $PYTHON_BINARY -m poetry install --with dev diff --git a/docarray/run.sh b/docarray/run.sh index 7db31b9..5ae6f1e 100644 --- a/docarray/run.sh +++ b/docarray/run.sh @@ -22,7 +22,7 @@ $PYTHON_BINARY -m venv venv # Install Poetry pip install -U pip poetry # Recreate the poetry lock file -poetry lock --no-update +poetry lock # Install from pyproject.toml into package specific environment poetry install --with dev --extras mongo diff --git a/llama-index-python-kvstore/run.sh b/llama-index-python-kvstore/run.sh index 1f31df4..f580fe3 100644 --- a/llama-index-python-kvstore/run.sh +++ b/llama-index-python-kvstore/run.sh @@ -28,7 +28,7 @@ $PYTHON_BINARY -m poetry env use $PYTHON_BINARY # PYTHON-4522: Will fix requirement in llama-index repo $PYTHON_BINARY -m poetry add motor # Recreate the poetry lock file -$PYTHON_BINARY -m poetry lock --no-update +$PYTHON_BINARY -m poetry lock # Install from pyproject.toml into package specific environment $PYTHON_BINARY -m poetry install --with dev diff --git a/llama-index-python-vectorstore/run.sh b/llama-index-python-vectorstore/run.sh index 524ba5c..edebfab 100644 --- a/llama-index-python-vectorstore/run.sh +++ b/llama-index-python-vectorstore/run.sh @@ -26,7 +26,7 @@ $PYTHON_BINARY -m poetry env use $PYTHON_BINARY # Activate the poetry env, which itself does not include poetry . "$($PYTHON_BINARY -m poetry env info --path)/bin/activate" # Recreate the poetry lock file -$PYTHON_BINARY -m poetry lock --no-update +$PYTHON_BINARY -m poetry lock # Install from pyproject.toml into package specific environment $PYTHON_BINARY -m poetry install --with dev From b480385e49230fb4d648192e489abe840834327e Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 7 Jan 2025 09:30:06 -0600 Subject: [PATCH 4/7] more removals --- langchain-python/run.sh | 2 +- langgraph-python/run.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/langchain-python/run.sh b/langchain-python/run.sh index 3e8bb31..c1c6fdc 100644 --- a/langchain-python/run.sh +++ b/langchain-python/run.sh @@ -20,7 +20,7 @@ cd libs/langchain-mongodb pip install poetry -poetry lock --no-update +poetry lock poetry install --with dev diff --git a/langgraph-python/run.sh b/langgraph-python/run.sh index 9864c97..aedf765 100644 --- a/langgraph-python/run.sh +++ b/langgraph-python/run.sh @@ -20,7 +20,7 @@ cd libs/langgraph-checkpoint-mongodb pip install poetry -poetry lock --no-update +poetry lock poetry install --with dev From 78209e6dc43c92fd9abf9b5304acf9f84bd5ea43 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 7 Jan 2025 10:26:54 -0600 Subject: [PATCH 5/7] pin poetry in docarray --- docarray/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docarray/run.sh b/docarray/run.sh index 5ae6f1e..ca2bcd0 100644 --- a/docarray/run.sh +++ b/docarray/run.sh @@ -20,7 +20,7 @@ $PYTHON_BINARY -c "import sys; print(f'Python version found: {sys.version_info}' $PYTHON_BINARY -m venv venv . venv/bin/activate # Install Poetry -pip install -U pip poetry +pip install -U pip "poetry<2" # Recreate the poetry lock file poetry lock # Install from pyproject.toml into package specific environment From 534c24b3600b87ef847af6c088d027061b50e4ce Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 7 Jan 2025 10:46:24 -0600 Subject: [PATCH 6/7] debug --- docarray/run.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docarray/run.sh b/docarray/run.sh index ca2bcd0..026ab15 100644 --- a/docarray/run.sh +++ b/docarray/run.sh @@ -17,6 +17,7 @@ PYTHON_BINARY=$(find_python3) $PYTHON_BINARY -c "import sys; print(f'Python version found: {sys.version_info}')" # Create and activate an isolated python venv environment +set -x $PYTHON_BINARY -m venv venv . venv/bin/activate # Install Poetry @@ -25,7 +26,7 @@ pip install -U pip "poetry<2" poetry lock # Install from pyproject.toml into package specific environment poetry install --with dev --extras mongo - +set +x # Run tests. Sensitive variables in Evergreen come from Evergeen project: ai-ml-pipeline-testing/ # shellcheck disable=SC2154 From 7e209dadd7aea9630d947ac19c6c0dac63a97f9f Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 7 Jan 2025 10:51:34 -0600 Subject: [PATCH 7/7] try again --- docarray/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docarray/run.sh b/docarray/run.sh index 026ab15..36d4433 100644 --- a/docarray/run.sh +++ b/docarray/run.sh @@ -21,9 +21,9 @@ set -x $PYTHON_BINARY -m venv venv . venv/bin/activate # Install Poetry -pip install -U pip "poetry<2" +pip install -U pip poetry # Recreate the poetry lock file -poetry lock +# poetry lock # Install from pyproject.toml into package specific environment poetry install --with dev --extras mongo set +x