Skip to content

Commit 1864fac

Browse files
mhbuehlerpre-commit-ci[bot]
mhbuehler
and
pre-commit-ci[bot]
authored
Fixes MultimodalQnA dataprep endpoint and port in the UI (#1457)
Signed-off-by: Melanie Buehler <melanie.h.buehler@intel.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 94f71f2 commit 1864fac

File tree

13 files changed

+28
-58
lines changed

13 files changed

+28
-58
lines changed

‎MultimodalQnA/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@ In the below, we provide a table that describes for each microservice component
8787
<details>
8888
<summary><b>Gaudi default compose.yaml</b></summary>
8989

90-
| MicroService | Open Source Project | HW | Port | Endpoint |
91-
| ------------ | --------------------- | ----- | ---- | --------------------------------------------------------------------- |
92-
| Embedding | Langchain | Xeon | 6000 | /v1/embeddings |
93-
| Retriever | Langchain, Redis | Xeon | 7000 | /v1/multimodal_retrieval |
94-
| LVM | Langchain, TGI | Gaudi | 9399 | /v1/lvm |
95-
| Dataprep | Redis, Langchain, TGI | Gaudi | 6007 | /v1/generate_transcripts, /v1/generate_captions, /v1/ingest_with_text |
90+
| MicroService | Open Source Project | HW | Port | Endpoint |
91+
| ------------ | --------------------- | ----- | ---- | ----------------------------------------------------------- |
92+
| Embedding | Langchain | Xeon | 6000 | /v1/embeddings |
93+
| Retriever | Langchain, Redis | Xeon | 7000 | /v1/multimodal_retrieval |
94+
| LVM | Langchain, TGI | Gaudi | 9399 | /v1/lvm |
95+
| Dataprep | Redis, Langchain, TGI | Gaudi | 6007 | /v1/generate_transcripts, /v1/generate_captions, /v1/ingest |
9696

9797
</details>
9898

‎MultimodalQnA/docker_compose/amd/gpu/rocm/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ To delete all uploaded files along with data indexed with `$INDEX_NAME` in REDIS
289289
```bash
290290
curl -X POST \
291291
-H "Content-Type: application/json" \
292+
-d '{"file_path": "all"}' \
292293
${DATAPREP_DELETE_FILE_ENDPOINT}
293294
```
294295

‎MultimodalQnA/docker_compose/amd/gpu/rocm/set_env.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ export MM_RETRIEVER_SERVICE_HOST_IP=${HOST_IP}
2626
export LVM_SERVICE_HOST_IP=${HOST_IP}
2727
export MEGA_SERVICE_HOST_IP=${HOST_IP}
2828
export BACKEND_SERVICE_ENDPOINT="http://${HOST_IP}:8888/v1/multimodalqna"
29-
export DATAPREP_INGEST_SERVICE_ENDPOINT="http://${HOST_IP}:5000/v1/dataprep/ingest"
30-
export DATAPREP_GEN_TRANSCRIPT_SERVICE_ENDPOINT="http://${HOST_IP}:5000/v1/dataprep/generate_transcripts"
31-
export DATAPREP_GEN_CAPTION_SERVICE_ENDPOINT="http://${HOST_IP}:5000/v1/dataprep/generate_captions"
32-
export DATAPREP_GET_FILE_ENDPOINT="http://${HOST_IP}:5000/v1/dataprep/get"
33-
export DATAPREP_DELETE_FILE_ENDPOINT="http://${HOST_IP}:5000/v1/dataprep/delete"
29+
export DATAPREP_INGEST_SERVICE_ENDPOINT="http://${HOST_IP}:6007/v1/dataprep/ingest"
30+
export DATAPREP_GEN_TRANSCRIPT_SERVICE_ENDPOINT="http://${HOST_IP}:6007/v1/dataprep/generate_transcripts"
31+
export DATAPREP_GEN_CAPTION_SERVICE_ENDPOINT="http://${HOST_IP}:6007/v1/dataprep/generate_captions"
32+
export DATAPREP_GET_FILE_ENDPOINT="http://${HOST_IP}:6007/v1/dataprep/get"
33+
export DATAPREP_DELETE_FILE_ENDPOINT="http://${HOST_IP}:6007/v1/dataprep/delete"

‎MultimodalQnA/docker_compose/intel/cpu/xeon/README.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export REDIS_INSIGHTS_PORT=8001
9292
export REDIS_URL="redis://${host_ip}:${REDIS_DB_PORT}"
9393
export REDIS_HOST=${host_ip}
9494
export INDEX_NAME="mm-rag-redis"
95-
export DATAPREP_MMR_PORT=5000
95+
export DATAPREP_MMR_PORT=6007
9696
export DATAPREP_INGEST_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/ingest"
9797
export DATAPREP_GEN_TRANSCRIPT_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/generate_transcripts"
9898
export DATAPREP_GEN_CAPTION_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/generate_captions"
@@ -334,15 +334,6 @@ export audio_fn="AudioSample.wav"
334334
wget https://github.com/intel/intel-extension-for-transformers/raw/main/intel_extension_for_transformers/neural_chat/assets/audio/sample.wav -O ${audio_fn}
335335
```
336336

337-
```bash
338-
export DATAPREP_MMR_PORT=6007
339-
export DATAPREP_INGEST_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/ingest"
340-
export DATAPREP_GEN_TRANSCRIPT_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/generate_transcripts"
341-
export DATAPREP_GEN_CAPTION_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/generate_captions"
342-
export DATAPREP_GET_FILE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/get"
343-
export DATAPREP_DELETE_FILE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/delete"
344-
```
345-
346337
Test dataprep microservice with generating transcript. This command updates a knowledge base by uploading a local video .mp4 and an audio .wav file.
347338

348339
```bash
@@ -398,6 +389,7 @@ To delete all uploaded files along with data indexed with `$INDEX_NAME` in REDIS
398389
```bash
399390
curl -X POST \
400391
-H "Content-Type: application/json" \
392+
-d '{"file_path": "all"}' \
401393
${DATAPREP_DELETE_FILE_ENDPOINT}
402394
```
403395

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ services:
2626
- redis-vector-db
2727
- lvm-llava
2828
ports:
29-
- "6007:${DATAPREP_MMR_PORT}"
29+
- "${DATAPREP_MMR_PORT}:5000"
3030
environment:
3131
no_proxy: ${no_proxy}
3232
http_proxy: ${http_proxy}

‎MultimodalQnA/docker_compose/intel/cpu/xeon/set_env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export REDIS_URL="redis://${host_ip}:${REDIS_DB_PORT}"
2828
export REDIS_HOST=${host_ip}
2929
export INDEX_NAME="mm-rag-redis"
3030

31-
export DATAPREP_MMR_PORT=5000
31+
export DATAPREP_MMR_PORT=6007
3232
export DATAPREP_INGEST_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/ingest"
3333
export DATAPREP_GEN_TRANSCRIPT_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/generate_transcripts"
3434
export DATAPREP_GEN_CAPTION_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/generate_captions"

‎MultimodalQnA/docker_compose/intel/hpu/gaudi/README.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export WHISPER_PORT=7066
3737
export WHISPER_SERVER_ENDPOINT="http://${host_ip}:${WHISPER_PORT}/v1/asr"
3838
export MAX_IMAGES=1
3939
export WHISPER_MODEL="base"
40-
export DATAPREP_MMR_PORT=5000
40+
export DATAPREP_MMR_PORT=6007
4141
export DATAPREP_INGEST_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/ingest"
4242
export DATAPREP_GEN_TRANSCRIPT_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/generate_transcripts"
4343
export DATAPREP_GEN_CAPTION_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/generate_captions"
@@ -282,15 +282,6 @@ wget https://github.com/intel/intel-extension-for-transformers/raw/main/intel_ex
282282

283283
Test dataprep microservice with generating transcript. This command updates a knowledge base by uploading a local video .mp4 and an audio .wav file.
284284

285-
```bash
286-
export DATAPREP_MMR_PORT=6007
287-
export DATAPREP_INGEST_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/ingest"
288-
export DATAPREP_GEN_TRANSCRIPT_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/generate_transcripts"
289-
export DATAPREP_GEN_CAPTION_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/generate_captions"
290-
export DATAPREP_GET_FILE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/get"
291-
export DATAPREP_DELETE_FILE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/delete"
292-
```
293-
294285
```bash
295286
curl --silent --write-out "HTTPSTATUS:%{http_code}" \
296287
${DATAPREP_GEN_TRANSCRIPT_SERVICE_ENDPOINT} \
@@ -324,6 +315,7 @@ Also, you are able to get the list of all files that you uploaded:
324315
```bash
325316
curl -X POST \
326317
-H "Content-Type: application/json" \
318+
-d '{"file_path": "all"}' \
327319
${DATAPREP_GET_FILE_ENDPOINT}
328320
```
329321

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ services:
2828
- redis-vector-db
2929
- lvm
3030
ports:
31-
- "6007:${DATAPREP_MMR_PORT}"
31+
- "${DATAPREP_MMR_PORT}:5000"
3232
environment:
3333
no_proxy: ${no_proxy}
3434
http_proxy: ${http_proxy}

‎MultimodalQnA/docker_compose/intel/hpu/gaudi/set_env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export WHISPER_PORT=7066
2828
export WHISPER_SERVER_ENDPOINT="http://${host_ip}:${WHISPER_PORT}/v1/asr"
2929
export MAX_IMAGES=1
3030

31-
export DATAPREP_MMR_PORT=5000
31+
export DATAPREP_MMR_PORT=6007
3232
export DATAPREP_INGEST_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/ingest"
3333
export DATAPREP_GEN_TRANSCRIPT_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/generate_transcripts"
3434
export DATAPREP_GEN_CAPTION_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/generate_captions"

‎MultimodalQnA/tests/test_compose_on_gaudi.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ function setup_env() {
8282
export MAX_IMAGES=1
8383
export WHISPER_MODEL="base"
8484
export WHISPER_SERVER_ENDPOINT="http://${host_ip}:${WHISPER_PORT}/v1/asr"
85-
export DATAPREP_MMR_PORT=5000
85+
export DATAPREP_MMR_PORT=6007
8686
export DATAPREP_INGEST_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/ingest"
8787
export DATAPREP_GEN_TRANSCRIPT_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/generate_transcripts"
8888
export DATAPREP_GEN_CAPTION_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/generate_captions"
@@ -210,11 +210,6 @@ function validate_microservices() {
210210

211211
sleep 1m # retrieval can't curl as expected, try to wait for more time
212212

213-
export DATAPREP_INGEST_SERVICE_ENDPOINT="http://${host_ip}:6007/v1/dataprep/ingest"
214-
export DATAPREP_GEN_TRANSCRIPT_SERVICE_ENDPOINT="http://${host_ip}:6007/v1/dataprep/generate_transcripts"
215-
export DATAPREP_GEN_CAPTION_SERVICE_ENDPOINT="http://${host_ip}:6007/v1/dataprep/generate_captions"
216-
export DATAPREP_GET_FILE_ENDPOINT="http://${host_ip}:6007/v1/dataprep/get"
217-
218213
# test data prep
219214
echo "Validating Data Prep with Generating Transcript for Video"
220215
validate_service \

‎MultimodalQnA/tests/test_compose_on_rocm.sh

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ function setup_env() {
6767
export LVM_SERVICE_HOST_IP=${HOST_IP}
6868
export MEGA_SERVICE_HOST_IP=${HOST_IP}
6969
export BACKEND_SERVICE_ENDPOINT="http://${HOST_IP}:8888/v1/multimodalqna"
70-
export DATAPREP_INGEST_SERVICE_ENDPOINT="http://${HOST_IP}:5000/v1/dataprep/ingest"
71-
export DATAPREP_GEN_TRANSCRIPT_SERVICE_ENDPOINT="http://${HOST_IP}:5000/v1/dataprep/generate_transcripts"
72-
export DATAPREP_GEN_CAPTION_SERVICE_ENDPOINT="http://${HOST_IP}:5000/v1/dataprep/generate_captions"
73-
export DATAPREP_GET_FILE_ENDPOINT="http://${HOST_IP}:5000/v1/dataprep/get"
74-
export DATAPREP_DELETE_FILE_ENDPOINT="http://${HOST_IP}:5000/v1/dataprep/delete"
70+
export DATAPREP_INGEST_SERVICE_ENDPOINT="http://${HOST_IP}:6007/v1/dataprep/ingest"
71+
export DATAPREP_GEN_TRANSCRIPT_SERVICE_ENDPOINT="http://${HOST_IP}:6007/v1/dataprep/generate_transcripts"
72+
export DATAPREP_GEN_CAPTION_SERVICE_ENDPOINT="http://${HOST_IP}:6007/v1/dataprep/generate_captions"
73+
export DATAPREP_GET_FILE_ENDPOINT="http://${HOST_IP}:6007/v1/dataprep/get"
74+
export DATAPREP_DELETE_FILE_ENDPOINT="http://${HOST_IP}:6007/v1/dataprep/delete"
7575
}
7676

7777
function start_services() {
@@ -174,11 +174,6 @@ function validate_microservices() {
174174

175175
sleep 1m # retrieval can't curl as expected, try to wait for more time
176176

177-
export DATAPREP_INGEST_SERVICE_ENDPOINT="http://${HOST_IP}:6007/v1/dataprep/ingest"
178-
export DATAPREP_GEN_TRANSCRIPT_SERVICE_ENDPOINT="http://${HOST_IP}:6007/v1/dataprep/generate_transcripts"
179-
export DATAPREP_GEN_CAPTION_SERVICE_ENDPOINT="http://${HOST_IP}:6007/v1/dataprep/generate_captions"
180-
export DATAPREP_GET_FILE_ENDPOINT="http://${HOST_IP}:6007/v1/dataprep/get"
181-
182177
# test data prep
183178
echo "Data Prep with Generating Transcript for Video"
184179
validate_service \

‎MultimodalQnA/tests/test_compose_on_xeon.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ function setup_env() {
7979
export REDIS_URL="redis://${host_ip}:${REDIS_DB_PORT}"
8080
export REDIS_HOST=${host_ip}
8181
export INDEX_NAME="mm-rag-redis"
82-
export DATAPREP_MMR_PORT=5000
82+
export DATAPREP_MMR_PORT=6007
8383
export DATAPREP_INGEST_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/ingest"
8484
export DATAPREP_GEN_TRANSCRIPT_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/generate_transcripts"
8585
export DATAPREP_GEN_CAPTION_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_MMR_PORT}/v1/dataprep/generate_captions"
@@ -207,11 +207,6 @@ function validate_microservices() {
207207

208208
sleep 1m # retrieval can't curl as expected, try to wait for more time
209209

210-
export DATAPREP_INGEST_SERVICE_ENDPOINT="http://${host_ip}:6007/v1/dataprep/ingest"
211-
export DATAPREP_GEN_TRANSCRIPT_SERVICE_ENDPOINT="http://${host_ip}:6007/v1/dataprep/generate_transcripts"
212-
export DATAPREP_GEN_CAPTION_SERVICE_ENDPOINT="http://${host_ip}:6007/v1/dataprep/generate_captions"
213-
export DATAPREP_GET_FILE_ENDPOINT="http://${host_ip}:6007/v1/dataprep/get"
214-
215210
# test data prep
216211
echo "Validating Data Prep with Generating Transcript for Video"
217212
validate_service \

‎MultimodalQnA/ui/gradio/multimodalqna_ui_gradio.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ def select_upload_type(choice, request: gr.Request):
610610
"BACKEND_SERVICE_ENDPOINT", f"http://localhost:{MEGA_SERVICE_PORT}/v1/multimodalqna"
611611
)
612612
dataprep_ingest_endpoint = os.getenv(
613-
"DATAPREP_INGEST_SERVICE_ENDPOINT", f"http://localhost:{DATAPREP_MMR_PORT}/v1/ingest_with_text"
613+
"DATAPREP_INGEST_SERVICE_ENDPOINT", f"http://localhost:{DATAPREP_MMR_PORT}/v1/ingest"
614614
)
615615
dataprep_gen_transcript_endpoint = os.getenv(
616616
"DATAPREP_GEN_TRANSCRIPT_SERVICE_ENDPOINT", f"http://localhost:{DATAPREP_MMR_PORT}/v1/generate_transcripts"

0 commit comments

Comments
 (0)