Skip to content

Commit 3a13423

Browse files
gukoffgukoff
committed
Merge remote-tracking branch 'origin/main' into document-same-region-limitation
2 parents 7e306dc + 5063969 commit 3a13423

File tree

196 files changed

+4404
-3920
lines changed

Some content is hidden

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

196 files changed

+4404
-3920
lines changed

‎.github/policies/disallow-edits.yml

Lines changed: 6 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,14 @@ configuration:
1919
@${issueAuthor} - You tried to add an index file to this repository; this is not permitted so your pull request will be closed automatically.
2020
- closePullRequest
2121

22-
- description: Close PRs to the "personalizer" and "responsible-ai" folders where the author isn't a member of the MicrosoftDocs org (i.e. PRs in public repo).
22+
- description: Close PRs to the "responsible-ai" folders where the author isn't a member of the MicrosoftDocs org (i.e. PRs in public repo).
2323
if:
2424
- payloadType: Pull_Request
2525
- isAction:
2626
action: Opened
27-
- or:
28-
- filesMatchPattern:
29-
matchAny: true
30-
pattern: articles/ai-foundry/responsible-ai/*
31-
- filesMatchPattern:
32-
matchAny: true
33-
pattern: articles/ai-services/personalizer/*
27+
- filesMatchPattern:
28+
matchAny: true
29+
pattern: articles/ai-foundry/responsible-ai/*
3430
- not:
3531
activitySenderHasAssociation:
3632
association: Member
@@ -40,50 +36,15 @@ configuration:
4036
@${issueAuthor} - Pull requests that modify files in this folder aren't accepted from public contributors.
4137
- closePullRequest
4238

43-
- description: \@mention specific people when a PR is opened in the "personalizer" or "responsible-ai" folder.
44-
if:
45-
- payloadType: Pull_Request
46-
- isAction:
47-
action: Opened
48-
- or:
49-
- filesMatchPattern:
50-
matchAny: true
51-
pattern: articles/ai-foundry/responsible-ai/*
52-
- filesMatchPattern:
53-
matchAny: true
54-
pattern: articles/ai-services/personalizer/*
55-
- activitySenderHasAssociation:
56-
association: Member
57-
- not:
58-
or:
59-
- isActivitySender:
60-
user: eric-urban
61-
- isActivitySender:
62-
user: nitinme
63-
- isActivitySender:
64-
user: mrbullwinkle
65-
then:
66-
- addReply:
67-
reply: >-
68-
@${issueAuthor} - Please don't sign off on this PR. The area owners will sign off once they've reviewed your contribution.
69-
- mentionUsers:
70-
mentionees:
71-
- eric-urban
72-
- nitinme
73-
- mrbullwinkle
74-
replyTemplate: ${mentionees} - Please review this PR and sign off when you're ready to merge it.
75-
assignMentionees: True # This part probably won't work since the bot doesn't have write perms.
76-
- addLabel:
77-
label: needs-human-review
7839

79-
- description: \@mention specific people when a PR is opened in the "ai-services/responsible-ai" folder.
40+
- description: \@mention specific people when a PR is opened in the "ai-foundry/responsible-ai" folder.
8041
if:
8142
- payloadType: Pull_Request
8243
- isAction:
8344
action: Opened
8445
- filesMatchPattern:
8546
matchAny: true
86-
pattern: articles/ai-services/responsible-ai/*
47+
pattern: articles/ai-foundry/responsible-ai/*
8748
- activitySenderHasAssociation:
8849
association: Member
8950
- not:
@@ -100,8 +61,6 @@ configuration:
10061
user: laujan
10162
- isActivitySender:
10263
user: patrickfarley
103-
- isActivitySender:
104-
user: jboback
10564
- isActivitySender:
10665
user: heidisteen
10766
- isActivitySender:
@@ -118,7 +77,6 @@ configuration:
11877
- aahill
11978
- laujan
12079
- patrickfarley
121-
- jboback
12280
- heidisteen
12381
- haileytap
12482
replyTemplate: ${mentionees} - Please review this PR and sign off when you're ready to merge it.

‎.openpublishing.publish.config.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,12 @@
188188
"branch": "main",
189189
"branch_mapping": {}
190190
},
191+
{
192+
"path_to_root": "azure-search-dotnet-samples",
193+
"url": "https://github.com/Azure-Samples/azure-search-dotnet-samples",
194+
"branch": "main",
195+
"branch_mapping": {}
196+
},
191197
{
192198
"path_to_root": "azureai-model-inference-bicep",
193199
"url": "https://github.com/Azure-Samples/azureai-model-inference-bicep",
@@ -199,6 +205,12 @@
199205
"url": "https://github.com/MicrosoftDocs/azure-docs-pr",
200206
"branch": "main",
201207
"branch_mapping": {}
208+
},
209+
{
210+
"path_to_root": "azure-policy-autogen-docs",
211+
"url": "https://github.com/MicrosoftDocs/azure-policy-autogen-docs",
212+
"branch": "main",
213+
"branch_mapping": {}
202214
}
203215
],
204216
"branch_target_mapping": {},

‎.openpublishing.redirection.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,11 @@
460460
"redirect_url": "../foundry-models/overview",
461461
"redirect_document_id": false
462462
},
463+
{
464+
"source_path": "articles/ai-foundry/concepts/concept-model-distillation.md",
465+
"redirect_url": "../openai/how-to/stored-completions",
466+
"redirect_document_id": false
467+
},
463468
{
464469
"source_path": "articles/ai-foundry/model-inference/quotas-limits.md",
465470
"redirect_url": "../foundry-models/quotas-limits",
@@ -486,4 +491,4 @@
486491
"redirect_document_id": false
487492
}
488493
]
489-
}
494+
}

‎articles/ai-foundry/.openpublishing.redirection.ai-studio.json

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,9 +450,19 @@
450450
"redirect_url": "/azure/ai-foundry/how-to/troubleshoot-secure-connection-project",
451451
"redirect_document_id": true
452452
},
453+
{
454+
"source_path_from_root": "/articles/ai-foundry/foundry-models/supported-languages-openai.md",
455+
"redirect_url": "/azure/ai-services/openai/supported-languages",
456+
"redirect_document_id": false
457+
},
453458
{
454459
"source_path_from_root": "/articles/ai-studio/how-to/use-blocklists.md",
455-
"redirect_url": "/azure/ai-foundry/how-to/use-blocklists",
460+
"redirect_url": "/azure/ai-foundry/foundry-models/how-to/use-blocklists",
461+
"redirect_document_id": false
462+
},
463+
{
464+
"source_path_from_root": "/articles/ai-foundry/how-to/use-blocklists.md",
465+
"redirect_url": "/azure/ai-foundry/foundry-models/how-to/use-blocklists",
456466
"redirect_document_id": true
457467
},
458468
{
@@ -772,6 +782,16 @@
772782
"redirect_url": "/azure/ai-foundry/context/context.json",
773783
"redirect_document_id": false
774784
},
785+
{
786+
"source_path_from_root": "/articles/ai-foundry/foundry-models/index.yml",
787+
"redirect_url": "/azure/ai-foundry/",
788+
"redirect_document_id": false
789+
},
790+
{
791+
"source_path_from_root": "/articles/ai-foundry/foundry-models/context/context.yml",
792+
"redirect_url": "/azure/ai-foundry/context/context",
793+
"redirect_document_id": false
794+
},
775795
{
776796
"source_path_from_root": "/articles/ai-studio/responsible-use-of-ai-overview.md",
777797
"redirect_url": "/azure/ai-foundry/responsible-use-of-ai-overview",
@@ -1182,6 +1202,21 @@
11821202
"source_path_from_root": "/articles/ai-foundry/how-to/online-evaluation.md",
11831203
"redirect_url": "/azure/ai-foundry/how-to/monitor-applications",
11841204
"redirect_document_id": false
1205+
},
1206+
{
1207+
"source_path_from_root": "/articles/ai-foundry/openai/index.yml",
1208+
"redirect_url": "/azure/ai-foundry/",
1209+
"redirect_document_id": false
1210+
},
1211+
{
1212+
"source_path_from_root": "/articles/ai-foundry/openai/context/context.yml",
1213+
"redirect_url": "/azure/ai-foundry/context/context",
1214+
"redirect_document_id": false
1215+
},
1216+
{
1217+
"source_path_from_root": "/articles/ai-foundry/openai/context/context.json",
1218+
"redirect_url": "/azure/ai-foundry/context/context",
1219+
"redirect_document_id": false
11851220
}
11861221
]
11871222
}

‎articles/ai-foundry/agents/concepts/model-region-support.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,24 @@ Azure AI Foundry Agent Service supports the following Azure OpenAI models in the
3030
> * The following table is for serverless API deployment availability. For information on Provisioned Throughput Unit (PTU) availability, see [provisioned throughput](../../openai/concepts/provisioned-throughput.md) in the Azure OpenAI documentation. `GlobalStandard` customers also have access to [global standard models](../../openai/concepts/models.md#global-standard-model-availability).
3131
> * [Hub based projects](../../what-is-azure-ai-foundry.md#project-types) are limited to the following models: gpt-4o, gpt-4o-mini, gpt-4, gpt-35-turbo
3232
33-
| REGION | o1 | o3-mini | gpt-4.1, 2025-04-14 | gpt-4.1-mini, 2025-04-14 | gpt-4.1-nano, 2025-04-14 | gpt-4o, 2024-05-13 | gpt-4o, 2024-08-06 | gpt-4o, 2024-11-20 | gpt-4o-mini, 2024-07-18 | gpt-4, 0613 | gpt-4, turbo-2024-04-09 | gpt-4-32k, 0613 | gpt-35-turbo, 1106 | gpt-35-turbo, 0125 |
34-
|------------------|----|---------|---------------------|--------------------------|--------------------------|--------------------|--------------------|--------------------|-------------------------|-------------|-------------------------|-----------------|--------------------|--------------------|
35-
| australiaeast | | | | | | | | X | | X | | X | X | X |
36-
| canadaeast | | | | | | | | X | | X | | X | X | X |
37-
| eastus | | | | | | X | X | X | X | X | X | | | X |
38-
| eastus2 | | | | | | X | X | X | X | X | X | | | X |
39-
| francecentral | | | | | | | | X | | X | | X | X | X |
40-
| japaneast | | | | | | | | X | | | | | | X |
41-
| koreacentral | | | | | | | | | | | | | | |
42-
| norwayeast | | | | | | | | X | | | | | | |
43-
| polandcentral | | | | | | | | | | | | | | |
44-
| southindia | | | | | | | | X | | | | | X | |
45-
| swedencentral | | | | | | X | X | X | X | X | X | X | X | X |
46-
| switzerlandnorth | | | | | | | | X | | X | | X | | X |
47-
| uaenorth | | | | | | | | | | | | | | |
48-
| uksouth | | | | | | | | X | | | | | X | X |
49-
| westus | | | | | | X | X | X | X | | X | | X | |
50-
| westus3 | | | | | | X | X | X | X | | X | | | |
33+
| REGION | o3-deep-research, 2025-06-26 | o1 | o3-mini | gpt-4.1, 2025-04-14 | gpt-4.1-mini, 2025-04-14 | gpt-4.1-nano, 2025-04-14 | gpt-4o, 2024-05-13 | gpt-4o, 2024-08-06 | gpt-4o, 2024-11-20 | gpt-4o-mini, 2024-07-18 | gpt-4, 0613 | gpt-4, turbo-2024-04-09 | gpt-4-32k, 0613 | gpt-35-turbo, 1106 | gpt-35-turbo, 0125 |
34+
|------------------|------------------------------|----|---------|---------------------|--------------------------|--------------------------|--------------------|--------------------|--------------------|-------------------------|-------------|-------------------------|-----------------|--------------------|--------------------|
35+
| australiaeast | | | | | | | | | X | | X | | X | X | X |
36+
| canadaeast | | | | | | | | | X | | X | | X | X | X |
37+
| eastus | | | | | | | X | X | X | X | X | X | | | X |
38+
| eastus2 | | | | | | | X | X | X | X | X | X | | | X |
39+
| francecentral | | | | | | | | | X | | X | | X | X | X |
40+
| japaneast | | | | | | | | | X | | | | | | X |
41+
| koreacentral | | | | | | | | | | | | | | | |
42+
| norwayeast | X | | | | | | | | X | | | | | | |
43+
| polandcentral | | | | | | | | | | | | | | | |
44+
| southindia | | | | | | | | | X | | | | | X | |
45+
| swedencentral | | | | | | | X | X | X | X | X | X | X | X | X |
46+
| switzerlandnorth | | | | | | | | | X | | X | | X | | X |
47+
| uaenorth | | | | | | | | | | | | | | | |
48+
| uksouth | | | | | | | | | X | | | | | X | X |
49+
| westus | X | | | | | | X | X | X | X | | X | | X | |
50+
| westus3 | | | | | | | X | X | X | X | | X | | | |
5151

5252
## Non-Microsoft models
5353

0 commit comments

Comments
 (0)