chore: dev to main

.github/workflows/Scheduled-Dependabot-PRs-Auto-Merge.yml

@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install GitHub CLI
         run: |

.github/workflows/azure-dev.yml

@@ -15,11 +15,11 @@ jobs:
     steps:
       # Step 1: Checkout the code from your repository
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       # Step 2: Validate the Azure template using microsoft/template-validation-action
       - name: Validate Azure Template
-        uses: microsoft/template-validation-action@v0.4.3
+        uses: microsoft/template-validation-action@v0.4.4
         id: validation
         env:
           AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}

.github/workflows/broken-links-checker.yml

@@ -16,15 +16,15 @@ jobs:
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       # For PR : Get only changed markdown files
       - name: Get changed markdown files (PR only)
         id: changed-markdown-files
         if: github.event_name == 'pull_request'
-        uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 # v46
+        uses: tj-actions/changed-files@e0021407031f5be11a464abee9a0776171c79891 # v46
         with:
           files: |
             **/*.md
@@ -34,7 +34,7 @@ jobs:
       - name: Check Broken Links in Changed Markdown Files
         id: lychee-check-pr
         if: github.event_name == 'pull_request' && steps.changed-markdown-files.outputs.any_changed == 'true'
-        uses: lycheeverse/lychee-action@v2.6.1
+        uses: lycheeverse/lychee-action@v2.7.0
         with:
           args: >
             --verbose --no-progress --exclude ^https?://
@@ -47,7 +47,7 @@ jobs:
       - name: Check Broken Links in All Markdown Files in Entire Repo (Manual Trigger)
         id: lychee-check-manual
         if: github.event_name == 'workflow_dispatch'
-        uses: lycheeverse/lychee-action@v2.6.1
+        uses: lycheeverse/lychee-action@v2.7.0
         with:
           args: >
             --verbose --no-progress --exclude ^https?://

.github/workflows/create-release.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ github.event.workflow_run.head_sha }}
 

.github/workflows/deploy.yml

@@ -29,7 +29,7 @@ jobs:
       WEBAPP_URL: ${{ steps.get_output.outputs.WEBAPP_URL }}
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Azure CLI
         run: |

.github/workflows/docker-build-and-push.yml

@@ -33,7 +33,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

.github/workflows/job-deploy.yml

@@ -87,7 +87,7 @@ on:
         value: ${{ jobs.azure-setup.outputs.IMAGE_TAG }}
       QUOTA_FAILED:
         description: "Quota Check Failed Flag"
-        value: ${{ jobs.azure-setup.outputs.QUOTA_FAILED }}
+        value: ${{ jobs.azure-setup.outputs.QUOTA_FAILED || 'false' }}
 
 env:
   GPT_MIN_CAPACITY: 150

.github/workflows/node.js.yml

@@ -5,7 +5,7 @@ name: Build Frontend
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "dev" ]
     paths:
       - 'src/frontend/**/*.ts'
       - 'src/frontend/**/*.tsx'
@@ -17,7 +17,7 @@ on:
       - 'src/frontend/**/*.html'
       - '.github/workflows/node.js.yml'
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "dev" ]
     paths:
       - 'src/frontend/**/*.ts'
       - 'src/frontend/**/*.tsx'
@@ -37,18 +37,17 @@ jobs:
         working-directory: src/frontend
     strategy:
       matrix:
