Skip to content

Commit 5aba955

Browse files
ZePan110ZePan110
authored
Merge branch 'main' into ze-fix/sec
2 parents 5bd4674 + fdaf687 commit 5aba955

172 files changed

Lines changed: 6504 additions & 2727 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/_run-one-click.yml‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -123,20 +123,11 @@ jobs:
123123
id: get-default-params
124124
if: ${{ inputs.deploy_method == 'k8s' }}
125125
run: |
126-
cd ${{ github.workspace }}
127-
example=$(echo "${{ inputs.example }}" | cut -d'-' -f1)
128-
PARAMS_JSON=$(python3 .github/workflows/scripts/get-params.py $example)
129-
echo "LLM_model=$(echo "$PARAMS_JSON" | jq -r '.llm_model')" >> $GITHUB_ENV
130-
if [ "$example" = "ChatQnA" ]; then
131-
echo "LLM_model=$(echo "$PARAMS_JSON" | jq -r '.llm_model')" >> $GITHUB_ENV
132-
echo "Embedding_model=$(echo "$PARAMS_JSON" | jq -r '.embed_model')" >> $GITHUB_ENV
133-
echo "Reranking_model=$(echo "$PARAMS_JSON" | jq -r '.rerank_model')" >> $GITHUB_ENV
134-
echo "Mount_dir=$(echo "$PARAMS_JSON" | jq -r '.mount_dir')" >> $GITHUB_ENV
135-
elif [ "$example" = "VisualQnA" ]; then
136-
echo "LVM_model=$(echo "$PARAMS_JSON" | jq -r '.lvm_model')" >> $GITHUB_ENV
137-
elif [ "$example" = "AgentQnA" ]; then
138-
echo "LLM_model=$(echo "$PARAMS_JSON" | jq -r '.gaudi.llm_model')" >> $GITHUB_ENV
139-
fi
126+
echo "LLM_model=" >> $GITHUB_ENV
127+
echo "Embedding_model=" >> $GITHUB_ENV
128+
echo "Reranking_model=" >> $GITHUB_ENV
129+
echo "Mount_dir=" >> $GITHUB_ENV
130+
echo "LVM_model=" >> $GITHUB_ENV
140131
141132
- name: deploy and test
142133
shell: bash

‎.github/workflows/scripts/get-params.py‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎AudioQnA/kubernetes/helm/cpu-openeuler-values.yaml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Copyright (C) 2025 Huawei Technologies Co., Ltd.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
# This file is based on cpu-values.yaml and overrides image tags to 'latest-openeuler'
5+
# for all enabled services to run on openEuler.
6+
image:
7+
tag: latest-openeuler
8+
9+
tgi:
10+
enabled: false
11+
12+
# Overrides from cpu-values.yaml
13+
vllm:
14+
enabled: true
15+
image:
16+
repository: openeuler/vllm-cpu
17+
tag: 0.10.1-oe2403lts
18+
19+
speecht5:
20+
enabled: true
21+
image:
22+
tag: latest-openeuler
23+
24+
whisper:
25+
enabled: true
26+
image:
27+
tag: latest-openeuler
28+
29+
gpt-sovits:
30+
enabled: false
31+
32+
nginx:
33+
image:
34+
tag: latest-openeuler
35+
service:
36+
type: NodePort
37+
38+
audioqna-ui:
39+
image:
40+
tag: latest-openeuler

‎ChatQnA/tests/test_compose_openeuler_on_xeon.sh‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -126,35 +126,6 @@ function validate_megaservice() {
126126

127127
}
128128

