Skip to content

Commit 7b9bcfb

Browse files
Roopan-MicrosoftAjitPadhi-MicrosoftPavan-Microsoftross-p-smithgpickett
authored
fix: Merging Dev changes to Main Branch (#1702)
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Ajit Padhi <[email protected]> Co-authored-by: Pavan-Microsoft <[email protected]> Co-authored-by: Ross Smith <[email protected]> Co-authored-by: gpickett <[email protected]> Co-authored-by: Francia Riesco <[email protected]> Co-authored-by: Francia Riesco <[email protected]> Co-authored-by: Prajwal D C <[email protected]> Co-authored-by: Harmanpreet-Microsoft <[email protected]> Co-authored-by: UtkarshMishra-Microsoft <[email protected]> Co-authored-by: Priyanka-Microsoft <[email protected]> Co-authored-by: Prasanjeet-Microsoft <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kiran-Siluveru-Microsoft <[email protected]> Co-authored-by: Prashant-Microsoft <[email protected]> Co-authored-by: Rohini-Microsoft <[email protected]> Co-authored-by: Avijit-Microsoft <[email protected]> Co-authored-by: RaviKiran-Microsoft <[email protected]> Co-authored-by: Somesh Joshi <[email protected]> Co-authored-by: Himanshi Agrawal <[email protected]> Co-authored-by: pradeepjha-microsoft <[email protected]> Co-authored-by: Harmanpreet Kaur <[email protected]> Co-authored-by: Bangarraju-Microsoft <[email protected]> Co-authored-by: Harsh-Microsoft <[email protected]>
1 parent f6b565a commit 7b9bcfb

File tree

8 files changed

+4037
-4712
lines changed

8 files changed

+4037
-4712
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ jobs:
3838
new_username: 'cwydcontainerreg'
3939
app_name: ${{ matrix.app_name }}
4040
dockerfile: ${{ matrix.dockerfile }}
41-
push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' }}
41+
push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo'|| github.ref_name == 'dependabotchanges' }}
4242
secrets: inherit

‎.github/workflows/build-docker.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@ jobs:
8383
${{ inputs.old_registry }}/${{ inputs.app_name }}:${{ steps.date.outputs.date }}_${{ github.run_number }}
8484
8585
- name: Build Docker Image and optionally push (New Registry)
86-
if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' }}
86+
if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo'|| github.ref_name == 'dependabotchanges' }}
8787
uses: docker/build-push-action@v6
8888
with:
8989
context: .
9090
file: ${{ inputs.dockerfile }}
9191
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.head_ref || github.ref_name }}
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 }}
9393
tags: |
94-
${{ inputs.new_registry }}/${{ inputs.app_name }}:${{ github.ref_name == 'main' && 'latest' || github.ref_name == 'dev' && 'dev' || github.ref_name == 'demo' && 'demo' || github.head_ref || 'default' }}
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' }}
9595
${{ inputs.new_registry }}/${{ inputs.app_name }}:${{ steps.date.outputs.date }}_${{ github.run_number }}

‎code/frontend/package-lock.json

Lines changed: 1298 additions & 2131 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎code/frontend/package.json

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,24 @@
1111
"test:watch": "jest --coverage --verbose --watchAll"
1212
},
1313
"dependencies": {
14-
"@babel/traverse": "^7.26.4",
15-
"@fluentui/react": "^8.122.2",
16-
"@fluentui/react-icons": "^2.0.270",
14+
"@babel/traverse": "^7.26.7",
15+
"@fluentui/react": "^8.122.9",
16+
"@fluentui/react-icons": "^2.0.274",
1717
"@fortawesome/fontawesome-svg-core": "^6.7.2",
1818
"@fortawesome/free-solid-svg-icons": "^6.7.2",
1919
"@fortawesome/react-fontawesome": "github:fortawesome/react-fontawesome",
2020
"lodash": "^4.17.21",
2121
"lodash-es": "^4.17.21",
2222
"microsoft-cognitiveservices-speech-sdk": "^1.42.0",
23-
"postcss": "^8.4.49",
24-
"react": "^18.2.0",
23+
"postcss": "^8.5.1",
24+
"react": "^18.3.1",
2525
"react-dom": "^18.3.1",
26-
"react-markdown": "^9.0.1",
27-
"react-router-dom": "^7.1.0",
26+
"react-markdown": "^9.0.3",
27+
"react-router-dom": "^7.1.5",
2828
"rehype-raw": "^7.0.0",
2929
"remark-gfm": "^4.0.0",
3030
"remark-supersub": "^1.0.0",
31-
"undici": "^6.19.8",
32-
"uuid": "^11.0.3"
31+
"uuid": "^11.0.5"
3332
},
3433
"devDependencies": {
3534
"@testing-library/jest-dom": "^6.5.0",
@@ -38,8 +37,8 @@
3837
"@types/isomorphic-fetch": "^0.0.39",
3938
"@types/jest": "^29.5.13",
4039
"@types/lodash-es": "^4.17.12",
41-
"@types/node": "^22.10.2",
42-
"@types/react": "^18.3.12",
40+
"@types/node": "^22.13.0",
41+
"@types/react": "^18.3.1",
4342
"@types/react-dom": "^18.3.1",
4443
"@types/testing-library__user-event": "^4.2.0",
4544
"@types/uuid": "^10.0.0",
@@ -52,8 +51,8 @@
5251
"prettier": "^3.4.2",
5352
"ts-jest": "^29.2.5",
5453
"ts-node": "^10.9.2",
55-
"typescript": "^5.7.2",
56-
"vite": "^6.0.5",
57-
"vitest": "^2.1.8"
54+
"typescript": "^5.7.3",
55+
"vite": "^6.0.11",
56+
"vitest": "^3.0.4"
5857
}
5958
}

‎poetry.lock

Lines changed: 2466 additions & 2374 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pyproject.toml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ azure-ai-formrecognizer = "3.3.3"
1717
azure-storage-blob = "12.20.0"
1818
azure-identity = "1.19.0"
1919
flask = {extras = ["async"], version = "^3.0.3"}
20-
openai = "1.58.1"
20+
openai = "1.61.0"
2121
langchain = "0.2.17"
2222
langchain-community = "0.2.19"
2323
langchain-openai = "0.1.25"
@@ -38,7 +38,8 @@ pillow = "10.4.0"
3838
azure-mgmt-cognitiveservices = "^13.6.0"
3939
jsonschema = "^4.23.0"
4040
semantic-kernel = {version = "1.3.0", python = "<3.13"}
41-
azure-ai-ml = "^1.23.0"
41+
pydantic = "2.7.4"
42+
azure-ai-ml = "^1.24.0"
4243
azure-cosmos = "^4.7.0"
4344
asyncpg = "^0.30.0"
4445
psycopg2-binary = "^2.9.10"
@@ -48,12 +49,12 @@ pgvector = "^0.3.6"
4849
pytest = "^8.3.4"
4950
pytest-cov = "6.0.0"
5051
flake8 = "7.1.1"
51-
black = "24.10.0"
52-
pre-commit = "4.0.1"
53-
pytest_httpserver = "1.1.0"
54-
trustme = "1.2.0"
52+
black = "25.1.0"
53+
pre-commit = "4.1.0"
54+
pytest_httpserver = "1.1.1"
55+
trustme = "1.2.1"
5556
jupyter = "1.1.1"
56-
pytest-asyncio = "^0.25.0"
57+
pytest-asyncio = "^0.25.3"
5758

5859
[tool.poetry.group.prompt-flow]
5960
optional = true

0 commit comments

Comments
 (0)