chore: merge dev into main (features, bug fixes, infra updates)

.dockerignore

@@ -0,0 +1,162 @@
+# Include any files or directories that you don't want to be copied to your
+# container here (e.g., local build artifacts, temporary files, etc.).
+#
+# For more help, visit the .dockerignore file reference guide at
+# https://docs.docker.com/engine/reference/builder/#dockerignore-file
+
+**/.DS_Store
+**/__pycache__
+**/.venv
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/bin
+**/charts
+**/docker-compose*
+**/compose*
+**/Dockerfile*
+**/*.Dockerfile
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.log
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# VS Code
+.vscode/
+
+# Ignore other unnecessary files
+*.bak
+*.swp
+.DS_Store
+*.pdb
+*.sqlite3

.env.sample

@@ -64,6 +64,7 @@ AZURE_KEY_VAULT_ENDPOINT=
 CONVERSATION_FLOW=
 # Chat History CosmosDB Integration Settings
 AZURE_COSMOSDB_ACCOUNT_NAME=
+AZURE_COSMOSDB_ACCOUNT_KEY=
 AZURE_COSMOSDB_DATABASE_NAME=
 AZURE_COSMOSDB_CONVERSATIONS_CONTAINER_NAME=
 AZURE_COSMOSDB_ENABLE_FEEDBACK=

.github/workflows/ci.yml

@@ -103,7 +103,7 @@ jobs:
           imageName: ghcr.io/azure-samples/chat-with-your-data-solution-accelerator
           cacheFrom: ghcr.io/azure-samples/chat-with-your-data-solution-accelerator
           imageTag: ${{ env.imageTag }}
-          runCmd: make ci && make deploy
+          runCmd: export optional_args="./code/tests" && make ci && make deploy
           refFilterForPush: refs/heads/${{ github.event_name == 'schedule' && 'main' || github.ref_name }}
           env: |
             AZURE_CLIENT_ID

.github/workflows/test-automation.yml

@@ -0,0 +1,106 @@
+name: Test Automation CWYD
+on:
+  push:
+    branches:
+      - main
+      - dev
+    paths:
+      - 'tests/e2e-test/**'
+  schedule:
+    - cron: '0 13 * * 3'  # Runs at 1 PM UTC once a week on Wednesday
+  workflow_dispatch:
+
+env:
+    web_url: ${{ vars.CWYD_WEB_URL }}
+    admin_url: ${{ vars.CWYD_ADMIN_URL }}
+    accelerator_name: "Chat with your Data"
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.13'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r tests/e2e-test/requirements.txt
+
+      - name: Ensure browsers are installed
+        run: python -m playwright install --with-deps chromium
+
+      - name: Run tests(1)
+        id: test1
+        run: |
+          xvfb-run pytest --headed --html=report/report.html --self-contained-html
+        working-directory: tests/e2e-test
+        continue-on-error: true
+
+      - name: Sleep for 30 seconds
+        if: ${{ steps.test1.outcome == 'failure' }}
+        run: sleep 30s
+        shell: bash
+
+      - name: Run tests(2)
+        id: test2
+        if: ${{ steps.test1.outcome == 'failure' }}
+        run: |
+          xvfb-run pytest --headed --html=report/report.html --self-contained-html
+        working-directory: tests/e2e-test
+        continue-on-error: true
+
+      - name: Sleep for 60 seconds
+        if: ${{ steps.test2.outcome == 'failure' }}
+        run: sleep 60s
+        shell: bash
+
+      - name: Run tests(3)
+        id: test3
+        if: ${{ steps.test2.outcome == 'failure' }}
+        run: |
+          xvfb-run pytest --headed --html=report/report.html --self-contained-html
+        working-directory: tests/e2e-test
+
+      - name: Upload test report
+        id: upload_report
+        uses: actions/upload-artifact@v4
+        if: ${{ !cancelled() }}
+        with:
+          name: cwyd-test-report
+          path: tests/e2e-test/report/*
+
+      - name: Send Notification
+        if: always()
+        run: |
+          RUN_URL="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          REPORT_URL=${{ steps.upload_report.outputs.artifact-url }}
+          IS_SUCCESS=${{ steps.test1.outcome == 'success' || steps.test2.outcome == 'success' || steps.test3.outcome == 'success' }}
+          # Construct the email body
+          if [ "$IS_SUCCESS" = "true" ]; then
+            EMAIL_BODY=$(cat <<EOF
+            {
+              "body": "<p>Dear Team,</p><p>We would like to inform you that the ${{ env.accelerator_name }} Test Automation process has completed successfully.</p><p><strong>Run URL:</strong> <a href=\"${RUN_URL}\">${RUN_URL}</a><br></p><p><strong>Test Report:</strong> <a href=\"${REPORT_URL}\">${REPORT_URL}</a></p><p>Best regards,<br>Your Automation Team</p>",
+              "subject": "${{ env.accelerator_name }} Test Automation - Success"
+            }
+          EOF
+            )
+          else
+            EMAIL_BODY=$(cat <<EOF
+            {
+              "body": "<p>Dear Team,</p><p>We would like to inform you that the ${{ env.accelerator_name }} Test Automation process  has encountered an issue and has failed to complete successfully.</p><p><strong>Run URL:</strong> <a href=\"${RUN_URL}\">${RUN_URL}</a><br> ${OUTPUT}</p><p><strong>Test Report:</strong> <a href=\"${REPORT_URL}\">${REPORT_URL}</a></p><p>Please investigate the matter at your earliest convenience.</p><p>Best regards,<br>Your Automation Team</p>",
+              "subject": "${{ env.accelerator_name }} Test Automation - Failure"
+            }
+          EOF
+            )
+          fi
+
+          # Send the notification
+          curl -X POST "${{ secrets.EMAILNOTIFICATION_LOGICAPP_URL_TA }}" \
+            -H "Content-Type: application/json" \
+            -d "$EMAIL_BODY" || echo "Failed to send notification"

.github/workflows/tests.yml

@@ -78,7 +78,7 @@ jobs:
 
           echo "MIN_COVERAGE=$MIN_COVERAGE" >> "$GITHUB_OUTPUT"
       - name: Run Python Tests
-        run: make python-test optional_args="--junitxml=coverage-junit.xml --cov=. --cov-report xml:coverage.xml --cov-fail-under ${{ steps.coverage-value.outputs.MIN_COVERAGE }}"
+        run: make python-test optional_args="--junitxml=coverage-junit.xml --cov=. --cov-report xml:coverage.xml --cov-fail-under ${{ steps.coverage-value.outputs.MIN_COVERAGE }} ./code/tests"
       - uses: actions/upload-artifact@v4
         if: ${{ !cancelled() }}
         with:

.gitignore

@@ -418,6 +418,8 @@ temp/
 # so that Azure App Service can install the dependencies
 requirements.txt
 !infra/prompt-flow/cwyd/requirements.txt
+!tests/e2e-test/requirements.txt
+!tests/llm-evaluator/requirements.txt
 
 # Cypress UI tests screenshots folder
 tests/integration/ui/cypress/screenshots/

code/backend/pages/01_Ingest_Data.py

@@ -64,6 +64,11 @@ def sanitize_metadata_value(value):
 
 
 def add_url_embeddings(urls: list[str]):
+    has_valid_url = bool(list(filter(str.strip, urls)))
+    if not has_valid_url:
+        st.error("Please enter at least one valid URL.")
+        return
+
     params = {}
     if env_helper.FUNCTION_KEY is not None:
         params["code"] = env_helper.FUNCTION_KEY

code/backend/pages/04_Configuration.py

@@ -491,37 +491,43 @@ def validate_documents():
                     "Configuration saved successfully! Please restart the chat service for these changes to take effect."
                 )
 
-    with st.popover(":red[Reset configuration to defaults]"):
-
-        # Close button with a custom class
-        if st.button("X", key="close_popup", help="Close popup"):
-            st.session_state["popup_open"] = False
-            st.rerun()
-
-        st.write(
-            "**Resetting the configuration cannot be reversed, proceed with caution!**"
-        )
+    @st.dialog("Reset Configuration", width="small")
+    def reset_config_dialog():
+        st.write("**Resetting the configuration cannot be reversed. Proceed with caution!**")
 
         st.text_input('Enter "reset" to proceed', key="reset_configuration")
         if st.button(
-            ":red[Reset]", disabled=st.session_state["reset_configuration"] != "reset"
+            ":red[Reset]",
+            disabled=st.session_state.get("reset_configuration", "") != "reset",
+            key="confirm_reset"
         ):
-            try:
-                ConfigHelper.delete_config()
-            except ResourceNotFoundError:
-                pass
-
-            for key in st.session_state:
-                del st.session_state[key]
-
+            with st.spinner("Resetting Configuration to Default values..."):
+                try:
+                    ConfigHelper.delete_config()
+                except ResourceNotFoundError:
+                    pass
+
+                ConfigHelper.clear_config()
+            st.session_state.clear()
             st.session_state["reset"] = True
             st.session_state["reset_configuration"] = ""
+            st.session_state["show_reset_dialog"] = False
             st.rerun()
 
-        if st.session_state.get("reset") is True:
-            st.success("Configuration reset successfully!")
-            del st.session_state["reset"]
-            del st.session_state["reset_configuration"]
+    # Reset configuration button
+    if st.button(":red[Reset configuration to defaults]"):
+        st.session_state["show_reset_dialog"] = True
+
+    # Open the dialog if needed
+    if st.session_state.get("show_reset_dialog"):
+        reset_config_dialog()
+        st.session_state["show_reset_dialog"] = False
+
+    # After reset success
+    if st.session_state.get("reset"):
+        st.success("Configuration reset successfully!")
+        del st.session_state["reset"]
+        del st.session_state["reset_configuration"]
 
 except Exception as e:
     logger.error(f"Error occurred: {e}")