Skip to content

Commit 1806e80

Browse files
rbrugarorbrugaro
committed
changed DATAPREP port to 5001 because 5000 is reserved for local registry
Signed-off-by: Rita Brugarolas <[email protected]>
1 parent 13c4ff5 commit 1806e80

File tree

9 files changed

+30
-30
lines changed

9 files changed

+30
-30
lines changed

‎comps/dataprep/deployment/docker_compose/compose.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020
image: ${REGISTRY:-opea}/dataprep:${TAG:-latest}
2121
container_name: dataprep-elasticsearch
2222
ports:
23-
- "${DATAPREP_PORT:-5000}:5000"
23+
- "${DATAPREP_PORT:-5001}:5001"
2424
ipc: host
2525
environment:
2626
no_proxy: ${no_proxy}
@@ -40,7 +40,7 @@ services:
4040
image: ${REGISTRY:-opea}/dataprep:${TAG:-latest}
4141
container_name: dataprep-milvus-server
4242
ports:
43-
- "${DATAPREP_PORT:-5000}:5000"
43+
- "${DATAPREP_PORT:-5001}:5001"
4444
ipc: host
4545
environment:
4646
no_proxy: ${no_proxy}
@@ -66,7 +66,7 @@ services:
6666
image: ${REGISTRY:-opea}/dataprep:${TAG:-latest}
6767
container_name: dataprep-multimodal-milvus-server
6868
ports:
69-
- "${DATAPREP_PORT:-5000}:5000"
69+
- "${DATAPREP_PORT:-5001}:5001"
7070
depends_on:
7171
standalone:
7272
condition: service_healthy
@@ -97,7 +97,7 @@ services:
9797
tei-embedding-serving:
9898
condition: service_healthy
9999
ports:
100-
- "${DATAPREP_PORT:-5000}:5000"
100+
- "${DATAPREP_PORT:-5001}:5001"
101101
ipc: host
102102
environment:
103103
no_proxy: ${no_proxy}
@@ -125,7 +125,7 @@ services:
125125
image: ${REGISTRY:-opea}/dataprep:${TAG:-latest}
126126
container_name: dataprep-opensearch-server
127127
ports:
128-
- "${DATAPREP_PORT:-5000}:5000"
128+
- "${DATAPREP_PORT:-5001}:5001"
129129
depends_on:
130130
opensearch-vector-db:
131131
condition: service_healthy
@@ -147,7 +147,7 @@ services:
147147
image: ${REGISTRY:-opea}/dataprep:${TAG:-latest}
148148
container_name: dataprep-pgvector-server
149149
ports:
150-
- "${DATAPREP_PORT:-5000}:5000"
150+
- "${DATAPREP_PORT:-5001}:5001"
151151
depends_on:
152152
pgvector-db:
153153
condition: service_healthy
@@ -164,7 +164,7 @@ services:
164164
image: ${REGISTRY:-opea}/dataprep:${TAG:-latest}
165165
container_name: dataprep-pinecone-server
166166
ports:
167-
- "${DATAPREP_PORT:-5000}:5000"
167+
- "${DATAPREP_PORT:-5001}:5001"
168168
ipc: host
169169
environment:
170170
no_proxy: ${no_proxy}
@@ -185,7 +185,7 @@ services:
185185
tei-embedding-serving:
186186
condition: service_healthy
187187
ports:
188-
- "${DATAPREP_PORT:-5000}:5000"
188+
- "${DATAPREP_PORT:-5001}:5001"
189189
ipc: host
190190
environment:
191191
no_proxy: ${no_proxy}
@@ -208,7 +208,7 @@ services:
208208
tei-embedding-serving:
209209
condition: service_healthy
210210
ports:
211-
- "${DATAPREP_PORT:-5000}:5000"
211+
- "${DATAPREP_PORT:-5001}:5001"
212212
ipc: host
213213
environment:
214214
no_proxy: ${no_proxy}
@@ -227,7 +227,7 @@ services:
227227
image: ${REGISTRY:-opea}/dataprep:${TAG:-latest}
228228
container_name: dataprep-multimodal-redis-server
229229
ports:
230-
- "${DATAPREP_PORT:-5000}:5000"
230+
- "${DATAPREP_PORT:-5001}:5001"
231231
depends_on:
232232
redis-vector-db:
233233
condition: service_healthy
@@ -250,7 +250,7 @@ services:
250250
image: ${REGISTRY:-opea}/dataprep:${TAG:-latest}
251251
container_name: dataprep-vdms-server
252252
ports:
253-
- "${DATAPREP_PORT:-5000}:5000"
253+
- "${DATAPREP_PORT:-5001}:5001"
254254
depends_on:
255255
vdms-vector-db:
256256
condition: service_healthy
@@ -270,7 +270,7 @@ services:
270270
image: ${REGISTRY:-opea}/dataprep:${TAG:-latest}
271271
container_name: dataprep-vdms-multimodal-server
272272
ports:
273-
- "${DATAPREP_PORT:-5000}:5000"
273+
- "${DATAPREP_PORT:-5001}:5001"
274274
depends_on:
275275
vdms-vector-db:
276276
condition: service_healthy
@@ -297,7 +297,7 @@ services:
297297
tei-embedding-serving:
298298
condition: service_healthy
299299
ports:
300-
- "${DATAPREP_PORT:-5000}:5000"
300+
- "${DATAPREP_PORT:-5001}:5001"
301301
environment:
302302
no_proxy: ${no_proxy}
303303
http_proxy: ${http_proxy}

