Merge remote-tracking branch 'upstream/main'

.github/CODEOWNERS

@@ -2,4 +2,4 @@
 # Each line is a file pattern followed by one or more owners.
 
 # These owners will be the default owners for everything in the repo.
-* @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft
+* @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft @Fr4nc3

.github/workflows/ci.yml

@@ -52,6 +52,7 @@ jobs:
         env:
           AZURE_ENV_NAME: ${{ github.run_id }}
           AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
+          AZURE_RESOURCE_GROUP: ${{ vars.AZURE_RESOURCE_GROUP }}
         with:
           imageName: ghcr.io/roopan-microsoft/psl-cwyd-main
           cacheFrom: ghcr.io/roopan-microsoft/psl-cwyd-main
@@ -65,13 +66,15 @@ jobs:
             AZURE_SUBSCRIPTION_ID
             AZURE_ENV_NAME
             AZURE_LOCATION
+            AZURE_RESOURCE_GROUP
 
       - name: Tidy up
         uses: devcontainers/[email protected]
         if: always()
         env:
           AZURE_ENV_NAME: ${{ github.run_id }}
           AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
+          AZURE_RESOURCE_GROUP: ${{ vars.AZURE_RESOURCE_GROUP }}
         with:
           push: never
           imageName: ghcr.io/roopan-microsoft/psl-cwyd-main

.github/workflows/comment_coverage.yml

@@ -39,7 +39,7 @@ jobs:
             return response.data[0]?.number ?? "";
           retries: 3
       - name: Comment coverage
-        uses: MishaKav/pytest-coverage-comment@fa1c641d7e3fa1d98ed95d5f658ccd638b774628
+        uses: MishaKav/pytest-coverage-comment@81882822c5b22af01f91bd3eacb1cefb6ad73dc2
         with:
           pytest-xml-coverage-path: coverage.xml
           junitxml-path: coverage-junit.xml

Makefile

@@ -57,10 +57,14 @@ azd-login: ## 🔑 Login to Azure with azd and a SPN
 	@echo -e "\e[34m$@\e[0m" || true
 	@azd auth login --client-id ${AZURE_CLIENT_ID} --client-secret ${AZURE_CLIENT_SECRET} --tenant-id ${AZURE_TENANT_ID}
 
-deploy: azd-login ## 🚀 Deploy everything to Azure
+az-login: ## 🔑 Login to Azure with az and a SPN
+	az login --service-principal -u ${AZURE_CLIENT_ID} -p ${AZURE_CLIENT_SECRET} --tenant ${AZURE_TENANT_ID}
+
+deploy: azd-login az-login ## 🚀 Deploy everything to Azure
 	@echo -e "\e[34m$@\e[0m" || true
 	@azd env new ${AZURE_ENV_NAME}
 	@azd env set AZURE_APP_SERVICE_HOSTING_MODEL code --no-prompt
+	@az group create --name ${AZURE_RESOURCE_GROUP} --location ${AZURE_LOCATION}
 	@azd provision --no-prompt
 	@azd deploy web --no-prompt
 	@azd deploy function --no-prompt

code/frontend/package.json

@@ -10,35 +10,35 @@
         "test": "vitest run"
     },
     "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@fluentui/react": "^8.121.4",
-        "@fluentui/react-icons": "^2.0.259",
+        "@babel/traverse": "^7.25.9",
+        "@fluentui/react": "^8.121.8",
+        "@fluentui/react-icons": "^2.0.265",
         "@fortawesome/fontawesome-svg-core": "^6.6.0",
         "@fortawesome/free-solid-svg-icons": "^6.6.0",
         "@fortawesome/react-fontawesome": "github:fortawesome/react-fontawesome",
         "lodash": "^4.17.21",
         "lodash-es": "^4.17.21",
-        "microsoft-cognitiveservices-speech-sdk": "^1.40.0",
-        "postcss": "^8.4.47",
+        "microsoft-cognitiveservices-speech-sdk": "^1.41.0",
+        "postcss": "^8.4.48",
         "react": "^18.2.0",
         "react-dom": "^18.3.1",
         "react-markdown": "^9.0.1",
-        "react-router-dom": "^6.26.2",
+        "react-router-dom": "^6.27.0",
         "rehype-raw": "^7.0.0",
         "remark-gfm": "^4.0.0",
         "remark-supersub": "^1.0.0",
-        "uuid": "^10.0.0"
+        "uuid": "^11.0.2"
     },
     "devDependencies": {
         "@types/lodash-es": "^4.17.12",
         "@types/node": "^22.5.5",
-        "@types/react": "^18.3.9",
-        "@types/react-dom": "^18.3.0",
+        "@types/react": "^18.3.12",
+        "@types/react-dom": "^18.3.1",
         "@types/uuid": "^10.0.0",
-        "@vitejs/plugin-react": "^4.3.2",
+        "@vitejs/plugin-react": "^4.3.3",
         "prettier": "^3.3.3",
         "typescript": "^5.6.2",
-        "vite": "^5.4.7",
-        "vitest": "^2.1.3"
+        "vite": "^5.4.10",
+        "vitest": "^2.1.4"
     }
 }

docker/Admin.Dockerfile

@@ -7,6 +7,7 @@ RUN pip install --upgrade pip && pip install poetry && poetry export -o requirem
 COPY ./code/backend /usr/local/src/myscripts/admin
 COPY ./code/backend/batch/utilities /usr/local/src/myscripts/utilities
 WORKDIR /usr/local/src/myscripts/admin
-ENV PYTHONPATH "${PYTHONPATH}:/usr/local/src/myscripts/"
+# https://github.com/docker/buildx/issues/2751
+ENV PYTHONPATH="${PYTHONPATH}:/usr/local/src/myscripts/"
 EXPOSE 80
-CMD ["streamlit", "run", "Admin.py", "--server.port", "80", "--server.enableXsrfProtection", "false"]
+CMD ["streamlit", "run", "Admin.py", "--server.port", "80", "--server.enableXsrfProtection", "false"]

docker/Frontend.Dockerfile

@@ -19,6 +19,7 @@ RUN pip install --upgrade pip && pip install poetry uwsgi && poetry export -o re
 COPY ./code/*.py /usr/src/app/
 COPY ./code/backend /usr/src/app/backend
 COPY --from=frontend /home/node/app/dist/static /usr/src/app/static/
-ENV PYTHONPATH "${PYTHONPATH}:/usr/src/app"
+# https://github.com/docker/buildx/issues/2751
+ENV PYTHONPATH="${PYTHONPATH}:/usr/src/app"
 EXPOSE 80
 CMD ["uwsgi", "--http", ":80", "--wsgi-file", "app.py", "--callable", "app", "-b", "32768", "--http-timeout", "230"]