Skip to content

Commit e57951a

Browse files
committed
Merge branch 'release-foundry-models-toc' of github.com:MicrosoftDocs/azure-ai-docs-pr into integrate-foundry-models-toc
# Conflicts: # articles/ai-foundry/toc.yml
2 parents 1d07033 + fd670e3 commit e57951a

File tree

87 files changed

+2240
-1408
lines changed

Some content is hidden

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

87 files changed

+2240
-1408
lines changed

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,6 +1202,21 @@
12021202
"source_path_from_root": "/articles/ai-foundry/how-to/online-evaluation.md",
12031203
"redirect_url": "/azure/ai-foundry/how-to/monitor-applications",
12041204
"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
12051220
}
12061221
]
12071222
}

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

articles/ai-foundry/agents/faq.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ sections:
2525
- question: |
2626
Where is this data stored?
2727
answer: |
28-
Data is stored in a secure, Microsoft-managed storage account that is logically separated.
28+
Basic Setup: Data is stored in a secure, Microsoft-managed storage account that is logically separated.
29+
Standard Setup: Data is stored in your own Azure resources, giving you full ownership and control.
2930
- question: |
3031
How long is this data stored?
3132
answer: |

0 commit comments

Comments
 (0)