Merge branch 'main' into feature/CodeGen_CodeTrans_k8s

Author: chyundunovDatamonsters

AudioQnA/Dockerfile

@@ -3,7 +3,6 @@
 
 ARG IMAGE_REPO=opea
 ARG BASE_TAG=latest
-FROM opea/comps-base:$BASE_TAG
 FROM $IMAGE_REPO/comps-base:$BASE_TAG
 
 COPY ./audioqna.py $HOME/audioqna.py

AudioQnA/Dockerfile.multilang

@@ -3,7 +3,6 @@
 
 ARG IMAGE_REPO=opea
 ARG BASE_TAG=latest
-FROM opea/comps-base:$BASE_TAG
 FROM $IMAGE_REPO/comps-base:$BASE_TAG
 
 COPY ./audioqna_multilang.py $HOME/audioqna_multilang.py

ChatQnA/docker_compose/amd/gpu/rocm/README.md

@@ -165,7 +165,7 @@ services:
 
   chatqna-nginx-server:
     image: ${REGISTRY:-opea}/nginx:${TAG:-latest}
-    container_name: chaqna-nginx-server
+    container_name: chatqna-nginx-server
     depends_on:
       - chatqna-backend-server
       - chatqna-ui-server

ChatQnA/docker_compose/amd/gpu/rocm/compose.yaml

@@ -187,7 +187,7 @@ services:
 
   chatqna-nginx-server:
     image: ${REGISTRY:-opea}/nginx:${TAG:-latest}
-    container_name: chaqna-nginx-server
+    container_name: chatqna-nginx-server
     depends_on:
       - chatqna-backend-server
       - chatqna-ui-server

ChatQnA/docker_compose/amd/gpu/rocm/compose_faqgen.yaml

@@ -192,7 +192,7 @@ services:
 
   chatqna-nginx-server:
     image: ${REGISTRY:-opea}/nginx:${TAG:-latest}
-    container_name: chaqna-nginx-server
+    container_name: chatqna-nginx-server
     depends_on:
       - chatqna-backend-server
       - chatqna-ui-server

ChatQnA/docker_compose/amd/gpu/rocm/compose_faqgen_vllm.yaml

