Skip to content

Commit 1315a6b

Browse files
yao531441pre-commit-ci[bot]ZePan110
authored and
louie-tsai
committed
One click : Support Chatqna docker offline mode. (#2197)
Signed-off-by: Yao, Qing <qing.yao@intel.com> Signed-off-by: ZePan110 <ze.pan@intel.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: ZePan110 <ze.pan@intel.com> Signed-off-by: Tsai, Louie <louie.tsai@intel.com>
1 parent e6da419 commit 1315a6b

File tree

9 files changed

+361
-47
lines changed

9 files changed

+361
-47
lines changed

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,24 @@ jobs:
9494
with:
9595
fetch-depth: 0
9696

97+
- name: Clean up deployment before test
98+
if: ${{ inputs.deploy_method == 'k8s' }}
99+
shell: bash
100+
run: |
101+
cd ${{ github.workspace }}/one_click_deploy
102+
103+
INPUT_DATA=$(
104+
jq -r --arg type "${{ inputs.deploy_method }}" --arg id "${{ inputs.example }}" \
105+
'.[$type][$id].inputs.clear[]' ${{ github.workspace }}/.github/workflows/one-click-inputs-nobuild.json | \
106+
sed "s/\$hardware/${{ inputs.hardware }}/g"
107+
)
108+
echo "Generated input:"
109+
echo "$INPUT_DATA"
110+
111+
python3 one_click_deploy.py << INPUTS
112+
$INPUT_DATA
113+
INPUTS
114+
97115
- name: Install dependencies
98116
run: |
99117
sudo apt update
@@ -175,7 +193,7 @@ jobs:
175193
176194
INPUT_DATA=$(
177195
jq -r --arg type "${{ inputs.deploy_method }}" --arg id "${{ inputs.example }}" \
178-
'.[$type][$id].inputs.clear[]' ${{ github.workspace }}/.github/workflows/one-click-inputs.json | \
196+
'.[$type][$id].inputs.clear[]' ${{ github.workspace }}/.github/workflows/one-click-inputs-nobuild.json | \
179197
sed "s/\$hardware/${{ inputs.hardware }}/g"
180198
)
181199
echo "Generated input:"

‎.github/workflows/one-click-inputs-nobuild.json

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"ChatQnA": {
44
"inputs": {
55
"deploy": [
6+
"1",
67
"1",
78
"1",
89
"docker",
@@ -20,14 +21,15 @@
2021
"y",
2122
"Y"
2223
],
23-
"clear": ["1", "2", "docker", "$hardware", "Y"]
24+
"clear": ["1", "1", "2", "docker", "$hardware", "Y"]
2425
}
2526
},
2627
"CodeTrans": {
2728
"inputs": {
2829
"deploy": [
2930
"2",
3031
"1",
32+
"1",
3133
"docker",
3234
"$hardware",
3335
"$HF_TOKEN",
@@ -40,14 +42,15 @@
4042
"y",
4143
"Y"
4244
],
43-
"clear": ["2", "2", "docker", "$hardware", "Y"]
45+
"clear": ["2", "1", "2", "docker", "$hardware", "Y"]
4446
}
4547
},
4648
"DocSum": {
4749
"inputs": {
4850
"deploy": [
4951
"3",
5052
"1",
53+
"1",
5154
"docker",
5255
"$hardware",
5356
"$HF_TOKEN",
@@ -60,14 +63,15 @@
6063
"y",
6164
"Y"
6265
],
63-
"clear": ["3", "2", "docker", "$hardware", "Y"]
66+
"clear": ["3", "1", "2", "docker", "$hardware", "Y"]
6467
}
6568
},
6669
"CodeGen": {
6770
"inputs": {
6871
"deploy": [
6972
"4",
7073
"1",
74+
"1",
7175
"docker",
7276
"$hardware",
7377
"$HF_TOKEN",
@@ -80,14 +84,15 @@
8084
"y",
8185
"Y"
8286
],
83-
"clear": ["4", "2", "docker", "$hardware", "Y"]
87+
"clear": ["4", "1", "2", "docker", "$hardware", "Y"]
8488
}
8589
},
8690
"AudioQnA": {
8791
"inputs": {
8892
"deploy": [
8993
"5",
9094
"1",
95+
"1",
9196
"docker",
9297
"$hardware",
9398
"$HF_TOKEN",
@@ -100,14 +105,15 @@
100105
"y",
101106
"Y"
102107
],
103-
"clear": ["5", "2", "docker", "$hardware", "Y"]
108+
"clear": ["5", "1", "2", "docker", "$hardware", "Y"]
104109
}
105110
},
106111
"VisualQnA": {
107112
"inputs": {
108113
"deploy": [
109114
"6",
110115
"1",
116+
"1",
111117
"docker",
112118
"$hardware",
113119
"$HF_TOKEN",
@@ -120,14 +126,15 @@
120126
"y",
121127
"Y"
122128
],
123-
"clear": ["6", "2", "docker", "$hardware", "Y"]
129+
"clear": ["6", "1", "2", "docker", "$hardware", "Y"]
124130
}
125131
},
126132
"FaqGen": {
127133
"inputs": {
128134
"deploy": [
129135
"7",
130136
"1",
137+
"1",
131138
"docker",
132139
"$hardware",
133140
"$HF_TOKEN",
@@ -140,14 +147,15 @@
140147
"y",
141148
"Y"
142149
],
143-
"clear": ["7", "2", "docker", "$hardware", "Y"]
150+
"clear": ["7", "1", "2", "docker", "$hardware", "Y"]
144151
}
145152
},
146153
"AgentQnA": {
147154
"inputs": {
148155
"deploy": [
149156
"8",
150157
"1",
158+
"1",
151159
"docker",
152160
"$hardware",
153161
"$HF_TOKEN",
@@ -161,14 +169,15 @@
161169
"y",
162170
"Y"
163171
],
164-
"clear": ["8", "2", "docker", "$hardware", "Y"]
172+
"clear": ["8", "1", "2", "docker", "$hardware", "Y"]
165173
}
166174
}
167175
},
168176
"k8s": {
169177
"ChatQnA": {
170178
"inputs": {
171179
"deploy": [
180+
"1",
172181
"1",
173182
"1",
174183
"k8s",
@@ -186,14 +195,15 @@
186195
"8080",
187196
"Y"
188197
],
189-
"clear": ["1", "2", "k8s", "y", "Y"]
198+
"clear": ["1", "1", "2", "k8s", "y", "Y"]
190199
}
191200
},
192201
"CodeTrans": {
193202
"inputs": {
194203
"deploy": [
195204
"2",
196205
"1",
206+
"1",
197207
"k8s",
198208
"$hardware",
199209
"$HF_TOKEN",
@@ -207,14 +217,15 @@
207217
"8080",
208218
"Y"
209219
],
210-
"clear": ["2", "2", "k8s", "y", "Y"]
220+
"clear": ["2", "1", "2", "k8s", "y", "Y"]
211221
}
212222
},
213223
"DocSum": {
214224
"inputs": {
215225
"deploy": [
216226
"3",
217227
"1",
228+
"1",
218229
"k8s",
219230
"$hardware",
220231
"$HF_TOKEN",
@@ -228,14 +239,15 @@
228239
"8080",
229240
"Y"
230241
],
231-
"clear": ["3", "2", "k8s", "y", "Y"]
242+
"clear": ["3", "1", "2", "k8s", "y", "Y"]
232243
}
233244
},
234245
"CodeGen": {
235246
"inputs": {
236247
"deploy": [
237248
"4",
238249
"1",
250+
"1",
239251
"k8s",
240252
"$hardware",
241253
"$HF_TOKEN",
@@ -249,14 +261,15 @@
249261
"8080",
250262
"Y"
251263
],
252-
"clear": ["4", "2", "k8s", "y", "Y"]
264+
"clear": ["4", "1", "2", "k8s", "y", "Y"]
253265
}
254266
},
255267
"AudioQnA": {
256268
"inputs": {
257269
"deploy": [
258270
"5",
259271
"1",
272+
"1",
260273
"k8s",
261274
"$hardware",
262275
"$HF_TOKEN",
@@ -270,14 +283,15 @@
270283
"8080",
271284
"Y"
272285
],
273-
"clear": ["5", "2", "k8s", "y", "Y"]
286+
"clear": ["5", "1", "2", "k8s", "y", "Y"]
274287
}
275288
},
276289
"VisualQnA": {
277290
"inputs": {
278291
"deploy": [
279292
"6",
280293
"1",
294+
"1",
281295
"k8s",
282296
"$hardware",
283297
"$HF_TOKEN",
@@ -291,14 +305,15 @@
291305
"8080",
292306
"Y"
293307
],
294-
"clear": ["6", "2", "k8s", "y", "Y"]
308+
"clear": ["6", "1", "2", "k8s", "y", "Y"]
295309
}
296310
},
297311
"FaqGen": {
298312
"inputs": {
299313
"deploy": [
300314
"7",
301315
"1",
316+
"1",
302317
"k8s",
303318
"$hardware",
304319
"$HF_TOKEN",
@@ -312,14 +327,15 @@
312327
"8080",
313328
"Y"
314329
],
315-
"clear": ["7", "2", "k8s", "y", "Y"]
330+
"clear": ["7", "1", "2", "k8s", "y", "Y"]
316331
}
317332
},
318333
"AgentQnA": {
319334
"inputs": {
320335
"deploy": [
321336
"8",
322337
"1",
338+
"1",
323339
"k8s",
324340
"$hardware",
325341
"$HF_TOKEN",
@@ -334,7 +350,7 @@
334350
"8080",
335351
"Y"
336352
],
337-
"clear": ["8", "2", "k8s", "y", "Y"]
353+
"clear": ["8", "1", "2", "k8s", "y", "Y"]
338354
}
339355
}
340356
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ on:
1212
types: [opened, reopened, synchronize] # added `ready_for_review` since draft is skipped
1313
paths:
1414
- "**/one_click_deploy/**"
15+
- "**/workflows/one-click-inputs-nobuild.json"
16+
- "**/workflows/pr-one-click.yml"
17+
- "**/workflows/_run-one-click.yml"
1518

1619
# If there is a new commit, the previous jobs will be canceled
1720
concurrency:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ services:
3131
REDIS_HOST: redis-vector-db
3232
INDEX_NAME: ${INDEX_NAME}
3333
TEI_ENDPOINT: http://tei-embedding-service:80
34+
TEI_EMBEDDING_ENDPOINT: http://tei-embedding-service:80
3435
HF_TOKEN: ${HF_TOKEN}
3536
healthcheck:
3637
test: ["CMD-SHELL", "curl -f http://localhost:5000/v1/health_check || exit 1"]
@@ -102,6 +103,7 @@ services:
102103
HF_TOKEN: ${HF_TOKEN}
103104
LLM_MODEL_ID: ${LLM_MODEL_ID}
104105
VLLM_TORCH_PROFILER_DIR: "/mnt"
106+
HF_HUB_OFFLINE: ${HF_HUB_OFFLINE:-0}
105107
VLLM_CPU_KVCACHE_SPACE: 40
106108
healthcheck:
107109
test: ["CMD-SHELL", "curl -f http://$host_ip:9009/health || exit 1"]

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ services:
3131
REDIS_HOST: redis-vector-db
3232
INDEX_NAME: ${INDEX_NAME}
3333
TEI_ENDPOINT: http://tei-embedding-service:80
34+
TEI_EMBEDDING_ENDPOINT: http://tei-embedding-service:80
3435
HF_TOKEN: ${HF_TOKEN}
3536
healthcheck:
3637
test: ["CMD-SHELL", "curl -f http://localhost:5000/v1/health_check || exit 1"]
@@ -106,6 +107,7 @@ services:
106107
OMPI_MCA_btl_vader_single_copy_mechanism: none
107108
LLM_MODEL_ID: ${LLM_MODEL_ID}
108109
NUM_CARDS: ${NUM_CARDS}
110+
HF_HUB_OFFLINE: ${HF_HUB_OFFLINE:-0}
109111
VLLM_TORCH_PROFILER_DIR: "/mnt"
110112
healthcheck:
111113
test: ["CMD-SHELL", "curl -f http://localhost:80/health || exit 1"]

0 commit comments

Comments
 (0)