Set no wrapper ChatQnA as default (opea-project#891)

Signed-off-by: lvliang-intel <liang1.lv@intel.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
lvliang-intel · Oct 11, 2024 · 619d941 · 619d941
1 parent b71a12d
commit 619d941
Show file tree

Hide file tree

Showing 66 changed files with 634 additions and 4,781 deletions.
diff --git a/ChatQnA/Dockerfile b/ChatQnA/Dockerfile
@@ -19,7 +19,8 @@ RUN git clone https://github.com/opea-project/GenAIComps.git
 
 WORKDIR /home/user/GenAIComps
 RUN pip install --no-cache-dir --upgrade pip && \
-    pip install --no-cache-dir -r /home/user/GenAIComps/requirements.txt
+    pip install --no-cache-dir -r /home/user/GenAIComps/requirements.txt && \
+    pip install --no-cache-dir langchain_core
 
 COPY ./chatqna.py /home/user/chatqna.py
 

diff --git a/ChatQnA/Dockerfile.guardrails b/ChatQnA/Dockerfile.guardrails
@@ -19,9 +19,10 @@ RUN git clone https://github.com/opea-project/GenAIComps.git
 
 WORKDIR /home/user/GenAIComps
 RUN pip install --no-cache-dir --upgrade pip && \
-    pip install --no-cache-dir -r /home/user/GenAIComps/requirements.txt
+    pip install --no-cache-dir -r /home/user/GenAIComps/requirements.txt && \
+    pip install --no-cache-dir langchain_core
 
-COPY ./chatqna_guardrails.py /home/user/chatqna_guardrails.py
+COPY ./chatqna.py /home/user/chatqna.py
 
 ENV PYTHONPATH=$PYTHONPATH:/home/user/GenAIComps
 
@@ -31,4 +32,4 @@ WORKDIR /home/user
 
 RUN echo 'ulimit -S -n 999999' >> ~/.bashrc
 
-ENTRYPOINT ["python", "chatqna_guardrails.py"]
+ENTRYPOINT ["python", "chatqna.py", "--with-guardrails"]
diff --git a/ChatQnA/Dockerfile.no_wrapper b/ChatQnA/Dockerfile.no_wrapper
diff --git a/ChatQnA/Dockerfile.no_wrapper_without_rerank b/ChatQnA/Dockerfile.no_wrapper_without_rerank
diff --git a/ChatQnA/Dockerfile.without_rerank b/ChatQnA/Dockerfile.without_rerank
@@ -6,9 +6,9 @@
 FROM python:3.11-slim
 
 RUN apt-get update -y && apt-get install -y --no-install-recommends --fix-missing \
+    git \
     libgl1-mesa-glx \
-    libjemalloc-dev \
-    git
+    libjemalloc-dev
 
 RUN useradd -m -s /bin/bash user && \
     mkdir -p /home/user && \
@@ -19,9 +19,10 @@ RUN git clone https://github.com/opea-project/GenAIComps.git
 
 WORKDIR /home/user/GenAIComps
 RUN pip install --no-cache-dir --upgrade pip && \
-    pip install --no-cache-dir -r /home/user/GenAIComps/requirements.txt
+    pip install --no-cache-dir -r /home/user/GenAIComps/requirements.txt && \
+    pip install --no-cache-dir langchain_core
 
-COPY ./chatqna_without_rerank.py /home/user/chatqna_without_rerank.py
+COPY ./chatqna.py /home/user/chatqna.py
 
 ENV PYTHONPATH=$PYTHONPATH:/home/user/GenAIComps
 
@@ -31,4 +32,4 @@ WORKDIR /home/user
 
 RUN echo 'ulimit -S -n 999999' >> ~/.bashrc
 
-ENTRYPOINT ["python", "chatqna_without_rerank.py"]
+ENTRYPOINT ["python", "chatqna.py", "--without-rerank"]
diff --git a/..._wrapper_oob_eight_gaudi_with_rerank.yaml → ...ht_gaudi/oob_eight_gaudi_with_rerank.yaml b/..._wrapper_oob_eight_gaudi_with_rerank.yaml → ...ht_gaudi/oob_eight_gaudi_with_rerank.yaml
@@ -327,7 +327,7 @@ spec:
         envFrom:
         - configMapRef:
             name: qna-config
-        image: opea/tei-gaudi:latest
+        image: ghcr.io/huggingface/tei-gaudi:latest
         imagePullPolicy: IfNotPresent
         name: reranking-dependency-deploy
         ports:

diff --git a/...o_wrapper_oob_four_gaudi_with_rerank.yaml → ...our_gaudi/oob_four_gaudi_with_rerank.yaml b/...o_wrapper_oob_four_gaudi_with_rerank.yaml → ...our_gaudi/oob_four_gaudi_with_rerank.yaml
@@ -327,7 +327,7 @@ spec:
         envFrom:
         - configMapRef:
             name: qna-config
-        image: opea/tei-gaudi:latest
+        image: ghcr.io/huggingface/tei-gaudi:latest
         imagePullPolicy: IfNotPresent
         name: reranking-dependency-deploy
         ports:

diff --git a/...wrapper_oob_single_gaudi_with_rerank.yaml → ...e_gaudi/oob_single_gaudi_with_rerank.yaml b/...wrapper_oob_single_gaudi_with_rerank.yaml → ...e_gaudi/oob_single_gaudi_with_rerank.yaml
@@ -327,7 +327,7 @@ spec:
         envFrom:
         - configMapRef:
             name: qna-config
-        image: opea/tei-gaudi:latest
+        image: ghcr.io/huggingface/tei-gaudi:latest
         imagePullPolicy: IfNotPresent
         name: reranking-dependency-deploy
         ports:

diff --git a/...no_wrapper_oob_two_gaudi_with_rerank.yaml → .../two_gaudi/oob_two_gaudi_with_rerank.yaml b/...no_wrapper_oob_two_gaudi_with_rerank.yaml → .../two_gaudi/oob_two_gaudi_with_rerank.yaml
@@ -327,7 +327,7 @@ spec:
         envFrom:
         - configMapRef:
             name: qna-config
-        image: opea/tei-gaudi:latest
+        image: ghcr.io/huggingface/tei-gaudi:latest
         imagePullPolicy: IfNotPresent
         name: reranking-dependency-deploy
         ports:

diff --git a/...apper_oob_eight_gaudi_without_rerank.yaml → ...gaudi/oob_eight_gaudi_without_rerank.yaml b/...apper_oob_eight_gaudi_without_rerank.yaml → ...gaudi/oob_eight_gaudi_without_rerank.yaml
diff --git a/...rapper_oob_four_gaudi_without_rerank.yaml → ..._gaudi/oob_four_gaudi_without_rerank.yaml b/...rapper_oob_four_gaudi_without_rerank.yaml → ..._gaudi/oob_four_gaudi_without_rerank.yaml
diff --git a/...pper_oob_single_gaudi_without_rerank.yaml → ...audi/oob_single_gaudi_without_rerank.yaml b/...pper_oob_single_gaudi_without_rerank.yaml → ...audi/oob_single_gaudi_without_rerank.yaml
diff --git a/...wrapper_oob_two_gaudi_without_rerank.yaml → ...o_gaudi/oob_two_gaudi_without_rerank.yaml b/...wrapper_oob_two_gaudi_without_rerank.yaml → ...o_gaudi/oob_two_gaudi_without_rerank.yaml
diff --git a/...rapper_tuned_eight_gaudi_with_rerank.yaml → .../eight_gaudi/eight_gaudi_with_rerank.yaml b/...rapper_tuned_eight_gaudi_with_rerank.yaml → .../eight_gaudi/eight_gaudi_with_rerank.yaml
@@ -345,7 +345,7 @@ spec:
         envFrom:
         - configMapRef:
             name: qna-config
-        image: opea/tei-gaudi:latest
+        image: ghcr.io/huggingface/tei-gaudi:latest
         imagePullPolicy: IfNotPresent
         name: reranking-dependency-deploy
         ports:

diff --git a/...wrapper_tuned_four_gaudi_with_rerank.yaml → ...r_gaudi/tuned_four_gaudi_with_rerank.yaml b/...wrapper_tuned_four_gaudi_with_rerank.yaml → ...r_gaudi/tuned_four_gaudi_with_rerank.yaml
@@ -345,7 +345,7 @@ spec:
         envFrom:
         - configMapRef:
             name: qna-config
-        image: opea/tei-gaudi:latest
+        image: ghcr.io/huggingface/tei-gaudi:latest
         imagePullPolicy: IfNotPresent
         name: reranking-dependency-deploy
         ports:

diff --git a/...apper_tuned_single_gaudi_with_rerank.yaml → ...gaudi/tuned_single_gaudi_with_rerank.yaml b/...apper_tuned_single_gaudi_with_rerank.yaml → ...gaudi/tuned_single_gaudi_with_rerank.yaml
@@ -345,7 +345,7 @@ spec:
         envFrom:
         - configMapRef:
             name: qna-config
-        image: opea/tei-gaudi:latest
+        image: ghcr.io/huggingface/tei-gaudi:latest
         imagePullPolicy: IfNotPresent
         name: reranking-dependency-deploy
         ports:

diff --git a/..._wrapper_tuned_two_gaudi_with_rerank.yaml → ...wo_gaudi/tuned_two_gaudi_with_rerank.yaml b/..._wrapper_tuned_two_gaudi_with_rerank.yaml → ...wo_gaudi/tuned_two_gaudi_with_rerank.yaml
@@ -345,7 +345,7 @@ spec:
         envFrom:
         - configMapRef:
             name: qna-config
-        image: opea/tei-gaudi:latest
+        image: ghcr.io/huggingface/tei-gaudi:latest
         imagePullPolicy: IfNotPresent
         name: reranking-dependency-deploy
         ports:

diff --git a/...per_tuned_eight_gaudi_without_rerank.yaml → ...udi/tuned_eight_gaudi_without_rerank.yaml b/...per_tuned_eight_gaudi_without_rerank.yaml → ...udi/tuned_eight_gaudi_without_rerank.yaml
diff --git a/...pper_tuned_four_gaudi_without_rerank.yaml → ...audi/tuned_four_gaudi_without_rerank.yaml b/...pper_tuned_four_gaudi_without_rerank.yaml → ...audi/tuned_four_gaudi_without_rerank.yaml
diff --git a/...er_tuned_single_gaudi_without_rerank.yaml → ...di/tuned_single_gaudi_without_rerank.yaml b/...er_tuned_single_gaudi_without_rerank.yaml → ...di/tuned_single_gaudi_without_rerank.yaml
diff --git a/...apper_tuned_two_gaudi_without_rerank.yaml → ...gaudi/tuned_two_gaudi_without_rerank.yaml b/...apper_tuned_two_gaudi_without_rerank.yaml → ...gaudi/tuned_two_gaudi_without_rerank.yaml