Skip to content

fix: downmerge from main to dev #180

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.

Sign up for GitHub

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

Merged
Avijit-Microsoft merged 14 commits into from
Aug 26, 2026
Merged

fix: downmerge from main to dev #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d37f2f7
chore: dev to main merge
Avijit-Microsoft May 18, 2026
c13d354
chore: dev to main merge
Avijit-Microsoft May 26, 2026
aaab723
chore: dev to main merge
Avijit-Microsoft Jun 3, 2026
3eb257d
chore: dev to main merge
Avijit-Microsoft Jun 10, 2026
f72e410
commit
Tejasri-Microsoft Jun 26, 2026
7b3dce4
Merge pull request #168 from Tejasri-Microsoft/psl-ts-hp-cicd
aniaroramsft Jun 26, 2026
70e95c1
chore: update CODEOWNERS handles
Rafi-Mohammad-69 Jun 29, 2026
547dfac
chore: update CODEOWNERS handles
Avijit-Microsoft Jun 30, 2026
9c67c4d
Upgrade gpt-4.1 mini model to gpt-5-mini
chaudhariniraj Jul 10, 2026
5f9b854
resolve copilot comment
chaudhariniraj Jul 10, 2026
3bc7619
resolve copilot comment 2
chaudhariniraj Jul 10, 2026
9f4f32d
Merge pull request #173 from chaudhariniraj/dev
Roopan-Microsoft Jul 10, 2026
4120ba3
Update Owners ID for Vinay and Prajwal
NirajC3-Microsoft Jul 16, 2026
6a13b3a
Merge pull request #175 from chaudhariniraj/main
Roopan-Microsoft Jul 16, 2026
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
64 changes: 0 additions & 64 deletions .github/workflows/create-release.yml
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions docs/quota_check.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ az login
## 📌 Default Models & Capacities:
These match the `modelDeploymentList` in the Bicep parameters:
```
gpt-4.1-mini:40:GlobalStandard, text-embedding-3-large:40:Standard
gpt-5-mini:40:GlobalStandard, text-embedding-3-large:40:Standard
Comment thread
Priyanka2-Microsoft marked this conversation as resolved.
```

