diff --git a/SearchQnA/docker_compose/amd/gpu/rocm/set_env.sh b/SearchQnA/docker_compose/amd/gpu/rocm/set_env.sh index faedeb3f5..3d84e01fc 100644 --- a/SearchQnA/docker_compose/amd/gpu/rocm/set_env.sh +++ b/SearchQnA/docker_compose/amd/gpu/rocm/set_env.sh @@ -2,8 +2,8 @@ # Copyright (C) 2025 Advanced Micro Devices, Inc. -export HOST_IP='' -export EXTERNAL_HOST_IP='' +export HOST_IP=${ip_address} +export EXTERNAL_HOST_IP=${ip_address} export SEARCH_EMBEDDING_MODEL_ID='BAAI/bge-base-en-v1.5' export SEARCH_GOOGLE_API_KEY=${GOOGLE_API_KEY} @@ -12,9 +12,9 @@ export SEARCH_HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN} export SEARCH_LLM_MODEL_ID='Intel/neural-chat-7b-v3-3' export SEARCH_RERANK_MODEL_ID='BAAI/bge-reranker-base' -export SEARCH_BACKEND_SERVICE_PORT=18142 +export SEARCH_BACKEND_SERVICE_PORT=3008 export SEARCH_EMBEDDING_SERVICE_PORT=3002 -export SEARCH_FRONTEND_SERVICE_PORT=18143 +export SEARCH_FRONTEND_SERVICE_PORT=5173 export SEARCH_LLM_SERVICE_PORT=3007 export SEARCH_RERANK_SERVICE_PORT=3005 export SEARCH_TEI_EMBEDDING_PORT=3001 diff --git a/SearchQnA/docker_compose/amd/gpu/rocm/set_env_vllm.sh b/SearchQnA/docker_compose/amd/gpu/rocm/set_env_vllm.sh index d59d242d3..a891cce2a 100644 --- a/SearchQnA/docker_compose/amd/gpu/rocm/set_env_vllm.sh +++ b/SearchQnA/docker_compose/amd/gpu/rocm/set_env_vllm.sh @@ -2,8 +2,8 @@ # Copyright (C) 2025 Advanced Micro Devices, Inc. -export HOST_IP='' -export EXTERNAL_HOST_IP='' +export HOST_IP=${ip_address} +export EXTERNAL_HOST_IP=${ip_address} export SEARCH_EMBEDDING_MODEL_ID='BAAI/bge-base-en-v1.5' export SEARCH_GOOGLE_API_KEY=${GOOGLE_API_KEY} @@ -12,11 +12,11 @@ export SEARCH_HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN} export SEARCH_LLM_MODEL_ID='Intel/neural-chat-7b-v3-3' export SEARCH_RERANK_MODEL_ID='BAAI/bge-reranker-base' -export MODEL_PATH="./data" +export MODEL_CACHE="./data" -export SEARCH_BACKEND_SERVICE_PORT=18142 +export SEARCH_BACKEND_SERVICE_PORT=3008 export SEARCH_EMBEDDING_SERVICE_PORT=3002 -export SEARCH_FRONTEND_SERVICE_PORT=18143 +export SEARCH_FRONTEND_SERVICE_PORT=5173 export SEARCH_LLM_SERVICE_PORT=3007 export SEARCH_RERANK_SERVICE_PORT=3005 export SEARCH_TEI_EMBEDDING_PORT=3001 diff --git a/SearchQnA/docker_compose/set_env.sh b/SearchQnA/docker_compose/intel/set_env.sh similarity index 82% rename from SearchQnA/docker_compose/set_env.sh rename to SearchQnA/docker_compose/intel/set_env.sh index 232dcf728..45aaa7eb4 100644 --- a/SearchQnA/docker_compose/set_env.sh +++ b/SearchQnA/docker_compose/intel/set_env.sh @@ -2,11 +2,13 @@ # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -pushd "../../" > /dev/null +pushd "../../../" > /dev/null source .set_env.sh popd > /dev/null - +export GOOGLE_CSE_ID=$GOOGLE_CSE_ID +export GOOGLE_API_KEY=$GOOGLE_API_KEY +export HUGGINGFACEHUB_API_TOKEN=$HUGGINGFACEHUB_API_TOKEN export EMBEDDING_MODEL_ID=BAAI/bge-base-en-v1.5 export TEI_EMBEDDING_ENDPOINT=http://${host_ip}:3001 export RERANK_MODEL_ID=BAAI/bge-reranker-base diff --git a/SearchQnA/tests/README.md b/SearchQnA/tests/README.md new file mode 100644 index 000000000..4dd235fbb --- /dev/null +++ b/SearchQnA/tests/README.md @@ -0,0 +1,33 @@ +# SearchQnA E2E test scripts + +## Set the required environment variable + +```bash +export HUGGINGFACEHUB_API_TOKEN="Your_Huggingface_API_Token" +``` + +## Run test + +On Intel Xeon with TGI: + +```bash +bash test_compose_on_xeon.sh +``` + +On Intel Gaudi with TGI: + +```bash +bash test_compose_on_gaudi.sh +``` + +On AMD ROCm with TGI: + +```bash +bash test_compose_on_rocm.sh +``` + +On AMD ROCm with vLLM: + +```bash +bash test_compose_vllm_on_rocm.sh +``` diff --git a/SearchQnA/tests/test_compose_on_gaudi.sh b/SearchQnA/tests/test_compose_on_gaudi.sh index b3e528629..0e4952fd4 100644 --- a/SearchQnA/tests/test_compose_on_gaudi.sh +++ b/SearchQnA/tests/test_compose_on_gaudi.sh @@ -43,34 +43,13 @@ function build_docker_images() { function start_services() { - cd $WORKPATH/docker_compose/intel/hpu/gaudi - export GOOGLE_CSE_ID=$GOOGLE_CSE_ID - export GOOGLE_API_KEY=$GOOGLE_API_KEY - export HUGGINGFACEHUB_API_TOKEN=$HUGGINGFACEHUB_API_TOKEN - - export EMBEDDING_MODEL_ID=BAAI/bge-base-en-v1.5 - export TEI_EMBEDDING_ENDPOINT=http://$ip_address:3001 - export RERANK_MODEL_ID=BAAI/bge-reranker-base + cd $WORKPATH/docker_compose/intel/ export RERANK_TYPE="tei" - export TEI_RERANKING_ENDPOINT=http://$ip_address:3004 - - export TGI_LLM_ENDPOINT=http://$ip_address:3006 - export LLM_MODEL_ID=Intel/neural-chat-7b-v3-3 - - export MEGA_SERVICE_HOST_IP=${ip_address} - export EMBEDDING_SERVICE_HOST_IP=${ip_address} - export WEB_RETRIEVER_SERVICE_HOST_IP=${ip_address} - export RERANK_SERVICE_HOST_IP=${ip_address} - export LLM_SERVICE_HOST_IP=${ip_address} - - export EMBEDDING_SERVICE_PORT=3002 - export WEB_RETRIEVER_SERVICE_PORT=3003 - export RERANK_SERVICE_PORT=3005 - export LLM_SERVICE_PORT=3007 export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:3008/v1/searchqna" export host_ip=${ip_address} export LOGFLAG=true - + source ./set_env.sh + cd hpu/gaudi sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env diff --git a/SearchQnA/tests/test_compose_on_rocm.sh b/SearchQnA/tests/test_compose_on_rocm.sh index 4ab67a661..a822ff182 100644 --- a/SearchQnA/tests/test_compose_on_rocm.sh +++ b/SearchQnA/tests/test_compose_on_rocm.sh @@ -30,36 +30,7 @@ function build_docker_images() { function start_services() { cd $WORKPATH/docker_compose/amd/gpu/rocm/ - - export HOST_IP=${ip_address} - export EXTERNAL_HOST_IP=${ip_address} - - export SEARCH_EMBEDDING_MODEL_ID='BAAI/bge-base-en-v1.5' - export SEARCH_GOOGLE_API_KEY=${GOOGLE_API_KEY} - export SEARCH_GOOGLE_CSE_ID=${GOOGLE_CSE_ID} - export SEARCH_HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN} - export SEARCH_LLM_MODEL_ID='Intel/neural-chat-7b-v3-3' - export SEARCH_RERANK_MODEL_ID='BAAI/bge-reranker-base' - - export SEARCH_BACKEND_SERVICE_PORT=3008 - export SEARCH_EMBEDDING_SERVICE_PORT=3002 - export SEARCH_FRONTEND_SERVICE_PORT=5173 - export SEARCH_LLM_SERVICE_PORT=3007 - export SEARCH_RERANK_SERVICE_PORT=3005 - export SEARCH_TEI_EMBEDDING_PORT=3001 - export SEARCH_TEI_RERANKING_PORT=3004 - export SEARCH_TGI_SERVICE_PORT=3006 - export SEARCH_WEB_RETRIEVER_SERVICE_PORT=3003 - - export SEARCH_BACKEND_SERVICE_ENDPOINT=http://${EXTERNAL_HOST_IP}:${SEARCH_BACKEND_SERVICE_PORT}/v1/searchqna - export SEARCH_EMBEDDING_SERVICE_HOST_IP=${HOST_IP} - export SEARCH_LLM_SERVICE_HOST_IP=${HOST_IP} - export SEARCH_MEGA_SERVICE_HOST_IP=${HOST_IP} - export SEARCH_RERANK_SERVICE_HOST_IP=${HOST_IP} - export SEARCH_TEI_EMBEDDING_ENDPOINT=http://${HOST_IP}:${SEARCH_TEI_EMBEDDING_PORT} - export SEARCH_TEI_RERANKING_ENDPOINT=http://${HOST_IP}:${SEARCH_TEI_RERANKING_PORT} - export SEARCH_TGI_LLM_ENDPOINT=http://${HOST_IP}:${SEARCH_TGI_SERVICE_PORT} - export SEARCH_WEB_RETRIEVER_SERVICE_HOST_IP=${HOST_IP} + source ./set_env.sh sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env diff --git a/SearchQnA/tests/test_compose_on_xeon.sh b/SearchQnA/tests/test_compose_on_xeon.sh index df5214b91..408048060 100644 --- a/SearchQnA/tests/test_compose_on_xeon.sh +++ b/SearchQnA/tests/test_compose_on_xeon.sh @@ -41,34 +41,13 @@ function build_docker_images() { } function start_services() { - cd $WORKPATH/docker_compose/intel/cpu/xeon/ - export GOOGLE_CSE_ID=$GOOGLE_CSE_ID - export GOOGLE_API_KEY=$GOOGLE_API_KEY - export HUGGINGFACEHUB_API_TOKEN=$HUGGINGFACEHUB_API_TOKEN - - export EMBEDDING_MODEL_ID=BAAI/bge-base-en-v1.5 - export TEI_EMBEDDING_ENDPOINT=http://$ip_address:3001 - export RERANK_MODEL_ID=BAAI/bge-reranker-base + cd $WORKPATH/docker_compose/intel/ export RERANK_TYPE="tei" - export TEI_RERANKING_ENDPOINT=http://$ip_address:3004 - - export TGI_LLM_ENDPOINT=http://$ip_address:3006 - export LLM_MODEL_ID=Intel/neural-chat-7b-v3-3 - - export MEGA_SERVICE_HOST_IP=${ip_address} - export EMBEDDING_SERVICE_HOST_IP=${ip_address} - export WEB_RETRIEVER_SERVICE_HOST_IP=${ip_address} - export RERANK_SERVICE_HOST_IP=${ip_address} - export LLM_SERVICE_HOST_IP=${ip_address} - - export EMBEDDING_SERVICE_PORT=3002 - export WEB_RETRIEVER_SERVICE_PORT=3003 - export RERANK_SERVICE_PORT=3005 - export LLM_SERVICE_PORT=3007 export BACKEND_SERVICE_ENDPOINT="http://${ip_address}:3008/v1/searchqna" export host_ip=${ip_address} export LOGFLAG=true - + source ./set_env.sh + cd cpu/xeon sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env diff --git a/SearchQnA/tests/test_compose_vllm_on_rocm.sh b/SearchQnA/tests/test_compose_vllm_on_rocm.sh index 530245cdc..92de3f9e0 100644 --- a/SearchQnA/tests/test_compose_vllm_on_rocm.sh +++ b/SearchQnA/tests/test_compose_vllm_on_rocm.sh @@ -31,36 +31,8 @@ function start_services() { cd $WORKPATH/docker_compose/amd/gpu/rocm/ export HOST_IP=${ip_address} - export EXTERNAL_HOST_IP=${ip_address} - - export SEARCH_EMBEDDING_MODEL_ID='BAAI/bge-base-en-v1.5' - export SEARCH_GOOGLE_API_KEY=${GOOGLE_API_KEY} - export SEARCH_GOOGLE_CSE_ID=${GOOGLE_CSE_ID} - export SEARCH_HUGGINGFACEHUB_API_TOKEN=${HUGGINGFACEHUB_API_TOKEN} - export SEARCH_LLM_MODEL_ID='Intel/neural-chat-7b-v3-3' - export SEARCH_RERANK_MODEL_ID='BAAI/bge-reranker-base' - - export MODEL_CACHE="./data" - - export SEARCH_BACKEND_SERVICE_PORT=3008 - export SEARCH_EMBEDDING_SERVICE_PORT=3002 - export SEARCH_FRONTEND_SERVICE_PORT=5173 - export SEARCH_LLM_SERVICE_PORT=3007 - export SEARCH_RERANK_SERVICE_PORT=3005 - export SEARCH_TEI_EMBEDDING_PORT=3001 - export SEARCH_TEI_RERANKING_PORT=3004 - export SEARCH_VLLM_SERVICE_PORT=3080 - export SEARCH_WEB_RETRIEVER_SERVICE_PORT=3003 - - export SEARCH_BACKEND_SERVICE_ENDPOINT=http://${EXTERNAL_HOST_IP}:${SEARCH_BACKEND_SERVICE_PORT}/v1/searchqna - export SEARCH_EMBEDDING_SERVICE_HOST_IP=${HOST_IP} - export SEARCH_LLM_ENDPOINT=http://${HOST_IP}:${SEARCH_VLLM_SERVICE_PORT} - export SEARCH_LLM_SERVICE_HOST_IP=${HOST_IP} - export SEARCH_MEGA_SERVICE_HOST_IP=${HOST_IP} - export SEARCH_RERANK_SERVICE_HOST_IP=${HOST_IP} - export SEARCH_TEI_EMBEDDING_ENDPOINT=http://${HOST_IP}:${SEARCH_TEI_EMBEDDING_PORT} - export SEARCH_TEI_RERANKING_ENDPOINT=http://${HOST_IP}:${SEARCH_TEI_RERANKING_PORT} - export SEARCH_WEB_RETRIEVER_SERVICE_HOST_IP=${HOST_IP} + # export SEARCH_BACKEND_SERVICE_PORT=3008 + source ./set_env_vllm.sh sed -i "s/backend_address/$ip_address/g" $WORKPATH/ui/svelte/.env