Skip to content

Commit c6c42d5

Browse files
AjitPadhi-MicrosoftPrasanjeet-MicrosoftRoopan-MicrosoftPavan-Microsoftross-p-smith
authored
chore: Depenadbot dev branch sync (#2081)
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Prasanjeet-Microsoft <v-singhprasa@microsoft.com> Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com> Co-authored-by: Roopan P M <v-roopanpm@microsoft.com> Co-authored-by: Pavan-Microsoft <v-kupavan@microsoft.com> Co-authored-by: Ross Smith <ross-p-smith@users.noreply.github.com> Co-authored-by: gpickett <122489228+gpickett@users.noreply.github.com> Co-authored-by: Francia Riesco <friesco@microsoft.com> Co-authored-by: Francia Riesco <Fr4nc3@users.noreply.github.com> Co-authored-by: Prajwal D C <v-dcprajwal@microsoft.com> Co-authored-by: Harmanpreet-Microsoft <v-harmanprka@microsoft.com> Co-authored-by: UtkarshMishra-Microsoft <v-utkamishra@microsoft.com> Co-authored-by: Priyanka-Microsoft <v-prisinghal@microsoft.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kiran-Siluveru-Microsoft <v-ksiluveru@microsoft.com> Co-authored-by: Prashant-Microsoft <v-pmalusare@microsoft.com> Co-authored-by: Rohini-Microsoft <v-rwalunj@microsoft.com> Co-authored-by: Avijit-Microsoft <v-aghorui@microsoft.com> Co-authored-by: RaviKiran-Microsoft <v-ravikirans@microsoft.com> Co-authored-by: Somesh Joshi <v-somejoshi@microsoft.com> Co-authored-by: Himanshi Agrawal <v-himagrawal@microsoft.com> Co-authored-by: pradeepjha-microsoft <v-pradeepjha@microsoft.com> Co-authored-by: Harmanpreet Kaur <v-harmanpkau@microsoft.com> Co-authored-by: Bangarraju-Microsoft <v-golib@microsoft.com> Co-authored-by: Harsh-Microsoft <v-hbangera@microsoft.com> Co-authored-by: Kanchan-Microsoft <v-knagshetti@microsoft.com> Co-authored-by: Cristopher Coronado <cristofima@hotmail.com> Co-authored-by: Cristopher Coronado Moreira <crcorona@pichincha.com> Co-authored-by: Vamshi-Microsoft <v-vamolla@microsoft.com> Co-authored-by: Thanusree-Microsoft <168087422+Thanusree-Microsoft@users.noreply.github.com> Co-authored-by: Niraj Chaudhari (Persistent Systems Inc) <v-nirajcha@microsoft.com> Co-authored-by: Rohini-Microsoft <168007985+Rohini-Microsoft@users.noreply.github.com> Co-authored-by: Ragini-Microsoft <v-raginich@microsoft.com> Co-authored-by: Rafi-Microsoft <v-rafmd@microsoft.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Atulku-Microsoft <v-atulku@microsoft.com> Co-authored-by: Kingshuk-Microsoft <v-kidatta@microsoft.com> Co-authored-by: Ayaz-Microsoft <v-ayazkhan@microsoft.com> Co-authored-by: Abdul-Microsoft <v-amujeebta@microsoft.com> Co-authored-by: Prekshith-Microsoft <v-pdj@microsoft.com>
1 parent 849212e commit c6c42d5

220 files changed

Lines changed: 84392 additions & 18273 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
FROM mcr.microsoft.com/devcontainers/python:3.11
1+
FROM mcr.microsoft.com/devcontainers/python:3.11-bookworm
2+
3+
# Remove Yarn repository to avoid GPG key expiration issue
4+
RUN rm -f /etc/apt/sources.list.d/yarn.list
25

36
# install git
47
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

.devcontainer/setupEnv.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
pip install --upgrade pip
44

5-
pip install poetry
5+
pip install --upgrade poetry
66

77
# https://pypi.org/project/poetry-plugin-export/
8-
pip install poetry-plugin-export
8+
pip install --upgrade poetry-plugin-export
99

1010
poetry env use python3.11
1111

.env.sample

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ AZURE_SEARCH_FIELDS_TAG=tag
1414
AZURE_SEARCH_FIELDS_METADATA=metadata
1515
AZURE_SEARCH_FILENAME_COLUMN=filepath
1616
AZURE_SEARCH_TITLE_COLUMN=title
17+
AZURE_SEARCH_SOURCE_COLUMN=source
18+
AZURE_SEARCH_TEXT_COLUMN=text
19+
AZURE_SEARCH_LAYOUT_TEXT_COLUMN=layoutText
1720
AZURE_SEARCH_URL_COLUMN=url
1821
AZURE_SEARCH_CONVERSATIONS_LOG_INDEX=conversations-log
1922
AZURE_SEARCH_USE_INTEGRATED_VECTORIZATION=false
@@ -35,6 +38,11 @@ AZURE_OPENAI_STREAM=True
3538
# Backend for processing the documents and application logging in the app
3639
AzureWebJobsStorage=
3740
BACKEND_URL=http://localhost:7071
41+
42+
# Enhanced logging configuration (optional)
43+
LOGLEVEL=INFO
44+
PACKAGE_LOGGING_LEVEL=WARNING
45+
# AZURE_LOGGING_PACKAGES=azure.core,azure.identity
3846
DOCUMENT_PROCESSING_QUEUE_NAME=
3947
AZURE_BLOB_ACCOUNT_NAME=
4048
AZURE_BLOB_ACCOUNT_KEY=
@@ -60,6 +68,8 @@ AZURE_SPEECH_SERVICE_REGION=
6068
AZURE_AUTH_TYPE=keys
6169
USE_KEY_VAULT=true
6270
AZURE_KEY_VAULT_ENDPOINT=
71+
# Application environment (e.g., dev, prod)
72+
APP_ENV="dev"
6373
# Chat conversation type to decide between custom or byod (bring your own data) conversation type
6474
CONVERSATION_FLOW=
6575
# Chat History CosmosDB Integration Settings

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Each line is a file pattern followed by one or more owners.
33

44
# These owners will be the default owners for everything in the repo.
5-
* @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft @Fr4nc3 @Vinay-Microsoft @aniaroramsft
5+
* @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft @Fr4nc3 @Vinay-Microsoft @aniaroramsft @toherman-msft @nchandhi @dgp10801

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

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,34 +20,36 @@ jobs:
2020
with:
2121
fetch-depth: 0
2222

23-
- name: Get Added/Modified Markdown Files (PR only)
24-
id: changed-files
23+
# For PR : Get only changed markdown files
24+
- name: Get changed markdown files (PR only)
25+
id: changed-markdown-files
2526
if: github.event_name == 'pull_request'
26-
run: |
27-
git fetch origin ${{ github.base_ref }}
28-
files=$(git diff --name-only origin/${{ github.base_ref }}...HEAD | grep '\.md$' || true)
29-
echo "md_files<<EOF" >> $GITHUB_OUTPUT
30-
echo "$files" >> $GITHUB_OUTPUT
31-
echo "EOF" >> $GITHUB_OUTPUT
32-
- name: Check Broken Links in Added/Modified Files (PR)
33-
if: github.event_name == 'pull_request' && steps.changed-files.outputs.md_files != ''
27+
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46
28+
with:
29+
files: |
30+
**/*.md
31+
# For PR: Check broken links only in changed files
32+
- name: Check Broken Links in Changed Markdown Files
33+
id: lychee-check-pr
34+
if: github.event_name == 'pull_request' && steps.changed-markdown-files.outputs.any_changed == 'true'
3435
uses: lycheeverse/lychee-action@v2.7.0
3536
with:
3637
args: >
37-
--verbose --exclude-mail --no-progress --exclude ^https?://
38-
${{ steps.changed-files.outputs.md_files }}
38+
--verbose --no-progress --exclude ^https?://
39+
${{ steps.changed-markdown-files.outputs.all_changed_files }}
3940
failIfEmpty: false
4041
env:
4142
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4243

43-
- name: Check Broken Links in Entire Repo (Manual)
44+
# For manual trigger: Check all markdown files in repo
45+
- name: Check Broken Links in All Markdown Files in Entire Repo (Manual Trigger)
46+
id: lychee-check-manual
4447
if: github.event_name == 'workflow_dispatch'
4548
uses: lycheeverse/lychee-action@v2.7.0
4649
with:
4750
args: >
48-
--verbose --exclude-mail --no-progress --exclude ^https?://
51+
--verbose --no-progress --exclude ^https?://
4952
'**/*.md'
5053
failIfEmpty: false
51-
output: lychee/out.md
5254
env:
5355
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build-docker-images.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ on:
66
- main
77
- dev
88
- demo
9+
paths:
10+
- 'code/**'
11+
- '!code/tests/**'
12+
- 'docker/**'
13+
- 'package.json'
14+
- 'pyproject.toml'
15+
- '.github/workflows/build-docker-images.yml'
16+
- '.github/workflows/build-docker.yml'
917
pull_request:
1018
branches:
1119
- main
@@ -32,9 +40,7 @@ jobs:
3240
dockerfile: docker/Frontend.Dockerfile
3341
uses: ./.github/workflows/build-docker.yml
3442
with:
35-
old_registry: ${{ github.ref_name == 'main' && 'fruoccopublic.azurecr.io' }}
3643
new_registry: 'cwydcontainerreg.azurecr.io'
37-
old_username: ${{ github.ref_name == 'main' && 'fruoccopublic' }}
3844
new_username: 'cwydcontainerreg'
3945
app_name: ${{ matrix.app_name }}
4046
dockerfile: ${{ matrix.dockerfile }}

.github/workflows/build-docker.yml

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@ name: Reusable Docker build and push workflow
33
on:
44
workflow_call:
55
inputs:
6-
old_registry:
7-
required: true
8-
type: string
9-
old_username:
10-
required: true
11-
type: string
126
new_registry:
137
required: true
148
type: string
@@ -37,15 +31,6 @@ jobs:
3731
- name: Checkout
3832
uses: actions/checkout@v6
3933

40-
# Login for 'main' branch to both registries
41-
- name: Docker Login to fruoccopublic (Main)
42-
if: ${{ inputs.push == true && github.ref_name == 'main' }}
43-
uses: docker/login-action@v3
44-
with:
45-
registry: ${{ inputs.old_registry }}
46-
username: ${{ inputs.old_username }}
47-
password: ${{ secrets.DOCKER_PASSWORD }}
48-
4934
- name: Docker Login to cwydcontainerreg (Main)
5035
if: ${{ inputs.push == true && github.ref_name == 'main' }}
5136
uses: docker/login-action@v3
@@ -70,26 +55,14 @@ jobs:
7055
id: date
7156
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
7257

73-
- name: Build Docker Image and optionally push (Old Registry)
74-
if: ${{ github.ref_name == 'main' }}
75-
uses: docker/build-push-action@v6
76-
with:
77-
context: .
78-
file: ${{ inputs.dockerfile }}
79-
push: ${{ inputs.push }}
80-
cache-from: type=registry,ref=${{ inputs.old_registry }}/${{ inputs.app_name }}:${{ github.ref_name == 'main' && 'latest' || github.head_ref || github.ref_name }}
81-
tags: |
82-
${{ inputs.old_registry }}/${{ inputs.app_name }}:${{ github.ref_name == 'main' && 'latest' || github.head_ref || 'default' }}
83-
${{ inputs.old_registry }}/${{ inputs.app_name }}:${{ steps.date.outputs.date }}_${{ github.run_number }}
84-
8558
- name: Build Docker Image and optionally push (New Registry)
8659
if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo'|| github.ref_name == 'dependabotchanges' }}
8760
uses: docker/build-push-action@v6
8861
with:
8962
context: .
9063
file: ${{ inputs.dockerfile }}
9164
push: ${{ inputs.push }}
92-
cache-from: type=registry,ref=${{ inputs.new_registry }}/${{ inputs.app_name }}:${{ github.ref_name == 'main' && 'latest' || github.ref_name == 'dev' && 'dev' || github.ref_name == 'demo' && 'demo'|| github.ref_name == 'dependabotchanges' && 'dependabotchanges' || github.head_ref || github.ref_name }}
65+
cache-from: type=registry,ref=${{ inputs.new_registry }}/${{ inputs.app_name }}:${{ github.ref_name == 'main' && 'latest_waf' || github.ref_name == 'dev' && 'dev' || github.ref_name == 'demo' && 'demo'|| github.ref_name == 'dependabotchanges' && 'dependabotchanges' || github.head_ref || github.ref_name }}
9366
tags: |
94-
${{ inputs.new_registry }}/${{ inputs.app_name }}:${{ github.ref_name == 'main' && 'latest' || github.ref_name == 'dev' && 'dev' || github.ref_name == 'demo' && 'demo'|| github.ref_name == 'dependabotchanges' && 'dependabotchanges' || github.head_ref || 'default' }}
95-
${{ inputs.new_registry }}/${{ inputs.app_name }}:${{ steps.date.outputs.date }}_${{ github.run_number }}
67+
${{ inputs.new_registry }}/${{ inputs.app_name }}:${{ github.ref_name == 'main' && 'latest_waf' || github.ref_name == 'dev' && 'dev' || github.ref_name == 'demo' && 'demo'|| github.ref_name == 'dependabotchanges' && 'dependabotchanges' || github.head_ref || 'default' }}
68+
${{ inputs.new_registry }}/${{ inputs.app_name }}:${{ github.ref_name == 'main' && 'latest_waf' || github.ref_name == 'dev' && 'dev' || github.ref_name == 'demo' && 'demo'|| github.ref_name == 'dependabotchanges' && 'dependabotchanges' || github.head_ref || 'default' }}_${{ steps.date.outputs.date }}_${{ github.run_number }}

0 commit comments

Comments
 (0)