@@ -41,7 +41,6 @@ function build_docker_images() {
 }
 function start_services() {
     cd $WORKPATH/docker_compose/intel/cpu/xeon/
-    export no_proxy=${no_proxy},${ip_address}
     export EMBEDDING_MODEL_ID="BAAI/bge-base-en-v1.5"
     export RERANK_MODEL_ID="BAAI/bge-reranker-base"
     export LLM_MODEL_ID="meta-llama/Meta-Llama-3-8B-Instruct"

ChatQnA/tests/test_compose_milvus_on_xeon.sh

@@ -43,9 +43,6 @@ function build_docker_images() {
 
 function start_services() {
     cd $WORKPATH/docker_compose/intel/hpu/gaudi
-
-    export http_proxy=${http_proxy}
-    export https_proxy=${http_proxy}
     export LLM_MODEL_ID="mistralai/Mistral-7B-Instruct-v0.3"
     export LLM_ENDPOINT="http://${ip_address}:8008"
     export LLM_COMPONENT_NAME="OpeaTextGenService"

CodeGen/docker_compose/amd/gpu/rocm/README.md

@@ -42,8 +42,6 @@ function build_docker_images() {
 
 function start_services() {
     cd $WORKPATH/docker_compose/amd/gpu/rocm/
-    export http_proxy=${http_proxy}
-    export https_proxy=${http_proxy}
     export CODETRANS_TGI_SERVICE_PORT=8008
     export CODETRANS_LLM_SERVICE_PORT=9000
     export CODETRANS_LLM_MODEL_ID="Qwen/Qwen2.5-Coder-7B-Instruct"

CodeTrans/docker_compose/amd/gpu/rocm/README.md

@@ -45,8 +45,6 @@ function build_docker_images() {
 
 function start_services() {
     cd $WORKPATH/docker_compose/intel/cpu/xeon/
-    export http_proxy=${http_proxy}
-    export https_proxy=${http_proxy}
     export LLM_MODEL_ID="mistralai/Mistral-7B-Instruct-v0.3"
     export LLM_ENDPOINT="http://${ip_address}:8008"
     export LLM_COMPONENT_NAME="OpeaTextGenService"

CodeTrans/tests/test_compose_on_gaudi.sh

@@ -41,8 +41,6 @@ function build_docker_images() {
 
 function start_services() {
     cd $WORKPATH/docker_compose/intel/hpu/gaudi/
-    export http_proxy=${http_proxy}
-    export https_proxy=${http_proxy}
     export LLM_MODEL_ID="mistralai/Mistral-7B-Instruct-v0.3"
     export LLM_ENDPOINT="http://${ip_address}:8008"
     export LLM_COMPONENT_NAME="OpeaTextGenService"

CodeTrans/tests/test_compose_on_rocm.sh

@@ -41,8 +41,6 @@ function build_docker_images() {
 
 function start_services() {
     cd $WORKPATH/docker_compose/intel/cpu/xeon/
-    export http_proxy=${http_proxy}
-    export https_proxy=${http_proxy}
     export LLM_MODEL_ID="mistralai/Mistral-7B-Instruct-v0.3"
     export LLM_ENDPOINT="http://${ip_address}:8008"
     export LLM_COMPONENT_NAME="OpeaTextGenService"

CodeTrans/tests/test_compose_on_xeon.sh

@@ -40,8 +40,6 @@ function build_docker_images() {
 
 function start_services() {
     cd $WORKPATH/docker_compose/amd/gpu/rocm/
-    export http_proxy=${http_proxy}
-    export https_proxy=${http_proxy}
     export HOST_IP=${ip_address}
     export CODETRANS_VLLM_SERVICE_PORT=8008
     export CODETRANS_LLM_SERVICE_PORT=9000

CodeTrans/tests/test_compose_tgi_on_gaudi.sh

@@ -1,8 +1,9 @@
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
+ARG IMAGE_REPO=opea
 ARG BASE_TAG=latest
-FROM opea/comps-base:$BASE_TAG
+FROM $IMAGE_REPO/comps-base:$BASE_TAG
 
 COPY ./chatqna.py $HOME/chatqna.py
 

CodeTrans/tests/test_compose_tgi_on_xeon.sh

@@ -63,7 +63,7 @@ services:
       - ecrag
   vllm-openvino-server:
     container_name: vllm-openvino-server
-    image: opea/vllm-arc:latest
+    image: ${REGISTRY:-opea}/vllm-arc:${TAG:-latest}
     ports:
       - ${VLLM_SERVICE_PORT:-8008}:80
     environment:

CodeTrans/tests/test_compose_vllm_on_rocm.sh

@@ -2,35 +2,33 @@
 # SPDX-License-Identifier: Apache-2.0
 
 services:
-  edgecraftrag-server:
+  edgecraftrag:
     build:
       context: ../
       args:
+        IMAGE_REPO: ${REGISTRY}
+        BASE_TAG: ${TAG}
         http_proxy: ${http_proxy}
         https_proxy: ${https_proxy}
+      dockerfile: ./Dockerfile
+    image: ${REGISTRY:-opea}/edgecraftrag:${TAG:-latest}
+  edgecraftrag-server:
+    build:
       dockerfile: ./Dockerfile.server
+    extends: edgecraftrag
     image: ${REGISTRY:-opea}/edgecraftrag-server:${TAG:-latest}
   edgecraftrag-ui:
     build:
-      context: ../
-      args:
-        http_proxy: ${http_proxy}
-        https_proxy: ${https_proxy}
       dockerfile: ./ui/docker/Dockerfile.ui
+    extends: edgecraftrag
     image: ${REGISTRY:-opea}/edgecraftrag-ui:${TAG:-latest}
   edgecraftrag-ui-gradio:
     build:
-      context: ../
-      args:
-        http_proxy: ${http_proxy}
-        https_proxy: ${https_proxy}
       dockerfile: ./ui/docker/Dockerfile.gradio
+    extends: edgecraftrag
     image: ${REGISTRY:-opea}/edgecraftrag-ui-gradio:${TAG:-latest}
-  edgecraftrag:
+  vllm-arc:
     build:
-      context: ../
-      args:
-        http_proxy: ${http_proxy}
-        https_proxy: ${https_proxy}
-      dockerfile: ./Dockerfile
-    image: ${REGISTRY:-opea}/edgecraftrag:${TAG:-latest}
+      context: GenAIComps
+      dockerfile: comps/third_parties/vllm/src/Dockerfile.intel_gpu
+    image: ${REGISTRY:-opea}/vllm-arc:${TAG:-latest}

EdgeCraftRAG/Dockerfile

@@ -30,8 +30,16 @@ HF_ENDPOINT=https://hf-mirror.com
 
 
 function build_docker_images() {
+    opea_branch=${opea_branch:-"main"}
     cd $WORKPATH/docker_image_build
+    git clone --depth 1 --branch ${opea_branch} https://github.com/opea-project/GenAIComps.git
+    pushd GenAIComps
+    echo "GenAIComps test commit is $(git rev-parse HEAD)"
+    docker build --no-cache -t ${REGISTRY}/comps-base:${TAG} --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile .
+    popd && sleep 1s
+
     echo "Build all the images with --no-cache, check docker_image_build.log for details..."
+    service_list="edgecraftrag edgecraftrag-server edgecraftrag-ui"
     docker compose -f build.yaml build --no-cache > ${LOG_PATH}/docker_image_build.log
 
     docker images && sleep 1s
@@ -102,16 +110,30 @@ function stop_docker() {
 function main() {
     mkdir -p $LOG_PATH
 
+    echo "::group::stop_docker"
     stop_docker
+    echo "::endgroup::"
+
+    echo "::group::build_docker_images"
     if [[ "$IMAGE_REPO" == "opea" ]]; then build_docker_images; fi
+    echo "::endgroup::"
+
+    echo "::group::start_services"
     start_services
-    echo "EC_RAG service started" && sleep 1s
+    echo "::endgroup::"
 
+    echo "::group::validate_rag"
     validate_rag
+    echo "::endgroup::"
+
+    echo "::group::validate_megaservice"
     validate_megaservice
+    echo "::endgroup::"
 
+    echo "::group::stop_docker"
     stop_docker
     echo y | docker system prune
+    echo "::endgroup::"
 
 }
 

EdgeCraftRAG/docker_compose/intel/gpu/arc/compose_vllm.yaml

@@ -33,7 +33,14 @@ vLLM_ENDPOINT="http://${HOST_IP}:${VLLM_SERVICE_PORT}"
 
 
 function build_docker_images() {
+    opea_branch=${opea_branch:-"main"}
     cd $WORKPATH/docker_image_build
+    git clone --depth 1 --branch ${opea_branch} https://github.com/opea-project/GenAIComps.git
+    pushd GenAIComps
+    echo "GenAIComps test commit is $(git rev-parse HEAD)"
+    docker build --no-cache -t ${REGISTRY}/comps-base:${TAG} --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f Dockerfile .
+    popd && sleep 1s
+
     echo "Build all the images with --no-cache, check docker_image_build.log for details..."
     docker compose -f build.yaml build --no-cache > ${LOG_PATH}/docker_image_build.log
 
@@ -152,19 +159,30 @@ function stop_docker() {
 function main() {
     mkdir -p "$LOG_PATH"
 
+    echo "::group::stop_docker"
     stop_docker
+    echo "::endgroup::"
+
+    echo "::group::build_docker_images"
     if [[ "$IMAGE_REPO" == "opea" ]]; then build_docker_images; fi
-    start_time=$(date +%s)
+    echo "::endgroup::"
+
+    echo "::group::start_services"
     start_services
-    end_time=$(date +%s)
-    duration=$((end_time-start_time))
-    echo "EC_RAG service start duration is $duration s" && sleep 1s
+    echo "::endgroup::"
 
+    echo "::group::validate_rag"
     validate_rag
+    echo "::endgroup::"
+
+    echo "::group::validate_megaservice"
     validate_megaservice
+    echo "::endgroup::"
 
+    echo "::group::stop_docker"
     stop_docker
     echo y | docker system prune
+    echo "::endgroup::"
 
 }