fix requirements (opea-project#284)

Signed-off-by: chensuyue <[email protected]>
XinyaoWa · Jul 9, 2024 · f4b0298 · f4b0298
1 parent f236949
commit f4b0298
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/.github/workflows/scripts/docker_images_build_push.sh b/.github/workflows/scripts/docker_images_build_push.sh
@@ -39,7 +39,7 @@ case ${micro_service} in
     "retrievers/langchain")
         IMAGE_NAME="opea/retriever-redis"
         ;;
-    "reranks/langchain")
+    "reranks/tei")
         IMAGE_NAME="opea/reranking-tei"
         ;;
     "llms/text-generation/tgi")

diff --git a/comps/llms/text-generation/tgi/requirements.txt b/comps/llms/text-generation/tgi/requirements.txt
@@ -1,5 +1,7 @@
+aiohttp
 docarray[full]
 fastapi
+httpx
 huggingface_hub
 langsmith
 opentelemetry-api

diff --git a/comps/reranks/requirements.txt b/comps/reranks/requirements.txt
@@ -1,5 +1,7 @@
+aiohttp
 docarray[full]
 fastapi
+httpx
 langsmith
 opentelemetry-api
 opentelemetry-exporter-otlp

diff --git a/comps/retrievers/llamaindex/requirements.txt b/comps/retrievers/llamaindex/requirements.txt
@@ -1,6 +1,8 @@
+aiohttp
 docarray[full]
 easyocr
 fastapi
+httpx
 langsmith
 llama-index-vector-stores-redis
 llama_index
@@ -11,3 +13,4 @@ pymupdf
 redis
 sentence_transformers
 shortuuid
+
diff --git a/tests/test_reranks_langchain.sh → tests/test_reranks_tei.sh b/tests/test_reranks_langchain.sh → tests/test_reranks_tei.sh
@@ -8,7 +8,7 @@ WORKPATH=$(dirname "$PWD")
 ip_address=$(hostname -I | awk '{print $1}')
 function build_docker_images() {
     cd $WORKPATH
-    docker build --no-cache -t opea/reranking-tei:comps -f comps/reranks/langchain/docker/Dockerfile .
+    docker build --no-cache -t opea/reranking-tei:comps -f comps/reranks/tei/docker/Dockerfile .
 }
 
 function start_service() {
@@ -29,12 +29,19 @@ function start_service() {
 
 function validate_microservice() {
     tei_service_port=5007
-    http_proxy="" curl http://${ip_address}:${tei_service_port}/v1/reranking\
+    local CONTENT=$(curl http://${ip_address}:${tei_service_port}/v1/reranking \
         -X POST \
         -d '{"initial_query":"What is Deep Learning?", "retrieved_docs": [{"text":"Deep Learning is not..."}, {"text":"Deep learning is..."}]}' \
-        -H 'Content-Type: application/json'
-    docker logs test-comps-reranking-tei-server
-    docker logs test-comps-reranking-tei-endpoint
+        -H 'Content-Type: application/json')
+
+    if echo "$CONTENT" | grep -q "### Search results:"; then
+        echo "Content is as expected."
+    else
+        echo "Content does not match the expected result: $CONTENT"
+        docker logs test-comps-reranking-tei-server
+        docker logs test-comps-reranking-tei-endpoint
+        exit 1
+    fi
 }
 
 function stop_docker() {