‎comps/dataprep/src/README_finance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export HUGGINGFACEHUB_API_TOKEN=<your-hf-token>
8787
```
8888

8989
```bash
90-
docker run -d --name="dataprep-redis-server-finance" -p 6007:5000 --runtime=runc --ipc=host -e http_proxy=$http_proxy -e https_proxy=$https_proxy -e REDIS_URL_VECTOR=$REDIS_URL_VECTOR -e REDIS_URL_KV=$REDIS_URL_KV -e LLM_MODEL=$LLM_MODEL -e LLM_ENDPOINT=$LLM_ENDPOINT -e TEI_EMBEDDING_ENDPOINT=$TEI_EMBEDDING_ENDPOINT -e HUGGINGFACEHUB_API_TOKEN=$HUGGINGFACEHUB_API_TOKEN -e HF_TOKEN=$HUGGINGFACEHUB_API_TOKEN -e DATAPREP_COMPONENT_NAME=$DATAPREP_COMPONENT_NAME opea/dataprep:latest
90+
docker run -d --name="dataprep-redis-server-finance" -p 6007:5001 --runtime=runc --ipc=host -e http_proxy=$http_proxy -e https_proxy=$https_proxy -e REDIS_URL_VECTOR=$REDIS_URL_VECTOR -e REDIS_URL_KV=$REDIS_URL_KV -e LLM_MODEL=$LLM_MODEL -e LLM_ENDPOINT=$LLM_ENDPOINT -e TEI_EMBEDDING_ENDPOINT=$TEI_EMBEDDING_ENDPOINT -e HUGGINGFACEHUB_API_TOKEN=$HUGGINGFACEHUB_API_TOKEN -e HF_TOKEN=$HUGGINGFACEHUB_API_TOKEN -e DATAPREP_COMPONENT_NAME=$DATAPREP_COMPONENT_NAME opea/dataprep:latest
9191
```
9292

9393
### 2.6 Check the status of dataprep microservice

‎comps/dataprep/src/README_multimodal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ docker build -t opea/dataprep:latest --build-arg https_proxy=$https_proxy --buil
4646
### 1.5 Run Docker with CLI (Option A)
4747

4848
```bash
49-
docker run -d --name="dataprep-multimodal-redis" -p 6007:5000 --runtime=runc --ipc=host -e no_proxy=$no_proxy -e http_proxy=$http_proxy -e https_proxy=$https_proxy -e REDIS_HOST=$your_ip -e REDIS_URL=$REDIS_URL -e INDEX_NAME=$INDEX_NAME -e LVM_ENDPOINT=$LVM_ENDPOINT -e HUGGINGFACEHUB_API_TOKEN=$HUGGINGFACEHUB_API_TOKEN -e MULTIMODAL_DATAPREP=true -e DATAPREP_COMPONENT_NAME="OPEA_DATAPREP_MULTIMODALREDIS" opea/dataprep-multimodal-redis:latest
49+
docker run -d --name="dataprep-multimodal-redis" -p 6007:5001 --runtime=runc --ipc=host -e no_proxy=$no_proxy -e http_proxy=$http_proxy -e https_proxy=$https_proxy -e REDIS_HOST=$your_ip -e REDIS_URL=$REDIS_URL -e INDEX_NAME=$INDEX_NAME -e LVM_ENDPOINT=$LVM_ENDPOINT -e HUGGINGFACEHUB_API_TOKEN=$HUGGINGFACEHUB_API_TOKEN -e MULTIMODAL_DATAPREP=true -e DATAPREP_COMPONENT_NAME="OPEA_DATAPREP_MULTIMODALREDIS" opea/dataprep-multimodal-redis:latest
5050
```
5151

5252
### 1.6 Run with Docker Compose (Option B - deprecated, will move to genAIExample in future)

‎comps/dataprep/src/README_neo4j_llamaindex.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export NEO4J_PORT1=7474
5252
export NEO4J_PORT2=7687
5353
export NEO4J_URI="bolt://${host_ip}:${NEO4J_PORT2}"
5454
export NEO4J_URL="bolt://${host_ip}:${NEO4J_PORT2}"
55-
export DATAPREP_PORT=5000
55+
export DATAPREP_PORT=5001
5656
export DATAPREP_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_PORT}/v1/dataprep"
5757
export LOGFLAG=True
5858
```