129-
function validate_frontend() {
130-
cd $WORKPATH/ui/svelte
131-
132-
echo "[TEST INFO]: Preparing frontend test using Docker..."
133-
134-
sed -i "s/localhost/$ip_address/g" playwright.config.ts
135-
136-
echo "[TEST INFO]: Running frontend tests in Docker..."
137-
exit_status=0
138-
139-
docker run --rm \
140-
--network="host" \
141-
-v $PWD:/work \
142-
-w /work \
143-
mcr.microsoft.com/playwright:v1.40.0-focal \
144-
/bin/bash -c "
145-
npm ci &&
146-
npx playwright@1.44.0 install --with-deps &&
147-
npx playwright@1.44.0 test
148-
" || exit_status=$?
149-
150-
if [ $exit_status -ne 0 ]; then
151-
echo "[TEST INFO]: ---------frontend test failed---------"
152-
exit $exit_status
153-
else
154-
echo "[TEST INFO]: ---------frontend test passed---------"
155-
fi
156-
}
157-
158129
function stop_docker() {
159130
cd $WORKPATH/docker_compose/intel/cpu/xeon
160131
docker compose -f compose_openeuler.yaml -f compose.telemetry.yaml down

ChatQnA/tests/test_compose_ui_on_xeon.sh renamed to ChatQnA/tests/test_ui_on_xeon.sh

File renamed without changes.

‎CodeGen/kubernetes/helm/cpu-openeuler-values.yaml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Copyright (C) 2025 Huawei Technologies Co., Ltd.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
# This file is based on cpu-values.yaml and overrides image tags to 'latest-openeuler'
5+
# for all enabled services to run on openEuler.
6+
image:
7+
tag: latest-openeuler
8+
9+
tgi:
10+
enabled: false
11+
vllm:
12+
image:
13+
repository: openeuler/vllm-cpu
14+
tag: 0.10.1-oe2403lts
15+
enabled: true
16+
llm-uservice:
17+
image:
18+
tag: latest-openeuler
19+
TEXTGEN_BACKEND: vLLM
20+
21+
tei:
22+
image:
23+
repository: openeuler/text-embeddings-inference-cpu
24+
tag: 1.7.0-oe2403lts
25+
26+
data-prep:
27+
image:
28+
tag: latest-openeuler
29+
30+
retriever-usvc:
31+
image:
32+
tag: latest-openeuler
33+
34+
embedding-usvc:
35+
image:
36+
tag: latest-openeuler
37+
38+
codegen-ui:
39+
image:
40+
tag: latest-openeuler

‎CodeGen/kubernetes/helm/cpu-tgi-openeuler-values.yaml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Copyright (C) 2025 Huawei Technologies Co., Ltd.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
# This file is based on cpu-values.yaml and overrides image tags to 'latest-openeuler'
5+
# for all enabled services to run on openEuler.
6+
7+
image:
8+
tag: latest-openeuler
9+
10+
tgi:
11+
enabled: true
12+
image:
13+
repository: openeuler/text-generation-inference-cpu
14+
tag: 2.4.0-oe2403lts
15+
16+
vllm:
17+
enabled: false
18+
llm-uservice:
19+
image:
20+
tag: latest-openeuler
21+
TEXTGEN_BACKEND: TGI
22+
23+
tei:
24+
image:
25+
repository: openeuler/text-embeddings-inference-cpu
26+
tag: 1.7.0-oe2403lts
27+
28+
data-prep:
29+
image:
30+
tag: latest-openeuler
31+
32+
retriever-usvc:
33+
image:
34+
tag: latest-openeuler
35+
36+
embedding-usvc:
37+
image:
38+
tag: latest-openeuler
39+
40+
codegen-ui:
41+
image:
42+
tag: latest-openeuler

‎CodeGen/tests/test_compose_on_epyc.sh‎

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -159,47 +159,6 @@ function validate_megaservice() {
159159

160160
}
161161

162-
function validate_frontend() {
163-
cd $WORKPATH/ui/svelte
164-
local conda_env_name="OPEA_e2e"
165-
export PATH=${HOME}/miniforge3/bin/:$PATH
166-
if conda info --envs | grep -q "$conda_env_name"; then
167-
echo "$conda_env_name exist!"
168-
else
169-
conda create -n ${conda_env_name} python=3.12 -y
170-
fi
171-
source activate ${conda_env_name}
172-
173-
sed -i "s/localhost/$ip_address/g" playwright.config.ts
174-
175-
conda install -c conda-forge nodejs=22.6.0 -y
176-
# npm install && npm ci && npx playwright install --with-deps
177-
npm install && npm ci && npx playwright install
178-
node -v && npm -v && pip list
179-
180-
exit_status=0
181-
npx playwright test || exit_status=$?
182-
183-
if [ $exit_status -ne 0 ]; then
184-
echo "[TEST INFO]: ---------frontend test failed---------"
185-
exit $exit_status
186-
else
187-
echo "[TEST INFO]: ---------frontend test passed---------"
188-
fi
189-
}
190-
191-
function validate_gradio() {
192-
local URL="http://${ip_address}:5173/health"
193-
local HTTP_STATUS=$(curl "$URL")
194-
local SERVICE_NAME="Gradio"
195-
196-
if [ "$HTTP_STATUS" = '{"status":"ok"}' ]; then
197-
echo "[ $SERVICE_NAME ] HTTP status is 200. UI server is running successfully..."
198-
else
199-
echo "[ $SERVICE_NAME ] UI server has failed..."
200-
fi
201-
}
202-
203162
function stop_docker() {
204163
local compose_file="$1"
205164

@@ -247,10 +206,6 @@ function main() {
247206
validate_megaservice
248207
echo "::endgroup::"
249208

250-
echo "::group::validate_gradio"
251-
validate_gradio
252-
echo "::endgroup::"
253-
254209
stop_docker "${docker_compose_files[${i}]}"
255210
sleep 5s
256211
done

‎CodeGen/tests/test_compose_on_gaudi.sh‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -146,46 +146,6 @@ function validate_megaservice() {
146146

147147
}
148148

149-
function validate_frontend() {
150-
cd $WORKPATH/ui/svelte
151-
local conda_env_name="OPEA_e2e"
152-
export PATH=${HOME}/miniforge3/bin/:$PATH
153-
if conda info --envs | grep -q "$conda_env_name"; then
154-
echo "$conda_env_name exist!"
155-
else
156-
conda create -n ${conda_env_name} python=3.12 -y
157-
fi
158-
source activate ${conda_env_name}
159-
160-
sed -i "s/localhost/$ip_address/g" playwright.config.ts
161-
162-
conda install -c conda-forge nodejs=22.6.0 -y
163-
npm install && npm ci && npx playwright install --with-deps
164-
node -v && npm -v && pip list
165-
166-
exit_status=0
167-
npx playwright test || exit_status=$?
168-
169-
if [ $exit_status -ne 0 ]; then
170-
echo "[TEST INFO]: ---------frontend test failed---------"
171-
exit $exit_status
172-
else
173-
echo "[TEST INFO]: ---------frontend test passed---------"
174-
fi
175-
}
176-
177-
function validate_gradio() {
178-
local URL="http://${ip_address}:5173/health"
179-
local HTTP_STATUS=$(curl "$URL")
180-
local SERVICE_NAME="Gradio"
181-
182-
if [ "$HTTP_STATUS" = '{"status":"ok"}' ]; then
183-
echo "[ $SERVICE_NAME ] HTTP status is 200. UI server is running successfully..."
184-
else
185-
echo "[ $SERVICE_NAME ] UI server has failed..."
186-
fi
187-
}
188-
189149
function stop_docker() {
190150
local compose_file="$1"
191151

@@ -234,10 +194,6 @@ function main() {
234194
validate_megaservice
235195
echo "::endgroup::"
236196

237-
echo "::group::validate_gradio"
238-
validate_gradio
239-
echo "::endgroup::"
240-
241197
stop_docker "${docker_compose_files[${i}]}"
242198
sleep 5s
243199
done

‎CodeGen/tests/test_compose_on_rocm.sh‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -111,35 +111,6 @@ function validate_megaservice() {
111111

112112
}
113113

114-
function validate_frontend() {
115-
cd $WORKPATH/ui/svelte
116-
local conda_env_name="OPEA_e2e"
117-
export PATH=${HOME}/miniconda3/bin/:$PATH
118-
if conda info --envs | grep -q "$conda_env_name"; then
119-
echo "$conda_env_name exist!"
120-
else
121-
conda create -n ${conda_env_name} python=3.12 -y
122-
fi
123-
source activate ${conda_env_name}
124-
125-
sed -i "s/localhost/$ip_address/g" playwright.config.ts
126-
127-
conda install -c conda-forge nodejs=22.6.0 -y
128-
npm install && npm ci && npx playwright install --with-deps
129-
node -v && npm -v && pip list
130-
131-
exit_status=0
132-
npx playwright test || exit_status=$?
133-
134-
if [ $exit_status -ne 0 ]; then
135-
echo "[TEST INFO]: ---------frontend test failed---------"
136-
exit $exit_status
137-
else
138-
echo "[TEST INFO]: ---------frontend test passed---------"
139-
fi
140-
}
141-
142-
143114
function stop_docker() {
144115
cd $WORKPATH/docker_compose/amd/gpu/rocm/
145116
docker compose stop && docker compose rm -f
@@ -167,10 +138,6 @@ function main() {
167138
validate_megaservice
168139
echo "::endgroup::"
169140

170-
echo "::group::validate_frontend"
171-
validate_frontend
172-
echo "::endgroup::"
173-
174141
echo "::group::stop_docker"
175142
stop_docker
176143
echo "::endgroup::"

0 commit comments

Comments
 (0)