Skip to content

Commit b6cd0d2

Browse files
Roopan-MicrosoftRoopan-Microsoft
committed
Merge branch 'dev-v4' into psl-TASfeature
2 parents a98ac5d + 4ff1586 commit b6cd0d2

12 files changed

Lines changed: 893 additions & 288 deletions

File tree

‎.github/workflows/deploy-orchestrator.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,8 @@ env:
7272

7373
jobs:
7474
docker-build:
75+
if: inputs.trigger_type == 'workflow_dispatch' && inputs.build_docker_image == true
7576
uses: ./.github/workflows/job-docker-build.yml
76-
with:
77-
trigger_type: ${{ inputs.trigger_type }}
78-
build_docker_image: ${{ inputs.build_docker_image }}
7977
secrets: inherit
8078

8179
deploy:

‎.github/workflows/deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
- cron: "0 11,23 * * *" # Runs at 11:00 AM and 11:00 PM GMT
1818
workflow_dispatch: #Allow manual triggering
1919
env:
20-
GPT_MIN_CAPACITY: 150
20+
GPT_MIN_CAPACITY: 50
2121
O4_MINI_MIN_CAPACITY: 50
2222
GPT41_MINI_MIN_CAPACITY: 50
2323
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}

‎.github/workflows/job-deploy-linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ jobs:
269269
azd env set AZURE_ENV_IMAGE_TAG="$INPUT_IMAGE_TAG"
270270
271271
if [[ "$INPUT_BUILD_DOCKER_IMAGE" == "true" ]]; then
272-
ACR_NAME=$(echo "${{ secrets.ACR_TEST_LOGIN_SERVER }}")
272+
ACR_NAME=$(echo "${{ vars.ACR_TEST_LOGIN_SERVER }}")
273273
azd env set AZURE_ENV_CONTAINER_REGISTRY_ENDPOINT="$ACR_NAME"
274274
echo "Set ACR name to: $ACR_NAME"
275275
else

‎.github/workflows/job-deploy-windows.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ jobs:
271271
272272
# Set ACR name only when building Docker image
273273
if ($env:INPUT_BUILD_DOCKER_IMAGE -eq "true") {
274-
$ACR_NAME = "${{ secrets.ACR_TEST_LOGIN_SERVER }}"
274+
$ACR_NAME = "${{ vars.ACR_TEST_LOGIN_SERVER }}"
275275
azd env set AZURE_ENV_CONTAINER_REGISTRY_ENDPOINT="$ACR_NAME"
276276
Write-Host "Set ACR name to: $ACR_NAME"
277277
} else {

‎.github/workflows/job-deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ on:
9898
value: ${{ jobs.azure-setup.outputs.QUOTA_FAILED }}
9999

100100
env:
101-
GPT_MIN_CAPACITY: 150
101+
GPT_MIN_CAPACITY: 50
102102
O4_MINI_MIN_CAPACITY: 50
103103
GPT41_MINI_MIN_CAPACITY: 50
104104
BRANCH_NAME: ${{ github.event.workflow_run.head_branch || github.head_ref || github.ref_name }}

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

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,21 @@
1-
name: Docker Build Job
1+
name: Build & Push Test Images (Feature Branch)
22
on:
33
workflow_call:
4-
inputs:
5-
trigger_type:
6-
description: 'Trigger type (workflow_dispatch, pull_request, schedule)'
7-
required: true
8-
type: string
9-
build_docker_image:
10-
description: 'Build And Push Docker Image (Optional)'
11-
required: false
12-
default: false
13-
type: boolean
144
outputs:
155
IMAGE_TAG:
166
description: "Generated Docker Image Tag"
177
value: ${{ jobs.docker-build.outputs.IMAGE_TAG }}
8+
workflow_dispatch:
9+
10+
permissions:
11+
contents: read
12+
id-token: write
1813

1914
env:
2015
BRANCH_NAME: ${{ github.event.workflow_run.head_branch || github.head_ref || github.ref_name }}
2116

2217
jobs:
2318
docker-build:
24-
if: inputs.trigger_type == 'workflow_dispatch' && inputs.build_docker_image == true
2519
runs-on: ubuntu-latest
2620
environment: production
2721
outputs:
@@ -55,7 +49,11 @@ jobs:
5549
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
5650

5751
- name: Log in to Azure Container Registry
58-
run: az acr login --name ${{ secrets.ACR_TEST_LOGIN_SERVER }}
52+
shell: bash
53+
run: |
54+
# Extract registry name from login server (e.g., myacr.azurecr.io -> myacr)
55+
ACR_NAME=$(echo "${{ vars.ACR_TEST_LOGIN_SERVER }}" | cut -d'.' -f1)
56+
az acr login --name "$ACR_NAME"
5957
6058
- name: Build and optionally push Backend Docker image
6159
uses: docker/build-push-action@v7
@@ -66,8 +64,8 @@ jobs:
6664
file: ./src/backend/Dockerfile
6765
push: true
6866
tags: |
69-
${{ secrets.ACR_TEST_LOGIN_SERVER }}/macaebackend:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}
70-
${{ secrets.ACR_TEST_LOGIN_SERVER }}/macaebackend:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}_${{ github.run_number }}
67+
${{ vars.ACR_TEST_LOGIN_SERVER }}/macaebackend:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}
68+
${{ vars.ACR_TEST_LOGIN_SERVER }}/macaebackend:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}_${{ github.run_number }}
7169
7270
- name: Build and optionally push Frontend Docker image
7371
uses: docker/build-push-action@v7
@@ -78,8 +76,8 @@ jobs:
7876
file: ./src/App/Dockerfile
7977
push: true
8078
tags: |
81-
${{ secrets.ACR_TEST_LOGIN_SERVER }}/macaefrontend:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}
82-
${{ secrets.ACR_TEST_LOGIN_SERVER }}/macaefrontend:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}_${{ github.run_number }}
79+
${{ vars.ACR_TEST_LOGIN_SERVER }}/macaefrontend:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}
80+
${{ vars.ACR_TEST_LOGIN_SERVER }}/macaefrontend:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}_${{ github.run_number }}
8381
- name: Build and optionally push MCP Docker image
8482
uses: docker/build-push-action@v7
8583
env:
@@ -89,8 +87,8 @@ jobs:
8987
file: ./src/mcp_server/Dockerfile
9088
push: true
9189
tags: |
92-
${{ secrets.ACR_TEST_LOGIN_SERVER }}/macaemcp:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}
93-
${{ secrets.ACR_TEST_LOGIN_SERVER }}/macaemcp:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}_${{ github.run_number }}
90+
${{ vars.ACR_TEST_LOGIN_SERVER }}/macaemcp:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}
91+
${{ vars.ACR_TEST_LOGIN_SERVER }}/macaemcp:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}_${{ github.run_number }}
9492
- name: Verify Docker Image Build
9593
shell: bash
9694
run: |
@@ -101,7 +99,7 @@ jobs:
10199
if: always()
102100
shell: bash
103101
run: |
104-
ACR_NAME=$(echo "${{ secrets.ACR_TEST_LOGIN_SERVER }}")
102+
ACR_NAME=$(echo "${{ vars.ACR_TEST_LOGIN_SERVER }}")
105103
echo "## 🐳 Docker Build Job Summary" >> $GITHUB_STEP_SUMMARY
106104
echo "" >> $GITHUB_STEP_SUMMARY
107105
echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY

