Skip to content

Commit 2de6c35

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-ai-docs-pr into stp_final_prompt
2 parents 97b8873 + 7ae65c1 commit 2de6c35

File tree

1,171 files changed

+17029
-12387
lines changed

Some content is hidden

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

1,171 files changed

+17029
-12387
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ _repo.*/
2121
# .github/prompts/*.zip
2222
# .github/patterns/*.md
2323

24-
articles/ai-foundry/includes/get-started-fdp.md
24+
articles/ai-foundry/includes/get-started-fdp.md
25+
articles/ai-foundry/toc-files/setup-management/toc.yml

.openpublishing.publish.config.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@
5050
"branch": "master",
5151
"branch_mapping": {}
5252
},
53+
{
54+
"path_to_root": "azure-sdk-for-js-docs",
55+
"url": "https://github.com/Azure-samples/azure-sdk-for-js-docs",
56+
"branch": "main",
57+
"branch_mapping": {}
58+
},
5359
{
5460
"path_to_root": "samples-luis",
5561
"url": "https://github.com/Azure-Samples/cognitive-services-language-understanding",
@@ -121,6 +127,12 @@
121127
"url": "https://github.com/azure-ai-foundry/foundry-samples",
122128
"branch": "main",
123129
"branch_mapping": {}
130+
},
131+
{
132+
"path_to_root": "foundry-samples-nov25-updates",
133+
"url": "https://github.com/azure-ai-foundry/foundry-samples",
134+
"branch": "nov25-updates",
135+
"branch_mapping": {}
124136
},
125137
{
126138
"path_to_root": "azureml-examples-main",
@@ -188,6 +200,12 @@
188200
"branch": "main",
189201
"branch_mapping": {}
190202
},
203+
{
204+
"path_to_root": "azure-search-java-samples",
205+
"url": "https://github.com/Azure-Samples/azure-search-java-samples",
206+
"branch": "main",
207+
"branch_mapping": {}
208+
},
191209
{
192210
"path_to_root": "azure-search-dotnet-samples",
193211
"url": "https://github.com/Azure-Samples/azure-search-dotnet-samples",

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
"redirect_url": "/azure/ai-foundry/whats-new-azure-ai-foundry",
2626
"redirect_document_id": false
2727
},
28+
{
29+
"source_path_from_root": "/articles/ai-foundry/foundry-models/how-to/github/create-model-deployments.md",
30+
"redirect_url": "/azure/ai-foundry/foundry-models/how-to/create-model-deployments",
31+
"redirect_document_id": false
32+
},
2833
{
2934
"source_path_from_root": "/articles/ai-foundry/concepts/rbac-ai-foundry.md",
3035
"redirect_url": "/azure/ai-foundry/concepts/rbac-azure-ai-foundry",
@@ -205,6 +210,11 @@
205210
"redirect_url": "/azure/ai-foundry/how-to/deploy-models-llama",
206211
"redirect_document_id": true
207212
},
213+
{
214+
"source_path_from_root": "/articles/ai-foundry/open-ai/how-to/deployment-types.md",
215+
"redirect_url": "/azure/ai-foundry/foundry-models/concepts/deployment-types",
216+
"redirect_document_id": true
217+
},
208218
{
209219
"source_path_from_root": "/articles/ai-foundry/how-to/deploy-models-llama.md",
210220
"redirect_url": "/azure/ai-foundry/concepts/models-featured#meta",
@@ -908,6 +918,11 @@
908918
"redirect_url": "/azure/ai-studio/how-to/data-add",
909919
"redirect_document_id": false
910920
},
921+
{
922+
"source_path_from_root": "/articles/ai-foundry/openai/how-to/manage-costs.md",
923+
"redirect_url": "/azure/ai-foundry/foundry-models/how-to/manage-costs",
924+
"redirect_document_id": true
925+
},
911926
{
912927
"source_path_from_root": "/articles/ai-studio/how-to/simulator-interaction-data.md",
913928
"redirect_url": "/azure/ai-studio/how-to/data-add",
@@ -1268,6 +1283,11 @@
12681283
"redirect_url": "/azure/ai-foundry/openai/how-to/responses",
12691284
"redirect_document_id": false
12701285
},
1286+
{
1287+
"source_path_from_root": "/articles/ai-foundry/openai/chatgpt-quickstart.md",
1288+
"redirect_url": "/azure/ai-foundry/openai/how-to/responses",
1289+
"redirect_document_id": false
1290+
},
12711291
{
12721292
"source_path_from_root": "/articles/ai-foundry/openai/how-to/work-with-code.md",
12731293
"redirect_url": "/azure/ai-foundry/openai/how-to/responses",

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

Lines changed: 70 additions & 59 deletions
Large diffs are not rendered by default.

articles/ai-foundry/agents/environment-setup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Projects are currently the unit of sharing and isolation in Foundry. See the [wh
3838

3939
### Prerequisites
4040

41-
* An Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services).
41+
* An Azure subscription - [Create one for free](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn).
4242
* Ensure that the individual creating the account and project has the **Azure AI Account Owner** role at the subscription scope
4343
* If configuring a [standard setup](#choose-your-setup), the same individual must also have permissions to assign roles to required resources (Cosmos DB, Azure AI Search, Azure Blob Storage). For more information on RBAC roles, specific to Azure AI Foundry Agent Service, see [Azure AI Foundry Agent Service RBAC roles](../concepts/rbac-azure-ai-foundry.md).
4444
* The built-in role needed is **Role Based Access Administrator**.

articles/ai-foundry/agents/faq.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
ms.service: azure-ai-foundry
99
ms.subservice: azure-ai-foundry-agent-service
1010
ms.topic: faq
11-
ms.date: 06/30/2025
11+
ms.date: 10/09/2025
1212
ms.author: aahi
1313
author: aahill
1414
title: Azure AI Foundry Agent Service frequently asked questions
@@ -55,8 +55,4 @@ sections:
5555
- question: |
5656
Is there any additional pricing or quota for using Foundry Agent Service?
5757
answer: |
58-
No. All [quotas](quotas-limits.md) apply to using models with Foundry Agent Service.
59-
- question: |
60-
Does the Foundry Agent Service API support non-Azure OpenAI models?
61-
answer: |
62-
Yes, the Foundry Agent Service API supports non-Azure OpenAI models. See the [models](concepts\model-region-support.md) page for more information.
58+
No. All [quotas](quotas-limits.md) apply to using models with Foundry Agent Service.

articles/ai-foundry/agents/how-to/tools/bing-custom-search.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: nitinme
77
ms.service: azure-ai-foundry
88
ms.subservice: azure-ai-foundry-agent-service
99
ms.topic: how-to
10-
ms.date: 08/15/2025
10+
ms.date: 09/26/2025
1111
author: aahill
1212
ms.author: aahi
1313
ms.custom: azure-ai-agents
@@ -40,7 +40,7 @@ The authorization will happen between Grounding with Bing Custom Search service
4040

4141
Developers and end users don't have access to raw content returned from Grounding with Bing Custom Search. The model response, however, includes citations with links to the websites used to generate the response and is allowed to be stored using the mechanisms provided by the Agents Service. You can retrieve the model response by accessing the data in the thread that was created. These references must be retained and displayed in the exact form provided by Microsoft, as per Grounding with Bing Custom Search's Use and Display Requirements.
4242

43-
43+
Transactions with your Grounding with Bing resource are counted by the number of tool calls per run. You can see how many tool calls are made from the run step.
4444

4545
## Setup
4646

articles/ai-foundry/agents/how-to/tools/bing-grounding.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: nitinme
77
ms.service: azure-ai-foundry
88
ms.subservice: azure-ai-foundry-agent-service
99
ms.topic: how-to
10-
ms.date: 08/07/2025
10+
ms.date: 09/26/2025
1111
author: aahill
1212
ms.author: aahi
1313
ms.custom: azure-ai-agents
@@ -38,6 +38,8 @@ Grounding with Bing returns relevant search results to the customer's model depl
3838
3939
The authorization will happen between Grounding with Bing Search service and Azure AI Foundry Agent Service. Any Bing search query that is generated and sent to Bing for the purposes of grounding is transferred, along with the resource key, outside of the Azure compliance boundary to the Grounding with Bing Search service. Grounding with Bing Search is subject to Bing's terms and do not have the same compliance standards and certifications as the Azure AI Foundry Agent Service, as described in the [Grounding with Bing Search Terms of Use](https://www.microsoft.com/bing/apis/grounding-legal). It is your responsibility to assess whether the use of Grounding with Bing Search in your agent meets your needs and requirements.
4040

41+
Transactions with your Grounding with Bing resource are counted by the number of tool calls per run. You can see how many tool calls are made from the run step.
42+
4143
## Supported capabilities and known issues
4244
- Grounding with Bing Search tool is designed to retrieve real-time information from web, NOT specific web domains.
4345
- NOT Recommended to **summarize** an entire web page.

articles/ai-foundry/agents/how-to/tools/model-context-protocol-samples.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: nitinme
77
ms.service: azure-ai-foundry
88
ms.subservice: azure-ai-foundry-agent-service
99
ms.topic: how-to
10-
ms.date: 09/04/2025
10+
ms.date: 09/30/2025
1111
author: aahill
1212
ms.author: aahi
1313
zone_pivot_groups: selection-mcp-code
@@ -16,9 +16,6 @@ ms.custom: azure-ai-agents-code
1616

1717
# How to use the Model Context Protocol tool (preview)
1818

19-
> [!NOTE]
20-
> Supported regions are `westus`, `westus2`, `uaenorth`, `southindia`, and `switzerlandnorth`.
21-
2219
Use this article to find code samples for connecting Azure AI Foundry Agent Service with Model Context Protocol (MCP) servers.
2320

2421
## Prerequisites
@@ -32,7 +29,7 @@ Use this article to find code samples for connecting Azure AI Foundry Agent Serv
3229
Create a client object that contains the endpoint for connecting to your AI project and other resources.
3330

3431
> [!NOTE]
35-
> You can find an asynchronous example on [GitHub](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/ai/Azure.AI.Agents.Persistent/samples/Sample26_PersistentAgents_MCP.md)
32+
> You can find an asynchronous example on [GitHub](https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/ai/Azure.AI.Agents.Persistent/samples)
3633
3734
```csharp
3835
var projectEndpoint = System.Environment.GetEnvironmentVariable("PROJECT_ENDPOINT");

articles/ai-foundry/agents/how-to/tools/model-context-protocol.md

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,13 @@ manager: nitinme
77
ms.service: azure-ai-foundry
88
ms.subservice: azure-ai-foundry-agent-service
99
ms.topic: how-to
10-
ms.date: 09/04/2025
10+
ms.date: 10/10/2025
1111
author: aahill
1212
ms.author: aahi
13-
ms.custom: references_regions
1413
---
1514

1615
# Connect to Model Context Protocol servers (preview)
1716

18-
> [!NOTE]
19-
> Supported regions are `westus`, `westus2`, `uaenorth`, `southindia`, and `switzerlandnorth`.
20-
2117
> [!NOTE]
2218
> When using a [Network Secured Azure AI Foundry](../../how-to/virtual-networks.md), private MCP servers deployed in the same virtual network is not supported, only publicly accessible MCP servers are supported.
2319
@@ -78,6 +74,21 @@ For more information on using MCP, see:
7874

7975
1. Submit your approval to the agent with `call_id` by setting `approve` to `true`.
8076

77+
## Host a local MCP server
78+
79+
The Azure AI Foundry Agent Service runtime only accepts a remote MCP server endpoint. If you want to add tools from a local MCP server, you'll have to self-host it on [Azure Container Apps](/samples/azure-samples/mcp-container-ts/mcp-container-ts/) or [Azure Functions](https://github.com/Azure-Samples/mcp-sdk-functions-hosting-python/blob/main/ExistingServer.md) to get a remote MCP server endpoint. Pay attention to the following considerations when attempting to host local MCP servers in the cloud:
80+
81+
|Local MCP server setup | Hosting in Azure Container Apps | Hosting in Azure Functions |
82+
|:---------:|:---------:|:---------:|
83+
| **Transport** | HTTP POST/GET endpoints required. | HTTP streamable required. |
84+
| **Code changes** | Container rebuild required. | Azure Functions-specific configuration files required in the root directory. |
85+
| **Authentication** | Custom authentication implementation required. | Key-based only. OAuth needs API Management. |
86+
| **Language** | Any language that runs in Linux containers (Python, Node.js, .NET, TypeScript, Go). | Python, Node.js, Java, .NET only. |
87+
| **Container Requirements** | Linux (linux/amd64) only. No privileged containers.| Containerized servers are not supported. |
88+
| **Dependencies** | All dependencies must be in container image. | OS-level dependencies (such as Playwright) are not supported. |
89+
| **State** | Stateless only. | Stateless only. |
90+
| **UVX/NPX** | Supported. | Not supported. `npx` start commands not supported. |
91+
8192
## Related content
8293

8394
* [Code samples for the Model Context Protocol tool](./model-context-protocol-samples.md)

0 commit comments

Comments
 (0)