‎comps/dataprep/src/README_redis.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ docker build -t opea/dataprep:latest --build-arg https_proxy=$https_proxy --buil
5151
### 1.5 Run Docker with CLI (Option A)
5252

5353
```bash
54-
docker run -d --name="dataprep-redis-server" -p 6007:5000 --runtime=runc --ipc=host -e http_proxy=$http_proxy -e https_proxy=$https_proxy -e REDIS_URL=$REDIS_URL -e INDEX_NAME=$INDEX_NAME -e TEI_EMBEDDING_ENDPOINT=$TEI_EMBEDDING_ENDPOINT -e HUGGINGFACEHUB_API_TOKEN=$HUGGINGFACEHUB_API_TOKEN opea/dataprep:latest
54+
docker run -d --name="dataprep-redis-server" -p 6007:5001 --runtime=runc --ipc=host -e http_proxy=$http_proxy -e https_proxy=$https_proxy -e REDIS_URL=$REDIS_URL -e INDEX_NAME=$INDEX_NAME -e TEI_EMBEDDING_ENDPOINT=$TEI_EMBEDDING_ENDPOINT -e HUGGINGFACEHUB_API_TOKEN=$HUGGINGFACEHUB_API_TOKEN opea/dataprep:latest
5555
```
5656

5757
### 1.6 Run with Docker Compose (Option B - deprecated, will move to genAIExample in future)

‎comps/dataprep/src/opea_dataprep_microservice.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
service_type=ServiceType.DATAPREP,
4747
endpoint="/v1/dataprep/ingest",
4848
host="0.0.0.0",
49-
port=5000,
49+
port=5001,
5050
)
5151
@register_statistics(names=["opea_service@dataprep"])
5252
async def ingest_files(
@@ -85,7 +85,7 @@ async def ingest_files(
8585
service_type=ServiceType.DATAPREP,
8686
endpoint="/v1/dataprep/get",
8787
host="0.0.0.0",
88-
port=5000,
88+
port=5001,
8989
)
9090
@register_statistics(names=["opea_service@dataprep"])
9191
async def get_files():
@@ -113,7 +113,7 @@ async def get_files():
113113
service_type=ServiceType.DATAPREP,
114114
endpoint="/v1/dataprep/delete",
115115
host="0.0.0.0",
116-
port=5000,
116+
port=5001,
117117
)
118118
@register_statistics(names=["opea_service@dataprep"])
119119
async def delete_files(file_path: str = Body(..., embed=True)):