‎docs/CustomizingAzdParameters.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ By default this template will use the environment name as the prefix to prevent
1818
| `AZURE_ENV_MODEL_4_1_DEPLOYMENT_TYPE` | string | `GlobalStandard` | Defines the deployment type for the AI model (e.g., Standard, GlobalStandard). |
1919
| `AZURE_ENV_MODEL_4_1_NAME` | string | `gpt-4.1` | Specifies the name of the GPT model to be deployed. |
2020
| `AZURE_ENV_MODEL_4_1_VERSION` | string | `2025-04-14` | Version of the GPT model to be used for deployment. |
21-
| `AZURE_ENV_MODEL_4_1_CAPACITY` | int | `150` | Sets the GPT model capacity. |
21+
| `AZURE_ENV_MODEL_4_1_CAPACITY` | int | `50` | Sets the GPT model capacity. |
2222
| `AZURE_ENV_REASONING_MODEL_DEPLOYMENT_TYPE` | string | `GlobalStandard` | Defines the deployment type for the AI model (e.g., Standard, GlobalStandard). |
2323
| `AZURE_ENV_REASONING_MODEL_NAME` | string | `o4-mini` | Specifies the name of the reasoning GPT model to be deployed. |
2424
| `AZURE_ENV_REASONING_MODEL_VERSION` | string | `2025-04-16` | Version of the reasoning GPT model to be used for deployment. |

‎docs/DeploymentGuide.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Ensure you have access to an [Azure subscription](https://azure.microsoft.com/fr
6868
📖 **Follow:** [Quota Check Instructions](./quota_check.md) to ensure sufficient capacity.
6969

7070
**Default Quota Configuration:**
71-
- **GPT-4.1:** 150k tokens
71+
- **GPT-4.1:** 50k tokens
7272
- **o4-mini:** 50k tokens
7373
- **GPT-4.1-mini:** 50k tokens
7474

@@ -246,7 +246,7 @@ You can customize various deployment settings before running `azd up`, including
246246
<details>
247247
<summary><b>[Optional] Quota Recommendations</b></summary>
248248

249-
By default, the **GPT model capacity** in deployment is set to **150k tokens**.
249+
By default, the **GPT model capacity** in deployment is set to **50k tokens**.
250250

251251
To adjust quota settings, follow these [steps](./AzureGPTQuotaSettings.md).
252252

‎docs/quota_check.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ az login --use-device-code
1616

1717
### 📌 Default Models & Capacities:
1818
```
19-
gpt4.1:150,o4-mini:50,gpt4.1-mini:50
19+
gpt4.1:50,o4-mini:50,gpt4.1-mini:50
2020
```
2121
### 📌 Default Regions:
2222
```
@@ -42,23 +42,23 @@ australiaeast, eastus2, francecentral, japaneast, norwayeast, swedencentral, uks
4242
```
4343
✔️ Check specific model(s) in default regions:
4444
```
45-
./quota_check_params.sh --models gpt4.1:150
45+
./quota_check_params.sh --models gpt4.1:50
4646
```
4747
✔️ Check default models in specific region(s):
4848
```
4949
./quota_check_params.sh --regions eastus2,westus
5050
```
5151
✔️ Passing Both models and regions:
5252
```
53-
./quota_check_params.sh --models gpt4.1:150 --regions eastus2,westus
53+
./quota_check_params.sh --models gpt4.1:50 --regions eastus2,westus
5454
```
5555
✔️ All parameters combined:
5656
```
57-
./quota_check_params.sh --models gpt4.1:150 --regions eastus2,westus --verbose
57+
./quota_check_params.sh --models gpt4.1:50 --regions eastus2,westus --verbose
5858
```
5959
✔️ Multiple models with single region:
6060
```
61-
./quota_check_params.sh --models gpt4.1:150,gpt4.1-mini:50 --regions eastus2 --verbose
61+
./quota_check_params.sh --models gpt4.1:50,gpt4.1-mini:50 --regions eastus2 --verbose
6262
```
6363

6464
### **Sample Output**

0 commit comments

Comments
 (0)