Adapt refactor comps

.github/workflows/_run-docker-compose.yml

@@ -134,6 +134,7 @@ jobs:
           SERVING_TOKEN: ${{ secrets.SERVING_TOKEN }}
           IMAGE_REPO: ${{ inputs.registry }}
           IMAGE_TAG: ${{ inputs.tag }}
+          opea_branch: 'wenjiao/extract_rerank'
           example: ${{ inputs.example }}
           hardware: ${{ inputs.hardware }}
           test_case: ${{ matrix.test_case }}

.github/workflows/pr-docker-compose-e2e.yml

@@ -4,7 +4,7 @@
 name: E2E test with docker compose
 
 on:
-  pull_request_target:
+  pull_request:
     branches: ["main", "*rc"]
     types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped
     paths:

.github/workflows/pr-dockerfile-path-and-build-yaml-scan.yml

@@ -22,7 +22,7 @@ jobs:
         run: |
           cd ..
           git clone https://github.com/opea-project/GenAIComps.git
-
+          cd GenAIComps && git checkout "wenjiao/refactor_rerank"
       - name: Check for Missing Dockerfile Paths in GenAIComps
         run: |
           cd ${{github.workspace}}

AgentQnA/tests/step1_build_images.sh

@@ -21,7 +21,7 @@ function build_docker_images_for_retrieval_tool(){
     # git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../
     get_genai_comps
     echo "Build all the images with --no-cache..."
-    service_list="doc-index-retriever dataprep-redis embedding-tei retriever-redis reranking-tei"
+    service_list="doc-index-retriever dataprep-redis embedding-tei retriever-redis reranking"
     docker compose -f build.yaml build ${service_list} --no-cache
     docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.5
 

ChatQnA/docker_image_build/build.yaml

@@ -68,9 +68,9 @@ services:
   reranking-tei:
     build:
       context: GenAIComps
-      dockerfile: comps/reranks/src/Dockerfile
+      dockerfile: comps/rerankings/src/Dockerfile
     extends: chatqna
-    image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
+    image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
   llm-textgen:
     build:
       context: GenAIComps

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

@@ -924,7 +924,7 @@ spec:
             runAsUser: 1000
             seccompProfile:
               type: RuntimeDefault
-          image: "opea/reranking-tei:latest"
+          image: "opea/reranking:latest"
           imagePullPolicy: Always
           ports:
             - name: reranking-usvc

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

@@ -832,7 +832,7 @@ spec:
             runAsUser: 1000
             seccompProfile:
               type: RuntimeDefault
-          image: "opea/reranking-tei:latest"
+          image: "opea/reranking:latest"
           imagePullPolicy: Always
           ports:
             - name: reranking-usvc

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

@@ -961,7 +961,7 @@ spec:
             runAsUser: 1000
             seccompProfile:
               type: RuntimeDefault
-          image: "opea/reranking-tei:latest"
+          image: "opea/reranking:latest"
           imagePullPolicy: Always
           ports:
             - name: reranking-usvc

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

@@ -21,7 +21,7 @@ DocRetriever are the most widely adopted use case for leveraging the different m
 - Rerank TEI Image
 
   ```bash
-  docker build -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/src/Dockerfile .
+  docker build -t opea/reranking:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/rerankings/src/Dockerfile .
   ```
 
 - Dataprep Image

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

@@ -107,7 +107,7 @@ services:
       timeout: 10s
       retries: 60
   reranking:
-    image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
+    image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
     container_name: reranking-tei-xeon-server
     depends_on:
       tei-reranking-service:

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

@@ -21,7 +21,7 @@ DocRetriever are the most widely adopted use case for leveraging the different m
 - Rerank TEI Image
 
   ```bash
-  docker build -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/reranks/src/Dockerfile .
+  docker build -t opea/reranking:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/rerankings/src/Dockerfile .
   ```
 
 - Dataprep Image

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

@@ -110,7 +110,7 @@ services:
       timeout: 10s
       retries: 60
   reranking:
-    image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
+    image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
     container_name: reranking-tei-gaudi-server
     depends_on:
       tei-reranking-service:

DocIndexRetriever/docker_image_build/build.yaml

@@ -26,9 +26,9 @@ services:
   reranking-tei:
     build:
       context: GenAIComps
-      dockerfile: comps/reranks/src/Dockerfile
+      dockerfile: comps/rerankings/src/Dockerfile
     extends: doc-index-retriever
-    image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
+    image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
   dataprep-redis:
     build:
       context: GenAIComps

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

@@ -25,7 +25,7 @@ docker build --no-cache -t opea/retriever-redis:latest --build-arg https_proxy=$
 ### 3. Build Rerank Image
 
 ```bash
-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 .
+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 .
 ```
 
 ### 4. Build LLM Image

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

@@ -111,7 +111,7 @@ services:
       timeout: 10s
       retries: 60
   reranking:
-    image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
+    image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
     container_name: reranking-tei-xeon-server
     depends_on:
       tei-reranking-service:

ProductivitySuite/docker_image_build/build.yaml

@@ -26,9 +26,9 @@ services:
   reranking-tei:
     build:
       context: GenAIComps
-      dockerfile: comps/reranks/src/Dockerfile
+      dockerfile: comps/rerankings/src/Dockerfile
     extends: chatqna
-    image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
+    image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
   llm-textgen:
     build:
       context: GenAIComps

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

@@ -753,7 +753,7 @@ spec:
             runAsUser: 1000
             seccompProfile:
               type: RuntimeDefault
-          image: "opea/reranking-tei:latest"
+          image: "opea/reranking:latest"
           imagePullPolicy: IfNotPresent
           ports:
             - name: reranking-usvc

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

@@ -21,7 +21,7 @@ docker build --no-cache -t opea/web-retriever-chroma:latest --build-arg https_pr
 ### 3. Build Rerank Image
 
 ```bash
-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 .
+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 .
 ```
 
 ### 4. Build LLM Image
@@ -53,7 +53,7 @@ Then run the command `docker images`, you will have following images ready:
 
 1. `opea/embedding-tei:latest`
 2. `opea/web-retriever-chroma:latest`
-3. `opea/reranking-tei:latest`
+3. `opea/reranking:latest`
 4. `opea/llm-textgen:latest`
 5. `opea/searchqna:latest`
 6. `opea/searchqna-ui:latest`

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

@@ -73,7 +73,7 @@ services:
       timeout: 10s
       retries: 60
   reranking:
-    image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
+    image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
     container_name: reranking-tei-xeon-server
     depends_on:
       tei-reranking-service:

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

@@ -23,7 +23,7 @@ docker build --no-cache -t opea/web-retriever-chroma:latest --build-arg https_pr
 ### 3. Build Rerank Image
 
 ```bash
-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 .
+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 .
 ```
 
 ### 4. Build LLM Image
@@ -53,7 +53,7 @@ Then run the command `docker images`, you will have
 
 1. `opea/embedding-tei:latest`
 2. `opea/web-retriever-chroma:latest`
-3. `opea/reranking-tei:latest`
+3. `opea/reranking:latest`
 4. `opea/llm-textgen:latest`
 5. `opea/searchqna:latest`
 

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

@@ -80,7 +80,7 @@ services:
       timeout: 10s
       retries: 60
   reranking:
-    image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
+    image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
     container_name: reranking-tei-gaudi-server
     depends_on:
       tei-reranking-service:

SearchQnA/docker_image_build/build.yaml

@@ -32,9 +32,9 @@ services:
   reranking-tei:
     build:
       context: GenAIComps
-      dockerfile: comps/reranks/src/Dockerfile
+      dockerfile: comps/rerankings/src/Dockerfile
     extends: searchqna
-    image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
+    image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
   llm-textgen:
     build:
       context: GenAIComps

SearchQnA/tests/test_compose_on_gaudi.sh

@@ -19,7 +19,7 @@ function build_docker_images() {
     git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../
 
     echo "Build all the images with --no-cache, check docker_image_build.log for details..."
-    service_list="searchqna searchqna-ui embedding-tei web-retriever-chroma reranking-tei llm-textgen"
+    service_list="searchqna searchqna-ui embedding-tei web-retriever-chroma reranking llm-textgen"
     docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log
 
     docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.5

SearchQnA/tests/test_compose_on_xeon.sh

@@ -19,7 +19,7 @@ function build_docker_images() {
     git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../
 
     echo "Build all the images with --no-cache, check docker_image_build.log for details..."
-    service_list="searchqna searchqna-ui embedding-tei web-retriever-chroma reranking-tei llm-textgen"
+    service_list="searchqna searchqna-ui embedding-tei web-retriever-chroma reranking llm-textgen"
     docker compose -f build.yaml build ${service_list} --no-cache > ${LOG_PATH}/docker_image_build.log
 
     docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.5

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

@@ -62,10 +62,10 @@ docker build -t opea/embedding-multimodal-clip:latest --build-arg https_proxy=$h
 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 .
 ```
 
-### 3. Build Rerank Image
+### 3. Build Reranking Image
 
 ```bash
-docker build -t opea/reranking-tei:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy  -f comps/reranks/src/Dockerfile .
+docker build -t opea/reranking:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy  -f comps/rerankings/src/Dockerfile .
 ```
 
 ### 4. Build LVM Image (Xeon)
@@ -109,7 +109,7 @@ Then run the command `docker images`, you will have the following 8 Docker Image
 1. `opea/dataprep-multimodal-vdms:latest`
 2. `opea/embedding-multimodal-clip:latest`
 3. `opea/retriever-vdms:latest`
-4. `opea/reranking-tei:latest`
+4. `opea/reranking:latest`
 5. `opea/video-llama-lvm-server:latest`
 6. `opea/lvm-video-llama:latest`
 7. `opea/videoqna:latest`

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

@@ -61,7 +61,7 @@ services:
     volumes:
       - /home/$USER/.cache/huggingface/hub:/home/user/.cache/huggingface/hub
   reranking:
-    image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
+    image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
     container_name: reranking-tei-server
     ports:
       - "8000:8000"

VideoQnA/docker_image_build/build.yaml

@@ -38,9 +38,9 @@ services:
   reranking-tei:
     build:
       context: GenAIComps
-      dockerfile: comps/reranks/src/Dockerfile
+      dockerfile: comps/rerankings/src/Dockerfile
     extends: videoqna
-    image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
+    image: ${REGISTRY:-opea}/reranking:${TAG:-latest}
   video-llama-lvm-server:
     build:
       context: GenAIComps