-        node-version: [18.x, 21.x]
+        node-version: [20.x, 22.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v5
+      uses: actions/setup-node@v6
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'npm'
         cache-dependency-path: 'src/frontend/package-lock.json'
     - run: npm ci
-    - run: npm install --save-dev jest-environment-jsdom  # Install missing package
     - run: NODE_OPTIONS=--max_old_space_size=8192 npm run build --if-present
     - run: npm run test --if-present

.github/workflows/pylint.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       # Step 1: Checkout code
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       # Step 2: Set up Python environment
       - name: Set up Python ${{ matrix.python-version }}

.github/workflows/python-app.yml

@@ -27,7 +27,7 @@ jobs:
     runs-on:
     - ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Python 3.11
       uses: actions/setup-python@v6
       with:
@@ -45,7 +45,7 @@ jobs:
     runs-on:
     - windows-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Python 3.11
       uses: actions/setup-python@v6
       with:

.github/workflows/stale-bot.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0  # Fetch full history for accurate branch checks
       - name: Fetch All Branches
@@ -75,7 +75,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload CSV Report of Inactive Branches
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: merged-branches-report
           path: merged_branches_report.csv

.github/workflows/telemetry-template-check.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Check for required metadata template line
         run: |

.github/workflows/test-automation.yml

@@ -31,7 +31,7 @@ jobs:
       TEST_REPORT_URL: ${{ steps.upload_report.outputs.artifact-url }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Python
         uses: actions/setup-python@v6
@@ -89,7 +89,7 @@ jobs:
 
       - name: Upload test report
         id: upload_report
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         if: ${{ !cancelled() }}
         with:
           name: test-report

.github/workflows/tests.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main  # Trigger on push to the main branch
+      - dev
     paths:
       - 'src/**/*.py'
       - 'src/requirements*.txt'
@@ -16,6 +17,7 @@ on:
   pull_request:
     branches:
       - main  # Trigger on pull requests to the main branch
+      - dev
     types:
       - opened
       - ready_for_review
@@ -37,7 +39,7 @@ jobs:
     runs-on: ubuntu-latest  # Use the latest Ubuntu runner
 
     steps:
-      - uses: actions/checkout@v5  # Checkout the repository
+      - uses: actions/checkout@v6  # Checkout the repository
 
       # Set up Python environment for Backend
       - name: Set up Python
@@ -67,7 +69,7 @@ jobs:
             echo "No tests found, skipping coverage check."
           fi
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         with:
           name: backend-coverage
           path: |
@@ -80,16 +82,16 @@ jobs:
     runs-on: ubuntu-latest  # Use the latest Ubuntu runner
 
     steps:
-      - uses: actions/checkout@v5  # Checkout the repository
+      - uses: actions/checkout@v6  # Checkout the repository
 
       # Set up Node.js environment for Frontend
       - name: Set up Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: '20'  # Set the Node.js version
 
       - name: Cache npm dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -121,7 +123,7 @@ jobs:
             echo "No tests found, skipping coverage check."
           fi
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         with:
           name: frontend-coverage
           path: |

infra/main_custom.bicep

@@ -1102,6 +1102,10 @@ module keyvault 'br/public:avm/res/key-vault/vault:0.12.1' = {
       {name: 'AZURE-OPENAI-PREVIEW-API-VERSION', value: azureOpenaiAPIVersion}
       {name: 'AZURE-OPEN-AI-DEPLOYMENT-MODEL', value: gptModelName}
       {name: 'TENANT-ID', value: subscription().tenantId}
+      {
+        name: 'AZURE-AI-AGENT-ENDPOINT'
+        value: aiFoundryAiProjectEndpoint
+      }
     ]
   }
   dependsOn:[
@@ -1160,7 +1164,8 @@ module webSite 'modules/web-sites.bicep' = {
       {
         name: 'appsettings'
         properties: {
-          SCM_DO_BUILD_DURING_DEPLOYMENT: 'false'
+          SCM_DO_BUILD_DURING_DEPLOYMENT: 'True'
+          ENABLE_ORYX_BUILD: 'True'
           AUTH_ENABLED: 'false'
           AZURE_SEARCH_SERVICE: aiSearch.outputs.name
           AZURE_SEARCH_INDEX: azureSearchIndex

infra/scripts/index_scripts/02_process_data.py

@@ -177,6 +177,6 @@ def prepare_search_doc(content, document_id):
         docs = []
 
 if docs != []:
-    results = search_client.upload_documents(documents=docs)
+    search_client.upload_documents(documents=docs)
 
 print(f'{str(counter)} files processed.')

scripts/data_utils.py

@@ -157,7 +157,13 @@ def extract_caption(self, text):
 
     def mask_urls_and_imgs(self, text) -> Tuple[Dict[str, str], str]:
         def find_urls(string):
-            regex = r"(?i)\b((?:https?://|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}/)(?:[^()\s<>]+|\(([^()\s<>]+|(\([^()\s<>]+\)))*\))+(?:\(([^()\s<>]+|(\([^()\s<>]+\)))*\)|[^()\s`!()\[\]{};:'\".,<>?«»“”‘’]))"
+            regex = (
+                r"(?i)\b("
+                r"(?:https?://|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}/)"
+                r"(?:[^()\s<>]+|\(([^()\s<>]+|(\([^()\s<>]+\)))*\))+"
+                r"(?:\(([^()\s<>]+|(\([^()\s<>]+\)))*\)|[^()\s`!()\[\]{};:'\".,<>?«»“”‘’])"
+                r")"
+            )
             urls = re.findall(regex, string)
             return [x[0] for x in urls]
 
@@ -693,7 +699,9 @@ def extract_pdf_content(file_path, form_recognizer_client, use_layout=False):
     page_map = []
     model = "prebuilt-layout" if use_layout else "prebuilt-read"
 
-    base64file = base64.b64encode(open(file_path, "rb").read()).decode()
+    with open(file_path, "rb") as f:
+        file_bytes = f.read()
+    base64file = base64.b64encode(file_bytes).decode()
     poller = form_recognizer_client.begin_analyze_document(
         model, AnalyzeDocumentRequest(bytes_source=base64file)
     )
@@ -1048,7 +1056,8 @@ def image_content_to_tag(image_content: str) -> str:
 
 
 def get_caption(image_path, captioning_model_endpoint, captioning_model_key):
-    encoded_image = base64.b64encode(open(image_path, "rb").read()).decode("ascii")
+    with open(image_path, "rb") as image_file:
+        encoded_image = base64.b64encode(image_file.read()).decode("ascii")
     file_ext = image_path.split(".")[-1]
     headers = {
         "Content-Type": "application/json",

src/app.py

@@ -167,7 +167,6 @@ async def init_ai_foundry_client():
         return ai_foundry_client
     except Exception as e:
         logging.exception("Exception in AI Foundry initialization", e)
-        ai_foundry_client = None
         raise e
 
 
@@ -197,7 +196,6 @@ def init_cosmosdb_client():
             if span is not None:
                 span.record_exception(e)
                 span.set_status(Status(StatusCode.ERROR, str(e)))
-            cosmos_conversation_client = None
             raise e
     else:
         logging.debug("CosmosDB not configured")

src/backend/history/cosmosdbservice.py

@@ -110,7 +110,7 @@ async def delete_messages(self, conversation_id, user_id):
                     item=message["id"], partition_key=user_id
                 )
                 response_list.append(resp)
-            return response_list
+        return response_list
 
     async def get_conversations(self, user_id, limit, sort_order="DESC", offset=0):
         parameters = [{"name": "@userId", "value": user_id}]

src/backend/settings.py

@@ -249,8 +249,9 @@ def split_contexts(
 class DatasourcePayloadConstructor(BaseModel, ABC):
     _settings: "_AppSettings" = PrivateAttr()
 
-    def __init__(self, settings: "_AppSettings", **data):
-        super().__init__(**data)
+    def __init__(self, *args, settings: "_AppSettings", **data):
+        # Call next __init__ in MRO to allow cooperative multiple inheritance
+        super().__init__(*args, **data)
         self._settings = settings
 
     @abstractmethod
@@ -302,6 +303,10 @@ class _AzureSearchSettings(BaseSettings, DatasourcePayloadConstructor):
     fields_mapping: Optional[dict] = None
     filter: Optional[str] = Field(default=None, exclude=True)
 
+    def __init__(self, settings: "_AppSettings", **data):
+        # Ensure both BaseSettings and DatasourcePayloadConstructor are initialized
+        super().__init__(settings=settings, **data)
+
     @field_validator("content_columns", "vector_columns", mode="before")
     @classmethod
     def split_columns(cls, comma_separated_string: str) -> List[str]:
@@ -439,6 +444,7 @@ def set_datasource_settings(self) -> Self:
             logging.warning(
                 "No datasource configuration found in the environment -- calls will be made to Azure OpenAI without grounding data."
             )
+            return self
 
 
 app_settings = _AppSettings()