Merge branch 'main' into neo4j_k8s

opea-project · Jan 28, 2025 · 8049e5e · 8049e5e
2 parents 1a57dc1 + 63c66a0
commit 8049e5e
Show file tree

Hide file tree

Showing 84 changed files with 964 additions and 1,033 deletions.
diff --git a/.github/workflows/docker/compose/animation-compose.yaml b/.github/workflows/docker/compose/animation-compose.yaml
@@ -7,11 +7,3 @@ services:
     build:
       dockerfile: comps/animation/src/Dockerfile
     image: ${REGISTRY:-opea}/animation:${TAG:-latest}
-  wav2lip:
-    build:
-      dockerfile: comps/third_parties/wav2lip/src/Dockerfile
-    image: ${REGISTRY:-opea}/wav2lip:${TAG:-latest}
-  wav2lip-gaudi:
-    build:
-      dockerfile: comps/third_parties/wav2lip/src/Dockerfile.intel_hpu
-    image: ${REGISTRY:-opea}/wav2lip-gaudi:${TAG:-latest}
diff --git a/.github/workflows/pr-helm-test.yaml b/.github/workflows/pr-helm-test.yaml
@@ -63,7 +63,7 @@ jobs:
 
   Chart-test:
     needs: [job1]
-    if: always() && ${{ needs.job1.outputs.run_matrix.service.length }} > 0
+    if: always() && ${{ fromJSON(needs.job1.outputs.run_matrix).length != 0 }}
     uses: ./.github/workflows/_run-helm-chart.yml
     strategy:
       matrix: ${{ fromJSON(needs.job1.outputs.run_matrix) }}

diff --git a/.github/workflows/push-image-build.yml b/.github/workflows/push-image-build.yml
@@ -32,22 +32,28 @@ jobs:
       - name: Get Test Services
         id: get-services
         run: |
+          set -x
           base_commit=$(git rev-parse HEAD~1)
           merged_commit=$(git log -1 --format='%H')
           # git diff --name-only ${base_commit} ${merged_commit} | grep -E "cores|comps/__init__.py" | grep -Ev ".md"
