OPEA - AmazonBedrock integration

.github/CODEOWNERS

@@ -1,26 +1,28 @@
 # Code owners will review PRs within their respective folders. 
 # Typically, ownership is organized at the second-level subdirectory under the homepage
-/comps/agent/ [email protected]
-/comps/finetuning/ [email protected]
-/comps/guardrails/ [email protected]
-/comps/asr/ [email protected]
-/comps/intent_detection/ [email protected]
-/comps/cores/ [email protected]
-/comps/dataprep/ [email protected]
+
+* [email protected] [email protected] [email protected]
+/.github/ [email protected] [email protected]
+/comps/third_parties/ [email protected] [email protected] [email protected]
+/comps/agent/ [email protected] [email protected]
+/comps/animation/ [email protected] [email protected]
+/comps/asr/ [email protected] [email protected]
+/comps/chathistory/ [email protected] [email protected]
+/comps/cores/ [email protected] [email protected] [email protected] [email protected] [email protected]
+/comps/dataprep/ [email protected] [email protected]
 /comps/embeddings/ [email protected]
-/comps/guardrails/ [email protected]
-/comps/llms/ [email protected]
-/comps/lvms/ [email protected]
-/comps/nginx/ [email protected]
-/comps/prompt_registry/ [email protected]
-/comps/feedback_management/ [email protected]
-/comps/chathistory/ [email protected]
-/comps/texttosql/ [email protected]
-/comps/text2image/ [email protected]
-/comps/reranks/ [email protected]
-/comps/retrievers/ [email protected]
-/comps/tts/ [email protected]
-/comps/ragas/ [email protected]
-/comps/vectorstores/ [email protected]
-/comps/web_retrievers/ [email protected]
-/*/ [email protected]
+/comps/feedback_management/ [email protected] [email protected]
+/comps/finetuning/ [email protected] [email protected]
+/comps/guardrails/ [email protected] [email protected]
+/comps/image2image/ [email protected] [email protected]
+/comps/image2video/ [email protected] [email protected]
+/comps/llms/ [email protected] [email protected]
+/comps/lvms/ [email protected] [email protected]
+/comps/prompt_registry/ [email protected] [email protected]
+/comps/ragas/ [email protected] [email protected]
+/comps/rerankings/ [email protected] [email protected]
+/comps/retrievers/ [email protected] [email protected]
+/comps/text2image/ [email protected] [email protected]
+/comps/text2sql/ [email protected] [email protected]
+/comps/tts/ [email protected] [email protected]
+/comps/web_retrievers/ [email protected] [email protected]

.github/ISSUE_TEMPLATE/1_bug_template.yml

@@ -66,6 +66,7 @@ body:
       options:
         - label: Pull docker images from hub.docker.com
         - label: Build docker images from source
+        - label: Other
     validations:
       required: true
 
@@ -74,10 +75,10 @@ body:
     attributes:
       label: Deploy method
       options:
-        - label: Docker compose
         - label: Docker
-        - label: Kubernetes
-        - label: Helm
+        - label: Docker Compose
+        - label: Kubernetes Helm Charts
+        - label: Other
     validations:
       required: true
 
@@ -88,6 +89,7 @@ body:
       options:
         - Single Node
         - Multiple Nodes
+        - Other
       default: 0
     validations:
       required: true

.github/ISSUE_TEMPLATE/2_feature_template.yml

@@ -66,6 +66,7 @@ body:
       options:
         - Single Node
         - Multiple Nodes
+        - Other
       default: 0
     validations:
       required: true

.github/license_template.txt

@@ -1,2 +1,2 @@
-Copyright (C) 2024 Intel Corporation
+Copyright (C) 2025 Intel Corporation
 SPDX-License-Identifier: Apache-2.0

.github/workflows/_comps-workflow.yml

@@ -17,11 +17,19 @@ on:
         default: true
         required: false
         type: boolean
-      test:
+      test_compose:
         default: true
         description: "Test comps with docker compose"
         required: false
         type: boolean
+      test_helmchart:
+        default: true
+        description: "Test comps with helm chart"
+        required: false
+        type: boolean
+      hardware:
+        required: true
+        type: string
       mode:
         default: "CD"
         description: "Whether the test range is CI, CD or CICD"
@@ -33,6 +41,7 @@ jobs:
   # Image Build
   ####################################################################################################
   build-images:
+    if: ${{ !(fromJSON(inputs.test_helmchart)) }}
     runs-on: "docker-build-gaudi"
     continue-on-error: true
     outputs:
@@ -65,7 +74,7 @@ jobs:
           fi
           if [[ $(grep -c "vllm-gaudi:" ${docker_compose_yml}) != 0 ]]; then
                git clone https://github.com/HabanaAI/vllm-fork.git vllm-fork
-               cd vllm-fork && git checkout 3c39626 && cd ../
+               cd vllm-fork && git checkout v0.6.4.post2+Gaudi-1.19.0 && cd ../
           fi
       - name: Get build list
         id: get-build-list
@@ -98,9 +107,22 @@ jobs:
   ####################################################################################################
   test-service-compose:
     needs: [build-images]
-    if: ${{ fromJSON(inputs.test) }}
+    if: ${{ fromJSON(inputs.test_compose) }}
     uses: ./.github/workflows/_run-docker-compose.yml
     with:
       tag: ${{ inputs.tag }}
       service: ${{ inputs.service }}
     secrets: inherit
+
+  ####################################################################################################
+  # Helm Chart Test
+  ####################################################################################################
+  test-service-helmchart:
+    if: ${{ fromJSON(inputs.test_helmchart) }}
+    uses: ./.github/workflows/_run-helm-chart.yml
+    with:
+      tag: ${{ inputs.tag }}
+      mode: ${{ inputs.mode }}
+      service: ${{ inputs.service }}
+      hardware: ${{ inputs.hardware }}
+    secrets: inherit

.github/workflows/_run-helm-chart.yml

@@ -0,0 +1,219 @@
+# Copyright (C) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+name: Helm Chart Test on GenAIComps For Call
+permissions: read-all
+on:
+  workflow_call:
+    inputs:
+      service:
+        default: "chatqna"
+        required: true
+        type: string
+        description: "service to test, e.g. asr"
+      dockerhub:
+        default: false
+        required: false
+        type: boolean
+        description: "Set to true if you want to use released docker images at dockerhub. By default using internal docker registry."
+      tag:
+        default: "latest"
+        required: false
+        type: string
+      mode:
+        default: "CD"
+        description: "Whether the test range is CI, CD or CICD"
+        required: false
+        type: string
+      hardware:
+        default: "xeon"
+        required: true
+        type: string
+
+jobs:
+  get-test-case:
+    runs-on: ubuntu-latest
+    outputs:
+      value_files: ${{ steps.get-test-files.outputs.value_files }}
+      CHECKOUT_REF: ${{ steps.get-checkout-ref.outputs.CHECKOUT_REF }}
+    steps:
+      - name: Get checkout ref
+        id: get-checkout-ref
+        run: |
+          if [ "${{ github.event_name }}" == "pull_request" ] || [ "${{ github.event_name }}" == "pull_request_target" ]; then
+            CHECKOUT_REF=refs/pull/${{ github.event.number }}/merge
+          else
+            CHECKOUT_REF=${{ github.ref }}
+          fi
+          echo "CHECKOUT_REF=${CHECKOUT_REF}" >> $GITHUB_OUTPUT
+          echo "checkout ref ${CHECKOUT_REF}"
+
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ steps.get-checkout-ref.outputs.CHECKOUT_REF }}
+          fetch-depth: 0
+
+      - name: Get test Services
+        id: get-test-files
+        run: |
+          set -x
+          if [ "${{ inputs.mode }}" = "CI" ]; then
+            base_commit=${{ github.event.pull_request.base.sha }}
+            merged_commit=$(git log -1 --format='%H')
+            values_files=$(git diff --name-only ${base_commit} ${merged_commit} | \
+            grep "values.yaml" | \
+            grep "${{ inputs.service }}" | \
+            sort -u )
+            echo $values_files
+          elif [ "${{ inputs.mode }}" = "CD" ]; then
+            values_files=$(ls ${{ github.workspace }}/comps/${{ inputs.service }}/deployment/kubernetes/*values.yaml)
+          fi
+          value_files="["
+          for file in ${values_files}; do
+            if [ -f "$file" ]; then
+              filename=$(basename "$file")
+              if [[ "$filename" == *"gaudi"* ]]; then
+                if [[ "${{ inputs.hardware }}" == "gaudi" ]]; then
+                  value_files="${value_files}\"${filename}\","
+                fi
+              elif [[ "$filename" == *"nv"* ]]; then
+                continue
+              else
+                if [[ "${{ inputs.hardware }}" == "xeon" ]]; then
+                  value_files="${value_files}\"${filename}\","
+                fi
+              fi
+            fi
+          done
+          value_files="${value_files%,}]"
+
+          echo "value_files=${value_files}"
+          echo "value_files=${value_files}" >> $GITHUB_OUTPUT
+
+  helm-test:
+    needs: [get-test-case]
+    strategy:
+      matrix:
+        value_file: ${{ fromJSON(needs.get-test-case.outputs.value_files) }}
+    if: ${{ needs.get-test-case.outputs.value_files != '[]' }}
+    runs-on: ${{ inputs.hardware }}
+    continue-on-error: true
+    steps:
+      - name: Clean Up Working Directory
+        run: |
+          echo "value_file=${{ matrix.value_file }}"
+          sudo rm -rf ${{github.workspace}}/*
+
+      - name: Get checkout ref
+        id: get-checkout-ref
+        run: |
+          if [ "${{ github.event_name }}" == "pull_request" ] || [ "${{ github.event_name }}" == "pull_request_target" ]; then
+            CHECKOUT_REF=refs/pull/${{ github.event.number }}/merge
+          else
+            CHECKOUT_REF=${{ github.ref }}
+          fi
+          echo "CHECKOUT_REF=${CHECKOUT_REF}" >> $GITHUB_OUTPUT
+          echo "checkout ref ${CHECKOUT_REF}"
+
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ steps.get-checkout-ref.outputs.CHECKOUT_REF }}
+          fetch-depth: 0
+
+      - name: Set variables
+        env:
+          service: ${{ inputs.service }}
+        run: |
+          CHART_NAME="${service,,}"  # asr
+          echo "CHART_NAME=$CHART_NAME" >> $GITHUB_ENV
+          echo "RELEASE_NAME=${CHART_NAME}$(date +%Y%m%d%H%M%S)" >> $GITHUB_ENV
+          echo "NAMESPACE=${CHART_NAME}-$(date +%Y%m%d%H%M%S)" >> $GITHUB_ENV
+          echo "ROLLOUT_TIMEOUT_SECONDS=600s" >> $GITHUB_ENV
+          echo "TEST_TIMEOUT_SECONDS=600s" >> $GITHUB_ENV
+          echo "KUBECTL_TIMEOUT_SECONDS=60s" >> $GITHUB_ENV
+          echo "should_cleanup=false" >> $GITHUB_ENV
+          echo "skip_validate=false" >> $GITHUB_ENV
+          echo "CHART_FOLDER=comps/${service}/deployment/kubernetes" >> $GITHUB_ENV
+
+      - name: Helm install
+        id: install
+        env:
+          GOOGLE_CSE_ID: ${{ secrets.GOOGLE_CSE_ID }}
+          GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
+          HUGGINGFACEHUB_API_TOKEN: ${{ secrets.HUGGINGFACEHUB_API_TOKEN }}
+          HFTOKEN: ${{ secrets.HUGGINGFACEHUB_API_TOKEN }}
+          value_file: ${{ matrix.value_file }}
+        run: |
+          set -xe
+          echo "should_cleanup=true" >> $GITHUB_ENV
+          if [[ ! -f ${{ github.workspace }}/${{ env.CHART_FOLDER }}/${value_file} ]]; then
+            echo "No value file found, exiting test!"
+            echo "skip_validate=true" >> $GITHUB_ENV
+            echo "should_cleanup=false" >> $GITHUB_ENV
+            exit 0
+          fi
+
+          if ! helm install --create-namespace --namespace $NAMESPACE $RELEASE_NAME \
+            oci://ghcr.io/opea-project/charts/${CHART_NAME} \
+            --set global.HUGGINGFACEHUB_API_TOKEN=${HFTOKEN} \
+            --set global.modelUseHostPath=/home/sdp/.cache/huggingface/hub \
+            --set GOOGLE_API_KEY=${{ env.GOOGLE_API_KEY}} \
+            --set GOOGLE_CSE_ID=${{ env.GOOGLE_CSE_ID}} \
+            -f comps/${{ inputs.service }}/deployment/kubernetes/${value_file} \
+            --version 0-latest \
+            --wait; then
+            echo "Failed to install chart ${{ inputs.service }}"
+            echo "skip_validate=true" >> $GITHUB_ENV
+            .github/workflows/scripts/k8s-utils.sh dump_pods_status $NAMESPACE
+            exit 1
+          fi
+          helm list -A
+          kubectl get pods -n $NAMESPACE
+
+      - name: Validate e2e test
+        if: always()
+        run: |
+          set -xe
+          if $skip_validate; then
+            echo "Skip validate"
+          else
+            LOG_PATH=/home/$(whoami)/helm-logs
+            chart=${{ env.CHART_NAME }}
+            helm test -n $NAMESPACE $RELEASE_NAME --logs --timeout "$TEST_TIMEOUT_SECONDS" | tee ${LOG_PATH}/charts-${chart}.log
+            exit_code=$?
+            if [ $exit_code -ne 0 ]; then
+                echo "Chart ${chart} test failed, please check the logs in ${LOG_PATH}!"
+                exit 1
+            fi
+
+            echo "Checking response results, make sure the output is reasonable. "
+            teststatus=false
+            if [[ -f $LOG_PATH/charts-${chart}.log ]] && \
+            [[ $(grep -c "^Phase:.*Failed" $LOG_PATH/charts-${chart}.log) != 0 ]]; then
+                teststatus=false
+                ${{ github.workspace }}/.github/workflows/scripts/k8s-utils.sh dump_all_pod_logs $NAMESPACE
+            else
+                teststatus=true
+            fi
+
+            if [ $teststatus == false ]; then
+                echo "Response check failed, please check the logs in artifacts!"
+                exit 1
+            else
+                echo "Response check succeeded!"
+                exit 0
+            fi
+          fi
+
+      - name: Helm uninstall
+        if: always()
+        run: |
+          if [[ $should_cleanup ]]; then
+            helm uninstall $RELEASE_NAME --namespace $NAMESPACE
+            if ! kubectl delete ns $NAMESPACE --timeout=$KUBECTL_TIMEOUT_SECONDS; then
+              kubectl delete pods --namespace $NAMESPACE --force --grace-period=0 --all
+              kubectl delete ns $NAMESPACE --force --grace-period=0 --timeout=$KUBECTL_TIMEOUT_SECONDS
+            fi
+          fi

.github/workflows/check-online-doc-build.yml

@@ -13,7 +13,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
 
     - name: Checkout

.github/workflows/docker/compose/agent-compose.yaml

@@ -3,7 +3,7 @@
 
 # this file should be run in the root of the repo
 services:
-  agent-langchain:
+  agent:
     build:
-      dockerfile: comps/agent/langchain/Dockerfile
-    image: ${REGISTRY:-opea}/agent-langchain:${TAG:-latest}
+      dockerfile: comps/agent/src/Dockerfile
+    image: ${REGISTRY:-opea}/agent:${TAG:-latest}