Skip to content

Commit 3e40a7b

Browse files
authored
Merge pull request #166 from microsoft/feature/azd-goes-main
feat: Multi-agent with semantic kernel and Azure Foundry implementation
2 parents d720ee4 + bb9d590 commit 3e40a7b

File tree

103 files changed

+14503
-10390
lines changed

Some content is hidden

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

103 files changed

+14503
-10390
lines changed

.azdo/pipelines/azure-dev.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ trigger:
44
- main
55
- master
66
- feature/azd-semantickernel
7-
- gpickett-patch-6
87

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

.devcontainer/devcontainer.json

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,48 @@
11
{
22
"name": "Multi Agent Custom Automation Engine Solution Accelerator",
3-
"image": "mcr.microsoft.com/devcontainers/python:3.10",
3+
"image": "mcr.microsoft.com/devcontainers/python:3.11-bullseye",
44
"features": {
5-
"ghcr.io/devcontainers/features/azure-cli:1.0.8": {},
5+
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
66
"ghcr.io/azure/azure-dev/azd:latest": {},
7-
"ghcr.io/rchaganti/vsc-devcontainer-features/azurebicep:1.0.5": {}
7+
"ghcr.io/devcontainers/features/node:1": {},
8+
"ghcr.io/devcontainers/features/azure-cli:1": {},
9+
"ghcr.io/jsburckhardt/devcontainer-features/uv:1": {}
810
},
9-
10-
"postCreateCommand": "sudo chmod +x .devcontainer/setupEnv.sh && ./.devcontainer/setupEnv.sh",
11-
1211
"customizations": {
1312
"vscode": {
1413
"extensions": [
14+
"dbaeumer.vscode-eslint",
15+
"esbenp.prettier-vscode",
16+
"GitHub.vscode-github-actions",
1517
"ms-azuretools.azure-dev",
18+
"ms-azuretools.vscode-azurefunctions",
1619
"ms-azuretools.vscode-bicep",
17-
"ms-python.python"
18-
]
19-
},
20-
"codespaces": {
21-
"openFiles": [
22-
"README.md"
20+
"ms-azuretools.vscode-docker",
21+
"ms-vscode.js-debug",
22+
"ms-vscode.vscode-node-azure-pack",
23+
"charliermarsh.ruff",
24+
"exiasr.hadolint",
25+
"kevinrose.vsc-python-indent",
26+
"mosapride.zenkaku",
27+
"ms-python.python",
28+
"njpwerner.autodocstring",
29+
"redhat.vscode-yaml",
30+
"shardulm94.trailing-spaces",
31+
"tamasfe.even-better-toml",
32+
"yzhang.markdown-all-in-one",
33+
"ms-vscode.azure-account"
2334
]
2435
}
2536
},
26-
37+
"postCreateCommand": "bash ./.devcontainer/setupEnv.sh",
38+
"containerEnv": {
39+
"DISPLAY": "dummy",
40+
"PYTHONUNBUFFERED": "True",
41+
"UV_LINK_MODE": "copy",
42+
"UV_PROJECT_ENVIRONMENT": "/home/vscode/.venv"
43+
},
2744
"remoteUser": "vscode",
2845
"hostRequirements": {
2946
"memory": "8gb"
3047
}
31-
}
48+
}

.devcontainer/setupEnv.sh

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
11
#!/bin/bash
22

3-
pip install --upgrade pip
3+
cd ./src/backend
4+
uv add -r requirements.txt
45

6+
cd ../frontend
7+
uv add -r requirements.txt
58

6-
(cd ./src/frontend; pip install -r requirements.txt)
9+
cd ..
710

811

9-
(cd ./src/backend; pip install -r requirements.txt)
12+
13+
14+
15+
16+
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)
1024

1125

.github/workflows/azure-dev.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ on:
55
- dev
66
- main
77
- feature/azd-semantickernel
8-
workflow_dispatch:
8+
workflow_dispatch:
9+
910
permissions:
1011
contents: read
1112
id-token: write
1213
pull-requests: write
14+
1315
jobs:
1416
template_validation_job:
1517
runs-on: ubuntu-latest
@@ -23,7 +25,7 @@ jobs:
2325
- name: Set up Python
2426
uses: actions/setup-python@v4
2527
with:
26-
python-version: '3.9'
28+
python-version: "3.9"
2729

2830
# Step 3: Create and populate the virtual environment
2931
- name: Create virtual environment and install dependencies
@@ -54,7 +56,7 @@ jobs:
5456
AZURE_ENV_NAME: ${{ secrets.AZURE_ENV_NAME }}
5557
AZURE_LOCATION: ${{ secrets.AZURE_LOCATION }}
5658
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
57-
59+
5860
# Step 6: Debug output in case of failure
5961
- name: Debug on failure
6062
if: failure()
@@ -78,4 +80,4 @@ jobs:
7880
# Step 7: Print the result of the validation
7981
- name: Print result
8082
if: success()
81-
run: cat ${{ steps.validation.outputs.resultFile }}
83+
run: cat ${{ steps.validation.outputs.resultFile }}

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,4 +456,5 @@ __pycache__/
456456
*.xsd.cs
457457

458458
*.whl
459-
!autogen_core-0.3.dev0-py3-none-any.whl
459+
.azure
460+
.github/copilot-instructions.md
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"folders": [
3+
{
4+
"path": "."
5+
},
6+
// {
7+
// "path": "./src/frontend"
8+
// },
9+
// {
10+
// "path": "./src/backend"
11+
// }
12+
]
13+
}

0 commit comments

Comments
 (0)