Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: Merge Dependabot Changes into Dev Branch #1679

Open
wants to merge 74 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
4a13a57
build: bump opentelemetry-instrumentation-httpx from 0.48b0 to 0.50b0…
dependabot[bot] Dec 23, 2024
fcaa562
build: bump azure-ai-ml from 1.21.1 to 1.23.0 (#1559)
dependabot[bot] Dec 23, 2024
0986fe1
Merge branch 'main' into dependabotchanges
Roopan-Microsoft Dec 23, 2024
e1a9ff3
build: bump nanoid from 3.3.7 to 3.3.8 in /code/frontend (#1556)
dependabot[bot] Dec 23, 2024
4c06a4d
build: bump openai from 1.48.0 to 1.58.1 (#1578)
dependabot[bot] Dec 23, 2024
4f1bf6e
build: bump pytest from 8.3.3 to 8.3.4 (#1548)
dependabot[bot] Dec 23, 2024
1d07939
build: bump streamlit from 1.39.0 to 1.41.1 (#1579)
dependabot[bot] Dec 23, 2024
1f3c5d9
build: bump semantic-kernel from 1.3.0 to 1.17.1 (#1580)
dependabot[bot] Dec 23, 2024
c61a308
build: bump @types/node from 22.5.5 to 22.10.1 in /code/frontend (#1547)
dependabot[bot] Dec 23, 2024
2809781
build: bump vite from 5.4.10 to 6.0.1 in /code/frontend (#1546)
dependabot[bot] Dec 23, 2024
0980b69
build: bump vitest from 2.1.4 to 2.1.8 in /code/frontend (#1582)
dependabot[bot] Dec 23, 2024
35d4715
build: bump prettier from 3.3.3 to 3.4.2 in /code/frontend (#1581)
dependabot[bot] Dec 23, 2024
0233fe4
build: bump @vitejs/plugin-react from 4.3.3 to 4.3.4 in /code/fronten…
dependabot[bot] Dec 23, 2024
a247d27
build: bump typescript from 5.5.4 to 5.7.2 in /tests/integration/ui (…
dependabot[bot] Dec 23, 2024
b175a5f
build: bump @fluentui/react-icons from 2.0.265 to 2.0.266 in /code/fr…
dependabot[bot] Dec 23, 2024
7b872cd
build: bump react-router-dom from 6.27.0 to 7.0.1 in /code/frontend (…
dependabot[bot] Dec 23, 2024
a3cbc54
build: bump cypress from 13.15.2 to 13.17.0 in /tests/integration/ui …
dependabot[bot] Dec 23, 2024
e81a965
build: bump @fortawesome/fontawesome-svg-core from 6.6.0 to 6.7.2 in …
dependabot[bot] Dec 23, 2024
610541b
build: bump typescript from 5.6.2 to 5.7.2 in /code/frontend (#1517)
dependabot[bot] Dec 23, 2024
cbba914
build: bump tornado from 6.4.1 to 6.4.2 (#1511)
dependabot[bot] Dec 23, 2024
060ca4e
build: bump cross-spawn from 7.0.3 to 7.0.6 in /tests/integration/ui …
dependabot[bot] Dec 23, 2024
2cbc462
build: bump cross-spawn from 7.0.3 to 7.0.6 in /extensions/teams (#1500)
dependabot[bot] Dec 23, 2024
3184090
build: bump aiohttp from 3.10.2 to 3.10.11 (#1499)
dependabot[bot] Dec 23, 2024
f1f2801
build: bump postcss from 8.4.48 to 8.4.49 in /code/frontend (#1496)
dependabot[bot] Dec 23, 2024
033df75
build: bump uuid from 11.0.2 to 11.0.3 in /code/frontend (#1472)
dependabot[bot] Dec 23, 2024
9792387
build: bump @azure/identity and botbuilder in /extensions/teams (#1282)
dependabot[bot] Dec 23, 2024
2cad336
build: bump @fluentui/react from 8.121.8 to 8.122.2 in /code/frontend…
dependabot[bot] Dec 23, 2024
ae60417
build: bump actions/checkout from 3 to 4 (#1586)
dependabot[bot] Dec 23, 2024
82df7ec
build: bump azure-mgmt-cognitiveservices from 13.5.0 to 13.6.0 (#1595)
dependabot[bot] Dec 23, 2024
3b8e540
build: bump azure-monitor-opentelemetry from 1.6.2 to 1.6.4 (#1596)
dependabot[bot] Dec 23, 2024
a7c356b
build: bump react-router-dom from 7.0.1 to 7.1.0 in /code/frontend (#…
dependabot[bot] Dec 23, 2024
73307a3
build: bump @babel/traverse from 7.25.9 to 7.26.4 in /code/frontend (…
dependabot[bot] Dec 23, 2024
d3a4ed4
build: bump microsoft-cognitiveservices-speech-sdk from 1.41.0 to 1.4…
dependabot[bot] Dec 23, 2024
8a4f11b
build: bump @types/node from 22.10.1 to 22.10.2 in /code/frontend (#1…
dependabot[bot] Dec 23, 2024
9ab4e91
build: bump @fluentui/react-icons from 2.0.266 to 2.0.270 in /code/fr…
dependabot[bot] Dec 23, 2024
4d89338
build: bump @fortawesome/free-solid-svg-icons from 6.6.0 to 6.7.2 in …
dependabot[bot] Dec 23, 2024
f8ba1a5
build: bump vite from 6.0.1 to 6.0.5 in /code/frontend (#1588)
dependabot[bot] Dec 23, 2024
6654030
build: bump pytest-asyncio from 0.24.0 to 0.25.0 (#1594)
dependabot[bot] Dec 23, 2024
483a490
build: bump fake-useragent from 1.5.1 to 2.0.3 (#1597)
dependabot[bot] Dec 23, 2024
0cbbac0
build: bump the langchain group with 2 updates (#1598)
dependabot[bot] Dec 23, 2024
61753fe
Merge branch 'dev' into dependabotchanges
Roopan-Microsoft Dec 30, 2024
6f4cebb
Downgrade semantic-kernel
Pavan-Microsoft Dec 30, 2024
901bd2f
build: bump trustme from 1.2.0 to 1.2.1 (#1635)
dependabot[bot] Feb 4, 2025
93ee6a9
build: bump pytest-httpserver from 1.1.0 to 1.1.1 (#1636)
dependabot[bot] Feb 4, 2025
47dec89
build: bump react-dom and @types/react-dom in /code/frontend (#1657)
dependabot[bot] Feb 4, 2025
a7ab10c
build: bump postcss from 8.4.49 to 8.5.1 in /code/frontend (#1655)
dependabot[bot] Feb 4, 2025
93f9856
build: bump @types/node from 22.10.2 to 22.13.0 in /code/frontend (#1…
dependabot[bot] Feb 4, 2025
4c065a9
build: bump openai from 1.58.1 to 1.61.0 (#1637)
dependabot[bot] Feb 4, 2025
767aca7
build: bump uuid from 11.0.3 to 11.0.5 in /code/frontend (#1648)
dependabot[bot] Feb 4, 2025
266b90e
build: bump vitest from 2.1.8 to 3.0.4 in /code/frontend (#1649)
dependabot[bot] Feb 4, 2025
107104a
build: bump @fluentui/react-icons from 2.0.270 to 2.0.274 in /code/fr…
dependabot[bot] Feb 4, 2025
fd5f0b3
build: bump typescript from 5.7.2 to 5.7.3 in /code/frontend (#1646)
dependabot[bot] Feb 4, 2025
176d9f8
build: bump react-markdown from 9.0.1 to 9.0.3 in /code/frontend (#1654)
dependabot[bot] Feb 4, 2025
73a0d45
build: bump cypress from 13.17.0 to 14.0.1 in /tests/integration/ui (…
dependabot[bot] Feb 4, 2025
7daeefb
build: bump pytest-asyncio from 0.25.0 to 0.25.3 (#1641)
dependabot[bot] Feb 4, 2025
b98a80e
build: bump @babel/traverse from 7.26.4 to 7.26.7 in /code/frontend (…
dependabot[bot] Feb 4, 2025
3b28433
build: bump vite from 6.0.5 to 6.0.11 in /code/frontend (#1652)
dependabot[bot] Feb 4, 2025
78c5561
build: bump typescript from 5.7.2 to 5.7.3 in /tests/integration/ui (…
dependabot[bot] Feb 4, 2025
ccf9228
build: bump react and @types/react in /code/frontend (#1647)
dependabot[bot] Feb 4, 2025
afc9a99
build: bump react-router-dom from 7.1.0 to 7.1.5 in /code/frontend (#…
dependabot[bot] Feb 4, 2025
8697a92
build: bump azure-ai-ml from 1.23.0 to 1.24.0 (#1640)
dependabot[bot] Feb 4, 2025
fad46a3
build: bump @fluentui/react from 8.122.2 to 8.122.9 in /code/frontend…
dependabot[bot] Feb 4, 2025
ed151ac
build: bump black from 24.10.0 to 25.1.0 (#1639)
dependabot[bot] Feb 4, 2025
4f35d46
build: bump pre-commit from 4.0.1 to 4.1.0 (#1642)
dependabot[bot] Feb 4, 2025
27f1161
build: bump azure-storage-blob from 12.20.0 to 12.24.1 (#1638)
dependabot[bot] Feb 4, 2025
fe8311d
Merge branch 'dev' into dependabotchanges
Roopan-Microsoft Feb 6, 2025
7c0f039
fix: Downgrade Packages and Fix Dependency Issues (#1666)
Prasanjeet-Microsoft Feb 13, 2025
2382831
fix: merging dev changes to main branch (#1629)
Roopan-Microsoft Feb 19, 2025
79e0aba
Merge branch 'main' into dependabotchanges
Roopan-Microsoft Feb 21, 2025
2c04ba7
updated package.json lock
Feb 21, 2025
7f922d1
added dependabotchanges
Feb 21, 2025
e1bea1d
Merge branch 'dev' into dependabotchanges
Roopan-Microsoft Feb 24, 2025
f85061e
conflicts resolved
Roopan-Microsoft Feb 24, 2025
5dc62e2
Removed the duplicate lines from the package.json file and regenerate…
Prasanjeet-Microsoft Feb 24, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-docker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ jobs:
new_username: 'cwydcontainerreg'
app_name: ${{ matrix.app_name }}
dockerfile: ${{ matrix.dockerfile }}
push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' }}
push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo'|| github.ref_name == 'dependabotchanges' }}
secrets: inherit
6 changes: 3 additions & 3 deletions .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ jobs:
${{ inputs.old_registry }}/${{ inputs.app_name }}:${{ steps.date.outputs.date }}_${{ github.run_number }}

- name: Build Docker Image and optionally push (New Registry)
if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' }}
if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo'|| github.ref_name == 'dependabotchanges' }}
uses: docker/build-push-action@v6
with:
context: .
file: ${{ inputs.dockerfile }}
push: ${{ inputs.push }}
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 }}
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 }}
tags: |
${{ 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' }}
${{ 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' }}
${{ inputs.new_registry }}/${{ inputs.app_name }}:${{ steps.date.outputs.date }}_${{ github.run_number }}
7,836 changes: 3,369 additions & 4,467 deletions code/frontend/package-lock.json

Large diffs are not rendered by default.

29 changes: 13 additions & 16 deletions code/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,24 @@
"test:watch": "jest --coverage --verbose --watchAll"
},
"dependencies": {
"@babel/traverse": "^7.26.4",
"@fluentui/react": "^8.122.2",
"@fluentui/react-icons": "^2.0.270",
"@babel/traverse": "^7.26.7",
"@fluentui/react": "^8.122.9",
"@fluentui/react-icons": "^2.0.274",
"@fortawesome/fontawesome-svg-core": "^6.7.2",
"@fortawesome/free-solid-svg-icons": "^6.7.2",
"@fortawesome/react-fontawesome": "github:fortawesome/react-fontawesome",
"lodash": "^4.17.21",
"lodash-es": "^4.17.21",
"microsoft-cognitiveservices-speech-sdk": "^1.42.0",
"postcss": "^8.4.49",
"react": "^18.2.0",
"postcss": "^8.5.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-markdown": "^9.0.1",
"react-router-dom": "^7.1.0",
"react-markdown": "^9.0.3",
"react-router-dom": "^7.1.5",
"rehype-raw": "^7.0.0",
"remark-gfm": "^4.0.0",
"remark-supersub": "^1.0.0",
"undici": "^6.19.8",
"uuid": "^11.0.3"
"uuid": "^11.0.5"
},
"devDependencies": {
"@testing-library/jest-dom": "^6.5.0",
Expand All @@ -38,8 +37,8 @@
"@types/isomorphic-fetch": "^0.0.39",
"@types/jest": "^29.5.13",
"@types/lodash-es": "^4.17.12",
"@types/node": "^22.10.2",
"@types/react": "^18.3.12",
"@types/node": "^22.13.0",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.1",
"@types/testing-library__user-event": "^4.2.0",
"@types/uuid": "^10.0.0",
Expand All @@ -50,10 +49,8 @@
"msw": "^2.4.9",
"@vitejs/plugin-react": "^4.3.4",
"prettier": "^3.4.2",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2",
"typescript": "^5.7.2",
"vite": "^6.0.5",
"vitest": "^2.1.8"
"typescript": "^5.7.3",
"vite": "^6.0.11",
"vitest": "^3.0.4"
}
}
4,782 changes: 2,427 additions & 2,355 deletions poetry.lock

Large diffs are not rendered by default.

17 changes: 9 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ azure-functions = "1.21.0"
streamlit = "1.41.1"
python-dotenv = "1.0.1"
azure-ai-formrecognizer = "3.3.3"
azure-storage-blob = "12.20.0"
azure-storage-blob = "12.24.1"
azure-identity = "1.19.0"
flask = {extras = ["async"], version = "^3.0.3"}
openai = "1.58.1"
openai = "1.61.0"
langchain = "0.2.17"
langchain-community = "0.2.19"
langchain-openai = "0.1.25"
Expand All @@ -38,7 +38,8 @@ pillow = "10.4.0"
azure-mgmt-cognitiveservices = "^13.6.0"
jsonschema = "^4.23.0"
semantic-kernel = {version = "1.3.0", python = "<3.13"}
azure-ai-ml = "^1.23.0"
pydantic = "2.7.4"
azure-ai-ml = "^1.24.0"
azure-cosmos = "^4.7.0"
asyncpg = "^0.30.0"
psycopg2-binary = "^2.9.10"
Expand All @@ -48,12 +49,12 @@ pgvector = "^0.3.6"
pytest = "^8.3.4"
pytest-cov = "6.0.0"
flake8 = "7.1.1"
black = "24.10.0"
pre-commit = "4.0.1"
pytest_httpserver = "1.1.0"
trustme = "1.2.0"
black = "25.1.0"
pre-commit = "4.1.0"
pytest_httpserver = "1.1.1"
trustme = "1.2.1"
jupyter = "1.1.1"
pytest-asyncio = "^0.25.0"
pytest-asyncio = "^0.25.3"

[tool.poetry.group.prompt-flow]
optional = true
Expand Down
20 changes: 11 additions & 9 deletions tests/integration/ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions tests/integration/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"cypress:open": "cypress open"
},
"devDependencies": {
"cypress": "^13.17.0",
"typescript": "^5.7.2"
"cypress": "^14.0.1",
"typescript": "^5.7.3"
}
}
Loading