diff --git a/.github/workflows/job-docker-build.yml b/.github/workflows/job-docker-build.yml deleted file mode 100644 index 1ee14faad..000000000 --- a/.github/workflows/job-docker-build.yml +++ /dev/null @@ -1,117 +0,0 @@ -name: Docker Build Job - -on: - workflow_call: - inputs: - trigger_type: - description: 'Trigger type (workflow_dispatch, pull_request, schedule)' - required: true - type: string - build_docker_image: - description: 'Build And Push Docker Image (Optional)' - required: false - default: false - type: boolean - outputs: - IMAGE_TAG: - description: "Generated Docker Image Tag" - value: ${{ jobs.docker-build.outputs.IMAGE_TAG }} - -env: - BRANCH_NAME: ${{ github.event.workflow_run.head_branch || github.head_ref || github.ref_name }} - -jobs: - docker-build: - if: inputs.trigger_type == 'workflow_dispatch' && inputs.build_docker_image == true - runs-on: ubuntu-latest - environment: production - outputs: - IMAGE_TAG: ${{ steps.generate_docker_tag.outputs.IMAGE_TAG }} - steps: - - name: Checkout Code - uses: actions/checkout@v6 - - - name: Generate Unique Docker Image Tag - id: generate_docker_tag - shell: bash - run: | - echo "🔨 Building new Docker image - generating unique tag..." - TIMESTAMP=$(date +%Y%m%d-%H%M%S) - RUN_ID="${{ github.run_id }}" - BRANCH_NAME="${{ github.head_ref || github.ref_name }}" - CLEAN_BRANCH_NAME=$(echo "$BRANCH_NAME" | sed 's/[^a-zA-Z0-9._-]/-/g' | sed 's/--*/-/g' | sed 's/^-\|-$//g') - UNIQUE_TAG="${CLEAN_BRANCH_NAME}-${TIMESTAMP}-${RUN_ID}" - echo "IMAGE_TAG=$UNIQUE_TAG" >> $GITHUB_ENV - echo "IMAGE_TAG=$UNIQUE_TAG" >> $GITHUB_OUTPUT - echo "Generated unique Docker tag: $UNIQUE_TAG" - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to Azure - uses: azure/login@v2 - with: - client-id: ${{ secrets.AZURE_CLIENT_ID }} - tenant-id: ${{ secrets.AZURE_TENANT_ID }} - subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} - - - name: Log in to Azure Container Registry - run: | - ACR_NAME=$(echo "${{ secrets.ACR_TEST_LOGIN_SERVER }}" | sed 's/\.azurecr\.io$//') - az acr login --name "$ACR_NAME" - - - name: Build and Push Docker Image for WebApp - uses: docker/build-push-action@v6 - env: - DOCKER_BUILD_SUMMARY: false - with: - context: ./src/App - file: ./src/App/WebApp.Dockerfile - push: True - tags: | - ${{ secrets.ACR_TEST_LOGIN_SERVER }}/km-app:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }} - ${{ secrets.ACR_TEST_LOGIN_SERVER }}/km-app:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}_${{ github.run_number }} - - - name: Build and Push Docker Image for API - uses: docker/build-push-action@v6 - env: - DOCKER_BUILD_SUMMARY: false - with: - context: ./src/api - file: ./src/api/ApiApp.Dockerfile - push: True - tags: | - ${{ secrets.ACR_TEST_LOGIN_SERVER }}/km-api:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }} - ${{ secrets.ACR_TEST_LOGIN_SERVER }}/km-api:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}_${{ github.run_number }} - - - name: Verify Docker Image Build - shell: bash - run: | - echo "✅ Docker image successfully built and pushed" - echo "Image tag: ${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}" - - - name: Generate Docker Build Summary - if: always() - shell: bash - run: | - ACR_NAME=$(echo "${{ secrets.ACR_TEST_LOGIN_SERVER }}") - echo "## 🐳 Docker Build Job Summary" >> $GITHUB_STEP_SUMMARY - echo "" >> $GITHUB_STEP_SUMMARY - echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY - echo "|-------|--------|" >> $GITHUB_STEP_SUMMARY - echo "| **Job Status** | ${{ job.status == 'success' && '✅ Success' || '❌ Failed' }} |" >> $GITHUB_STEP_SUMMARY - echo "| **Image Tag** | \`${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}\` |" >> $GITHUB_STEP_SUMMARY - echo "| **Branch** | ${{ env.BRANCH_NAME }} |" >> $GITHUB_STEP_SUMMARY - echo "" >> $GITHUB_STEP_SUMMARY - if [[ "${{ job.status }}" == "success" ]]; then - echo "### ✅ Build Details" >> $GITHUB_STEP_SUMMARY - echo "Successfully built and pushed three Docker images to ACR:" >> $GITHUB_STEP_SUMMARY - echo "" >> $GITHUB_STEP_SUMMARY - echo "**Built Images:**" >> $GITHUB_STEP_SUMMARY - echo "- \`${ACR_NAME}.azurecr.io/km-api:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}\`" >> $GITHUB_STEP_SUMMARY - echo "- \`${ACR_NAME}.azurecr.io/km-web:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}\`" >> $GITHUB_STEP_SUMMARY - else - echo "### ❌ Build Failed" >> $GITHUB_STEP_SUMMARY - echo "- Docker build process encountered an error" >> $GITHUB_STEP_SUMMARY - echo "- Check the docker-build job for detailed error information" >> $GITHUB_STEP_SUMMARY - fi \ No newline at end of file diff --git a/infra/scripts/agent_scripts/requirements.txt b/infra/scripts/agent_scripts/requirements.txt index 5c3d5e927..b1179006b 100644 --- a/infra/scripts/agent_scripts/requirements.txt +++ b/infra/scripts/agent_scripts/requirements.txt @@ -1,3 +1,3 @@ -aiohttp==3.13.3 +aiohttp==3.13.4 azure-identity==1.25.2 azure-ai-projects==2.0.0b3 diff --git a/infra/scripts/index_scripts/requirements.txt b/infra/scripts/index_scripts/requirements.txt index f905453ef..c96054146 100644 --- a/infra/scripts/index_scripts/requirements.txt +++ b/infra/scripts/index_scripts/requirements.txt @@ -5,7 +5,7 @@ azure-ai-agents==1.2.0b5 azure-ai-inference==1.0.0b9 agent-framework-core==1.0.0rc2 agent-framework-azure-ai==1.0.0rc2 -pypdf==6.6.2 +pypdf==6.10.0 tiktoken==0.12.0 azure-identity==1.25.2 azure-ai-textanalytics==5.3.0 diff --git a/src/App/package-lock.json b/src/App/package-lock.json index 4eab2f1d3..b3b6d6198 100644 --- a/src/App/package-lock.json +++ b/src/App/package-lock.json @@ -16083,9 +16083,9 @@ } }, "node_modules/lodash": { - "version": "4.17.23", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz", - "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==", + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz", + "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==", "license": "MIT" }, "node_modules/lodash-es": { diff --git a/src/App/package.json b/src/App/package.json index b14b93aa3..79e7aaec4 100644 --- a/src/App/package.json +++ b/src/App/package.json @@ -75,6 +75,7 @@ "picomatch": "^4.0.4" }, "serialize-javascript": "^7.0.3", - "bfj": "^9.1.3" + "bfj": "^9.1.3", + "lodash": "^4.18.0" } } \ No newline at end of file diff --git a/src/api/requirements.txt b/src/api/requirements.txt index 07f563955..752463deb 100644 --- a/src/api/requirements.txt +++ b/src/api/requirements.txt @@ -7,9 +7,9 @@ pydantic[email]==2.11.10 # Azure SDK Core azure-core==1.38.0 -requests==2.32.5 -types-requests==2.32.4.20260107 -aiohttp==3.13.3 +requests==2.33.0 +types-requests==2.33.0.20260408 +aiohttp==3.13.4 # Azure Services azure-identity==1.25.2