Skip to content

Commit c930bea

Browse files
lvliang-intellvliang-intel
authored
Add missing nginx microservice and fix frontend test (#951)
Signed-off-by: lvliang-intel <liang1.lv@intel.com>
1 parent 0edff26 commit c930bea

19 files changed

+203
-13
lines changed

‎ChatQnA/docker_compose/intel/cpu/aipc/compose.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,25 @@ services:
128128
- DELETE_FILE=${DATAPREP_DELETE_FILE_ENDPOINT}
129129
ipc: host
130130
restart: always
131+
chaqna-aipc-nginx-server:
132+
image: ${REGISTRY:-opea}/nginx:${TAG:-latest}
133+
container_name: chaqna-aipc-nginx-server
134+
depends_on:
135+
- chaqna-aipc-backend-server
136+
- chaqna-aipc-ui-server
137+
ports:
138+
- "${NGINX_PORT:-80}:80"
139+
environment:
140+
- no_proxy=${no_proxy}
141+
- https_proxy=${https_proxy}
142+
- http_proxy=${http_proxy}
143+
- FRONTEND_SERVICE_IP=${FRONTEND_SERVICE_IP}
144+
- FRONTEND_SERVICE_PORT=${FRONTEND_SERVICE_PORT}
145+
- BACKEND_SERVICE_NAME=${BACKEND_SERVICE_NAME}
146+
- BACKEND_SERVICE_IP=${BACKEND_SERVICE_IP}
147+
- BACKEND_SERVICE_PORT=${BACKEND_SERVICE_PORT}
148+
ipc: host
149+
restart: always
131150

132151
networks:
133152
default:

‎ChatQnA/docker_compose/intel/cpu/xeon/compose.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,25 @@ services:
131131
- DELETE_FILE=${DATAPREP_DELETE_FILE_ENDPOINT}
132132
ipc: host
133133
restart: always
134+
chaqna-xeon-nginx-server:
135+
image: ${REGISTRY:-opea}/nginx:${TAG:-latest}
136+
container_name: chaqna-xeon-nginx-server
137+
depends_on:
138+
- chaqna-xeon-backend-server
139+
- chaqna-xeon-ui-server
140+
ports:
141+
- "${NGINX_PORT:-80}:80"
142+
environment:
143+
- no_proxy=${no_proxy}
144+
- https_proxy=${https_proxy}
145+
- http_proxy=${http_proxy}
146+
- FRONTEND_SERVICE_IP=${FRONTEND_SERVICE_IP}
147+
- FRONTEND_SERVICE_PORT=${FRONTEND_SERVICE_PORT}
148+
- BACKEND_SERVICE_NAME=${BACKEND_SERVICE_NAME}
149+
- BACKEND_SERVICE_IP=${BACKEND_SERVICE_IP}
150+
- BACKEND_SERVICE_PORT=${BACKEND_SERVICE_PORT}
151+
ipc: host
152+
restart: always
134153

135154
networks:
136155
default:

‎ChatQnA/docker_compose/intel/cpu/xeon/compose_qdrant.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,25 @@ services:
130130
- DELETE_FILE=${DATAPREP_DELETE_FILE_ENDPOINT}
131131
ipc: host
132132
restart: always
133+
chaqna-xeon-nginx-server:
134+
image: ${REGISTRY:-opea}/nginx:${TAG:-latest}
135+
container_name: chaqna-xeon-nginx-server
136+
depends_on:
137+
- chaqna-xeon-backend-server
138+
- chaqna-xeon-ui-server
139+
ports:
140+
- "${NGINX_PORT:-80}:80"
141+
environment:
142+
- no_proxy=${no_proxy}
143+
- https_proxy=${https_proxy}
144+
- http_proxy=${http_proxy}
145+
- FRONTEND_SERVICE_IP=${FRONTEND_SERVICE_IP}
146+
- FRONTEND_SERVICE_PORT=${FRONTEND_SERVICE_PORT}
147+
- BACKEND_SERVICE_NAME=${BACKEND_SERVICE_NAME}
148+
- BACKEND_SERVICE_IP=${BACKEND_SERVICE_IP}
149+
- BACKEND_SERVICE_PORT=${BACKEND_SERVICE_PORT}
150+
ipc: host
151+
restart: always
133152

134153
networks:
135154
default:

‎ChatQnA/docker_compose/intel/cpu/xeon/compose_vllm.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,25 @@ services:
131131
- DELETE_FILE=${DATAPREP_DELETE_FILE_ENDPOINT}
132132
ipc: host
133133
restart: always
134+
chaqna-xeon-nginx-server:
135+
image: ${REGISTRY:-opea}/nginx:${TAG:-latest}
136+
container_name: chaqna-xeon-nginx-server
137+
depends_on:
138+
- chaqna-xeon-backend-server
139+
- chaqna-xeon-ui-server
140+
ports:
141+
- "${NGINX_PORT:-80}:80"
142+
environment:
143+
- no_proxy=${no_proxy}
144+
- https_proxy=${https_proxy}
145+
- http_proxy=${http_proxy}
146+
- FRONTEND_SERVICE_IP=${FRONTEND_SERVICE_IP}
147+
- FRONTEND_SERVICE_PORT=${FRONTEND_SERVICE_PORT}
148+
- BACKEND_SERVICE_NAME=${BACKEND_SERVICE_NAME}
149+
- BACKEND_SERVICE_IP=${BACKEND_SERVICE_IP}
150+
- BACKEND_SERVICE_PORT=${BACKEND_SERVICE_PORT}
151+
ipc: host
152+
restart: always
134153

135154
networks:
136155
default:

‎ChatQnA/docker_compose/intel/cpu/xeon/compose_without_rerank.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,25 @@ services:
112112
- DELETE_FILE=${DATAPREP_DELETE_FILE_ENDPOINT}
113113
ipc: host
114114
restart: always
115+
chaqna-xeon-nginx-server:
116+
image: ${REGISTRY:-opea}/nginx:${TAG:-latest}
117+
container_name: chaqna-xeon-nginx-server
118+
depends_on:
119+
- chaqna-xeon-backend-server
120+
- chaqna-xeon-ui-server
121+
ports:
122+
- "${NGINX_PORT:-80}:80"
123+
environment:
124+
- no_proxy=${no_proxy}
125+
- https_proxy=${https_proxy}
126+
- http_proxy=${http_proxy}
127+
- FRONTEND_SERVICE_IP=${FRONTEND_SERVICE_IP}
128+
- FRONTEND_SERVICE_PORT=${FRONTEND_SERVICE_PORT}
129+
- BACKEND_SERVICE_NAME=${BACKEND_SERVICE_NAME}
130+
- BACKEND_SERVICE_IP=${BACKEND_SERVICE_IP}
131+
- BACKEND_SERVICE_PORT=${BACKEND_SERVICE_PORT}
132+
ipc: host
133+
restart: always
115134

116135
networks:
117136
default:

‎ChatQnA/docker_compose/intel/hpu/gaudi/compose.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,25 @@ services:
144144
- DELETE_FILE=${DATAPREP_DELETE_FILE_ENDPOINT}
145145
ipc: host
146146
restart: always
147+
chaqna-gaudi-nginx-server:
148+
image: ${REGISTRY:-opea}/nginx:${TAG:-latest}
149+
container_name: chaqna-gaudi-nginx-server
150+
depends_on:
151+
- chaqna-gaudi-backend-server
152+
- chaqna-gaudi-ui-server
153+
ports:
154+
- "${NGINX_PORT:-80}:80"
155+
environment:
156+
- no_proxy=${no_proxy}
157+
- https_proxy=${https_proxy}
158+
- http_proxy=${http_proxy}
159+
- FRONTEND_SERVICE_IP=${FRONTEND_SERVICE_IP}
160+
- FRONTEND_SERVICE_PORT=${FRONTEND_SERVICE_PORT}
161+
- BACKEND_SERVICE_NAME=${BACKEND_SERVICE_NAME}
162+
- BACKEND_SERVICE_IP=${BACKEND_SERVICE_IP}
163+
- BACKEND_SERVICE_PORT=${BACKEND_SERVICE_PORT}
164+
ipc: host
165+
restart: always
147166

148167
networks:
149168
default:

‎ChatQnA/docker_compose/intel/hpu/gaudi/compose_guardrails.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,25 @@ services:
185185
- DELETE_FILE=${DATAPREP_DELETE_FILE_ENDPOINT}
186186
ipc: host
187187
restart: always
188+
chaqna-gaudi-nginx-server:
189+
image: ${REGISTRY:-opea}/nginx:${TAG:-latest}
190+
container_name: chaqna-gaudi-nginx-server
191+
depends_on:
192+
- chaqna-gaudi-backend-server
193+
- chaqna-gaudi-ui-server
194+
ports:
195+
- "${NGINX_PORT:-80}:80"
196+
environment:
197+
- no_proxy=${no_proxy}
198+
- https_proxy=${https_proxy}
199+
- http_proxy=${http_proxy}
200+
- FRONTEND_SERVICE_IP=${FRONTEND_SERVICE_IP}
201+
- FRONTEND_SERVICE_PORT=${FRONTEND_SERVICE_PORT}
202+
- BACKEND_SERVICE_NAME=${BACKEND_SERVICE_NAME}
203+
- BACKEND_SERVICE_IP=${BACKEND_SERVICE_IP}
204+
- BACKEND_SERVICE_PORT=${BACKEND_SERVICE_PORT}
205+
ipc: host
206+
restart: always
188207

189208
networks:
190209
default:

‎ChatQnA/docker_compose/intel/hpu/gaudi/compose_vllm.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,25 @@ services:
137137
- DELETE_FILE=${DATAPREP_DELETE_FILE_ENDPOINT}
138138
ipc: host
139139
restart: always
140+
chaqna-gaudi-nginx-server:
141+
image: ${REGISTRY:-opea}/nginx:${TAG:-latest}
142+
container_name: chaqna-gaudi-nginx-server
143+
depends_on:
144+
- chaqna-gaudi-backend-server
145+
- chaqna-gaudi-ui-server
146+
ports:
147+
- "${NGINX_PORT:-80}:80"
148+
environment:
149+
- no_proxy=${no_proxy}
150+
- https_proxy=${https_proxy}
151+
- http_proxy=${http_proxy}
152+
- FRONTEND_SERVICE_IP=${FRONTEND_SERVICE_IP}
153+
- FRONTEND_SERVICE_PORT=${FRONTEND_SERVICE_PORT}
154+
- BACKEND_SERVICE_NAME=${BACKEND_SERVICE_NAME}
155+
- BACKEND_SERVICE_IP=${BACKEND_SERVICE_IP}
156+
- BACKEND_SERVICE_PORT=${BACKEND_SERVICE_PORT}
157+
ipc: host
158+
restart: always
140159

141160
networks:
142161
default:

‎ChatQnA/docker_compose/intel/hpu/gaudi/compose_vllm_ray.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,25 @@ services:
137137
- DELETE_FILE=${DATAPREP_DELETE_FILE_ENDPOINT}
138138
ipc: host
139139
restart: always
140+
chaqna-gaudi-nginx-server:
141+
image: ${REGISTRY:-opea}/nginx:${TAG:-latest}
142+
container_name: chaqna-gaudi-nginx-server
143+
depends_on:
144+
- chaqna-gaudi-backend-server
145+
- chaqna-gaudi-ui-server
146+
ports:
147+
- "${NGINX_PORT:-80}:80"
148+
environment:
149+
- no_proxy=${no_proxy}
150+
- https_proxy=${https_proxy}
151+
- http_proxy=${http_proxy}
152+
- FRONTEND_SERVICE_IP=${FRONTEND_SERVICE_IP}
153+
- FRONTEND_SERVICE_PORT=${FRONTEND_SERVICE_PORT}
154+
- BACKEND_SERVICE_NAME=${BACKEND_SERVICE_NAME}
155+
- BACKEND_SERVICE_IP=${BACKEND_SERVICE_IP}
156+
- BACKEND_SERVICE_PORT=${BACKEND_SERVICE_PORT}
157+
ipc: host
158+
restart: always
140159

141160
networks:
142161
default:

‎ChatQnA/docker_compose/intel/hpu/gaudi/compose_without_rerank.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,25 @@ services:
125125
- DELETE_FILE=${DATAPREP_DELETE_FILE_ENDPOINT}
126126
ipc: host
127127
restart: always
128+
chaqna-gaudi-nginx-server:
129+
image: ${REGISTRY:-opea}/nginx:${TAG:-latest}
130+
container_name: chaqna-gaudi-nginx-server
131+
depends_on:
132+
- chaqna-gaudi-backend-server
133+
- chaqna-gaudi-ui-server
134+
ports:
135+
- "${NGINX_PORT:-80}:80"
136+
environment:
137+
- no_proxy=${no_proxy}
138+
- https_proxy=${https_proxy}
139+
- http_proxy=${http_proxy}
140+
- FRONTEND_SERVICE_IP=${FRONTEND_SERVICE_IP}
141+
- FRONTEND_SERVICE_PORT=${FRONTEND_SERVICE_PORT}
142+
- BACKEND_SERVICE_NAME=${BACKEND_SERVICE_NAME}
143+
- BACKEND_SERVICE_IP=${BACKEND_SERVICE_IP}
144+
- BACKEND_SERVICE_PORT=${BACKEND_SERVICE_PORT}
145+
ipc: host
146+
restart: always
128147

129148
networks:
130149
default:

‎ChatQnA/tests/test_compose_guardrails_on_gaudi.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function build_docker_images() {
1919
git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../
2020

2121
echo "Build all the images with --no-cache, check docker_image_build.log for details..."
22-
service_list="chatqna-guardrails chatqna-ui dataprep-redis retriever-redis guardrails-tgi"
22+
service_list="chatqna-guardrails chatqna-ui dataprep-redis retriever-redis guardrails-tgi nginx"
2323
docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log
2424

2525
docker pull ghcr.io/huggingface/tgi-gaudi:2.0.5
@@ -214,7 +214,7 @@ function main() {
214214

215215
validate_microservices
216216
validate_megaservice
217-
# validate_frontend
217+
validate_frontend
218218

219219
stop_docker
220220
echo y | docker system prune

‎ChatQnA/tests/test_compose_on_gaudi.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function build_docker_images() {
1919
git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../
2020

2121
echo "Build all the images with --no-cache, check docker_image_build.log for details..."
22-
service_list="chatqna chatqna-ui dataprep-redis retriever-redis"
22+
service_list="chatqna chatqna-ui dataprep-redis retriever-redis nginx"
2323
docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log
2424

2525
docker pull ghcr.io/huggingface/tgi-gaudi:2.0.5
@@ -240,7 +240,7 @@ function main() {
240240
elif [ "${mode}" == "" ]; then
241241
validate_microservices
242242
validate_megaservice
243-
# validate_frontend
243+
validate_frontend
244244
fi
245245

246246
stop_docker

‎ChatQnA/tests/test_compose_on_xeon.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function build_docker_images() {
1919
git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../
2020

2121
echo "Build all the images with --no-cache, check docker_image_build.log for details..."
22-
service_list="chatqna chatqna-ui chatqna-conversation-ui dataprep-redis retriever-redis"
22+
service_list="chatqna chatqna-ui chatqna-conversation-ui dataprep-redis retriever-redis nginx"
2323
docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log
2424

2525
docker pull ghcr.io/huggingface/tgi-gaudi:2.0.5
@@ -242,8 +242,8 @@ function main() {
242242
echo "==== microservices validated ===="
243243
validate_megaservice
244244
echo "==== megaservice validated ===="
245-
# validate_frontend
246-
# echo "==== frontend validated ===="
245+
validate_frontend
246+
echo "==== frontend validated ===="
247247
fi
248248

249249
stop_docker

‎ChatQnA/tests/test_compose_qdrant_on_xeon.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function build_docker_images() {
1919
git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../
2020

2121
echo "Build all the images with --no-cache, check docker_image_build.log for details..."
22-
service_list="chatqna chatqna-ui dataprep-qdrant retriever-qdrant"
22+
service_list="chatqna chatqna-ui dataprep-qdrant retriever-qdrant nginx"
2323
docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log
2424

2525
docker images && sleep 1s

‎ChatQnA/tests/test_compose_vllm_on_gaudi.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function build_docker_images() {
1919
git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../
2020

2121
echo "Build all the images with --no-cache, check docker_image_build.log for details..."
22-
service_list="chatqna chatqna-ui dataprep-redis retriever-redis llm-vllm-hpu"
22+
service_list="chatqna chatqna-ui dataprep-redis retriever-redis llm-vllm-hpu nginx"
2323
docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log
2424

2525
docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.5

‎ChatQnA/tests/test_compose_vllm_on_xeon.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function build_docker_images() {
2020
git clone https://github.com/vllm-project/vllm.git
2121

2222
echo "Build all the images with --no-cache, check docker_image_build.log for details..."
23-
service_list="chatqna chatqna-ui dataprep-redis retriever-redis vllm"
23+
service_list="chatqna chatqna-ui dataprep-redis retriever-redis vllm nginx"
2424
docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log
2525

2626
docker pull ghcr.io/huggingface/tgi-gaudi:2.0.5

‎ChatQnA/tests/test_compose_vllm_ray_on_gaudi.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function build_docker_images() {
1919
git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../
2020

2121
echo "Build all the images with --no-cache, check docker_image_build.log for details..."
22-
service_list="chatqna chatqna-ui dataprep-redis retriever-redis llm-vllm-ray-hpu"
22+
service_list="chatqna chatqna-ui dataprep-redis retriever-redis llm-vllm-ray-hpu nginx"
2323
docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log
2424

2525
docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.5

‎ChatQnA/tests/test_compose_without_rerank_on_gaudi.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function build_docker_images() {
1919
git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../
2020

2121
echo "Build all the images with --no-cache, check docker_image_build.log for details..."
22-
service_list="chatqna-without-rerank chatqna-ui dataprep-redis retriever-redis"
22+
service_list="chatqna-without-rerank chatqna-ui dataprep-redis retriever-redis nginx"
2323
docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log
2424

2525
docker pull ghcr.io/huggingface/tgi-gaudi:2.0.5

‎ChatQnA/tests/test_compose_without_rerank_on_xeon.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function build_docker_images() {
1919
git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../
2020

2121
echo "Build all the images with --no-cache, check docker_image_build.log for details..."
22-
service_list="chatqna-without-rerank chatqna-ui chatqna-conversation-ui dataprep-redis retriever-redis"
22+
service_list="chatqna-without-rerank chatqna-ui chatqna-conversation-ui dataprep-redis retriever-redis nginx"
2323
docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log
2424

2525
docker pull ghcr.io/huggingface/tgi-gaudi:2.0.5

0 commit comments

Comments
 (0)