‎comps/dataprep/src/opea_dataprep_multimodal_microservice.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
service_type=ServiceType.DATAPREP,
4040
endpoint="/v1/dataprep/ingest",
4141
host="0.0.0.0",
42-
port=5000,
42+
port=5001,
4343
)
4444
@register_statistics(names=["opea_service@dataprep_multimodal"])
4545
async def ingest_files(files: Optional[Union[UploadFile, List[UploadFile]]] = File(None)):
@@ -67,7 +67,7 @@ async def ingest_files(files: Optional[Union[UploadFile, List[UploadFile]]] = Fi
6767
service_type=ServiceType.DATAPREP,
6868
endpoint="/v1/dataprep/ingest_videos",
6969
host="0.0.0.0",
70-
port=5000,
70+
port=5001,
7171
)
7272
@register_statistics(names=["opea_service@dataprep_multimodal"])
7373
async def ingest_videos(files: Optional[Union[UploadFile, List[UploadFile]]] = File(None)):
@@ -95,7 +95,7 @@ async def ingest_videos(files: Optional[Union[UploadFile, List[UploadFile]]] = F
9595
service_type=ServiceType.DATAPREP,
9696
endpoint="/v1/dataprep/generate_transcripts",
9797
host="0.0.0.0",
98-
port=5000,
98+
port=5001,
9999
)
100100
@register_statistics(names=["opea_service@dataprep_multimodal"])
101101
async def ingest_generate_transcripts(files: Optional[Union[UploadFile, List[UploadFile]]] = File(None)):
@@ -122,7 +122,7 @@ async def ingest_generate_transcripts(files: Optional[Union[UploadFile, List[Upl
122122
service_type=ServiceType.DATAPREP,
123123
endpoint="/v1/dataprep/generate_captions",
124124
host="0.0.0.0",
125-
port=5000,
125+
port=5001,
126126
)
127127
@register_statistics(names=["opea_service@dataprep_multimodal"])
128128
async def ingest_generate_captions(files: Optional[Union[UploadFile, List[UploadFile]]] = File(None)):
@@ -150,7 +150,7 @@ async def ingest_generate_captions(files: Optional[Union[UploadFile, List[Upload
150150
service_type=ServiceType.DATAPREP,
151151
endpoint="/v1/dataprep/get",
152152
host="0.0.0.0",
153-
port=5000,
153+
port=5001,
154154
)
155155
@register_statistics(names=["opea_service@dataprep_multimodal"])
156156
async def get_files():
@@ -178,7 +178,7 @@ async def get_files():
178178
service_type=ServiceType.DATAPREP,
179179
endpoint="/v1/dataprep/get/{filename}",
180180
host="0.0.0.0",
181-
port=5000,
181+
port=5001,
182182
methods=["GET"],
183183
)
184184
@register_statistics(names=["opea_service@dataprep_multimodal"])
@@ -207,7 +207,7 @@ async def get_one_file(filename: str):
207207
service_type=ServiceType.DATAPREP,
208208
endpoint="/v1/dataprep/get_videos",
209209
host="0.0.0.0",
210-
port=5000,
210+
port=5001,
211211
methods=["GET"],
212212
)
213213
@register_statistics(names=["opea_service@dataprep_multimodal"])
@@ -236,7 +236,7 @@ async def get_videos():
236236
service_type=ServiceType.DATAPREP,
237237
endpoint="/v1/dataprep/delete",
238238
host="0.0.0.0",
239-
port=5000,
239+
port=5001,
240240
)
241241
@register_statistics(names=["opea_service@dataprep_multimodal"])
242242
async def delete_files(file_path: str = Body(..., embed=True)):

‎comps/retrievers/src/README_neo4j.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export NEO4J_PORT1=7474
4747
export NEO4J_PORT2=7687
4848
export NEO4J_URI="bolt://${host_ip}:${NEO4J_PORT2}"
4949
export NEO4J_URL="bolt://${host_ip}:${NEO4J_PORT2}"
50-
export DATAPREP_PORT=5000
50+
export DATAPREP_PORT=5001
5151
export DATAPREP_SERVICE_ENDPOINT="http://${host_ip}:${DATAPREP_PORT}/v1/dataprep"
5252
export RETRIEVER_PORT=7000
5353
export LOGFLAG=True

‎tests/retrievers/test_retrievers_neo4j_on_intel_hpu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function start_service() {
6767

6868
# dataprep neo4j
6969
# Not testing openai code path since not able to provide key for cicd
70-
docker run -d --name="test-comps-retrievers-neo4j-llama-index-dataprep" -p $DATAPREP_PORT:5000 -v ./data:/data --ipc=host -e TGI_LLM_ENDPOINT=$TGI_LLM_ENDPOINT \
70+
docker run -d --name="test-comps-retrievers-neo4j-llama-index-dataprep" -p $DATAPREP_PORT:5001 -v ./data:/data --ipc=host -e TGI_LLM_ENDPOINT=$TGI_LLM_ENDPOINT \
7171
-e TEI_EMBEDDING_ENDPOINT=$TEI_EMBEDDING_ENDPOINT -e EMBEDDING_MODEL_ID=$EMBEDDING_MODEL_ID -e LLM_MODEL_ID=$LLM_MODEL_ID -e host_ip=$host_ip -e no_proxy=$no_proxy \
7272
-e http_proxy=$http_proxy -e https_proxy=$https_proxy -e NEO4J_URL="bolt://${host_ip}:${NEO4J_PORT2}" -e NEO4J_USERNAME="neo4j" \
7373
-e NEO4J_PASSWORD="neo4jtest" -e NEO4J_PORT1=$NEO4J_PORT1 -e NEO4J_PORT2=$NEO4J_PORT2 -e HF_TOKEN=$HF_TOKEN -e MAX_INPUT_TOKENS=$MAX_INPUT_TOKENS -e LOGFLAG=True \

0 commit comments

Comments
 (0)