Merge branch 'main' into acaprivate

Author: pamelafox

.github/workflows/azure-dev.yml

@@ -129,28 +129,13 @@ jobs:
           node-version: 18
 
       - name: Log in with Azure (Federated Credentials)
-        if: ${{ env.AZURE_CLIENT_ID != '' }}
         run: |
           azd auth login `
             --client-id "$Env:AZURE_CLIENT_ID" `
             --federated-credential-provider "github" `
             --tenant-id "$Env:AZURE_TENANT_ID"
         shell: pwsh
 
-      - name: Log in with Azure (Client Credentials)
-        if: ${{ env.AZURE_CREDENTIALS != '' }}
-        run: |
-          $info = $Env:AZURE_CREDENTIALS | ConvertFrom-Json -AsHashtable;
-          Write-Host "::add-mask::$($info.clientSecret)"
-
-          azd auth login `
-            --client-id "$($info.clientId)" `
-            --client-secret "$($info.clientSecret)" `
-            --tenant-id "$($info.tenantId)"
-        shell: pwsh
-        env:
-          AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
-
       - name: Provision Infrastructure
         run: azd provision --no-prompt
         env:

.github/workflows/evaluate.yaml

@@ -159,7 +159,6 @@ jobs:
             az account set --subscription ${{env.AZURE_SUBSCRIPTION_ID}}
 
       - name: Login to with Azure with azd (Federated Credentials)
-        if: ${{ env.AZURE_CLIENT_ID != '' }}
         run: |
           azd auth login `
             --client-id "$Env:AZURE_CLIENT_ID" `

README.md

@@ -262,6 +262,7 @@ You can find extensive documentation in the [docs](docs/README.md) folder:
   - [Sharing deployment environments](docs/sharing_environments.md)
 - [Local development](docs/localdev.md)
 - [Customizing the app](docs/customization.md)
+- [App architecture](docs/architecture.md)
 - [HTTP Protocol](docs/http_protocol.md)
 - [Data ingestion](docs/data_ingestion.md)
 - [Evaluation](docs/evaluation.md)

app/backend/requirements.txt

@@ -4,13 +4,13 @@ aiofiles==24.1.0
     # via
     #   prompty
     #   quart
-aiohappyeyeballs==2.4.4
+aiohappyeyeballs==2.6.1
     # via aiohttp
-aiohttp==3.10.11
+aiohttp==3.12.14
     # via
     #   -r requirements.in
     #   microsoft-kiota-authentication-azure
-aiosignal==1.3.1
+aiosignal==1.4.0
     # via aiohttp
 annotated-types==0.7.0
     # via pydantic
@@ -125,7 +125,7 @@ hpack==4.0.0
     # via h2
 httpcore==1.0.9
     # via httpx
-httpx==0.27.0
+httpx[http2]==0.27.0
     # via
     #   microsoft-kiota-http
     #   msgraph-core
@@ -333,7 +333,9 @@ priority==2.0.0
 prompty==0.1.50
     # via -r requirements.in
 propcache==0.2.0
-    # via yarl
+    # via
+    #   aiohttp
+    #   yarl
 psutil==5.9.8
     # via azure-monitor-opentelemetry-exporter
 pycparser==2.22
@@ -344,7 +346,7 @@ pydantic-core==2.20.1
     # via pydantic
 pygments==2.18.0
     # via rich
-pyjwt==2.10.1
+pyjwt[crypto]==2.10.1
     # via
     #   -r requirements.in
     #   msal
@@ -386,7 +388,7 @@ sniffio==1.3.1
     #   anyio
     #   httpx
     #   openai
-soupsieve==2.6
+soupsieve==2.7
     # via beautifulsoup4
 std-uritemplate==2.0.5
     # via microsoft-kiota-abstractions
@@ -411,6 +413,7 @@ types-pillow==10.2.0.20240822
 typing-extensions==4.13.2
     # via
     #   -r requirements.in
+    #   aiosignal
     #   anyio
     #   asgiref
     #   azure-ai-documentintelligence