-          # if [ $? -eq 0 ]; then
+
           if git diff --name-only ${base_commit} ${merged_commit} | grep -E "cores|comps/__init__.py" | grep -Ev ".md"; then
             echo "ALL image build!!!"
             services=$(basename -a .github/workflows/docker/compose/*-compose.yaml | sed 's/-compose.yaml//' | jq -R '.' )
           else
             changed_src="$(git diff --name-only ${base_commit} ${merged_commit} | grep 'src/' | grep -vE '\.md')" || true
             changed_yamls="$(git diff --name-only ${base_commit} ${merged_commit} | grep '.github/workflows/docker/compose/')" || true
-            services=$(printf '%s\n' "${changed_src[@]}" | cut -d'/' -f2 | grep -vE '\.py' | sort -u | jq -R '.' ) || true
-            while IFS= read -r line; do
-              filename=$(basename "$line" -compose.yaml)
-              echo "$line $(printf '%s\n' "$filename" | jq -R '.' )"
-              services+=" $(printf '%s\n' "$filename" | jq -R '.' )" || true
-            done <<< "$changed_yamls"
+            [[ -n "$changed_src" ]] && services=$(printf '%s\n' "${changed_src[@]}" | cut -d'/' -f2 | grep -vE '\.py' | sort -u | jq -R '.' ) || true
+
+            if [[ -n "$changed_yamls" ]]; then
+              while IFS= read -r line; do
+                filename=$(basename "$line" -compose.yaml)
+                echo "$line $(printf '%s\n' "$filename" | jq -R '.' )"
+                services+=" $(printf '%s\n' "$filename" | jq -R '.' )" || true
+              done <<< "$changed_yamls"
+            else
+              echo "No changes in YAML files."
+            fi
           fi
 
           echo "services=$(echo "$services" | jq -sc 'unique | sort')"
@@ -56,6 +62,7 @@ jobs:
 
   image-build:
     needs: get-build-matrix
+    if: ${{ fromJSON(needs.get-build-matrix.outputs.services).length != 0 }}
     strategy:
       matrix:
         service: ${{ fromJSON(needs.get-build-matrix.outputs.services) }}
@@ -65,6 +72,7 @@ jobs:
     steps:
       - name: Clean up Working Directory
         run: |
+          echo "matrix.service=${{ matrix.service }}"
           sudo rm -rf ${{github.workspace}}/*
 
       - name: Checkout out Repo

diff --git a/comps/agent/src/Dockerfile b/comps/agent/src/Dockerfile
@@ -15,8 +15,6 @@ RUN useradd -m -s /bin/bash user && \
     mkdir -p /home/user && \
     chown -R user /home/user/
 
-USER user
-
 COPY comps /home/user/comps
 
 RUN pip install --no-cache-dir --upgrade pip setuptools && \
@@ -28,8 +26,6 @@ RUN pip install --no-cache-dir --upgrade pip setuptools && \
 
 ENV PYTHONPATH=/home/user
 
-USER root
-
 RUN mkdir -p /home/user/comps/agent/src/status && chown -R user /home/user/comps/agent/src/status
 
 USER user

diff --git a/comps/animation/src/Dockerfile b/comps/animation/src/Dockerfile
@@ -7,7 +7,6 @@ FROM python:3.11-slim
 RUN useradd -m -s /bin/bash user && \
     mkdir -p /home/user && \
     chown -R user /home/user/
-USER user
 
 ENV LANG=C.UTF-8
 ARG ARCH=cpu
@@ -18,7 +17,7 @@ RUN pip install --no-cache-dir --upgrade pip && \
     pip install --no-cache-dir -r /home/user/comps/animation/src/requirements.txt ;
 
 ENV PYTHONPATH=$PYTHONPATH:/home/user
-
+USER user
 WORKDIR /home/user/comps/animation/src
 
 ENTRYPOINT ["python3", "opea_animation_microservice.py"]
diff --git a/comps/asr/src/Dockerfile b/comps/asr/src/Dockerfile
@@ -6,7 +6,6 @@ FROM python:3.11-slim
 RUN useradd -m -s /bin/bash user && \
     mkdir -p /home/user && \
     chown -R user /home/user/
-USER user
 
 ENV LANG=C.UTF-8
 ARG ARCH=cpu
@@ -22,7 +21,7 @@ RUN pip install --no-cache-dir --upgrade pip setuptools && \
     fi
 
 ENV PYTHONPATH=$PYTHONPATH:/home/user
-
+USER user
 WORKDIR /home/user/comps/asr/src
 
 ENTRYPOINT ["python", "opea_asr_microservice.py"]
diff --git a/comps/asr/src/integrations/dependency/whisper/Dockerfile b/comps/asr/src/integrations/dependency/whisper/Dockerfile
@@ -17,8 +17,6 @@ RUN apt-get update \
 
 COPY --chown=user:user comps /home/user/comps
 
-USER user
-
 RUN pip install --no-cache-dir --upgrade pip setuptools && \
     pip install --no-cache-dir -r /home/user/comps/asr/src/requirements.txt && \
     if [ "${ARCH}" = "cpu" ]; then \
@@ -29,7 +27,7 @@ RUN pip install --no-cache-dir --upgrade pip setuptools && \
     fi
 
 ENV PYTHONPATH=$PYTHONPATH:/home/user
-
+USER user
 WORKDIR /home/user/comps/asr/src/integrations/dependency/whisper
 
 ENTRYPOINT ["python", "whisper_server.py", "--device", "cpu"]
diff --git a/comps/asr/src/integrations/dependency/whisper/Dockerfile.intel_hpu b/comps/asr/src/integrations/dependency/whisper/Dockerfile.intel_hpu
@@ -19,15 +19,14 @@ RUN apt-get update \
 
 COPY --chown=user:user comps /home/user/comps
 
-USER user
-
 # Install requirements and optimum habana
 RUN pip install --no-cache-dir --upgrade pip && \
     pip install --no-cache-dir -r /home/user/comps/asr/src/requirements.txt && \
     pip install --no-cache-dir optimum[habana]
 
 ENV PYTHONPATH=$PYTHONPATH:/home/users
 
+USER user
 WORKDIR /home/user/comps/asr/src/integrations/dependency/whisper
 
 ENTRYPOINT ["python", "whisper_server.py", "--device", "hpu"]
diff --git a/comps/chathistory/src/Dockerfile b/comps/chathistory/src/Dockerfile
@@ -14,8 +14,6 @@ RUN useradd -m -s /bin/bash user && \
     mkdir -p /home/user && \
     chown -R user /home/user/
 
-USER user
-
 COPY comps /home/user/comps
 COPY requirements.txt /home/user/
 
@@ -25,6 +23,8 @@ RUN pip install --no-cache-dir --upgrade pip setuptools && \
 
 ENV PYTHONPATH=$PYTHONPATH:/home/user
 
+USER user
+
 WORKDIR /home/user/comps/chathistory/src
 
 ENTRYPOINT ["python", "opea_chathistory_microservice.py"]