Skip to content

Commit 9970605

Browse files
WenjiaoYueWenjiaoYue
authored
Adapt refactor comps (#1340)
Signed-off-by: WenjiaoYue
1 parent 2820631 commit 9970605

File tree

25 files changed

+39
-39
lines changed

25 files changed

+39
-39
lines changed

‎AgentQnA/tests/step1_build_images.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function build_docker_images_for_retrieval_tool(){
2121
# git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../
2222
get_genai_comps
2323
echo "Build all the images with --no-cache..."
24-
service_list="doc-index-retriever dataprep-redis embedding retriever-redis reranking-tei"
24+
service_list="doc-index-retriever dataprep-redis embedding retriever-redis reranking"
2525
docker compose -f build.yaml build ${service_list} --no-cache
2626
docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.5
2727

‎ChatQnA/docker_image_build/build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ services:
6565
dockerfile: comps/retrievers/pinecone/langchain/Dockerfile
6666
extends: chatqna
6767
image: ${REGISTRY:-opea}/retriever-pinecone:${TAG:-latest}
68-
reranking-tei:
68+
reranking:
6969
build:
7070
context: GenAIComps
71-
dockerfile: comps/reranks/src/Dockerfile
71+
dockerfile: comps/rerankings/src/Dockerfile
7272
extends: chatqna
73-
image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
73+
image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
7474
llm-textgen:
7575
build:
7676
context: GenAIComps

‎ChatQnA/kubernetes/intel/cpu/xeon/manifest/chatqna-remote-inference.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,7 @@ spec:
921921
runAsUser: 1000
922922
seccompProfile:
923923
type: RuntimeDefault
924-
image: "opea/reranking-tei:latest"
924+
image: "opea/reranking:latest"
925925
imagePullPolicy: Always
926926
ports:
927927
- name: reranking-usvc

‎ChatQnA/kubernetes/intel/hpu/gaudi/manifest/chatqna-vllm-remote-inference.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ spec:
829829
runAsUser: 1000
830830
seccompProfile:
831831
type: RuntimeDefault
832-
image: "opea/reranking-tei:latest"
832+
image: "opea/reranking:latest"
833833
imagePullPolicy: Always
834834
ports:
835835
- name: reranking-usvc

‎ChatQnA/kubernetes/intel/hpu/gaudi/manifest/chatqna-vllm.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -958,7 +958,7 @@ spec:
958958
runAsUser: 1000
959959
seccompProfile:
960960
type: RuntimeDefault
961-
image: "opea/reranking-tei:latest"
961+
image: "opea/reranking:latest"
962962
imagePullPolicy: Always
963963
ports:
964964
- name: reranking-usvc

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ DocRetriever are the most widely adopted use case for leveraging the different m
2121
- Rerank TEI Image
2222

2323
```bash
24-
docker build -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/src/Dockerfile .
24+
docker build -t opea/reranking:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/rerankings/src/Dockerfile .
2525
```
2626

2727
- Dataprep Image

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ services:
107107
timeout: 10s
108108
retries: 60
109109
reranking:
110-
image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
110+
image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
111111
container_name: reranking-tei-xeon-server
112112
depends_on:
113113
tei-reranking-service:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ DocRetriever are the most widely adopted use case for leveraging the different m
2121
- Rerank TEI Image
2222

2323
```bash
24-
docker build -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/src/Dockerfile .
24+
docker build -t opea/reranking:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/rerankings/src/Dockerfile .
2525
```
2626

2727
- Dataprep Image

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ services:
110110
timeout: 10s
111111
retries: 60
112112
reranking:
113-
image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
113+
image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
114114
container_name: reranking-tei-gaudi-server
115115
depends_on:
116116
tei-reranking-service:

‎DocIndexRetriever/docker_image_build/build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ services:
2323
dockerfile: comps/retrievers/redis/langchain/Dockerfile
2424
extends: doc-index-retriever
2525
image: ${REGISTRY:-opea}/retriever-redis:${TAG:-latest}
26-
reranking-tei:
26+
reranking:
2727
build:
2828
context: GenAIComps
29-
dockerfile: comps/reranks/src/Dockerfile
29+
dockerfile: comps/rerankings/src/Dockerfile
3030
extends: doc-index-retriever
31-
image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
31+
image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
3232
dataprep-redis:
3333
build:
3434
context: GenAIComps

‎DocIndexRetriever/tests/test_compose_on_xeon.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function build_docker_images() {
2121
echo "Cloning GenAIComps repository"
2222
git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../
2323
fi
24-
service_list="dataprep-redis embedding retriever-redis reranking-tei doc-index-retriever"
24+
service_list="dataprep-redis embedding retriever-redis reranking doc-index-retriever"
2525
docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log
2626

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ docker build --no-cache -t opea/retriever-redis:latest --build-arg https_proxy=$
2525
### 3. Build Rerank Image
2626

2727
```bash
28-
docker build --no-cache -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/src/Dockerfile .
28+
docker build --no-cache -t opea/reranking:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/rerankings/src/Dockerfile .
2929
```
3030

3131
### 4. Build LLM Image

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ services:
111111
timeout: 10s
112112
retries: 60
113113
reranking:
114-
image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
114+
image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
115115
container_name: reranking-tei-xeon-server
116116
depends_on:
117117
tei-reranking-service:

‎ProductivitySuite/docker_image_build/build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ services:
2323
dockerfile: comps/retrievers/redis/langchain/Dockerfile
2424
extends: chatqna
2525
image: ${REGISTRY:-opea}/retriever-redis:${TAG:-latest}
26-
reranking-tei:
26+
reranking:
2727
build:
2828
context: GenAIComps
29-
dockerfile: comps/reranks/src/Dockerfile
29+
dockerfile: comps/rerankings/src/Dockerfile
3030
extends: chatqna
31-
image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
31+
image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
3232
llm-textgen:
3333
build:
3434
context: GenAIComps

‎ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/chatqna.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ spec:
753753
runAsUser: 1000
754754
seccompProfile:
755755
type: RuntimeDefault
756-
image: "opea/reranking-tei:latest"
756+
image: "opea/reranking:latest"
757757
imagePullPolicy: IfNotPresent
758758
ports:
759759
- name: reranking-usvc

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ docker build --no-cache -t opea/web-retriever-chroma:latest --build-arg https_pr
2121
### 3. Build Rerank Image
2222

2323
```bash
24-
docker build --no-cache -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/src/Dockerfile .
24+
docker build --no-cache -t opea/reranking:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/rerankings/src/Dockerfile .
2525
```
2626

2727
### 4. Build LLM Image
@@ -53,7 +53,7 @@ Then run the command `docker images`, you will have following images ready:
5353

5454
1. `opea/embedding:latest`
5555
2. `opea/web-retriever-chroma:latest`
56-
3. `opea/reranking-tei:latest`
56+
3. `opea/reranking:latest`
5757
4. `opea/llm-textgen:latest`
5858
5. `opea/searchqna:latest`
5959
6. `opea/searchqna-ui:latest`

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ services:
7373
timeout: 10s
7474
retries: 60
7575
reranking:
76-
image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
76+
image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
7777
container_name: reranking-tei-xeon-server
7878
depends_on:
7979
tei-reranking-service:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ docker build --no-cache -t opea/web-retriever-chroma:latest --build-arg https_pr
2323
### 3. Build Rerank Image
2424

2525
```bash
26-
docker build --no-cache -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/src/Dockerfile .
26+
docker build --no-cache -t opea/reranking:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/rerankings/src/Dockerfile .
2727
```
2828

2929
### 4. Build LLM Image
@@ -53,7 +53,7 @@ Then run the command `docker images`, you will have
5353

5454
1. `opea/embedding:latest`
5555
2. `opea/web-retriever-chroma:latest`
56-
3. `opea/reranking-tei:latest`
56+
3. `opea/reranking:latest`
5757
4. `opea/llm-textgen:latest`
5858
5. `opea/searchqna:latest`
5959

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ services:
8080
timeout: 10s
8181
retries: 60
8282
reranking:
83-
image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
83+
image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
8484
container_name: reranking-tei-gaudi-server
8585
depends_on:
8686
tei-reranking-service:

‎SearchQnA/docker_image_build/build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ services:
2929
dockerfile: comps/web_retrievers/chroma/langchain/Dockerfile
3030
extends: searchqna
3131
image: ${REGISTRY:-opea}/web-retriever-chroma:${TAG:-latest}
32-
reranking-tei:
32+
reranking:
3333
build:
3434
context: GenAIComps
35-
dockerfile: comps/reranks/src/Dockerfile
35+
dockerfile: comps/rerankings/src/Dockerfile
3636
extends: searchqna
37-
image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
37+
image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
3838
llm-textgen:
3939
build:
4040
context: GenAIComps

‎SearchQnA/tests/test_compose_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="searchqna searchqna-ui embedding web-retriever-chroma reranking-tei llm-textgen"
22+
service_list="searchqna searchqna-ui embedding web-retriever-chroma reranking llm-textgen"
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

‎SearchQnA/tests/test_compose_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="searchqna searchqna-ui embedding web-retriever-chroma reranking-tei llm-textgen"
22+
service_list="searchqna searchqna-ui embedding web-retriever-chroma reranking llm-textgen"
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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ docker build -t opea/embedding-multimodal-clip:latest --build-arg https_proxy=$h
6262
docker build -t opea/retriever-vdms:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/retrievers/vdms/langchain/Dockerfile .
6363
```
6464

65-
### 3. Build Rerank Image
65+
### 3. Build Reranking Image
6666

6767
```bash
68-
docker build -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/src/Dockerfile .
68+
docker build -t opea/reranking:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/rerankings/src/Dockerfile .
6969
```
7070

7171
### 4. Build LVM Image (Xeon)
@@ -109,7 +109,7 @@ Then run the command `docker images`, you will have the following 8 Docker Image
109109
1. `opea/dataprep-multimodal-vdms:latest`
110110
2. `opea/embedding-multimodal-clip:latest`
111111
3. `opea/retriever-vdms:latest`
112-
4. `opea/reranking-tei:latest`
112+
4. `opea/reranking:latest`
113113
5. `opea/video-llama-lvm-server:latest`
114114
6. `opea/lvm-video-llama:latest`
115115
7. `opea/videoqna:latest`

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ services:
6161
volumes:
6262
- /home/$USER/.cache/huggingface/hub:/home/user/.cache/huggingface/hub
6363
reranking:
64-
image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
64+
image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
6565
container_name: reranking-tei-server
6666
ports:
6767
- "8000:8000"

‎VideoQnA/docker_image_build/build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ services:
3535
dockerfile: comps/retrievers/vdms/langchain/Dockerfile
3636
extends: videoqna
3737
image: ${REGISTRY:-opea}/retriever-vdms:${TAG:-latest}
38-
reranking-tei:
38+
reranking:
3939
build:
4040
context: GenAIComps
41-
dockerfile: comps/reranks/src/Dockerfile
41+
dockerfile: comps/rerankings/src/Dockerfile
4242
extends: videoqna
43-
image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
43+
image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
4444
video-llama-lvm-server:
4545
build:
4646
context: GenAIComps

0 commit comments

Comments
 (0)