From 1eaf6b7afd7a7f8c7aee67236c55a5fd8090e0a0 Mon Sep 17 00:00:00 2001
From: ZePan110 <ze.pan@intel.com>
Date: Mon, 12 Aug 2024 09:31:44 +0800
Subject: [PATCH 1/7] Support launch as Non-Root user in all published
 container images. (#406)

Signed-off-by: zepan <ze.pan@intel.com>
---
 comps/asr/Dockerfile                            | 13 +++++++++----
 comps/asr/whisper/Dockerfile                    | 17 ++++++++++++-----
 comps/asr/whisper/Dockerfile_hpu                | 14 ++++++++++----
 .../langchain-mosec/mosec-docker/Dockerfile     | 14 +++++++++-----
 .../text-generation/vllm-xft/docker/Dockerfile  |  1 -
 .../text-generation/vllm/docker/Dockerfile.hpu  | 11 ++++++-----
 comps/llms/utils/lm-eval/Dockerfile.cpu         |  6 ++++--
 comps/lvms/Dockerfile                           | 13 ++++++++-----
 comps/lvms/llava/Dockerfile                     | 13 ++++++++-----
 comps/lvms/llava/Dockerfile_hpu                 | 14 +++++++++-----
 .../langchain-mosec/mosec-docker/Dockerfile     | 12 ++++++++----
 comps/tts/Dockerfile                            | 13 ++++++++-----
 comps/tts/speecht5/Dockerfile                   | 13 +++++++++----
 comps/tts/speecht5/Dockerfile_hpu               | 14 +++++++++-----
 .../langchain/chroma/docker/Dockerfile          |  6 ++++--
 tests/test_asr_whisper.sh                       | 14 ++++++++------
 tests/test_embeddings_langchain-mosec.sh        | 10 +++++++++-
 tests/test_lvms_llava.sh                        | 13 ++++++++-----
 tests/test_reranks_langchain-mosec.sh           |  2 +-
 tests/test_tts_speecht5.sh                      | 12 +++++++-----
 tests/test_web_retrievers_langchain_chroma.sh   |  3 ++-
 21 files changed, 148 insertions(+), 80 deletions(-)

diff --git a/comps/asr/Dockerfile b/comps/asr/Dockerfile
index cc2740b7d9..2e8731e858 100644
--- a/comps/asr/Dockerfile
+++ b/comps/asr/Dockerfile
@@ -3,15 +3,20 @@
 
 FROM python:3.11-slim
 
+RUN useradd -m -s /bin/bash user && \
+    mkdir -p /home/user && \
+    chown -R user /home/user/
+USER user
+
 ENV LANG=C.UTF-8
 
-COPY comps /home/comps
+COPY comps /home/user/comps
 
 RUN pip install --no-cache-dir --upgrade pip && \
-    pip install --no-cache-dir -r /home/comps/asr/requirements.txt
+    pip install --no-cache-dir -r /home/user/comps/asr/requirements.txt
 
-ENV PYTHONPATH=$PYTHONPATH:/home
+ENV PYTHONPATH=$PYTHONPATH:/home/user
 
-WORKDIR /home/comps/asr
+WORKDIR /home/user/comps/asr
 
 ENTRYPOINT ["python", "asr.py"]
\ No newline at end of file
diff --git a/comps/asr/whisper/Dockerfile b/comps/asr/whisper/Dockerfile
index c3e2a00254..f0e09e5fbb 100644
--- a/comps/asr/whisper/Dockerfile
+++ b/comps/asr/whisper/Dockerfile
@@ -3,21 +3,28 @@
 
 FROM python:3.11-slim
 
+
+RUN useradd -m -s /bin/bash user && \
+    mkdir -p /home/user && \
+    chown -R user /home/user/
+
 # Set environment variables
 ENV LANG=en_US.UTF-8
-ENV PYTHONPATH=/home/user
 
 # Install system dependencies
 RUN apt-get update \
     && apt-get install -y ffmpeg
 
-COPY comps /home/comps
+COPY --chown=user:user comps /home/user/comps
+
+USER user
 
 RUN pip install --no-cache-dir --upgrade pip && \
-    pip install --no-cache-dir -r /home/comps/asr/requirements.txt
+    pip install --no-cache-dir -r /home/user/comps/asr/requirements.txt && \
+    pip list
 
-ENV PYTHONPATH=$PYTHONPATH:/home
+ENV PYTHONPATH=$PYTHONPATH:/home/user
 
-WORKDIR /home/comps/asr/whisper
+WORKDIR /home/user/comps/asr/whisper
 
 ENTRYPOINT ["python", "whisper_server.py", "--device", "cpu"]
\ No newline at end of file
diff --git a/comps/asr/whisper/Dockerfile_hpu b/comps/asr/whisper/Dockerfile_hpu
index 128b8d5ccf..85f467606c 100644
--- a/comps/asr/whisper/Dockerfile_hpu
+++ b/comps/asr/whisper/Dockerfile_hpu
@@ -4,6 +4,10 @@
 # HABANA environment
 FROM vault.habana.ai/gaudi-docker/1.16.1/ubuntu22.04/habanalabs/pytorch-installer-2.2.2:latest AS hpu
 
+RUN useradd -m -s /bin/bash user && \
+    mkdir -p /home/user && \
+    chown -R user /home/user/
+
 # Set environment variables
 ENV LANG=en_US.UTF-8
 ENV PYTHONPATH=/home/user:/usr/lib/habanalabs/:/optimum-habana
@@ -12,15 +16,17 @@ ENV PYTHONPATH=/home/user:/usr/lib/habanalabs/:/optimum-habana
 RUN apt-get update \
     && apt-get install -y ffmpeg
 
-COPY comps /home/comps
+COPY --chown=user:user comps /home/user/comps
+
+USER user
 
 # Install requirements and optimum habana
 RUN pip install --no-cache-dir --upgrade pip && \
-    pip install --no-cache-dir -r /home/comps/asr/requirements.txt && \
+    pip install --no-cache-dir -r /home/user/comps/asr/requirements.txt && \
     pip install optimum[habana]
 
-ENV PYTHONPATH=$PYTHONPATH:/home
+ENV PYTHONPATH=$PYTHONPATH:/home/user
 
-WORKDIR /home/comps/asr/whisper
+WORKDIR /home/user/comps/asr/whisper
 
 ENTRYPOINT ["python", "whisper_server.py", "--device", "hpu"]
\ No newline at end of file
diff --git a/comps/embeddings/langchain-mosec/mosec-docker/Dockerfile b/comps/embeddings/langchain-mosec/mosec-docker/Dockerfile
index eec3020a45..a8241e04ed 100644
--- a/comps/embeddings/langchain-mosec/mosec-docker/Dockerfile
+++ b/comps/embeddings/langchain-mosec/mosec-docker/Dockerfile
@@ -2,22 +2,26 @@
 # SPDX-License-Identifier: Apache-2.0
 
 From ubuntu:22.04
+RUN useradd -m -s /bin/bash user && \
+    mkdir -p /home/user && \
+    chown -R user /home/user/
 ARG DEBIAN_FRONTEND=noninteractive
 
 ENV GLIBC_TUNABLES glibc.cpu.x86_shstk=permissive
+RUN apt update && apt install -y python3 python3-pip 
 
-COPY comps /root/comps
+USER user
+COPY comps /home/user/comps
 
-RUN apt update && apt install -y python3 python3-pip 
 RUN pip3 install torch==2.2.2 torchvision --index-url https://download.pytorch.org/whl/cpu 
 RUN pip3 install intel-extension-for-pytorch==2.2.0
 RUN pip3 install transformers
 RUN pip3 install llmspec mosec
 
-RUN cd /root/ && export HF_ENDPOINT=https://hf-mirror.com && huggingface-cli download --resume-download BAAI/bge-large-zh-v1.5 --local-dir /root/bge-large-zh-v1.5
+RUN cd /home/user/ && export HF_ENDPOINT=https://hf-mirror.com && huggingface-cli download --resume-download BAAI/bge-large-zh-v1.5 --local-dir /home/user/bge-large-zh-v1.5
 
-ENV EMB_MODEL="/root/bge-large-zh-v1.5/"
+ENV EMB_MODEL="/home/user/bge-large-zh-v1.5/"
 
-WORKDIR /root/comps/embeddings/langchain-mosec/mosec-docker
+WORKDIR /home/user/comps/embeddings/langchain-mosec/mosec-docker
 
 CMD ["python3", "server-ipex.py"]
diff --git a/comps/llms/text-generation/vllm-xft/docker/Dockerfile b/comps/llms/text-generation/vllm-xft/docker/Dockerfile
index db682e04fb..95cd596d74 100644
--- a/comps/llms/text-generation/vllm-xft/docker/Dockerfile
+++ b/comps/llms/text-generation/vllm-xft/docker/Dockerfile
@@ -95,4 +95,3 @@ RUN chmod +x /root/comps/llms/text-generation/vllm-xft/run.sh
 WORKDIR /root/comps/llms/text-generation/vllm-xft/
 
 ENTRYPOINT ["/root/comps/llms/text-generation/vllm-xft/run.sh"]
-
diff --git a/comps/llms/text-generation/vllm/docker/Dockerfile.hpu b/comps/llms/text-generation/vllm/docker/Dockerfile.hpu
index af5d708520..730fe37e76 100644
--- a/comps/llms/text-generation/vllm/docker/Dockerfile.hpu
+++ b/comps/llms/text-generation/vllm/docker/Dockerfile.hpu
@@ -1,8 +1,12 @@
 # FROM vault.habana.ai/gaudi-docker/1.15.1/ubuntu22.04/habanalabs/pytorch-installer-2.2.0:latest
 FROM vault.habana.ai/gaudi-docker/1.16.0/ubuntu22.04/habanalabs/pytorch-installer-2.2.2:latest
-
+RUN useradd -m -s /bin/bash user && \
+    mkdir -p /home/user && \
+    chown -R user /home/user/
 ENV LANG=en_US.UTF-8
-
+RUN sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config && \
+    service ssh restart
+USER user
 WORKDIR /root
 
 RUN pip install --upgrade-strategy eager optimum[habana]
@@ -11,9 +15,6 @@ RUN pip install -v git+https://github.com/HabanaAI/vllm-fork.git@cf6952d
 
 RUN pip install setuptools
 
-RUN sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config && \
-    service ssh restart
-
 ENV no_proxy=localhost,127.0.0.1
 
 ENV PT_HPU_LAZY_ACC_PAR_MODE=0
diff --git a/comps/llms/utils/lm-eval/Dockerfile.cpu b/comps/llms/utils/lm-eval/Dockerfile.cpu
index 933a523a50..ceb98887d8 100644
--- a/comps/llms/utils/lm-eval/Dockerfile.cpu
+++ b/comps/llms/utils/lm-eval/Dockerfile.cpu
@@ -1,6 +1,8 @@
 ARG UBUNTU_VER=22.04
 FROM ubuntu:${UBUNTU_VER} as devel
-
+RUN useradd -m -s /bin/bash user && \
+    mkdir -p /home/user && \
+    chown -R user /home/user/
 ARG REPO_COMPS=https://github.com/opea-project/GenAIComps.git
 ARG BRANCH=main
 ENV LANG=C.UTF-8
@@ -16,7 +18,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
     git \
     vim \
     wget
-
+USER user
 RUN git clone --single-branch --branch=${BRANCH} ${REPO_COMPS} /home/user/GenAIComps/ && \
     cd /home/user/GenAIComps/ && python3 setup.py install && \
     pip install --no-cache-dir -r /home/user/GenAIComps/comps/llms/utils/lm-eval/requirements.txt
diff --git a/comps/lvms/Dockerfile b/comps/lvms/Dockerfile
index 73be60ba62..734d2cdb61 100644
--- a/comps/lvms/Dockerfile
+++ b/comps/lvms/Dockerfile
@@ -2,17 +2,20 @@
 # SPDX-License-Identifier: Apache-2.0
 
 FROM python:3.11-slim
-
+RUN useradd -m -s /bin/bash user && \
+    mkdir -p /home/user && \
+    chown -R user /home/user/
+USER user
 # Set environment variables
 ENV LANG=en_US.UTF-8
 
-COPY comps /home/comps
+COPY comps /home/user/comps
 
 RUN pip install --no-cache-dir --upgrade pip && \
-    pip install --no-cache-dir -r /home/comps/lvms/requirements.txt
+    pip install --no-cache-dir -r /home/user/comps/lvms/requirements.txt
 
-ENV PYTHONPATH=$PYTHONPATH:/home
+ENV PYTHONPATH=$PYTHONPATH:/home/user
 
-WORKDIR /home/comps/lvms
+WORKDIR /home/user/comps/lvms
 
 ENTRYPOINT ["python", "lvm.py"]
\ No newline at end of file
diff --git a/comps/lvms/llava/Dockerfile b/comps/lvms/llava/Dockerfile
index efd2b1d45c..07d5cc41d9 100644
--- a/comps/lvms/llava/Dockerfile
+++ b/comps/lvms/llava/Dockerfile
@@ -2,18 +2,21 @@
 # SPDX-License-Identifier: Apache-2.0
 
 FROM python:3.11-slim
-
+RUN useradd -m -s /bin/bash user && \
+    mkdir -p /home/user && \
+    chown -R user /home/user/
+USER user
 # Set environment variables
 ENV LANG=en_US.UTF-8
 ENV PYTHONPATH=/home/user:/usr/lib/habanalabs/:/optimum-habana
 
-COPY comps /home/comps
+COPY comps /home/user/comps
 
 RUN pip install --no-cache-dir --upgrade pip && \
-    pip install --no-cache-dir -r /home/comps/lvms/requirements.txt
+    pip install --no-cache-dir -r /home/user/comps/lvms/requirements.txt
 
-ENV PYTHONPATH=$PYTHONPATH:/home
+ENV PYTHONPATH=$PYTHONPATH:/home/user
 
-WORKDIR /home/comps/lvms/llava
+WORKDIR /home/user/comps/lvms/llava
 
 ENTRYPOINT ["python", "llava_server.py", "--device", "cpu"]
\ No newline at end of file
diff --git a/comps/lvms/llava/Dockerfile_hpu b/comps/lvms/llava/Dockerfile_hpu
index bb2bf0676c..272fad8267 100644
--- a/comps/lvms/llava/Dockerfile_hpu
+++ b/comps/lvms/llava/Dockerfile_hpu
@@ -3,21 +3,25 @@
 
 # HABANA environment
 FROM vault.habana.ai/gaudi-docker/1.16.1/ubuntu22.04/habanalabs/pytorch-installer-2.2.2:latest AS hpu
-RUN rm -rf /etc/ssh/ssh_host*
+RUN useradd -m -s /bin/bash user && \
+    mkdir -p /home/user && \
+    chown -R user /home/user/
 
+RUN rm -rf /etc/ssh/ssh_host*
+USER user
 # Set environment variables
 ENV LANG=en_US.UTF-8
 ENV PYTHONPATH=/home/user:/usr/lib/habanalabs/:/optimum-habana
 
-COPY comps /home/comps
+COPY comps /home/user/comps
 
 # Install requirements and optimum habana
 RUN pip install --no-cache-dir --upgrade pip && \
-    pip install --no-cache-dir -r /home/comps/lvms/requirements.txt && \
+    pip install --no-cache-dir -r /home/user/comps/lvms/requirements.txt && \
     pip install optimum[habana]
 
-ENV PYTHONPATH=$PYTHONPATH:/home
+ENV PYTHONPATH=$PYTHONPATH:/home/user
 
-WORKDIR /home/comps/lvms/llava
+WORKDIR /home/user/comps/lvms/llava
 
 ENTRYPOINT ["python", "llava_server.py"]
\ No newline at end of file
diff --git a/comps/reranks/langchain-mosec/mosec-docker/Dockerfile b/comps/reranks/langchain-mosec/mosec-docker/Dockerfile
index 0c634fb903..8fca32833d 100644
--- a/comps/reranks/langchain-mosec/mosec-docker/Dockerfile
+++ b/comps/reranks/langchain-mosec/mosec-docker/Dockerfile
@@ -2,22 +2,26 @@
 # SPDX-License-Identifier: Apache-2.0
 
 From ubuntu:22.04
+RUN useradd -m -s /bin/bash user && \
+    mkdir -p /home/user && \
+    chown -R user /home/user/
 ARG DEBIAN_FRONTEND=noninteractive
 
 ENV GLIBC_TUNABLES glibc.cpu.x86_shstk=permissive
 
-COPY comps /root/comps
+COPY comps /home/user/comps
 
 RUN apt update && apt install -y python3 python3-pip 
+USER user
 RUN pip3 install torch==2.2.2 torchvision --trusted-host download.pytorch.org --index-url https://download.pytorch.org/whl/cpu 
 RUN pip3 install intel-extension-for-pytorch==2.2.0
 RUN pip3 install transformers sentence-transformers
 RUN pip3 install llmspec mosec
 
-RUN cd /root/ && export HF_ENDPOINT=https://hf-mirror.com && huggingface-cli download --resume-download BAAI/bge-reranker-large --local-dir /root/bge-reranker-large
+RUN cd /home/user/ && export HF_ENDPOINT=https://hf-mirror.com && huggingface-cli download --resume-download BAAI/bge-reranker-large --local-dir /home/user/bge-reranker-large
 
-ENV EMB_MODEL="/root/bge-reranker-large/"
+ENV EMB_MODEL="/home/user/bge-reranker-large/"
 
-WORKDIR /root/comps/reranks/langchain-mosec/mosec-docker
+WORKDIR /home/user/comps/reranks/langchain-mosec/mosec-docker
 
 CMD ["python3", "server-ipex.py"]
diff --git a/comps/tts/Dockerfile b/comps/tts/Dockerfile
index 73272567d8..ae00a24e3e 100644
--- a/comps/tts/Dockerfile
+++ b/comps/tts/Dockerfile
@@ -2,16 +2,19 @@
 # SPDX-License-Identifier: Apache-2.0
 
 FROM python:3.11-slim
-
+RUN useradd -m -s /bin/bash user && \
+    mkdir -p /home/user && \
+    chown -R user /home/user/
+USER user
 ENV LANG=C.UTF-8
 
-COPY comps /home/comps
+COPY comps /home/user/comps
 
 RUN pip install --no-cache-dir --upgrade pip && \
-    pip install --no-cache-dir -r /home/comps/tts/requirements.txt
+    pip install --no-cache-dir -r /home/user/comps/tts/requirements.txt
 
-ENV PYTHONPATH=$PYTHONPATH:/home
+ENV PYTHONPATH=$PYTHONPATH:/home/user
 
-WORKDIR /home/comps/tts
+WORKDIR /home/user/comps/tts
 
 ENTRYPOINT ["python", "tts.py"]
\ No newline at end of file
diff --git a/comps/tts/speecht5/Dockerfile b/comps/tts/speecht5/Dockerfile
index e4afd07dba..5ddd43e2cf 100644
--- a/comps/tts/speecht5/Dockerfile
+++ b/comps/tts/speecht5/Dockerfile
@@ -2,6 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 FROM python:3.11-slim
+RUN useradd -m -s /bin/bash user && \
+    mkdir -p /home/user && \
+    chown -R user /home/user/
 
 # Set environment variables
 ENV LANG=en_US.UTF-8
@@ -12,13 +15,15 @@ RUN apt-get update \
     && apt-get install -y ffmpeg \
     && apt-get install -y curl
 
-COPY comps /home/comps
+COPY --chown=user:user comps /home/user/comps
+
+USER user
 
 RUN pip install --no-cache-dir --upgrade pip && \
-    pip install --no-cache-dir -r /home/comps/tts/requirements.txt
+    pip install --no-cache-dir -r /home/user/comps/tts/requirements.txt
 
-ENV PYTHONPATH=$PYTHONPATH:/home
+ENV PYTHONPATH=$PYTHONPATH:/home/user
 
-WORKDIR /home/comps/tts/speecht5
+WORKDIR /home/user/comps/tts/speecht5
 
 ENTRYPOINT ["python", "speecht5_server.py", "--device", "cpu"]
\ No newline at end of file
diff --git a/comps/tts/speecht5/Dockerfile_hpu b/comps/tts/speecht5/Dockerfile_hpu
index 8f889b86ab..330ae276ed 100644
--- a/comps/tts/speecht5/Dockerfile_hpu
+++ b/comps/tts/speecht5/Dockerfile_hpu
@@ -3,7 +3,9 @@
 
 # HABANA environment
 FROM vault.habana.ai/gaudi-docker/1.16.1/ubuntu22.04/habanalabs/pytorch-installer-2.2.2:latest AS hpu
-
+RUN useradd -m -s /bin/bash user && \
+    mkdir -p /home/user && \
+    chown -R user /home/user/
 RUN rm -rf /etc/ssh/ssh_host*
 
 # Set environment variables
@@ -15,15 +17,17 @@ RUN apt-get update \
     && apt-get install -y ffmpeg \
     && apt-get install -y curl
 
-COPY comps /home/comps
+COPY --chown=user:user comps /home/user/comps
+
+USER user
 
 # Install requirements and optimum habana
 RUN pip install --no-cache-dir --upgrade pip && \
-    pip install --no-cache-dir -r /home/comps/tts/requirements.txt && \
+    pip install --no-cache-dir -r /home/user/comps/tts/requirements.txt && \
     pip install optimum[habana]
 
-ENV PYTHONPATH=$PYTHONPATH:/home
+ENV PYTHONPATH=$PYTHONPATH:/home/user
 
-WORKDIR /home/comps/tts/speecht5
+WORKDIR /home/user/comps/tts/speecht5
 
 ENTRYPOINT ["python", "speecht5_server.py", "--device", "hpu"]
\ No newline at end of file
diff --git a/comps/web_retrievers/langchain/chroma/docker/Dockerfile b/comps/web_retrievers/langchain/chroma/docker/Dockerfile
index a6c3d80d5a..c391fefe2d 100644
--- a/comps/web_retrievers/langchain/chroma/docker/Dockerfile
+++ b/comps/web_retrievers/langchain/chroma/docker/Dockerfile
@@ -2,14 +2,16 @@
 # SPDX-License-Identifier: Apache-2.0
 
 FROM langchain/langchain:latest
-
+RUN useradd -m -s /bin/bash user && \
+    mkdir -p /home/user && \
+    chown -R user /home/user/
 ARG ARCH="cpu"  # Set this to "cpu" or "gpu"
 
 RUN apt-get update -y && apt-get install -y --no-install-recommends --fix-missing \
     libgl1-mesa-glx \
     libjemalloc-dev \
     vim
-
+USER user
 COPY comps /home/user/comps
 
 RUN pip install --no-cache-dir --upgrade pip && \
diff --git a/tests/test_asr_whisper.sh b/tests/test_asr_whisper.sh
index 5e6e4a8c81..1cfc4a0937 100644
--- a/tests/test_asr_whisper.sh
+++ b/tests/test_asr_whisper.sh
@@ -2,7 +2,7 @@
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-set -xe
+set -x
 
 WORKPATH=$(dirname "$PWD")
 ip_address=$(hostname -I | awk '{print $1}')
@@ -10,23 +10,25 @@ ip_address=$(hostname -I | awk '{print $1}')
 function build_docker_images() {
     cd $WORKPATH
     echo $(pwd)
-    docker build -t opea/whisper:latest -f comps/asr/whisper/Dockerfile .
-    docker build -t opea/asr:latest -f comps/asr/Dockerfile .
+    docker build -t opea/whisper:comps -f comps/asr/whisper/Dockerfile .
+    docker build -t opea/asr:comps -f comps/asr/Dockerfile .
 }
 
 function start_service() {
     unset http_proxy
-    docker run -d --name="test-comps-asr-whisper" -e http_proxy=$http_proxy -e https_proxy=$https_proxy -p 7066:7066 --ipc=host opea/whisper:latest
-    docker run -d --name="test-comps-asr" -e ASR_ENDPOINT=http://$ip_address:7066 -e http_proxy=$http_proxy -e https_proxy=$https_proxy -p 9099:9099 --ipc=host opea/asr:latest
+    docker run -d --name="test-comps-asr-whisper" -e http_proxy=$http_proxy -e https_proxy=$https_proxy -p 7066:7066 --ipc=host opea/whisper:comps
+    docker run -d --name="test-comps-asr" -e ASR_ENDPOINT=http://$ip_address:7066 -e http_proxy=$http_proxy -e https_proxy=$https_proxy -p 9089:9099 --ipc=host opea/asr:comps
     sleep 3m
 }
 
 function validate_microservice() {
-    result=$(http_proxy="" curl http://localhost:9099/v1/audio/transcriptions -XPOST -d '{"byte_str": "UklGRigAAABXQVZFZm10IBIAAAABAAEARKwAAIhYAQACABAAAABkYXRhAgAAAAEA"}' -H 'Content-Type: application/json')
+    result=$(http_proxy="" curl http://localhost:9089/v1/audio/transcriptions -XPOST -d '{"byte_str": "UklGRigAAABXQVZFZm10IBIAAAABAAEARKwAAIhYAQACABAAAABkYXRhAgAAAAEA"}' -H 'Content-Type: application/json')
     if [[ $result == *"you"* ]]; then
         echo "Result correct."
     else
         echo "Result wrong."
+        docker logs test-comps-asr-whisper
+        docker logs test-comps-asr
         exit 1
     fi
 
diff --git a/tests/test_embeddings_langchain-mosec.sh b/tests/test_embeddings_langchain-mosec.sh
index 1989063467..a2f9aeb2a2 100644
--- a/tests/test_embeddings_langchain-mosec.sh
+++ b/tests/test_embeddings_langchain-mosec.sh
@@ -2,7 +2,7 @@
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-set -xe
+set -x
 
 WORKPATH=$(dirname "$PWD")
 ip_address=$(hostname -I | awk '{print $1}')
@@ -36,6 +36,14 @@ function validate_microservice() {
         -X POST \
         -d '{"text":"What is Deep Learning?"}' \
         -H 'Content-Type: application/json'
+    if [ $? -eq 0 ]; then
+        echo "curl command executed successfully"
+    else
+        echo "curl command failed"
+        docker logs test-comps-embedding-langchain-mosec-endpoint
+        docker logs test-comps-embedding-langchain-mosec-server
+        exit 1
+    fi
 }
 
 function stop_docker() {
diff --git a/tests/test_lvms_llava.sh b/tests/test_lvms_llava.sh
index da7c740a9d..d9d4258e79 100644
--- a/tests/test_lvms_llava.sh
+++ b/tests/test_lvms_llava.sh
@@ -2,7 +2,7 @@
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-set -xe
+set -x
 
 WORKPATH=$(dirname "$PWD")
 ip_address=$(hostname -I | awk '{print $1}')
@@ -10,23 +10,26 @@ ip_address=$(hostname -I | awk '{print $1}')
 function build_docker_images() {
     cd $WORKPATH
     echo $(pwd)
-    docker build -t opea/llava:latest -f comps/lvms/llava/Dockerfile .
-    docker build --no-cache -t opea/lvm:latest -f comps/lvms/Dockerfile .
+    docker build -t opea/llava:comps -f comps/lvms/llava/Dockerfile .
+    docker build --no-cache -t opea/lvm:comps -f comps/lvms/Dockerfile .
 }
 
 function start_service() {
     unset http_proxy
-    docker run -d --name="test-comps-lvm-llava" -e http_proxy=$http_proxy -e https_proxy=$https_proxy -p 8399:8399 --ipc=host opea/llava:latest
-    docker run -d --name="test-comps-lvm" -e LVM_ENDPOINT=http://$ip_address:8399 -e http_proxy=$http_proxy -e https_proxy=$https_proxy -p 9399:9399 --ipc=host opea/lvm:latest
+    docker run -d --name="test-comps-lvm-llava" -e http_proxy=$http_proxy -e https_proxy=$https_proxy -p 8399:8399 --ipc=host opea/llava:comps
+    docker run -d --name="test-comps-lvm" -e LVM_ENDPOINT=http://$ip_address:8399 -e http_proxy=$http_proxy -e https_proxy=$https_proxy -p 9399:9399 --ipc=host opea/lvm:comps
     sleep 8m
 }
 
 function validate_microservice() {
+
     result=$(http_proxy="" curl http://localhost:9399/v1/lvm -XPOST -d '{"image": "iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAFUlEQVR42mP8/5+hnoEIwDiqkL4KAcT9GO0U4BxoAAAAAElFTkSuQmCC", "prompt":"What is this?"}' -H 'Content-Type: application/json')
     if [[ $result == *"yellow"* ]]; then
         echo "Result correct."
     else
         echo "Result wrong."
+        docker logs test-comps-lvm-llava
+        docker logs test-comps-lvm
         exit 1
     fi
 
diff --git a/tests/test_reranks_langchain-mosec.sh b/tests/test_reranks_langchain-mosec.sh
index 8d25d5fedc..42f100156c 100644
--- a/tests/test_reranks_langchain-mosec.sh
+++ b/tests/test_reranks_langchain-mosec.sh
@@ -2,7 +2,7 @@
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-set -xe
+set -x
 
 WORKPATH=$(dirname "$PWD")
 ip_address=$(hostname -I | awk '{print $1}')
diff --git a/tests/test_tts_speecht5.sh b/tests/test_tts_speecht5.sh
index d9426bdff4..1982271fae 100644
--- a/tests/test_tts_speecht5.sh
+++ b/tests/test_tts_speecht5.sh
@@ -2,7 +2,7 @@
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-set -xe
+set -x
 
 WORKPATH=$(dirname "$PWD")
 ip_address=$(hostname -I | awk '{print $1}')
@@ -10,14 +10,14 @@ ip_address=$(hostname -I | awk '{print $1}')
 function build_docker_images() {
     cd $WORKPATH
     echo $(pwd)
-    docker build -t opea/speecht5:latest -f comps/tts/speecht5/Dockerfile .
-    docker build -t opea/tts:latest -f comps/tts/Dockerfile .
+    docker build -t opea/speecht5:comps -f comps/tts/speecht5/Dockerfile .
+    docker build -t opea/tts:comps -f comps/tts/Dockerfile .
 }
 
 function start_service() {
     unset http_proxy
-    docker run -d --name="test-comps-tts-speecht5" -e http_proxy=$http_proxy -e https_proxy=$https_proxy -p 7055:7055 --ipc=host opea/speecht5:latest
-    docker run -d --name="test-comps-tts" -e TTS_ENDPOINT=http://$ip_address:7055 -e http_proxy=$http_proxy -e https_proxy=$https_proxy -p 9088:9088 --ipc=host opea/tts:latest
+    docker run -d --name="test-comps-tts-speecht5" -e http_proxy=$http_proxy -e https_proxy=$https_proxy -p 7055:7055 --ipc=host opea/speecht5:comps
+    docker run -d --name="test-comps-tts" -e TTS_ENDPOINT=http://$ip_address:7055 -e http_proxy=$http_proxy -e https_proxy=$https_proxy -p 9088:9088 --ipc=host opea/tts:comps
     sleep 3m
 }
 
@@ -27,6 +27,8 @@ function validate_microservice() {
         echo "Result correct."
     else
         echo "Result wrong."
+        docker logs test-comps-tts-speecht5
+        docker logs test-comps-tts
         exit 1
     fi
 
diff --git a/tests/test_web_retrievers_langchain_chroma.sh b/tests/test_web_retrievers_langchain_chroma.sh
index d1e2c3ed53..132e7233d2 100644
--- a/tests/test_web_retrievers_langchain_chroma.sh
+++ b/tests/test_web_retrievers_langchain_chroma.sh
@@ -2,7 +2,7 @@
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-set -xe
+set -x
 
 WORKPATH=$(dirname "$PWD")
 ip_address=$(hostname -I | awk '{print $1}')
@@ -36,6 +36,7 @@ function validate_microservice() {
         -d "{\"text\":\"What is OPEA?\",\"embedding\":${test_embedding}}" \
         -H 'Content-Type: application/json'
     docker logs test-comps-web-retriever-tei-endpoint
+    docker logs test-comps-web-retriever-chroma-server
 }
 
 function stop_docker() {

From ec4143e74f83a3662c972a303191e7d67dfafbf5 Mon Sep 17 00:00:00 2001
From: "chen, suyue" <suyue.chen@intel.com>
Date: Mon, 12 Aug 2024 10:25:43 +0800
Subject: [PATCH 2/7] Add E2E example test (#453)

Signed-off-by: chensuyue <suyue.chen@intel.com>
---
 ...t-test-matrix.yml => _get-test-matrix.yml} |  0
 ...d-on-manual.yml => manual-image-build.yml} |  0
 .../{code-scan.yml => mix-code-scan.yml}      |  0
 ...vice-test.yml => mix-megaservice-test.yml} |  2 +-
 .../{trellix.yml => mix-trellix.yml}          |  0
 ...test.yaml => pr-dockerfile-path-scan.yaml} |  0
 .github/workflows/pr-examples-test.yml        | 72 +++++++++++++++++
 ...vice-test.yml => pr-microservice-test.yml} | 10 ++-
 ...build-on-push.yml => push-image-build.yml} |  2 +-
 .github/workflows/reuse-image-build.yml       | 32 --------
 ...-schedule.yml => schedule-image-build.yml} |  0
 .../scripts/docker_images_build_push.sh       | 77 ------------------
 tests/{test_asr_whisper.sh => test_asr.sh}    |  0
 tests/{test_tts_speecht5.sh => test_tts.sh}   |  0
 tests/test_workflow_chatqna.py                | 80 -------------------
 15 files changed, 80 insertions(+), 195 deletions(-)
 rename .github/workflows/{reuse-get-test-matrix.yml => _get-test-matrix.yml} (100%)
 rename .github/workflows/{image-build-on-manual.yml => manual-image-build.yml} (100%)
 rename .github/workflows/{code-scan.yml => mix-code-scan.yml} (100%)
 rename .github/workflows/{megaservice-test.yml => mix-megaservice-test.yml} (98%)
 rename .github/workflows/{trellix.yml => mix-trellix.yml} (100%)
 rename .github/workflows/{test.yaml => pr-dockerfile-path-scan.yaml} (100%)
 create mode 100644 .github/workflows/pr-examples-test.yml
 rename .github/workflows/{microservice-test.yml => pr-microservice-test.yml} (89%)
 rename .github/workflows/{image-build-on-push.yml => push-image-build.yml} (98%)
 delete mode 100644 .github/workflows/reuse-image-build.yml
 rename .github/workflows/{image-build-on-schedule.yml => schedule-image-build.yml} (100%)
 delete mode 100644 .github/workflows/scripts/docker_images_build_push.sh
 rename tests/{test_asr_whisper.sh => test_asr.sh} (100%)
 rename tests/{test_tts_speecht5.sh => test_tts.sh} (100%)
 delete mode 100644 tests/test_workflow_chatqna.py

diff --git a/.github/workflows/reuse-get-test-matrix.yml b/.github/workflows/_get-test-matrix.yml
similarity index 100%
rename from .github/workflows/reuse-get-test-matrix.yml
rename to .github/workflows/_get-test-matrix.yml
diff --git a/.github/workflows/image-build-on-manual.yml b/.github/workflows/manual-image-build.yml
similarity index 100%
rename from .github/workflows/image-build-on-manual.yml
rename to .github/workflows/manual-image-build.yml
diff --git a/.github/workflows/code-scan.yml b/.github/workflows/mix-code-scan.yml
similarity index 100%
rename from .github/workflows/code-scan.yml
rename to .github/workflows/mix-code-scan.yml
diff --git a/.github/workflows/megaservice-test.yml b/.github/workflows/mix-megaservice-test.yml
similarity index 98%
rename from .github/workflows/megaservice-test.yml
rename to .github/workflows/mix-megaservice-test.yml
index 7e55e2bf2a..83c826cd7e 100644
--- a/.github/workflows/megaservice-test.yml
+++ b/.github/workflows/mix-megaservice-test.yml
@@ -10,7 +10,7 @@ on:
     branches: [main]
     types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped
     paths:
-      - .github/workflows/megaservice-test.yml
+      - .github/workflows/mix-megaservice-test.yml
       - comps/cores/**
       - requirements.txt
       - setup.py
diff --git a/.github/workflows/trellix.yml b/.github/workflows/mix-trellix.yml
similarity index 100%
rename from .github/workflows/trellix.yml
rename to .github/workflows/mix-trellix.yml
diff --git a/.github/workflows/test.yaml b/.github/workflows/pr-dockerfile-path-scan.yaml
similarity index 100%
rename from .github/workflows/test.yaml
rename to .github/workflows/pr-dockerfile-path-scan.yaml
diff --git a/.github/workflows/pr-examples-test.yml b/.github/workflows/pr-examples-test.yml
new file mode 100644
index 0000000000..92354c5c24
--- /dev/null
+++ b/.github/workflows/pr-examples-test.yml
@@ -0,0 +1,72 @@
+# Copyright (C) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+name: Example-test
+
+on:
+  pull_request_target:
+    branches: [main]
+    types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped
+    paths:
+      - .github/workflows/pr-examples-test.yml
+      - comps/cores/**
+      - comps/embeddings/langchain/**
+      - comps/retrievers/langchain/redis/**
+      - comps/reranks/tei/**
+      - comps/llms/text-generation/tgi/**
+      - comps/dataprep/redis/langchain/**
+      - requirements.txt
+
+# If there is a new commit, the previous jobs will be canceled
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  example-test:
+    runs-on: gaudi-01-3
+    steps:
+      - name: Clean Up Working Directory
+        run: |
+          sudo rm -rf ${{github.workspace}}/* || true
+          echo y | docker system prune
+          docker rmi $(docker images --filter reference="*/*:comps" -q) || true
+
+      - name: Checkout out Repo
+        uses: actions/checkout@v4
+        with:
+          ref: "refs/pull/${{ github.event.number }}/merge"
+
+      - name: Run ChatQnA
+        env:
+          HUGGINGFACEHUB_API_TOKEN: ${{ secrets.HUGGINGFACEHUB_API_TOKEN }}
+        run: |
+          git clone https://github.com/opea-project/GenAIExamples.git
+          cd ${{ github.workspace }}/GenAIExamples/ChatQnA/docker/gaudi
+          sed -i "s#:latest#:comps#g" compose.yaml
+          cat compose.yaml
+
+          cd ${{ github.workspace }}/GenAIExamples/ChatQnA/tests
+          GenAIComps_dir=${{github.workspace}}
+          sed -i '/GenAIComps.git/d' test_chatqna_on_gaudi.sh
+          sed -i "s#cd GenAIComps#cd ${GenAIComps_dir}#g" test_chatqna_on_gaudi.sh
+          sed -i "s#docker build -t#docker build --no-cache -q -t#g" test_chatqna_on_gaudi.sh
+          sed -i "s#:latest#:comps#g" test_chatqna_on_gaudi.sh
+          cat test_chatqna_on_gaudi.sh
+
+          echo "Run test..."
+          timeout 50m bash test_chatqna_on_gaudi.sh
+
+      - name: Clean up container
+        if: cancelled() || failure()
+        run: |
+          cd ${{ github.workspace }}/GenAIExamples/ChatQnA/docker/gaudi
+          docker compose stop && docker compose rm -f
+          docker system prune -f
+
+      - name: Publish pipeline artifact
+        if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: "Examples-Test-Logs"
+          path: ${{ github.workspace }}/GenAIExamples/ChatQnA/tests/*.log
diff --git a/.github/workflows/microservice-test.yml b/.github/workflows/pr-microservice-test.yml
similarity index 89%
rename from .github/workflows/microservice-test.yml
rename to .github/workflows/pr-microservice-test.yml
index e40745f0b3..9abdce833e 100644
--- a/.github/workflows/microservice-test.yml
+++ b/.github/workflows/pr-microservice-test.yml
@@ -12,7 +12,7 @@ on:
       - tests/**
       - "!**.md"
       - "!**.txt"
-      - .github/workflows/microservice-test.yml
+      - .github/workflows/pr-microservice-test.yml
 
 # If there is a new commit, the previous jobs will be canceled
 concurrency:
@@ -21,7 +21,7 @@ concurrency:
 
 jobs:
   job1:
-    uses: ./.github/workflows/reuse-get-test-matrix.yml
+    uses: ./.github/workflows/_get-test-matrix.yml
 
   Microservice-test:
     needs: job1
@@ -31,7 +31,9 @@ jobs:
     continue-on-error: true
     steps:
       - name: Clean Up Working Directory
-        run: sudo rm -rf ${{github.workspace}}/*
+        run: |
+          sudo rm -rf ${{github.workspace}}/*
+          docker system prune -f
 
       - name: Checkout out Repo
         uses: actions/checkout@v4
@@ -57,7 +59,7 @@ jobs:
         run: |
           cid=$(docker ps -aq --filter "name=test-comps-*")
           if [[ ! -z "$cid" ]]; then docker stop $cid && docker rm $cid && sleep 1s; fi
-          echo y | docker system prune --all
+          docker system prune -f
 
       - name: Publish pipeline artifact
         if: ${{ !cancelled() }}
diff --git a/.github/workflows/image-build-on-push.yml b/.github/workflows/push-image-build.yml
similarity index 98%
rename from .github/workflows/image-build-on-push.yml
rename to .github/workflows/push-image-build.yml
index a72d13a619..5472111dde 100644
--- a/.github/workflows/image-build-on-push.yml
+++ b/.github/workflows/push-image-build.yml
@@ -10,7 +10,7 @@ on:
       - comps/**
       - "!**.md"
       - "!**.txt"
-      - .github/workflows/image-build-on-push.yml
+      - .github/workflows/push-image-build.yml
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-on-push
diff --git a/.github/workflows/reuse-image-build.yml b/.github/workflows/reuse-image-build.yml
deleted file mode 100644
index e2ed6883b1..0000000000
--- a/.github/workflows/reuse-image-build.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (C) 2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-name: Image Build
-permissions: read-all
-on:
-  workflow_call:
-    inputs:
-      micro_service:
-        required: true
-        type: string
-
-jobs:
-  micro-image-build:
-    continue-on-error: true
-    strategy:
-      matrix:
-        node: [docker-build-xeon, docker-build-gaudi]
-    runs-on: ${{ matrix.node }}
-    steps:
-      - name: Checkout out Repo
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Building MicroService Docker Image
-        id: build-microservice-image
-        env:
-          micro_service: ${{ inputs.micro_service }}
-          hardware: ${{ matrix.node }}
-        run: |
-          bash .github/workflows/scripts/docker_images_build_push.sh ${micro_service} ${hardware}
diff --git a/.github/workflows/image-build-on-schedule.yml b/.github/workflows/schedule-image-build.yml
similarity index 100%
rename from .github/workflows/image-build-on-schedule.yml
rename to .github/workflows/schedule-image-build.yml
diff --git a/.github/workflows/scripts/docker_images_build_push.sh b/.github/workflows/scripts/docker_images_build_push.sh
deleted file mode 100644
index eaf4d78f33..0000000000
--- a/.github/workflows/scripts/docker_images_build_push.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-set -xe
-
-WORKSPACE=$PWD
-IMAGE_REPO=${IMAGE_REPO:-$OPEA_IMAGE_REPO}
-IMAGE_TAG=${IMAGE_TAG:-latest}
-
-function docker_build() {
-    # docker_build <IMAGE_NAME>
-    IMAGE_NAME=$1
-    micro_service=$2
-    dockerfile_path=${WORKSPACE}/comps/${micro_service}
-    if [[ "$IMAGE_NAME" == *"gaudi" ]]; then
-        dockerfile_name="Dockerfile_hpu"
-    else
-        dockerfile_name="Dockerfile"
-    fi
-    if [ -f "$dockerfile_path/$dockerfile_name" ]; then
-        DOCKERFILE_PATH="$dockerfile_path/$dockerfile_name"
-    elif [ -f "$dockerfile_path/docker/$dockerfile_name" ]; then
-        DOCKERFILE_PATH="$dockerfile_path/docker/$dockerfile_name"
-    else
-        echo "Dockerfile not found"
-        exit 1
-    fi
-    echo "Building ${IMAGE_REPO}${IMAGE_NAME}:$IMAGE_TAG using Dockerfile $DOCKERFILE_PATH"
-
-    docker build --no-cache -t ${IMAGE_REPO}${IMAGE_NAME}:$IMAGE_TAG -f $DOCKERFILE_PATH .
-    docker push ${IMAGE_REPO}${IMAGE_NAME}:$IMAGE_TAG
-    docker rmi ${IMAGE_REPO}${IMAGE_NAME}:$IMAGE_TAG
-}
-
-micro_service=$1
-hardware=$(echo $2 | cut -d- -f3)
-case ${micro_service} in
-    "asr"|"tts")
-        IMAGE_NAME="opea/${micro_service}"
-        ;;
-    "embeddings/langchain")
-        IMAGE_NAME="opea/embedding-tei"
-        ;;
-    "retrievers/langchain/redis")
-        IMAGE_NAME="opea/retriever-redis"
-        ;;
-    "reranks/tei")
-        IMAGE_NAME="opea/reranking-tei"
-        ;;
-    "llms/text-generation/tgi")
-        IMAGE_NAME="opea/llm-tgi"
-        ;;
-    "dataprep/redis/langchain")
-        IMAGE_NAME="opea/dataprep-redis"
-        ;;
-    "llms/summarization/tgi")
-        IMAGE_NAME="opea/llm-docsum-tgi"
-        ;;
-    "llms/faq-generation/tgi")
-        IMAGE_NAME="opea/llm-faqgen-tgi"
-        ;;
-    "web_retrievers/langchain/chroma")
-        IMAGE_NAME="opea/web-retriever-chroma"
-        ;;
-    "tts/speecht5")
-        if [ "${hardware}" == "gaudi" ]; then IMAGE_NAME="opea/speecht5-gaudi"; else IMAGE_NAME="opea/speecht5"; fi
-        ;;
-    "asr/whisper")
-        if [ "${hardware}" == "gaudi" ]; then IMAGE_NAME="opea/whisper-gaudi"; else IMAGE_NAME="opea/whisper"; fi
-        ;;
-    *)
-        echo "Not supported yet"
-        exit 0
-        ;;
-esac
-docker_build "${IMAGE_NAME}" "${micro_service}"
diff --git a/tests/test_asr_whisper.sh b/tests/test_asr.sh
similarity index 100%
rename from tests/test_asr_whisper.sh
rename to tests/test_asr.sh
diff --git a/tests/test_tts_speecht5.sh b/tests/test_tts.sh
similarity index 100%
rename from tests/test_tts_speecht5.sh
rename to tests/test_tts.sh
diff --git a/tests/test_workflow_chatqna.py b/tests/test_workflow_chatqna.py
deleted file mode 100644
index a2ea0f2d0d..0000000000
--- a/tests/test_workflow_chatqna.py
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (C) 2024 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-#
-
-import asyncio
-import os
-
-from comps import ChatQnAGateway, MicroService, ServiceOrchestrator, ServiceType
-
-MEGA_SERVICE_HOST_IP = os.getenv("MEGA_SERVICE_HOST_IP", "0.0.0.0")
-MEGA_SERVICE_PORT = os.getenv("MEGA_SERVICE_PORT", 8888)
-EMBEDDING_SERVICE_HOST_IP = os.getenv("EMBEDDING_SERVICE_HOST_IP", "0.0.0.0")
-EMBEDDING_SERVICE_PORT = os.getenv("EMBEDDING_SERVICE_PORT", 6000)
-RETRIEVER_SERVICE_HOST_IP = os.getenv("RETRIEVER_SERVICE_HOST_IP", "0.0.0.0")
-RETRIEVER_SERVICE_PORT = os.getenv("RETRIEVER_SERVICE_PORT", 7000)
-RERANK_SERVICE_HOST_IP = os.getenv("RERANK_SERVICE_HOST_IP", "0.0.0.0")
-RERANK_SERVICE_PORT = os.getenv("RERANK_SERVICE_PORT", 8000)
-LLM_SERVICE_HOST_IP = os.getenv("LLM_SERVICE_HOST_IP", "0.0.0.0")
-LLM_SERVICE_PORT = os.getenv("LLM_SERVICE_PORT", 9000)
-
-
-class ChatQnAService:
-    def __init__(self, host="0.0.0.0", port=8000):
-        self.host = host
-        self.port = port
-        self.megaservice = ServiceOrchestrator()
-
-    def add_remote_service(self):
-        embedding = MicroService(
-            name="embedding",
-            host=EMBEDDING_SERVICE_HOST_IP,
-            port=EMBEDDING_SERVICE_PORT,
-            endpoint="/v1/embeddings",
-            use_remote_service=True,
-            service_type=ServiceType.EMBEDDING,
-        )
-        retriever = MicroService(
-            name="retriever",
-            host=RETRIEVER_SERVICE_HOST_IP,
-            port=RETRIEVER_SERVICE_PORT,
-            endpoint="/v1/retrieval",
-            use_remote_service=True,
-            service_type=ServiceType.RETRIEVER,
-        )
-        rerank = MicroService(
-            name="rerank",
-            host=RERANK_SERVICE_HOST_IP,
-            port=RERANK_SERVICE_PORT,
-            endpoint="/v1/reranking",
-            use_remote_service=True,
-            service_type=ServiceType.RERANK,
-        )
-        llm = MicroService(
-            name="llm",
-            host=LLM_SERVICE_HOST_IP,
-            port=LLM_SERVICE_PORT,
-            endpoint="/v1/chat/completions",
-            use_remote_service=True,
-            service_type=ServiceType.LLM,
-        )
-        self.megaservice.add(embedding).add(retriever).add(rerank).add(llm)
-        self.megaservice.flow_to(embedding, retriever)
-        self.megaservice.flow_to(retriever, rerank)
-        self.megaservice.flow_to(rerank, llm)
-        self.gateway = ChatQnAGateway(megaservice=self.megaservice, host="0.0.0.0", port=self.port)
-
-    async def schedule(self):
-        result_dict, runtime_graph = await self.megaservice.schedule(
-            initial_inputs={"text": "What is the revenue of Nike in 2023?"}
-        )
-        print(result_dict)
-
-
-if __name__ == "__main__":
-    chatqna = ChatQnAService(host=MEGA_SERVICE_HOST_IP, port=MEGA_SERVICE_PORT)
-    chatqna.add_remote_service()
-    asyncio.run(chatqna.schedule())

From ed99d47d7f6834800e2e106243885e3832cdc622 Mon Sep 17 00:00:00 2001
From: "chen, suyue" <suyue.chen@intel.com>
Date: Mon, 12 Aug 2024 10:33:23 +0800
Subject: [PATCH 3/7] build new images for llms (#450)

Signed-off-by: chensuyue <suyue.chen@intel.com>
---
 .github/workflows/docker/compose/llms-compose.yaml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker/compose/llms-compose.yaml b/.github/workflows/docker/compose/llms-compose.yaml
index a1bc921bbe..e722682e87 100644
--- a/.github/workflows/docker/compose/llms-compose.yaml
+++ b/.github/workflows/docker/compose/llms-compose.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # this file should be run in the root of the repo
-# images used by GenAIExamples: llm-tgi,llm-ollama,llm-docsum-tgi,llm-faqgen-tgi,llm-vllm,llm-vllm-ray
+# images used by GenAIExamples: llm-tgi,llm-ollama,llm-docsum-tgi,llm-faqgen-tgi,llm-vllm,llm-vllm-hpu,llm-vllm-ray,llm-vllm-ray-hpu
 services:
   llm-tgi:
     build:
@@ -24,7 +24,15 @@ services:
     build:
       dockerfile: comps/llms/text-generation/vllm/docker/Dockerfile.microservice
     image: ${REGISTRY}opea/llm-vllm:${TAG:-latest}
+  llm-vllm-hpu:
+    build:
+      dockerfile: comps/llms/text-generation/vllm/docker/Dockerfile.hpu
+    image: ${REGISTRY}opea/llm-vllm-hpu:${TAG:-latest}
   llm-vllm-ray:
     build:
       dockerfile: comps/llms/text-generation/vllm-ray/docker/Dockerfile.microservice
     image: ${REGISTRY}opea/llm-vllm-ray:${TAG:-latest}
+  llm-vllm-ray-hpu:
+    build:
+      dockerfile: comps/llms/text-generation/vllm-ray/docker/Dockerfile.vllmray
+    image: ${REGISTRY}opea/llm-vllm-ray-hpu:${TAG:-latest}

From 3ffcff41ea02f47e8403cb95d9b0a4f138d278cd Mon Sep 17 00:00:00 2001
From: "chen, suyue" <suyue.chen@intel.com>
Date: Mon, 12 Aug 2024 10:46:43 +0800
Subject: [PATCH 4/7] Update Microservice CI trigger path (#458)

Signed-off-by: chensuyue <suyue.chen@intel.com>
---
 .github/workflows/_get-test-matrix.yml     | 2 +-
 .github/workflows/pr-microservice-test.yml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/_get-test-matrix.yml b/.github/workflows/_get-test-matrix.yml
index 6860f8e9ba..09be978cb5 100644
--- a/.github/workflows/_get-test-matrix.yml
+++ b/.github/workflows/_get-test-matrix.yml
@@ -45,7 +45,7 @@ jobs:
           merged_commit=$(git log -1 --format='%H')
 
           changed_files="$(git diff --name-only ${base_commit} ${merged_commit} | \
-          grep 'comps/' | grep -vE '*.md|*.txt|comps/cores')" || true
+          grep 'comps/' | grep -vE '*.md|comps/cores')" || true
           services=$(printf '%s\n' "${changed_files[@]}" | cut -d'/' -f2 | grep -vE '*.py' | sort -u) || true
           run_matrix="{\"include\":["
           for service in ${services}; do
diff --git a/.github/workflows/pr-microservice-test.yml b/.github/workflows/pr-microservice-test.yml
index 9abdce833e..a9a6cb26c6 100644
--- a/.github/workflows/pr-microservice-test.yml
+++ b/.github/workflows/pr-microservice-test.yml
@@ -11,7 +11,6 @@ on:
       - comps/**
       - tests/**
       - "!**.md"
-      - "!**.txt"
       - .github/workflows/pr-microservice-test.yml
 
 # If there is a new commit, the previous jobs will be canceled

From 27a01ee3b08561bce744f4605a0fbf54c47b10a8 Mon Sep 17 00:00:00 2001
From: "Hoong Tee, Yeoh" <hoong.tee.yeoh@intel.com>
Date: Mon, 12 Aug 2024 10:47:15 +0800
Subject: [PATCH 5/7] prompt_registry: Unifying API endpoint port (#443)

* prompt_registry: Unifying API endpoint port

Unifying all port for API endpoints for prompt registry services with
recent register_microservice wrapper function update.

Signed-off-by: Yeoh, Hoong Tee <hoong.tee.yeoh@intel.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Yeoh, Hoong Tee <hoong.tee.yeoh@intel.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 comps/prompt_registry/mongo/README.md              | 10 +++++-----
 .../docker-compose-prompt-registry-mongo.yaml      |  3 +--
 comps/prompt_registry/mongo/prompt.py              | 14 ++++++--------
 tests/test_prompt_registry_mongo.sh                |  2 +-
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/comps/prompt_registry/mongo/README.md b/comps/prompt_registry/mongo/README.md
index 799fec7cae..0cbfd6f99f 100644
--- a/comps/prompt_registry/mongo/README.md
+++ b/comps/prompt_registry/mongo/README.md
@@ -41,7 +41,7 @@ docker run -d -p 27017:27017 --name=mongo mongo:latest
 2. Run prompt_registry service
 
 ```bash
-docker run -d --name="promptregistry-mongo-server" -p 6012:6012 -p 6013:6013 -p 6014:6014 -e http_proxy=$http_proxy -e https_proxy=$https_proxy -e no_proxy=$no_proxy -e MONGO_HOST=${MONGO_HOST} -e MONGO_PORT=${MONGO_PORT} -e DB_NAME=${DB_NAME} -e COLLECTION_NAME=${COLLECTION_NAME} opea/promptregistry-mongo-server:latest
+docker run -d --name="promptregistry-mongo-server" -p 6012:6012 -e http_proxy=$http_proxy -e https_proxy=$https_proxy -e no_proxy=$no_proxy -e MONGO_HOST=${MONGO_HOST} -e MONGO_PORT=${MONGO_PORT} -e DB_NAME=${DB_NAME} -e COLLECTION_NAME=${COLLECTION_NAME} opea/promptregistry-mongo-server:latest
 ```
 
 ## Invoke Microservice
@@ -64,7 +64,7 @@ curl -X 'POST' \
 
 ```bash
 curl -X 'POST' \
-  http://{host_ip}:6013/v1/prompt/get \
+  http://{host_ip}:6012/v1/prompt/get \
   -H 'accept: application/json' \
   -H 'Content-Type: application/json' \
   -d '{
@@ -73,7 +73,7 @@ curl -X 'POST' \
 
 ```bash
 curl -X 'POST' \
-  http://{host_ip}:6013/v1/prompt/get \
+  http://{host_ip}:6012/v1/prompt/get \
   -H 'accept: application/json' \
   -H 'Content-Type: application/json' \
   -d '{
@@ -84,7 +84,7 @@ curl -X 'POST' \
 
 ```bash
 curl -X 'POST' \
-  http://{host_ip}:6013/v1/prompt/get \
+  http://{host_ip}:6012/v1/prompt/get \
   -H 'accept: application/json' \
   -H 'Content-Type: application/json' \
   -d '{
@@ -95,7 +95,7 @@ curl -X 'POST' \
 
 ```bash
 curl -X 'POST' \
-  http://{host_ip}:6014/v1/prompt/delete \
+  http://{host_ip}:6012/v1/prompt/delete \
   -H 'accept: application/json' \
   -H 'Content-Type: application/json' \
   -d '{
diff --git a/comps/prompt_registry/mongo/docker/docker-compose-prompt-registry-mongo.yaml b/comps/prompt_registry/mongo/docker/docker-compose-prompt-registry-mongo.yaml
index 23db61c897..f6cb68831d 100644
--- a/comps/prompt_registry/mongo/docker/docker-compose-prompt-registry-mongo.yaml
+++ b/comps/prompt_registry/mongo/docker/docker-compose-prompt-registry-mongo.yaml
@@ -19,8 +19,6 @@ services:
     container_name: promptregistry-mongo-server
     ports:
       - "6012:6012"
-      - "6013:6013"
-      - "6014:6014"
     ipc: host
     environment:
       http_proxy: ${http_proxy}
@@ -28,6 +26,7 @@ services:
       no_proxy: ${no_proxy}
       MONGO_HOST: ${MONGO_HOST}
       MONGO_PORT: ${MONGO_PORT}
+      DB_NAME: ${DB_NAME}
       COLLECTION_NAME: ${COLLECTION_NAME}
     restart: unless-stopped
 
diff --git a/comps/prompt_registry/mongo/prompt.py b/comps/prompt_registry/mongo/prompt.py
index 4a3f52bc1c..e8d7d285ed 100644
--- a/comps/prompt_registry/mongo/prompt.py
+++ b/comps/prompt_registry/mongo/prompt.py
@@ -34,7 +34,7 @@ class PromptId(BaseModel):
 
 
 @register_microservice(
-    name="opea_service@prompt_mongo_create",
+    name="opea_service@prompt_mongo",
     endpoint="/v1/prompt/create",
     host="0.0.0.0",
     input_datatype=PromptCreate,
@@ -62,11 +62,11 @@ async def create_prompt(prompt: PromptCreate):
 
 
 @register_microservice(
-    name="opea_service@prompt_mongo_get",
+    name="opea_service@prompt_mongo",
     endpoint="/v1/prompt/get",
     host="0.0.0.0",
     input_datatype=PromptId,
-    port=6013,
+    port=6012,
 )
 async def get_prompt(prompt: PromptId):
     """Retrieves prompt from prompt store based on provided PromptId or user.
@@ -95,11 +95,11 @@ async def get_prompt(prompt: PromptId):
 
 
 @register_microservice(
-    name="opea_service@prompt_mongo_delete",
+    name="opea_service@prompt_mongo",
     endpoint="/v1/prompt/delete",
     host="0.0.0.0",
     input_datatype=PromptId,
-    port=6014,
+    port=6012,
 )
 async def delete_prompt(prompt: PromptId):
     """Delete a prompt from prompt store by given PromptId.
@@ -125,6 +125,4 @@ async def delete_prompt(prompt: PromptId):
 
 
 if __name__ == "__main__":
-    opea_microservices["opea_service@prompt_mongo_get"].start()
-    opea_microservices["opea_service@prompt_mongo_create"].start()
-    opea_microservices["opea_service@prompt_mongo_delete"].start()
+    opea_microservices["opea_service@prompt_mongo"].start()
diff --git a/tests/test_prompt_registry_mongo.sh b/tests/test_prompt_registry_mongo.sh
index bdf5d907c1..e91bf225cd 100644
--- a/tests/test_prompt_registry_mongo.sh
+++ b/tests/test_prompt_registry_mongo.sh
@@ -22,7 +22,7 @@ function build_docker_images() {
 
 function start_service() {
 
-    docker run -d --name="test-comps-promptregistry-mongo-server" -p 6012:6012 -p 6013:6013 -p 6014:6014 -e http_proxy=$http_proxy -e https_proxy=$https_proxy -e no_proxy=$no_proxy -e MONGO_HOST=${MONGO_HOST} -e MONGO_PORT=${MONGO_PORT} -e DB_NAME=${DB_NAME} -e COLLECTION_NAME=${COLLECTION_NAME} opea/promptregistry-mongo-server:latest
+    docker run -d --name="test-comps-promptregistry-mongo-server" -p 6012:6012 -e http_proxy=$http_proxy -e https_proxy=$https_proxy -e no_proxy=$no_proxy -e MONGO_HOST=${MONGO_HOST} -e MONGO_PORT=${MONGO_PORT} -e DB_NAME=${DB_NAME} -e COLLECTION_NAME=${COLLECTION_NAME} opea/promptregistry-mongo-server:latest
 
     sleep 10s
 }

From ac3909da6b3d0076448f8e563f356c6ccb4385cd Mon Sep 17 00:00:00 2001
From: Sihan Chen <39623753+Spycsh@users.noreply.github.com>
Date: Mon, 12 Aug 2024 11:38:22 +0800
Subject: [PATCH 6/7] fix ffmpeg build on hpu (#441)

---
 comps/asr/whisper/Dockerfile_hpu  | 1 +
 comps/tts/speecht5/Dockerfile_hpu | 1 +
 2 files changed, 2 insertions(+)

diff --git a/comps/asr/whisper/Dockerfile_hpu b/comps/asr/whisper/Dockerfile_hpu
index 85f467606c..15b2688f0a 100644
--- a/comps/asr/whisper/Dockerfile_hpu
+++ b/comps/asr/whisper/Dockerfile_hpu
@@ -11,6 +11,7 @@ RUN useradd -m -s /bin/bash user && \
 # Set environment variables
 ENV LANG=en_US.UTF-8
 ENV PYTHONPATH=/home/user:/usr/lib/habanalabs/:/optimum-habana
+ENV LD_LIBRARY_PATH=/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH
 
 # Install system dependencies
 RUN apt-get update \
diff --git a/comps/tts/speecht5/Dockerfile_hpu b/comps/tts/speecht5/Dockerfile_hpu
index 330ae276ed..7fd53e913f 100644
--- a/comps/tts/speecht5/Dockerfile_hpu
+++ b/comps/tts/speecht5/Dockerfile_hpu
@@ -11,6 +11,7 @@ RUN rm -rf /etc/ssh/ssh_host*
 # Set environment variables
 ENV LANG=en_US.UTF-8
 ENV PYTHONPATH=/home/user:/usr/lib/habanalabs/:/optimum-habana
+ENV LD_LIBRARY_PATH=/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH
 
 # Install system dependencies
 RUN apt-get update \

From c45f8f0161c165752a12e047b3fe4b2ea3684997 Mon Sep 17 00:00:00 2001
From: ZePan110 <ze.pan@intel.com>
Date: Mon, 12 Aug 2024 12:01:10 +0800
Subject: [PATCH 7/7] Add path check for dockerfiles in compose.yaml and change
 workflow name. (#412)

Signed-off-by: zepan <ze.pan@intel.com>
---
 .../workflows/pr-dockerfile-path-scan.yaml    | 64 ++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pr-dockerfile-path-scan.yaml b/.github/workflows/pr-dockerfile-path-scan.yaml
index 94b6ef31ef..0595e4bcba 100644
--- a/.github/workflows/pr-dockerfile-path-scan.yaml
+++ b/.github/workflows/pr-dockerfile-path-scan.yaml
@@ -14,7 +14,68 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  file-change-detection:
+  Dockerfile-path-change-detection-in-GenAIComps:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clean Up Working Directory
+        run: sudo rm -rf ${{github.workspace}}/*
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Check for changed Dockerfile paths in yaml
+        run: |
+          set -xe
+          shopt -s globstar
+          cd ${{github.workspace}}
+          is_use="FALSE"
+          used_files=""
+          merged_commit=$(git log -1 --format='%H')
+          changed_files="$(git diff --name-status --diff-filter=DR ${{ github.event.pull_request.base.sha }} ${merged_commit} -- '**/Dockerfile**' | cut -f2)"
+          if [ -n "$changed_files" ]; then
+            for file in $changed_files; do
+              if grep -q "$file" .github/workflows/docker/compose/*.yaml; then
+                is_use="TRUE"
+                used_files+="$file "
+              fi
+            done
+          fi
+
+          if [[ "$is_use" == "TRUE" ]]; then
+            echo "Warning: Changed Dockerfile paths:"
+            echo "$used_files"
+            echo "Please modify the corresponding yaml in GenAIComps/.github/workflows/docker/compose and ask suyue.chen@intel.com for final confirmation."
+            exit 1
+          fi
+
+      - name: Check for changed Dockerfile paths in readme
+        run: |
+          set -xe
+          shopt -s globstar
+          cd ${{github.workspace}}
+          is_use="FALSE"
+          used_files=""
+          merged_commit=$(git log -1 --format='%H')
+          changed_files="$(git diff --name-status --diff-filter=DR ${{ github.event.pull_request.base.sha }} ${merged_commit} -- '**/Dockerfile**' | cut -f2)"
+          if [ -n "$changed_files" ]; then
+            for file in $changed_files; do
+              if grep -q "$file" ./**/*.md; then
+                is_use="TRUE"
+                used_files+="$file "
+              fi
+            done
+          fi
+
+          if [[ "$is_use" == "TRUE" ]]; then
+            echo "Warning: Changed Dockerfile paths:"
+            echo "$used_files"
+            echo "Please modify the corresponding README in GenAIComps and ask suyue.chen@intel.com for final confirmation."
+            exit 1
+          fi
+
+  Dockerfile-path-change-detection-in-GenAIExamples:
     runs-on: ubuntu-latest
     steps:
       - name: Clean Up Working Directory
@@ -32,6 +93,7 @@ jobs:
 
       - name: Check for changed Dockerfile paths
         run: |
+          set -xe
           shopt -s globstar
           cd ${{github.workspace}}
           is_use="FALSE"