From e5ec1b7774102b31d9ab5bf3b63cd53982e33dd0 Mon Sep 17 00:00:00 2001 From: "Ye, Xinyu" Date: Thu, 26 Dec 2024 21:48:00 -0500 Subject: [PATCH 1/8] updated path for finetuning. Signed-off-by: Ye, Xinyu --- InstructionTuning/README.md | 2 +- InstructionTuning/docker_compose/intel/cpu/xeon/README.md | 2 +- InstructionTuning/docker_compose/intel/hpu/gaudi/README.md | 2 +- InstructionTuning/docker_image_build/build.yaml | 2 +- RerankFinetuning/docker_compose/intel/cpu/xeon/README.md | 2 +- RerankFinetuning/docker_image_build/build.yaml | 2 +- docker_images_list.md | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/InstructionTuning/README.md b/InstructionTuning/README.md index 4a9788f352..27f2028c3c 100644 --- a/InstructionTuning/README.md +++ b/InstructionTuning/README.md @@ -38,7 +38,7 @@ curl http://${your_ip}:8015/v1/fine_tuning/jobs \ }' ``` -The outputs of the finetune job (adapter_model.safetensors, adapter_config,json... ) are stored in `/home/user/comps/finetuning/output` and other execution logs are stored in `/home/user/ray_results` +The outputs of the finetune job (adapter_model.safetensors, adapter_config,json... ) are stored in `/home/user/comps/finetuning/src/output` and other execution logs are stored in `/home/user/ray_results` ### 3. Manage fine-tuning job diff --git a/InstructionTuning/docker_compose/intel/cpu/xeon/README.md b/InstructionTuning/docker_compose/intel/cpu/xeon/README.md index 684a88f794..a63c471679 100644 --- a/InstructionTuning/docker_compose/intel/cpu/xeon/README.md +++ b/InstructionTuning/docker_compose/intel/cpu/xeon/README.md @@ -14,7 +14,7 @@ Build docker image with below command: git clone https://github.com/opea-project/GenAIComps.git cd GenAIComps export HF_TOKEN=${your_huggingface_token} -docker build -t opea/finetuning:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy --build-arg HF_TOKEN=$HF_TOKEN -f comps/finetuning/Dockerfile . +docker build -t opea/finetuning:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy --build-arg HF_TOKEN=$HF_TOKEN -f comps/finetuning/src/Dockerfile . ``` ### 2. Run Docker with CLI diff --git a/InstructionTuning/docker_compose/intel/hpu/gaudi/README.md b/InstructionTuning/docker_compose/intel/hpu/gaudi/README.md index 550e8e2138..97c8c85fd7 100644 --- a/InstructionTuning/docker_compose/intel/hpu/gaudi/README.md +++ b/InstructionTuning/docker_compose/intel/hpu/gaudi/README.md @@ -13,7 +13,7 @@ Build docker image with below command: ```bash git clone https://github.com/opea-project/GenAIComps.git cd GenAIComps -docker build -t opea/finetuning-gaudi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/finetuning/Dockerfile.intel_hpu . +docker build -t opea/finetuning-gaudi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/finetuning/src/Dockerfile.intel_hpu . ``` ### 2. Run Docker with CLI diff --git a/InstructionTuning/docker_image_build/build.yaml b/InstructionTuning/docker_image_build/build.yaml index 9d4797cbd7..e01b08dd65 100644 --- a/InstructionTuning/docker_image_build/build.yaml +++ b/InstructionTuning/docker_image_build/build.yaml @@ -9,5 +9,5 @@ services: https_proxy: ${https_proxy} no_proxy: ${no_proxy} context: GenAIComps - dockerfile: comps/finetuning/Dockerfile + dockerfile: comps/finetuning/src/Dockerfile image: ${REGISTRY:-opea}/finetuning:${TAG:-latest} diff --git a/RerankFinetuning/docker_compose/intel/cpu/xeon/README.md b/RerankFinetuning/docker_compose/intel/cpu/xeon/README.md index 700358ac92..f9f5585d24 100644 --- a/RerankFinetuning/docker_compose/intel/cpu/xeon/README.md +++ b/RerankFinetuning/docker_compose/intel/cpu/xeon/README.md @@ -14,7 +14,7 @@ Build docker image with below command: git clone https://github.com/opea-project/GenAIComps.git cd GenAIComps export HF_TOKEN=${your_huggingface_token} -docker build -t opea/finetuning:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy --build-arg HF_TOKEN=$HF_TOKEN -f comps/finetuning/Dockerfile . +docker build -t opea/finetuning:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy --build-arg HF_TOKEN=$HF_TOKEN -f comps/finetuning/src/Dockerfile . ``` ### 2. Run Docker with CLI diff --git a/RerankFinetuning/docker_image_build/build.yaml b/RerankFinetuning/docker_image_build/build.yaml index 9d4797cbd7..e01b08dd65 100644 --- a/RerankFinetuning/docker_image_build/build.yaml +++ b/RerankFinetuning/docker_image_build/build.yaml @@ -9,5 +9,5 @@ services: https_proxy: ${https_proxy} no_proxy: ${no_proxy} context: GenAIComps - dockerfile: comps/finetuning/Dockerfile + dockerfile: comps/finetuning/src/Dockerfile image: ${REGISTRY:-opea}/finetuning:${TAG:-latest} diff --git a/docker_images_list.md b/docker_images_list.md index eefddde1c1..90e749638b 100644 --- a/docker_images_list.md +++ b/docker_images_list.md @@ -64,8 +64,8 @@ Take ChatQnA for example. ChatQnA is a chatbot application service based on the | [opea/embedding-tei](https://hub.docker.com/r/opea/embedding-tei) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/embeddings/tei/langchain/Dockerfile) | The docker image exposed the OPEA embedding microservice upon tei docker image for GenAI application use | | [opea/embedding-tei-llama-index](https://hub.docker.com/r/opea/embedding-tei-llama-index) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/embeddings/tei/llama_index/Dockerfile) | The docker image exposed the OPEA embedding microservice upon tei docker image base on LlamaIndex framework for GenAI application use | | [opea/feedbackmanagement](https://hub.docker.com/r/opea/feedbackmanagement) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/feedback_management/mongo/Dockerfile) | The docker image exposes that the OPEA feedback management microservice uses a MongoDB database for GenAI applications. | -| [opea/finetuning](https://hub.docker.com/r/opea/finetuning) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/finetuning/Dockerfile) | The docker image exposed the OPEA Fine-tuning microservice for GenAI application use | -| [opea/finetuning-gaudi](https://hub.docker.com/r/opea/finetuning-gaudi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/finetuning/Dockerfile.intel_hpu) | The docker image exposed the OPEA Fine-tuning microservice for GenAI application use on the Gaudi | +| [opea/finetuning](https://hub.docker.com/r/opea/finetuning) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/finetuning/src/Dockerfile) | The docker image exposed the OPEA Fine-tuning microservice for GenAI application use | +| [opea/finetuning-gaudi](https://hub.docker.com/r/opea/finetuning-gaudi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/finetuning/src/Dockerfile.intel_hpu) | The docker image exposed the OPEA Fine-tuning microservice for GenAI application use on the Gaudi | | [opea/gmcrouter](https://hub.docker.com/r/opea/gmcrouter) | [Link](https://github.com/opea-project/GenAIInfra/blob/main/microservices-connector/Dockerfile.manager) | The docker image served as one of key parts of the OPEA GenAI Microservice Connector(GMC) to route the traffic among the microservices defined in GMC | | [opea/gmcmanager](https://hub.docker.com/r/opea/gmcmanager) | [Link](https://github.com/opea-project/GenAIInfra/blob/main/microservices-connector/Dockerfile.router) | The docker image served as one of key parts of the OPEA GenAI Microservice Connector(GMC) to be controller manager to handle GMC CRD | | [opea/guardrails-tgi](https://hub.docker.com/r/opea/guardrails-tgi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/guardrails/llama_guard/langchain/Dockerfile) | The docker image exposed the OPEA guardrail microservice to provide content review for GenAI application use | From 415eaf933a7cb67ee34909a61670629b1f658c0e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 27 Dec 2024 06:01:21 +0000 Subject: [PATCH 2/8] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- docker_images_list.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_images_list.md b/docker_images_list.md index 90e749638b..16bc7c6b8d 100644 --- a/docker_images_list.md +++ b/docker_images_list.md @@ -64,8 +64,8 @@ Take ChatQnA for example. ChatQnA is a chatbot application service based on the | [opea/embedding-tei](https://hub.docker.com/r/opea/embedding-tei) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/embeddings/tei/langchain/Dockerfile) | The docker image exposed the OPEA embedding microservice upon tei docker image for GenAI application use | | [opea/embedding-tei-llama-index](https://hub.docker.com/r/opea/embedding-tei-llama-index) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/embeddings/tei/llama_index/Dockerfile) | The docker image exposed the OPEA embedding microservice upon tei docker image base on LlamaIndex framework for GenAI application use | | [opea/feedbackmanagement](https://hub.docker.com/r/opea/feedbackmanagement) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/feedback_management/mongo/Dockerfile) | The docker image exposes that the OPEA feedback management microservice uses a MongoDB database for GenAI applications. | -| [opea/finetuning](https://hub.docker.com/r/opea/finetuning) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/finetuning/src/Dockerfile) | The docker image exposed the OPEA Fine-tuning microservice for GenAI application use | -| [opea/finetuning-gaudi](https://hub.docker.com/r/opea/finetuning-gaudi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/finetuning/src/Dockerfile.intel_hpu) | The docker image exposed the OPEA Fine-tuning microservice for GenAI application use on the Gaudi | +| [opea/finetuning](https://hub.docker.com/r/opea/finetuning) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/finetuning/src/Dockerfile) | The docker image exposed the OPEA Fine-tuning microservice for GenAI application use | +| [opea/finetuning-gaudi](https://hub.docker.com/r/opea/finetuning-gaudi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/finetuning/src/Dockerfile.intel_hpu) | The docker image exposed the OPEA Fine-tuning microservice for GenAI application use on the Gaudi | | [opea/gmcrouter](https://hub.docker.com/r/opea/gmcrouter) | [Link](https://github.com/opea-project/GenAIInfra/blob/main/microservices-connector/Dockerfile.manager) | The docker image served as one of key parts of the OPEA GenAI Microservice Connector(GMC) to route the traffic among the microservices defined in GMC | | [opea/gmcmanager](https://hub.docker.com/r/opea/gmcmanager) | [Link](https://github.com/opea-project/GenAIInfra/blob/main/microservices-connector/Dockerfile.router) | The docker image served as one of key parts of the OPEA GenAI Microservice Connector(GMC) to be controller manager to handle GMC CRD | | [opea/guardrails-tgi](https://hub.docker.com/r/opea/guardrails-tgi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/guardrails/llama_guard/langchain/Dockerfile) | The docker image exposed the OPEA guardrail microservice to provide content review for GenAI application use | From f248fd8322d175ad6c9bd6defcdaf872b594759c Mon Sep 17 00:00:00 2001 From: chensuyue Date: Fri, 27 Dec 2024 17:15:06 +0800 Subject: [PATCH 3/8] for test only, need to revert before merge Signed-off-by: chensuyue --- .github/workflows/_run-docker-compose.yml | 1 + .github/workflows/pr-docker-compose-e2e.yml | 2 +- .github/workflows/pr-dockerfile-path-and-build-yaml-scan.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/_run-docker-compose.yml b/.github/workflows/_run-docker-compose.yml index daf87add83..20f203f734 100644 --- a/.github/workflows/_run-docker-compose.yml +++ b/.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: "ft" example: ${{ inputs.example }} hardware: ${{ inputs.hardware }} test_case: ${{ matrix.test_case }} diff --git a/.github/workflows/pr-docker-compose-e2e.yml b/.github/workflows/pr-docker-compose-e2e.yml index 687ae047a3..c52677f31e 100644 --- a/.github/workflows/pr-docker-compose-e2e.yml +++ b/.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: diff --git a/.github/workflows/pr-dockerfile-path-and-build-yaml-scan.yml b/.github/workflows/pr-dockerfile-path-and-build-yaml-scan.yml index ededdba43c..c66f0d77c1 100644 --- a/.github/workflows/pr-dockerfile-path-and-build-yaml-scan.yml +++ b/.github/workflows/pr-dockerfile-path-and-build-yaml-scan.yml @@ -22,6 +22,7 @@ jobs: run: | cd .. git clone https://github.com/opea-project/GenAIComps.git + cd GenAIComps && git checkout ft - name: Check for Missing Dockerfile Paths in GenAIComps run: | From a137c88111ea2236fc06f3ea2eba9857be1f0e77 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 08:10:44 +0000 Subject: [PATCH 4/8] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- docker_images_list.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_images_list.md b/docker_images_list.md index c8d4205022..32133d0037 100644 --- a/docker_images_list.md +++ b/docker_images_list.md @@ -62,8 +62,8 @@ Take ChatQnA for example. ChatQnA is a chatbot application service based on the | [opea/embedding-multimodal-bridgetower-gaudi](https://hub.docker.com/r/opea/embedding-multimodal-bridgetower-gaudi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/embeddings/src/integrations/dependency/bridgetower/Dockerfile.intel_hpu) | The docker image exposes OPEA multimodal embedded microservices based on bridgetower for use by GenAI applications on the Gaudi | | [opea/embedding-tei](https://hub.docker.com/r/opea/embedding-tei) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/embeddings/src/Dockerfile) | The docker image exposed the OPEA embedding microservice upon tei docker image for GenAI application use | | [opea/feedbackmanagement](https://hub.docker.com/r/opea/feedbackmanagement) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/feedback_management/mongo/Dockerfile) | The docker image exposes that the OPEA feedback management microservice uses a MongoDB database for GenAI applications. | -| [opea/finetuning](https://hub.docker.com/r/opea/finetuning) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/finetuning/src/Dockerfile) | The docker image exposed the OPEA Fine-tuning microservice for GenAI application use | -| [opea/finetuning-gaudi](https://hub.docker.com/r/opea/finetuning-gaudi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/finetuning/src/Dockerfile.intel_hpu) | The docker image exposed the OPEA Fine-tuning microservice for GenAI application use on the Gaudi | +| [opea/finetuning](https://hub.docker.com/r/opea/finetuning) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/finetuning/src/Dockerfile) | The docker image exposed the OPEA Fine-tuning microservice for GenAI application use | +| [opea/finetuning-gaudi](https://hub.docker.com/r/opea/finetuning-gaudi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/finetuning/src/Dockerfile.intel_hpu) | The docker image exposed the OPEA Fine-tuning microservice for GenAI application use on the Gaudi | | [opea/gmcrouter](https://hub.docker.com/r/opea/gmcrouter) | [Link](https://github.com/opea-project/GenAIInfra/blob/main/microservices-connector/Dockerfile.manager) | The docker image served as one of key parts of the OPEA GenAI Microservice Connector(GMC) to route the traffic among the microservices defined in GMC | | [opea/gmcmanager](https://hub.docker.com/r/opea/gmcmanager) | [Link](https://github.com/opea-project/GenAIInfra/blob/main/microservices-connector/Dockerfile.router) | The docker image served as one of key parts of the OPEA GenAI Microservice Connector(GMC) to be controller manager to handle GMC CRD | | [opea/guardrails-tgi](https://hub.docker.com/r/opea/guardrails-tgi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/guardrails/llama_guard/langchain/Dockerfile) | The docker image exposed the OPEA guardrail microservice to provide content review for GenAI application use | From 8344259380289d3ce2182c8a3eeeaac1f19cdce0 Mon Sep 17 00:00:00 2001 From: "Ye, Xinyu" Date: Mon, 6 Jan 2025 03:14:13 -0500 Subject: [PATCH 5/8] fix path. Signed-off-by: Ye, Xinyu --- RerankFinetuning/docker_compose/intel/hpu/gaudi/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RerankFinetuning/docker_compose/intel/hpu/gaudi/README.md b/RerankFinetuning/docker_compose/intel/hpu/gaudi/README.md index eebe6a3744..b024b1f0a6 100644 --- a/RerankFinetuning/docker_compose/intel/hpu/gaudi/README.md +++ b/RerankFinetuning/docker_compose/intel/hpu/gaudi/README.md @@ -13,7 +13,7 @@ Build docker image with below command: ```bash git clone https://github.com/opea-project/GenAIComps.git cd GenAIComps -docker build -t opea/finetuning-gaudi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/finetuning/Dockerfile.intel_hpu . +docker build -t opea/finetuning-gaudi:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f comps/finetuning/src/Dockerfile.intel_hpu . ``` ### 2. Run Docker with CLI From 6166eefb017f309bac09d0a8bf62214ff53ac4ed Mon Sep 17 00:00:00 2001 From: "Ye, Xinyu" Date: Mon, 6 Jan 2025 04:42:44 -0500 Subject: [PATCH 6/8] change branch. Signed-off-by: Ye, Xinyu --- InstructionTuning/tests/test_compose_on_xeon.sh | 2 +- RerankFinetuning/tests/test_compose_on_xeon.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/InstructionTuning/tests/test_compose_on_xeon.sh b/InstructionTuning/tests/test_compose_on_xeon.sh index 97a5f3c7e6..10bbc8c9d9 100644 --- a/InstructionTuning/tests/test_compose_on_xeon.sh +++ b/InstructionTuning/tests/test_compose_on_xeon.sh @@ -19,7 +19,7 @@ ray_port=8265 function build_docker_images() { cd $WORKPATH/docker_image_build if [ ! -d "GenAIComps" ] ; then - git clone https://github.com/opea-project/GenAIComps.git + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ fi docker compose -f build.yaml build --no-cache > ${LOG_PATH}/docker_image_build.log } diff --git a/RerankFinetuning/tests/test_compose_on_xeon.sh b/RerankFinetuning/tests/test_compose_on_xeon.sh index b0a10d5065..80dcaba764 100644 --- a/RerankFinetuning/tests/test_compose_on_xeon.sh +++ b/RerankFinetuning/tests/test_compose_on_xeon.sh @@ -18,7 +18,7 @@ ray_port=8265 function build_docker_images() { cd $WORKPATH/docker_image_build if [ ! -d "GenAIComps" ] ; then - git clone https://github.com/opea-project/GenAIComps.git + git clone https://github.com/opea-project/GenAIComps.git && cd GenAIComps && git checkout "${opea_branch:-"main"}" && cd ../ fi docker compose -f build.yaml build --no-cache > ${LOG_PATH}/docker_image_build.log } From b9357c934349cb4c89bb3f9ee76ebb33d4e01a56 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2025 03:54:23 +0000 Subject: [PATCH 7/8] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- docker_images_list.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_images_list.md b/docker_images_list.md index 24ae71dfcf..586d0a6fa7 100644 --- a/docker_images_list.md +++ b/docker_images_list.md @@ -60,7 +60,7 @@ Take ChatQnA for example. ChatQnA is a chatbot application service based on the | [opea/embedding](https://hub.docker.com/r/opea/embedding) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/embeddings/src/Dockerfile) | The docker image exposes OPEA multimodal embedded microservices for use by GenAI applications | | [opea/embedding-multimodal-bridgetower](https://hub.docker.com/r/opea/embedding-multimodal-bridgetower) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/embeddings/src/integrations/dependency/bridgetower/Dockerfile) | The docker image exposes OPEA multimodal embedded microservices based on bridgetower for use by GenAI applications | | [opea/embedding-multimodal-bridgetower-gaudi](https://hub.docker.com/r/opea/embedding-multimodal-bridgetower-gaudi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/embeddings/src/integrations/dependency/bridgetower/Dockerfile.intel_hpu) | The docker image exposes OPEA multimodal embedded microservices based on bridgetower for use by GenAI applications on the Gaudi | -| [opea/feedbackmanagement](https://hub.docker.com/r/opea/feedbackmanagement) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/feedback_management/src/Dockerfile) | The docker image exposes that the OPEA feedback management microservice uses a MongoDB database for GenAI applications. | +| [opea/feedbackmanagement](https://hub.docker.com/r/opea/feedbackmanagement) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/feedback_management/src/Dockerfile) | The docker image exposes that the OPEA feedback management microservice uses a MongoDB database for GenAI applications. | | [opea/finetuning](https://hub.docker.com/r/opea/finetuning) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/finetuning/src/Dockerfile) | The docker image exposed the OPEA Fine-tuning microservice for GenAI application use | | [opea/finetuning-gaudi](https://hub.docker.com/r/opea/finetuning-gaudi) | [Link](https://github.com/opea-project/GenAIComps/blob/main/comps/finetuning/src/Dockerfile.intel_hpu) | The docker image exposed the OPEA Fine-tuning microservice for GenAI application use on the Gaudi | | [opea/gmcrouter](https://hub.docker.com/r/opea/gmcrouter) | [Link](https://github.com/opea-project/GenAIInfra/blob/main/microservices-connector/Dockerfile.manager) | The docker image served as one of key parts of the OPEA GenAI Microservice Connector(GMC) to route the traffic among the microservices defined in GMC | From 1bafcfde641144119b2ea3fef60938163f06baae Mon Sep 17 00:00:00 2001 From: chensuyue Date: Thu, 9 Jan 2025 11:54:55 +0800 Subject: [PATCH 8/8] Revert "for test only, need to revert before merge" This reverts commit f248fd8322d175ad6c9bd6defcdaf872b594759c. --- .github/workflows/_run-docker-compose.yml | 1 - .github/workflows/pr-docker-compose-e2e.yml | 2 +- .github/workflows/pr-dockerfile-path-and-build-yaml-scan.yml | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/_run-docker-compose.yml b/.github/workflows/_run-docker-compose.yml index 20f203f734..daf87add83 100644 --- a/.github/workflows/_run-docker-compose.yml +++ b/.github/workflows/_run-docker-compose.yml @@ -134,7 +134,6 @@ jobs: SERVING_TOKEN: ${{ secrets.SERVING_TOKEN }} IMAGE_REPO: ${{ inputs.registry }} IMAGE_TAG: ${{ inputs.tag }} - opea_branch: "ft" example: ${{ inputs.example }} hardware: ${{ inputs.hardware }} test_case: ${{ matrix.test_case }} diff --git a/.github/workflows/pr-docker-compose-e2e.yml b/.github/workflows/pr-docker-compose-e2e.yml index 446afa9250..fe052f90a1 100644 --- a/.github/workflows/pr-docker-compose-e2e.yml +++ b/.github/workflows/pr-docker-compose-e2e.yml @@ -4,7 +4,7 @@ name: E2E test with docker compose on: - pull_request: + pull_request_target: branches: ["main", "*rc"] types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped paths: diff --git a/.github/workflows/pr-dockerfile-path-and-build-yaml-scan.yml b/.github/workflows/pr-dockerfile-path-and-build-yaml-scan.yml index fe0b94c391..9fa9d03342 100644 --- a/.github/workflows/pr-dockerfile-path-and-build-yaml-scan.yml +++ b/.github/workflows/pr-dockerfile-path-and-build-yaml-scan.yml @@ -22,7 +22,6 @@ jobs: run: | cd .. git clone https://github.com/opea-project/GenAIComps.git - cd GenAIComps && git checkout ft - name: Check for Missing Dockerfile Paths in GenAIComps run: |