Adapt refactor comps (#1340)

Signed-off-by: WenjiaoYue
2025-01-08 10:36:24 +08:00
parent 28206311fd
commit 9970605460
25 changed files with 39 additions and 39 deletions
--- a/AgentQnA/tests/step1_build_images.sh
+++ b/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 retriever-redis reranking-tei"
+    service_list="doc-index-retriever dataprep-redis embedding retriever-redis reranking"
    docker compose -f build.yaml build ${service_list} --no-cache
    docker pull ghcr.io/huggingface/text-embeddings-inference:cpu-1.5

--- a/ChatQnA/docker_image_build/build.yaml
+++ b/ChatQnA/docker_image_build/build.yaml
@@ -65,12 +65,12 @@ services:
      dockerfile: comps/retrievers/pinecone/langchain/Dockerfile
    extends: chatqna
    image: ${REGISTRY:-opea}/retriever-pinecone:${TAG:-latest}
-  reranking-tei:
+  reranking:
    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
--- a/ChatQnA/kubernetes/intel/cpu/xeon/manifest/chatqna-remote-inference.yaml
+++ b/ChatQnA/kubernetes/intel/cpu/xeon/manifest/chatqna-remote-inference.yaml
@@ -921,7 +921,7 @@ spec:
            runAsUser: 1000
            seccompProfile:
              type: RuntimeDefault
-          image: "opea/reranking-tei:latest"
+          image: "opea/reranking:latest"
          imagePullPolicy: Always
          ports:
            - name: reranking-usvc
--- a/ChatQnA/kubernetes/intel/hpu/gaudi/manifest/chatqna-vllm-remote-inference.yaml
+++ b/ChatQnA/kubernetes/intel/hpu/gaudi/manifest/chatqna-vllm-remote-inference.yaml
@@ -829,7 +829,7 @@ spec:
            runAsUser: 1000
            seccompProfile:
              type: RuntimeDefault
-          image: "opea/reranking-tei:latest"
+          image: "opea/reranking:latest"
          imagePullPolicy: Always
          ports:
            - name: reranking-usvc
--- a/ChatQnA/kubernetes/intel/hpu/gaudi/manifest/chatqna-vllm.yaml
+++ b/ChatQnA/kubernetes/intel/hpu/gaudi/manifest/chatqna-vllm.yaml
@@ -958,7 +958,7 @@ spec:
            runAsUser: 1000
            seccompProfile:
              type: RuntimeDefault
-          image: "opea/reranking-tei:latest"
+          image: "opea/reranking:latest"
          imagePullPolicy: Always
          ports:
            - name: reranking-usvc
--- a/DocIndexRetriever/docker_compose/intel/cpu/xeon/README.md
+++ b/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
--- a/DocIndexRetriever/docker_compose/intel/cpu/xeon/compose.yaml
+++ b/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:
--- a/DocIndexRetriever/docker_compose/intel/hpu/gaudi/README.md
+++ b/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
--- a/DocIndexRetriever/docker_compose/intel/hpu/gaudi/compose.yaml
+++ b/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:
--- a/DocIndexRetriever/docker_image_build/build.yaml
+++ b/DocIndexRetriever/docker_image_build/build.yaml
@@ -23,12 +23,12 @@ services:
      dockerfile: comps/retrievers/redis/langchain/Dockerfile
    extends: doc-index-retriever
    image: ${REGISTRY:-opea}/retriever-redis:${TAG:-latest}
-  reranking-tei:
+  reranking:
    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
--- a/DocIndexRetriever/tests/test_compose_on_xeon.sh
+++ b/DocIndexRetriever/tests/test_compose_on_xeon.sh
@@ -21,7 +21,7 @@ function build_docker_images() {
        echo "Cloning GenAIComps repository"
        git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../
    fi
-    service_list="dataprep-redis embedding retriever-redis reranking-tei doc-index-retriever"
+    service_list="dataprep-redis embedding retriever-redis reranking doc-index-retriever"
    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
--- a/ProductivitySuite/docker_compose/intel/cpu/xeon/README.md
+++ b/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
--- a/ProductivitySuite/docker_compose/intel/cpu/xeon/compose.yaml
+++ b/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:
--- a/ProductivitySuite/docker_image_build/build.yaml
+++ b/ProductivitySuite/docker_image_build/build.yaml
@@ -23,12 +23,12 @@ services:
      dockerfile: comps/retrievers/redis/langchain/Dockerfile
    extends: chatqna
    image: ${REGISTRY:-opea}/retriever-redis:${TAG:-latest}
-  reranking-tei:
+  reranking:
    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
--- a/ProductivitySuite/kubernetes/intel/cpu/xeon/manifest/chatqna.yaml
+++ b/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
--- a/SearchQnA/docker_compose/intel/cpu/xeon/README.md
+++ b/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: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`
--- a/SearchQnA/docker_compose/intel/cpu/xeon/compose.yaml
+++ b/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:
--- a/SearchQnA/docker_compose/intel/hpu/gaudi/README.md
+++ b/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: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`

--- a/SearchQnA/docker_compose/intel/hpu/gaudi/compose.yaml
+++ b/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:
--- a/SearchQnA/docker_image_build/build.yaml
+++ b/SearchQnA/docker_image_build/build.yaml
@@ -29,12 +29,12 @@ services:
      dockerfile: comps/web_retrievers/chroma/langchain/Dockerfile
    extends: searchqna
    image: ${REGISTRY:-opea}/web-retriever-chroma:${TAG:-latest}
-  reranking-tei:
+  reranking:
    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
--- a/SearchQnA/tests/test_compose_on_gaudi.sh
+++ b/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 web-retriever-chroma reranking-tei llm-textgen"
+    service_list="searchqna searchqna-ui embedding 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
--- a/SearchQnA/tests/test_compose_on_xeon.sh
+++ b/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 web-retriever-chroma reranking-tei llm-textgen"
+    service_list="searchqna searchqna-ui embedding 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
--- a/VideoQnA/docker_compose/intel/cpu/xeon/README.md
+++ b/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`
--- a/VideoQnA/docker_compose/intel/cpu/xeon/compose.yaml
+++ b/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"
--- a/VideoQnA/docker_image_build/build.yaml
+++ b/VideoQnA/docker_image_build/build.yaml
@@ -35,12 +35,12 @@ services:
      dockerfile: comps/retrievers/vdms/langchain/Dockerfile
    extends: videoqna
    image: ${REGISTRY:-opea}/retriever-vdms:${TAG:-latest}
-  reranking-tei:
+  reranking:
    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