Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set no wrapper ChatQnA as default #891

Merged
merged 18 commits into from
Oct 11, 2024
Merged

Set no wrapper ChatQnA as default #891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
108ed74
Set no wrapper ChatQnA as default
lvliang-intel Sep 30, 2024
63e6b92
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 30, 2024
e1567b5
fix image name
lvliang-intel Sep 30, 2024
f442014
Merge branch 'set_no_wrapper_as_default' of https://github.com/lvlian…
lvliang-intel Sep 30, 2024
3b01472
fix dockerfile
lvliang-intel Sep 30, 2024
3fab6b1
fix compose file name
lvliang-intel Sep 30, 2024
ad60931
fix env issues
lvliang-intel Sep 30, 2024
861817c
fix port id
lvliang-intel Sep 30, 2024
6cdfaf9
fix issues
lvliang-intel Sep 30, 2024
e4c41d5
Merge branch 'main' of https://github.com/lvliang-intel/GenAIExamples…
lvliang-intel Sep 30, 2024
243ae8c
update manifests
lvliang-intel Sep 30, 2024
2c4b389
fix dependency issue
lvliang-intel Oct 1, 2024
6ad98d9
rename benchmark manifests
lvliang-intel Oct 1, 2024
9fd890f
fix guardrail test
lvliang-intel Oct 9, 2024
8623c70
Merge branch 'main' of https://github.com/lvliang-intel/GenAIExamples…
lvliang-intel Oct 9, 2024
358919a
se official tei gaudi image
lvliang-intel Oct 10, 2024
df234c0
Merge branch 'main' of https://github.com/lvliang-intel/GenAIExamples…
lvliang-intel Oct 10, 2024
624a53e
Merge branch 'main' of https://github.com/lvliang-intel/GenAIExamples…
lvliang-intel Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ChatQnA/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 4 additions & 3 deletions ChatQnA/Dockerfile.guardrails
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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"]
31 changes: 0 additions & 31 deletions ChatQnA/Dockerfile.no_wrapper
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions ChatQnA/Dockerfile.no_wrapper_without_rerank
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions ChatQnA/Dockerfile.without_rerank
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand All @@ -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

Expand All @@ -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"]
2 changes: 1 addition & 1 deletion ..._wrapper_oob_eight_gaudi_with_rerank.yaml → ...ht_gaudi/oob_eight_gaudi_with_rerank.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...o_wrapper_oob_four_gaudi_with_rerank.yaml → ...our_gaudi/oob_four_gaudi_with_rerank.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...wrapper_oob_single_gaudi_with_rerank.yaml → ...e_gaudi/oob_single_gaudi_with_rerank.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...no_wrapper_oob_two_gaudi_with_rerank.yaml → .../two_gaudi/oob_two_gaudi_with_rerank.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
0 ...apper_oob_eight_gaudi_without_rerank.yaml → ...gaudi/oob_eight_gaudi_without_rerank.yaml
View file
Open in desktop
File renamed without changes.
0 ...rapper_oob_four_gaudi_without_rerank.yaml → ..._gaudi/oob_four_gaudi_without_rerank.yaml
View file
Open in desktop
File renamed without changes.
0 ...pper_oob_single_gaudi_without_rerank.yaml → ...audi/oob_single_gaudi_without_rerank.yaml
View file
Open in desktop
File renamed without changes.
0 ...wrapper_oob_two_gaudi_without_rerank.yaml → ...o_gaudi/oob_two_gaudi_without_rerank.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...rapper_tuned_eight_gaudi_with_rerank.yaml → .../eight_gaudi/eight_gaudi_with_rerank.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...wrapper_tuned_four_gaudi_with_rerank.yaml → ...r_gaudi/tuned_four_gaudi_with_rerank.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...apper_tuned_single_gaudi_with_rerank.yaml → ...gaudi/tuned_single_gaudi_with_rerank.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ..._wrapper_tuned_two_gaudi_with_rerank.yaml → ...wo_gaudi/tuned_two_gaudi_with_rerank.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
0 ...per_tuned_eight_gaudi_without_rerank.yaml → ...udi/tuned_eight_gaudi_without_rerank.yaml
View file
Open in desktop
File renamed without changes.
0 ...pper_tuned_four_gaudi_without_rerank.yaml → ...audi/tuned_four_gaudi_without_rerank.yaml
View file
Open in desktop
File renamed without changes.
0 ...er_tuned_single_gaudi_without_rerank.yaml → ...di/tuned_single_gaudi_without_rerank.yaml
View file
Open in desktop
File renamed without changes.
0 ...apper_tuned_two_gaudi_without_rerank.yaml → ...gaudi/tuned_two_gaudi_without_rerank.yaml
View file
Open in desktop
File renamed without changes.
Loading
Loading