Merge from main

Author: pamelafox

.devcontainer/devcontainer.json

@@ -16,10 +16,12 @@
             "version": "18",
             "nodeGypDependencies": false
         },
-        "ghcr.io/azure/azure-dev/azd:latest": {},
-        // Required for azd to package the app to ACA
-        "ghcr.io/devcontainers/features/docker-in-docker:2": {},
-		"ghcr.io/prulloac/devcontainer-features/ollama:1": {}
+        "ghcr.io/azure/azure-dev/azd:latest": {
+			"version": "1.10.3"
+		},
+		"ghcr.io/prulloac/devcontainer-features/ollama:1": {},
+		// az CLI is helpful for being able to login correctly with DefaultAzureCredential:
+		"ghcr.io/devcontainers/features/azure-cli": {}
     },
 	// Configure tool-specific properties.
 	"customizations": {
@@ -46,10 +48,6 @@
 						"source.fixAll": "explicit"
 					},
 					"editor.defaultFormatter": "charliermarsh.ruff"
-				},
-				"files.exclude": {
-					".ruff_cache": true,
-					".pytest_cache": true
 				}
 			}
 		}

.env.sample

@@ -13,12 +13,15 @@ OPENAI_EMBED_HOST=azure
 # You also need to `azd auth login` if running this locally
 AZURE_OPENAI_ENDPOINT=https://YOUR-AZURE-OPENAI-SERVICE-NAME.openai.azure.com
 AZURE_OPENAI_VERSION=2024-03-01-preview
-AZURE_OPENAI_CHAT_DEPLOYMENT=gpt-35-turbo
-AZURE_OPENAI_CHAT_MODEL=gpt-35-turbo
+AZURE_OPENAI_CHAT_DEPLOYMENT=gpt-4o-mini
+AZURE_OPENAI_CHAT_MODEL=gpt-4o-mini
 AZURE_OPENAI_EMBED_DEPLOYMENT=text-embedding-ada-002
 AZURE_OPENAI_EMBED_MODEL=text-embedding-ada-002
-AZURE_OPENAI_EMBED_MODEL_DIMENSIONS=1536
+AZURE_OPENAI_EMBED_DIMENSIONS=1536
 AZURE_OPENAI_EMBEDDING_COLUMN=embedding_ada002
+AZURE_OPENAI_EVAL_DEPLOYMENT=gpt-4
+AZURE_OPENAI_EVAL_MODEL=gpt-4
+AZURE_TENANT_ID=
 # Only needed when using key-based Azure authentication:
 AZURE_OPENAI_KEY=
 # Needed for OpenAI.com:

.github/workflows/app-tests.yaml

@@ -3,8 +3,18 @@ name: App Tests
 on:
   push:
     branches: [ main ]
+    paths-ignore:
+      - "**.md"
+      - ".azdo/**"
+      - ".devcontainer/**"
+      - ".github/**"
   pull_request:
     branches: [ main ]
+    paths-ignore:
+      - "**.md"
+      - ".azdo/**"
+      - ".devcontainer/**"
+      - ".github/**"
   workflow_dispatch:
 
 permissions:
@@ -17,68 +27,110 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["ubuntu-latest", "windows-latest", "macos-latest-xlarge", "macos-13"]
-        python_version: ["3.10", "3.11", "3.12"]
+        os: ["ubuntu-latest", "macos-latest-xlarge", "macos-13", "windows-latest"]
+        python_version: ["3.10"]
         exclude:
           - os: macos-latest-xlarge
             python_version: "3.10"
+    env:
+      UV_SYSTEM_PYTHON: 1
+      POSTGRES_HOST: localhost
+      POSTGRES_USERNAME: postgres
+      POSTGRES_PASSWORD: root
+      POSTGRES_DATABASE: postgres
+      POSTGRES_SSL: disable
     steps:
         - uses: actions/checkout@v4
-        - name: Check for MacOS Runner
-          if: matrix.os == 'macos-latest-xlarge'
-          run: brew install postgresql@14
-        - name: Install pgvector on Windows using install-pgvector.bat
+
+        - name: (MacOS) Install postgreSQL and pgvector using brew
+          if: matrix.os == 'macos-13' || matrix.os == 'macos-latest-xlarge'
+          run: |
+            brew install postgresql@14
+            brew link --overwrite postgresql@14
+            brew install pgvector
+            brew services start postgresql@14 && sleep 1
+            createuser -s ${{ env.POSTGRES_USERNAME }}
+            psql -d postgres -c "ALTER USER ${{ env.POSTGRES_USERNAME }} WITH PASSWORD '${{ env.POSTGRES_PASSWORD }}'"
+            psql -d postgres -c 'CREATE EXTENSION vector'
+
+        - name: Install pgvector
           if: matrix.os == 'windows-latest'
           shell: cmd
