Skip to content

Commit ce9e771

Browse files
Ashwal-MicrosoftAshwal-Microsoft
committed
Merge origin/dev into Ash-17Bicep-DependsOn
2 parents 4e506cc + 212b904 commit ce9e771

538 files changed

Lines changed: 98053 additions & 40765 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.

‎.azdo/pipelines/azure-dev.yml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
# Run when commits are pushed to mainline branch (main or master)
22
# Set this to the mainline branch you are using
33
trigger:
4-
- main
4+
branches:
5+
include:
6+
- main
7+
paths:
8+
include:
9+
- src/*
10+
- infra/*
11+
- azure.yaml
12+
- azure_custom.yaml
13+
- .azdo/pipelines/azure-dev.yml
14+
exclude:
15+
- '*.md'
16+
- docs/*
17+
- data/*
518

619
# Azure Pipelines workflow to deploy to Azure using azd
720
# To configure required secrets and service connection for connecting to Azure, simply run `azd pipeline config --provider azdo`

‎.coveragerc‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
[run]
2+
source = .
3+
omit =
4+
src/mcp_server/*
5+
src/backend/tests/*
6+
src/tests/mcp_server/*
7+
src/tests/agents/*
8+
src/**/__init__.py
9+
tests/e2e-test/*
10+
*/venv/*
11+
*/env/*
12+
*/.pytest_cache/*
13+
*/node_modules/*
14+
src/backend/v4/api/router.py
15+
16+
[paths]
17+
source =
18+
src/backend
19+
*/site-packages
20+
21+
[report]
22+
exclude_lines =
23+
pragma: no cover
24+
def __repr__
25+
raise AssertionError
26+
raise NotImplementedError

‎.devcontainer/Dockerfile‎

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

