From 8fc0e178d4366388329e02150709bc34391cb2cf Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 13 Nov 2024 15:35:54 -0600 Subject: [PATCH 1/3] try in a venv --- llama-index-python-vectorstore/run.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/llama-index-python-vectorstore/run.sh b/llama-index-python-vectorstore/run.sh index 03db38a..e3eaf02 100644 --- a/llama-index-python-vectorstore/run.sh +++ b/llama-index-python-vectorstore/run.sh @@ -12,7 +12,10 @@ $PYTHON_BINARY -c "import sys; print(f'Python version found: {sys.version_info}' # shellcheck disable=SC2164 cd llama-index-integrations/vector_stores/llama-index-vector-stores-mongodb -# Install Poetry into base python +# Install Poetry +$PYTHON_BINARY -m venv .venv +. .venv/bin/activate +PYTHON_BINARY=$(which python) $PYTHON_BINARY -m pip install -U pip poetry # Create a package specific poetry environment $PYTHON_BINARY -m poetry env use $PYTHON_BINARY From 27ca927e4708980d8347d603a81e50fe32217826 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 13 Nov 2024 15:44:39 -0600 Subject: [PATCH 2/3] INTPYTHON-413 Use venvs instead of base python --- chatgpt-retrieval-plugin/run.sh | 6 ++++-- llama-index-python-kvstore/run.sh | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/chatgpt-retrieval-plugin/run.sh b/chatgpt-retrieval-plugin/run.sh index 4445ed0..096bdf4 100644 --- a/chatgpt-retrieval-plugin/run.sh +++ b/chatgpt-retrieval-plugin/run.sh @@ -10,8 +10,10 @@ set -x PYTHON_BINARY=$(find_python3) $PYTHON_BINARY -c "import sys; print(f'Python version found: {sys.version_info}')" -# Install Poetry into base python -$PYTHON_BINARY -m pip install -U pip poetry +# Install Poetry +$PYTHON_BINARY -m venv .venv +. .venv/bin/activate +PYTHON_BINARY=$(which python) # 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-kvstore/run.sh b/llama-index-python-kvstore/run.sh index b951a27..70691bc 100644 --- a/llama-index-python-kvstore/run.sh +++ b/llama-index-python-kvstore/run.sh @@ -13,7 +13,10 @@ $PYTHON_BINARY -c "import sys; print(f'Python version found: {sys.version_info}' # shellcheck disable=SC2164 cd llama-index-integrations/storage/kvstore/llama-index-storage-kvstore-mongodb -# Install Poetry into base python +# Install Poetry +$PYTHON_BINARY -m venv .venv +. .venv/bin/activate +PYTHON_BINARY=$(which python) $PYTHON_BINARY -m pip install -U pip poetry # Create a package specific poetry environment $PYTHON_BINARY -m poetry env use $PYTHON_BINARY From 2c902cf2cce790c28a74ff79cf05b3a00747a589 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 13 Nov 2024 17:05:55 -0600 Subject: [PATCH 3/3] use my branch --- .evergreen/config.yml | 3 ++- chatgpt-retrieval-plugin/run.sh | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 6012ee1..133faab 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -175,7 +175,8 @@ buildvariants: expansions: DIR: llama-index-python-vectorstore REPO_NAME: llama_index - CLONE_URL: https://github.com/run-llama/llama_index.git + # TODO: Update INTPYTHON-414 + CLONE_URL: -b INTPYTHON-414 --single-branch https://github.com/blink1073/llama_index.git DATABASE: llama_index_test_db run_on: - rhel87-small diff --git a/chatgpt-retrieval-plugin/run.sh b/chatgpt-retrieval-plugin/run.sh index 096bdf4..2187b5c 100644 --- a/chatgpt-retrieval-plugin/run.sh +++ b/chatgpt-retrieval-plugin/run.sh @@ -14,6 +14,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 # Create a package specific poetry environment $PYTHON_BINARY -m poetry env use $PYTHON_BINARY # Activate the poetry env, which itself does not include poetry