-          run: .github\workflows\install-pgvector.bat
-        - name: Install PostgreSQL development libraries
+          run: |
+              call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+              cd %TEMP%
+              git clone --branch v0.7.4 https://github.com/pgvector/pgvector.git
+              cd pgvector
+              nmake /NOLOGO /F Makefile.win
+              nmake /NOLOGO /F Makefile.win install
+              sc config postgresql-x64-14 start=auto
+              net start postgresql-x64-14
+              "%PGBIN%/psql" -d postgres -c "CREATE EXTENSION vector"
+
+        - name: (Linux) Install pgvector and set password
           if: matrix.os == 'ubuntu-latest'
           run: |
-            sudo apt update
-            sudo apt install postgresql-server-dev-14
-        - name: Setup postgres
-          uses: ikalnytskyi/action-setup-postgres@v6
-          with:
-            username: admin
-            password: postgres
-            database: postgres
-        - name: Install pgvector on MacOS/Linux using install-pgvector.sh
-          if: matrix.os != 'windows-latest'
-          run: .github/workflows/install-pgvector.sh
+            sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y
+            sudo apt-get install postgresql-14-pgvector
+            sudo systemctl start postgresql
+            sudo -u postgres psql -c "ALTER USER ${{ env.POSTGRES_USERNAME }} PASSWORD '${{ env.POSTGRES_PASSWORD }}'"
+            sudo -u postgres psql -c 'CREATE EXTENSION vector'
+
         - name: Setup python
           uses: actions/setup-python@v5
           with:
             python-version: ${{ matrix.python_version }}
             architecture: x64
+
+        - name: Install uv
+          uses: astral-sh/setup-uv@v3
+          with:
+            enable-cache: true
+            version: "0.4.20"
+            cache-dependency-glob: "requirements**.txt"
+
         - name: Install dependencies
           run: |
-            python -m pip install -r requirements-dev.txt
+            uv pip install -r requirements-dev.txt
+
         - name: Install app as editable app
           run: |
-            python -m pip install -e src/backend
+            uv pip install -e src/backend
+
         - name: Setup local database with seed data
           run: |
-            cp .env.sample .env
             python ./src/backend/fastapi_app/setup_postgres_database.py
             python ./src/backend/fastapi_app/setup_postgres_seeddata.py
+
         - name: Setup node
           uses: actions/setup-node@v4
           with:
             node-version: 18
+
         - name: Build frontend
           run: |
             cd ./src/frontend
             npm install
             npm run build
+
+        - name: Setup mypy cache
+          uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
+          with:
+            path: ./.mypy_cache
+            key: mypy${{ matrix.os }}-${{ matrix.python_version }}-${{ hashFiles('requirements-dev.txt', 'src/backend/requirements.txt', 'src/backend/pyproject.toml') }}
+
         - name: Run MyPy
           run: python3 -m mypy .
+
         - name: Run Pytest
           run: python3 -m pytest -s -vv --cov --cov-fail-under=85
+
         - name: Run E2E tests with Playwright
           id: e2e
           run: |
             playwright install chromium --with-deps
             python3 -m pytest tests/e2e.py --tracing=retain-on-failure
+
         - name: Upload test artifacts
           if: ${{ failure() && steps.e2e.conclusion == 'failure' }}
           uses: actions/upload-artifact@v4

.github/workflows/azure-dev.yaml

@@ -3,8 +3,7 @@ name: Deploy with azd
 on:
   workflow_dispatch:
   push:
-    branches:
-      - main
+    branches: [ main ]
 
 # GitHub Actions workflow to deploy to Azure using azd
 # To configure required secrets for connecting to Azure, simply run `azd pipeline config`

.github/workflows/bicep-security-scan.yaml

@@ -22,7 +22,9 @@ jobs:
       - name: Build Bicep for linting
         uses: azure/CLI@v2
         with:
-          inlineScript: az config set bicep.use_binary_from_path=false && az bicep build -f infra/main.bicep --stdout
+          inlineScript: |
+            export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
+            az config set bicep.use_binary_from_path=false && az bicep build -f infra/main.bicep --stdout
 
       - name: Run Microsoft Security DevOps Analysis
         uses: microsoft/security-devops-action@preview