## 📌 Default Regions:
Expand Down Expand Up @@ -43,15 +43,15 @@ The accelerator also deploys a **Microsoft Fabric F8** capacity. Pass `--check-f
```
✔️ Check specific model(s) in default regions:
```sh
./quota_check.sh --models gpt-4.1-mini:40:GlobalStandard,text-embedding-3-large:40:Standard
./quota_check.sh --models gpt-5-mini:40:GlobalStandard,text-embedding-3-large:40:Standard
```
✔️ Check default models in specific region(s):
```sh
./quota_check.sh --regions eastus,westus
```
✔️ All parameters combined:
```sh
./quota_check.sh --models gpt-4.1-mini:40 --regions eastus,westus --verbose
./quota_check.sh --models gpt-5-mini:40 --regions eastus,westus --verbose
```
✔️ Also check Fabric capacity availability:
```sh
Expand All @@ -67,15 +67,15 @@ The accelerator also deploys a **Microsoft Fabric F8** capacity. Pass `--check-f
```
✔️ Check specific model(s):
```powershell
.\quota_check.ps1 -Models "gpt-4.1-mini:40:GlobalStandard,text-embedding-3-large:40:Standard"
.\quota_check.ps1 -Models "gpt-5-mini:40:GlobalStandard,text-embedding-3-large:40:Standard"
```
✔️ Check specific region(s):
```powershell
.\quota_check.ps1 -Regions "eastus,westus2"
```
✔️ All parameters combined:
```powershell
.\quota_check.ps1 -Models "gpt-4.1-mini:40" -Regions "eastus,westus" -CheckFabric -Verbose
.\quota_check.ps1 -Models "gpt-5-mini:40" -Regions "eastus,westus" -CheckFabric -Verbose
```

## **Sample Output**
Expand All @@ -86,7 +86,7 @@ The final table lists regions with available quota. You can select any of these
║ QUOTA CHECK SUMMARY ║
╚══════════════════════════════════════════════════════════════╝

Region gpt-4.1-mini text-embedding-3-large Status
Region gpt-5-mini text-embedding-3-large Status
──────────────────────────────────────────────────────────────────────────────────────────
eastus ✅ 200/240 (need 40) ✅ 120/200 (need 40) ✅ PASS
eastus2 ❌ 10/240 (need 40) ✅ 50/200 (need 40) ❌ FAIL
Expand Down
4 changes: 2 additions & 2 deletions infra/main.bicepparam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ param modelDeploymentList = [
name: 'chat'
model: {
format: 'OpenAI'
name: 'gpt-4.1-mini'
version: '2025-04-14'
name: 'gpt-5-mini'
version: '2025-08-07'
}
sku: {
name: 'GlobalStandard'
Expand Down
10 changes: 5 additions & 5 deletions scripts/quota_check.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
candidate region for the models required by this accelerator.

Default models (from infra/main.bicepparam):
gpt-4.1-mini GlobalStandard 40K TPM
gpt-5-mini GlobalStandard 40K TPM
text-embedding-3-large Standard 40K TPM

.PARAMETER Models
Comma-separated model list. Format: name:capacity[:sku]
When sku is omitted it defaults to GlobalStandard.
Example: "gpt-4.1-mini:40:GlobalStandard,text-embedding-3-large:40:Standard"
Example: "gpt-5-mini:40:GlobalStandard,text-embedding-3-large:40:Standard"

.PARAMETER Regions
Comma-separated Azure region list.
Expand All @@ -28,7 +28,7 @@
.EXAMPLE
.\quota_check.ps1
.EXAMPLE
.\quota_check.ps1 -Models "gpt-4.1-mini:40" -Regions "eastus,westus"
.\quota_check.ps1 -Models "gpt-5-mini:40" -Regions "eastus,westus"
.EXAMPLE
.\quota_check.ps1 -CheckFabric -Verbose
#>
Expand All @@ -43,7 +43,7 @@ param(
$ErrorActionPreference = 'Stop'

# ---- Defaults ----
$DefaultModels = 'gpt-4.1-mini:40:GlobalStandard,text-embedding-3-large:40:Standard'
$DefaultModels = 'gpt-5-mini:40:GlobalStandard,text-embedding-3-large:40:Standard'
$DefaultRegions = 'eastus,eastus2,swedencentral,uksouth,westus,westus2,southcentralus,canadacentral,australiaeast,japaneast,norwayeast'

# ---- Resolve inputs ----
Expand Down Expand Up @@ -141,7 +141,7 @@ foreach ($region in $regionList) {

$usage = $quotaInfo | Where-Object { $_.name.value -eq $quotaKey }

# Azure quota keys for gpt-4.1 family omit the first hyphen (gpt4.1-mini not gpt-4.1-mini)
# Azure quota keys for gpt-5 family omit the first hyphen (gpt5-mini not gpt-5-mini)
Comment thread
Priyanka2-Microsoft marked this conversation as resolved.
if (-not $usage -and $m.Name -match '^gpt-') {
$altName = $m.Name -replace '^gpt-', 'gpt'
$altKey = "OpenAI.$($m.Sku).$altName"
Expand Down
12 changes: 6 additions & 6 deletions scripts/quota_check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# for JSON parsing instead of python3 or jq.
#
# Default models (from infra/main.bicepparam):
# gpt-4.1-mini:40 (GlobalStandard), text-embedding-3-large:40 (Standard)
# gpt-5-mini:40 (GlobalStandard), text-embedding-3-large:40 (Standard)
#
# Default regions:
# eastus, eastus2, swedencentral, uksouth, westus, westus2,
Expand All @@ -19,16 +19,16 @@
# Usage:
# ./quota_check.sh
# ./quota_check.sh --verbose
# ./quota_check.sh --models gpt-4.1-mini:40,text-embedding-3-large:40
# ./quota_check.sh --models gpt-5-mini:40,text-embedding-3-large:40
# ./quota_check.sh --regions eastus,westus2
# ./quota_check.sh --models gpt-4.1-mini:40 --regions eastus,westus --verbose
# ./quota_check.sh --models gpt-5-mini:40 --regions eastus,westus --verbose
# ./quota_check.sh --check-fabric
# =============================================================================

set -euo pipefail

# ---- Defaults ----
DEFAULT_MODELS="gpt-4.1-mini:40:GlobalStandard,text-embedding-3-large:40:Standard"
DEFAULT_MODELS="gpt-5-mini:40:GlobalStandard,text-embedding-3-large:40:Standard"
DEFAULT_REGIONS="eastus,eastus2,swedencentral,uksouth,westus,westus2,southcentralus,canadacentral,australiaeast,japaneast,norwayeast"
VERBOSE=false
CHECK_FABRIC=false
Expand Down Expand Up @@ -69,7 +69,7 @@ while [[ $# -gt 0 ]]; do
echo ""
echo "Examples:"
echo " $0"
echo " $0 --models gpt-4.1-mini:40,text-embedding-3-large:40 --regions eastus,westus"
echo " $0 --models gpt-5-mini:40,text-embedding-3-large:40 --regions eastus,westus"
echo " $0 --check-fabric --verbose"
exit 0
;;
Expand Down Expand Up @@ -167,7 +167,7 @@ for m in "${MODELS[@]}"; do
MODEL_CAPS+=("$mcap")
MODEL_SKUS+=("$msku")
MODEL_PRIMARY_KEYS+=("OpenAI.${msku}.${mname}")
# Azure quota keys for gpt-4.1 family omit the first hyphen (gpt4.1-mini not gpt-4.1-mini)
# Azure quota keys for gpt-5 family omit the first hyphen (gpt5-mini not gpt-5-mini)
Comment thread
Priyanka2-Microsoft marked this conversation as resolved.
if [[ "$mname" == gpt-* ]]; then
alt_mname="${mname/gpt-/gpt}"
MODEL_ALT_KEYS+=("OpenAI.${msku}.${alt_mname}")
Expand Down
Loading