‎.devcontainer/devcontainer.json‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
{
22
"name": "Multi Agent Custom Automation Engine Solution Accelerator",
3-
"image": "mcr.microsoft.com/devcontainers/python:3.11-bullseye",
3+
"build": {
4+
"dockerfile": "Dockerfile"
5+
},
46
"features": {
5-
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
7+
"ghcr.io/devcontainers/features/docker-in-docker:2": {"version": "latest"},
68
"ghcr.io/azure/azure-dev/azd:latest": {},
79
"ghcr.io/devcontainers/features/node:1": {},
8-
"ghcr.io/devcontainers/features/azure-cli:1": {},
9-
"ghcr.io/jsburckhardt/devcontainer-features/uv:1": {}
10+
"ghcr.io/devcontainers/features/azure-cli:1": {
11+
"installBicep": true,
12+
"version": "latest",
13+
"bicepVersion": "latest"
14+
},
15+
"ghcr.io/jsburckhardt/devcontainer-features/uv:1": {"shellautocompletion": true,
16+
"version": "latest"}
1017
},
1118
"customizations": {
1219
"vscode": {

‎.devcontainer/setupEnv.sh‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
#!/bin/bash
2-
3-
cd ./src/backend
4-
uv add -r requirements.txt
5-
6-
cd ../frontend
7-
uv add -r requirements.txt
8-
9-
cd ..
10-
11-
1+
#!/bin/sh
122

3+
echo "Pull latest code for the current branch"
4+
git fetch
5+
git pull
136

7+
set -e
148

9+
echo "Setting up Backend..."
10+
cd ./src/backend
11+
uv sync --frozen --extra dev
12+
cd ../../
1513

14+
echo "Setting up Frontend..."
15+
cd ./src/App
16+
npm install
17+
pip install -r requirements.txt
18+
cd ../../
1619

17-
# pip install --upgrade pip
18-
19-
20-
# (cd ./src/frontend; pip install -r requirements.txt)
21-
22-
23-
# (cd ./src/backend; pip install -r requirements.txt)
24-
20+
echo "Setting up MCP..."
21+
cd ./src/mcp_server
22+
uv sync --frozen
23+
cd ../../
2524

25+
echo "Setup complete! 🎉"

‎.flake8‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
[flake8]
22
max-line-length = 88
33
extend-ignore = E501
4-
exclude = .venv, frontend, src/backend/tests
4+
exclude =
5+
.venv,
6+
frontend,
7+
src/frontend,
8+
src/backend/tests,
9+
*.tsx,
10+
*.ts,
11+
*.jsx,
12+
*.js
513
ignore = E203, W503, G004, G200, E402

‎.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 @marktayl1 @Fr4nc3 @Vinay-Microsoft @aniaroramsft
5+
* @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft @marktayl1 @Fr4nc3 @Vinay-Microsoft @aniaroramsft @toherman-msft @nchandhi @dgp10801

‎.github/dependabot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ updates:
3232
- "*"
3333

3434
- package-ecosystem: "pip"
35-
directory: "/src/frontend"
35+
directory: "/src/App"
3636
schedule:
3737
interval: "monthly"
3838
commit-message:

‎.github/workflows/agnext-biab-02-containerimage.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@ jobs:
1616
packages: write
1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v6
2020
# - name: Download deps
2121
# run: |
2222
# curl -fsSL ${{ vars.AUTOGEN_WHL_URL }} -o agnext-biab-02/autogen_core-0.3.dev0-py3-none-any.whl
2323
- name: Log in to the Container registry
24-
uses: docker/login-action@v3
24+
uses: docker/login-action@v4
2525
with:
2626
registry: ${{ env.REGISTRY }}
2727
username: ${{ github.actor }}
2828
password: ${{ secrets.GITHUB_TOKEN }}
2929
- name: Extract metadata (tags, labels) for Docker
3030
id: meta
31-
uses: docker/metadata-action@v5
31+
uses: docker/metadata-action@v6
3232
with:
3333
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
3434
tags: |
3535
type=ref,event=branch
3636
type=sha
3737
- name: Build and push Docker image
38-
uses: docker/build-push-action@v6
38+
uses: docker/build-push-action@v7
3939
with:
4040
context: agnext-biab-02/
4141
file: agnext-biab-02/Dockerfile

‎.github/workflows/azd-template-validation.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: AZD Template Validation
2+
on:
3+
schedule:
4+
- cron: '30 1 * * 4' # Every Thursday at 7:00 AM IST (1:30 AM UTC)
5+
workflow_dispatch:
6+
7+
permissions:
8+
contents: read
9+
id-token: write
10+
pull-requests: write
11+
12+
jobs:
13+
template_validation:
14+
runs-on: ubuntu-latest
15+
name: azd template validation
16+
environment: production
17+
steps:
18+
- uses: actions/checkout@v6
19+
20+
- name: Set timestamp
21+
run: echo "HHMM=$(date -u +'%H%M')" >> $GITHUB_ENV
22+
23+
- uses: microsoft/template-validation-action@v0.4.4
24+
with:
25+
validateAzd: ${{ vars.TEMPLATE_VALIDATE_AZD }}
26+
validateTests: ${{ vars.TEMPLATE_VALIDATE_TESTS }}
27+
useDevContainer: ${{ vars.TEMPLATE_USE_DEV_CONTAINER }}
28+
id: validation
29+
env:
30+
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
31+
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
32+
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
33+
AZURE_ENV_NAME: azd-${{ vars.AZURE_ENV_NAME }}-${{ env.HHMM }}
34+
AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
35+
AZURE_ENV_AI_SERVICE_LOCATION: ${{ vars.AZURE_AI_DEPLOYMENT_LOCATION }}
36+
AZURE_ENV_GPT_MODEL_CAPACITY: 1
37+
AZURE_ENV_MODEL_4_1_CAPACITY: 1 # keep low to avoid potential quota issues
38+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
39+
40+
- name: print result
41+
run: cat ${{ steps.validation.outputs.resultFile }}

0 commit comments

Comments
 (0)