Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bug] Fix VDMS retriever and apply fix to VDMS dataprep #928

Merged
merged 2 commits into from
Nov 21, 2024

Conversation

cwlacewe
Copy link
Contributor

Description

These changes are to fix the error in Action job #33234707275. The container crashes and the run complained about the protobuf version. To fix this, the requirements.txt was modified by pinning the protobuf version, pinned opentelemetry-proto version to avoid any conflict, and provided a minimum vdms version.

Issues

Issue #923

Type of change

List the type of change like below. Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds new functionality)
  • Breaking change (fix or feature that would break existing design and interface)
  • Others (enhancement, documentation, validation, etc.)

Dependencies

Modified following dependency versions

opentelemetry-proto==1.23.0 (pinned to avoid a conflict)
protobuf==4.24.2 (required by vdms)
vdms>=0.0.20

Tests

Ran the VDMS retriever test locally to verify it runs successfully using the following:

cd comps/
bash ../tests/retrievers/test_retrievers_vdms_langchain.sh

VDMS is also used in dataprep so tested the services for both multimodal_langchain and langchain respectively:

cd ../
export http_proxy=${http_proxy}
export https_proxy=${https_proxy}
export host_ip=$(hostname -I | awk '{print $1}')
export VDMS_HOST=${host_ip}
export VDMS_PORT=55555
export INDEX_NAME="rag-vdms"
export your_hf_api_token="{your_hf_token}"

docker build -t opea/dataprep-vdms:latest --network host --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/vdms/multimodal_langchain/Dockerfile .

docker compose -f comps/dataprep/vdms/multimodal_langchain/docker-compose-dataprep-vdms.yaml up -d

docker container logs -f dataprep-vdms-server

curl -X POST \
     -F 'link_list=["https://www.ces.tech/"]' \
     http://localhost:6007/v1/dataprep

docker compose -f comps/dataprep/vdms/multimodal_langchain/docker-compose-dataprep-vdms.yaml down

To test langchain:

docker build -t opea/dataprep-vdms:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/dataprep/vdms/langchain/Dockerfile .

export http_proxy=${http_proxy}
export https_proxy=${https_proxy}
export host_ip=$(hostname -I | awk '{print $1}')
export VDMS_HOST=${host_ip}
export VDMS_PORT=55555
export COLLECTION_NAME="rag-vdms"
export your_hf_api_token="{your_hf_token}"

docker compose -f comps/dataprep/vdms/langchain/docker-compose-dataprep-vdms.yaml up -d

docker container logs -f dataprep-vdms-server

curl -X POST \
     -F 'link_list=["https://www.ces.tech/"]' \
     http://localhost:6007/v1/dataprep

docker compose -f comps/dataprep/vdms/langchain/docker-compose-dataprep-vdms.yaml down

@lvliang-intel lvliang-intel merged commit 750e501 into opea-project:main Nov 21, 2024
12 checks passed
@chensuyue chensuyue mentioned this pull request Nov 21, 2024
4 tasks
chensuyue pushed a commit that referenced this pull request Nov 21, 2024
* Update requirements to pin protobuf version and fix grpc conflict, and limit vdms version

Signed-off-by: Lacewell, Chaunte W <[email protected]>

* Update fix by removing grpcio pin and pinning opentelemetry-proto to 1.23.0

Signed-off-by: Lacewell, Chaunte W <[email protected]>

---------

Signed-off-by: Lacewell, Chaunte W <[email protected]>

(cherry picked from commit 750e501)
Signed-off-by: chensuyue <[email protected]>
cameronmorin pushed a commit to opea-aws-proserve/GenAIComps that referenced this pull request Nov 22, 2024
…#928)

* Update requirements to pin protobuf version and fix grpc conflict, and limit vdms version

Signed-off-by: Lacewell, Chaunte W <[email protected]>

* Update fix by removing grpcio pin and pinning opentelemetry-proto to 1.23.0

Signed-off-by: Lacewell, Chaunte W <[email protected]>

---------

Signed-off-by: Lacewell, Chaunte W <[email protected]>
@srinarayan-srikanthan srinarayan-srikanthan mentioned this pull request Nov 25, 2024
4 tasks
cameronmorin pushed a commit to opea-aws-proserve/GenAIComps that referenced this pull request Nov 28, 2024
…#928)

* Update requirements to pin protobuf version and fix grpc conflict, and limit vdms version

Signed-off-by: Lacewell, Chaunte W <[email protected]>

* Update fix by removing grpcio pin and pinning opentelemetry-proto to 1.23.0

Signed-off-by: Lacewell, Chaunte W <[email protected]>

---------

Signed-off-by: Lacewell, Chaunte W <[email protected]>
cameronmorin pushed a commit to opea-aws-proserve/GenAIComps that referenced this pull request Dec 2, 2024
…#928)

* Update requirements to pin protobuf version and fix grpc conflict, and limit vdms version

Signed-off-by: Lacewell, Chaunte W <[email protected]>

* Update fix by removing grpcio pin and pinning opentelemetry-proto to 1.23.0

Signed-off-by: Lacewell, Chaunte W <[email protected]>

---------

Signed-off-by: Lacewell, Chaunte W <[email protected]>
Signed-off-by: Cameron Morin <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants