From 3b9e55cb8e1ff8fe9eb5687b39156cee2a35aace Mon Sep 17 00:00:00 2001 From: Sihan Chen <39623753+Spycsh@users.noreply.github.com> Date: Thu, 19 Dec 2024 12:12:33 +0800 Subject: [PATCH] Minor fix DocIndexRetriever test (#1266) --- .../intel/hpu/gaudi/compose.yaml | 4 ++ DocIndexRetriever/tests/test.py | 70 ------------------- .../tests/test_compose_on_gaudi.sh | 18 +---- 3 files changed, 6 insertions(+), 86 deletions(-) delete mode 100644 DocIndexRetriever/tests/test.py diff --git a/DocIndexRetriever/docker_compose/intel/hpu/gaudi/compose.yaml b/DocIndexRetriever/docker_compose/intel/hpu/gaudi/compose.yaml index fc8accadc..cc63afc67 100644 --- a/DocIndexRetriever/docker_compose/intel/hpu/gaudi/compose.yaml +++ b/DocIndexRetriever/docker_compose/intel/hpu/gaudi/compose.yaml @@ -61,6 +61,7 @@ services: http_proxy: ${http_proxy} https_proxy: ${https_proxy} TEI_EMBEDDING_ENDPOINT: ${TEI_EMBEDDING_ENDPOINT} + LOGFLAG: ${LOGFLAG} restart: unless-stopped retriever: image: ${REGISTRY:-opea}/retriever-redis:${TAG:-latest} @@ -76,6 +77,7 @@ services: https_proxy: ${https_proxy} REDIS_URL: ${REDIS_URL} INDEX_NAME: ${INDEX_NAME} + LOGFLAG: ${LOGFLAG} restart: unless-stopped tei-reranking-service: image: ghcr.io/huggingface/text-embeddings-inference:cpu-1.5 @@ -109,6 +111,7 @@ services: HUGGINGFACEHUB_API_TOKEN: ${HUGGINGFACEHUB_API_TOKEN} HF_HUB_DISABLE_PROGRESS_BARS: 1 HF_HUB_ENABLE_HF_TRANSFER: 0 + LOGFLAG: ${LOGFLAG} restart: unless-stopped doc-index-retriever-server: image: ${REGISTRY:-opea}/doc-index-retriever:${TAG:-latest} @@ -130,6 +133,7 @@ services: - RETRIEVER_SERVICE_HOST_IP=${RETRIEVER_SERVICE_HOST_IP} - RERANK_SERVICE_HOST_IP=${RERANK_SERVICE_HOST_IP} - LLM_SERVICE_HOST_IP=${LLM_SERVICE_HOST_IP} + - LOGFLAG=${LOGFLAG} ipc: host restart: always diff --git a/DocIndexRetriever/tests/test.py b/DocIndexRetriever/tests/test.py deleted file mode 100644 index e26ccd3db..000000000 --- a/DocIndexRetriever/tests/test.py +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -import argparse - -import requests - - -def search_knowledge_base(query: str, url: str, request_type: str) -> str: - """Search the knowledge base for a specific query.""" - print(url) - proxies = {"http": ""} - if request_type == "chat_completion": - print("Sending chat completion request") - payload = { - "messages": query, - "k": 5, - "top_n": 2, - } - else: - print("Sending textdoc request") - payload = { - "text": query, - } - response = requests.post(url, json=payload, proxies=proxies) - print(response) - print(response.json().keys()) - if "documents" in response.json(): - docs = response.json()["documents"] - context = "" - for i, doc in enumerate(docs): - if i == 0: - context = str(i) + ": " + doc - else: - context += "\n" + str(i) + ": " + doc - return context - elif "text" in response.json(): - return response.json()["text"] - elif "reranked_docs" in response.json(): - docs = response.json()["reranked_docs"] - context = "" - for i, doc in enumerate(docs): - if i == 0: - context = doc["text"] - else: - context += "\n" + doc["text"] - return context - else: - return "Error parsing response from the knowledge base." - - -def main(): - parser = argparse.ArgumentParser(description="Index data") - parser.add_argument("--host_ip", type=str, default="localhost", help="Host IP") - parser.add_argument("--port", type=int, default=8889, help="Port") - parser.add_argument("--request_type", type=str, default="chat_completion", help="Test type") - args = parser.parse_args() - print(args) - - host_ip = args.host_ip - port = args.port - url = "http://{host_ip}:{port}/v1/retrievaltool".format(host_ip=host_ip, port=port) - - response = search_knowledge_base("OPEA", url, request_type=args.request_type) - - print(response) - - -if __name__ == "__main__": - main() diff --git a/DocIndexRetriever/tests/test_compose_on_gaudi.sh b/DocIndexRetriever/tests/test_compose_on_gaudi.sh index bea6f8e7a..a23d00013 100644 --- a/DocIndexRetriever/tests/test_compose_on_gaudi.sh +++ b/DocIndexRetriever/tests/test_compose_on_gaudi.sh @@ -49,7 +49,7 @@ function start_services() { # Start Docker Containers docker compose up -d - sleep 20 + sleep 30 echo "Docker services started!" } @@ -93,25 +93,11 @@ function validate_megaservice() { if [ "$EXIT_CODE" == "1" ]; then docker logs tei-embedding-gaudi-server | tee -a ${LOG_PATH}/doc-index-retriever-service-gaudi.log docker logs retriever-redis-server | tee -a ${LOG_PATH}/doc-index-retriever-service-gaudi.log - docker logs reranking-tei-server | tee -a ${LOG_PATH}/doc-index-retriever-service-gaudi.log + docker logs reranking-tei-gaudi-server | tee -a ${LOG_PATH}/doc-index-retriever-service-gaudi.log docker logs doc-index-retriever-server | tee -a ${LOG_PATH}/doc-index-retriever-service-gaudi.log exit 1 fi - echo "==============Testing retriever service: ChatCompletion Request================" - cd $WORKPATH/tests - local CONTENT=$(python test.py --host_ip ${ip_address} --request_type chat_completion) - local EXIT_CODE=$(validate "$CONTENT" "OPEA" "doc-index-retriever-service-gaudi") - echo "$EXIT_CODE" - local EXIT_CODE="${EXIT_CODE:0-1}" - echo "return value is $EXIT_CODE" - if [ "$EXIT_CODE" == "1" ]; then - docker logs tei-embedding-gaudi-server | tee -a ${LOG_PATH}/doc-index-retriever-service-gaudi.log - docker logs retriever-redis-server | tee -a ${LOG_PATH}/doc-index-retriever-service-gaudi.log - docker logs reranking-tei-server | tee -a ${LOG_PATH}/doc-index-retriever-service-gaudi.log - docker logs doc-index-retriever-server | tee -a ${LOG_PATH}/doc-index-retriever-service-gaudi.log - exit 1 - fi } function stop_docker() {