Merge branch 'main' into 443165-june-freshness-phase-two

Author: laujan

.github/policies/disallow-edits.yml

@@ -19,18 +19,18 @@ configuration:
                 @${issueAuthor} - You tried to add an index file to this repository; this is not permitted so your pull request will be closed automatically.
           - closePullRequest
 
-      - description: Close PRs to the "ai-services/personalizer" and "ai-services/responsible-ai" folders where the author isn't a member of the MicrosoftDocs org (i.e. PRs in public repo).
+      - 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).
         if:
           - payloadType: Pull_Request
           - isAction:
               action: Opened
           - or:
             - filesMatchPattern:
                 matchAny: true
-                pattern: articles/ai-services/personalizer/*
+                pattern: articles/ai-foundry/responsible-ai/*
             - filesMatchPattern:
                 matchAny: true
-                pattern: articles/ai-services/responsible-ai/*
+                pattern: articles/ai-services/personalizer/*
           - not:
               activitySenderHasAssociation:
                 association: Member
@@ -40,14 +40,18 @@ configuration:
                 @${issueAuthor} - Pull requests that modify files in this folder aren't accepted from public contributors.
           - closePullRequest
 
-      - description: \@mention specific people when a PR is opened in the "ai-services/personalizer" folder.
+      - description: \@mention specific people when a PR is opened in the "personalizer" or "responsible-ai" folder.
         if:
           - payloadType: Pull_Request
           - isAction:
               action: Opened
-          - filesMatchPattern:
-              matchAny: true
-              pattern: articles/ai-services/personalizer/*
+          - or:
+            - filesMatchPattern:
+                matchAny: true
+                pattern: articles/ai-foundry/responsible-ai/*
+            - filesMatchPattern:
+                matchAny: true
+                pattern: articles/ai-services/personalizer/*
           - activitySenderHasAssociation:
               association: Member
           - not:

.gitignore

@@ -18,3 +18,5 @@ _repo.*/
 # CoPilot instructions and prompts
 .github/copilot-instructions.md
 .github/prompts/*.md
+.github/prompts/*.zip
+.github/patterns/*.md

.openpublishing.redirection.json

@@ -1,4 +1,4 @@
-{ 
+{
   "redirections": [
     {
       "source_path": "articles/ai-foundry/concepts/connections.md",
@@ -319,6 +319,171 @@
       "source_path_from_root": "/articles/ai-services/language-service/tutorials/prompt-flow.md",
       "redirect_url": "/azure/ai-services/language-service/tutorials/power-automate",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/concepts/content-filter.md",
+      "redirect_url": "../../foundry-models/concepts/content-filter",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/concepts/default-safety-policies.md",
+      "redirect_url": "../../foundry-models/concepts/default-safety-policies",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/concepts/deployment-types.md",
+      "redirect_url": "../../foundry-models/concepts/deployment-types",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/concepts/endpoints.md",
+      "redirect_url": "../../foundry-models/concepts/endpoints",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/concepts/models.md",
+      "redirect_url": "../../foundry-models/concepts/models",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/concepts/model-versions.md",
+      "redirect_url": "../../foundry-models/concepts/model-versions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/how-to/configure-content-filters.md",
+      "redirect_url": "../../foundry-models/how-to/configure-content-filters",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/how-to/configure-deployment-policies.md",
+      "redirect_url": "../../foundry-models/how-to/configure-deployment-policies",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/how-to/configure-entra-id.md",
+      "redirect_url": "../../foundry-models/how-to/configure-entra-id",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/how-to/configure-marketplace.md",
+      "redirect_url": "../../foundry-models/how-to/configure-marketplace",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/how-to/configure-project-connection.md",
+      "redirect_url": "../../foundry-models/how-to/configure-project-connection",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/how-to/create-model-deployments.md",
+      "redirect_url": "../../foundry-models/how-to/create-model-deployments",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/how-to/inference.md",
+      "redirect_url": "../../foundry-models/how-to/inference",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/how-to/manage-costs.md",
+      "redirect_url": "../../foundry-models/how-to/manage-costs",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/how-to/monitor-models.md",
+      "redirect_url": "../../foundry-models/how-to/monitor-models",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/how-to/quickstart-ai-project.md",
+      "redirect_url": "../../foundry-models/how-to/quickstart-ai-project",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/how-to/quickstart-create-resources.md",
+      "redirect_url": "../../foundry-models/how-to/quickstart-create-resources",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/how-to/quickstart-github-models.md",
+      "redirect_url": "../../foundry-models/how-to/quickstart-github-models",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/how-to/use-blocklists.md",
+      "redirect_url": "../../foundry-models/how-to/use-blocklists",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/how-to/use-chat-completions.md",
+      "redirect_url": "../../foundry-models/how-to/use-chat-completions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/how-to/use-chat-multi-modal.md",
+      "redirect_url": "../../foundry-models/how-to/use-chat-multi-modal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/how-to/use-chat-reasoning.md",
+      "redirect_url": "../../foundry-models/how-to/use-chat-reasoning",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/how-to/use-embeddings.md",
+      "redirect_url": "../../foundry-models/how-to/use-embeddings",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/how-to/use-image-embeddings.md",
+      "redirect_url": "../../foundry-models/how-to/use-image-embeddings",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/how-to/use-structured-outputs.md",
+      "redirect_url": "../../foundry-models/how-to/use-structured-outputs",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/how-to/github/create-model-deployments.md",
+      "redirect_url": "../../../foundry-models/how-to/github/create-model-deployments",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/tutorials/get-started-deepseek-r1.md",
+      "redirect_url": "../../foundry-models/tutorials/get-started-deepseek-r1",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/overview.md",
+      "redirect_url": "../foundry-models/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/quotas-limits.md",
+      "redirect_url": "../foundry-models/quotas-limits",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/supported-languages.md",
+      "redirect_url": "../foundry-models/supported-languages",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/supported-languages-openai.md",
+      "redirect_url": "../foundry-models/supported-languages-openai",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/faq.yml",
+      "redirect_url": "../foundry-models/faq",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/ai-foundry/model-inference/index.yml",
+      "redirect_url": "../foundry-models/index",
+      "redirect_document_id": false
     }
   ]
-}
+}

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

@@ -350,6 +350,11 @@
             "redirect_url": "/azure/ai-foundry/how-to/evaluate-results",
             "redirect_document_id": true
           },
+          {
+            "source_path_from_root": "/articles/ai-foundry/how-to/deploy-nvidia-inference-microservice.md",
+            "redirect_url": "/azure/ai-foundry/how-to/deploy-models-managed-pay-go#nvidia",
+            "redirect_document_id": true
+          },
           {
             "source_path_from_root": "/articles/ai-studio/how-to/fine-tune-managed-compute.md",
             "redirect_url": "/azure/ai-foundry/how-to/fine-tune-managed-compute",

articles/ai-foundry/agents/breadcrumb/toc.yml

@@ -14,9 +14,9 @@
   topicHref: /azure/index
   items:
   - name: AI Foundry               # Original doc set name
-    tocHref: /legal/cognitive-services/openai    # Destination doc set route
+    tocHref: /azure/ai-foundry/responsible-ai/openai    # Destination doc set route
     topicHref: /azure/ai-services/agents/index    # Original doc set route
     items:
     - name: Agent Service      # Destination doc set name
-      tocHref: /legal/cognitive-services/openai      # Destination doc set route
+      tocHref: /azure/ai-foundry/responsible-ai/openai      # Destination doc set route
       topicHref: /azure/ai-services/agents/index    # Original doc set route

articles/ai-foundry/agents/concepts/agent-catalog.md

@@ -15,7 +15,7 @@ ms.custom:
 # Get started with the Agent Catalog
 
 Accelerate your agent development using code samples and best practices for creating agents. Each agent sample below links to a GitHub Repository, where you can browse the agent's configuration files, setup instructions and source code to start integrating them into your own project in code.
-With agents you create using these code samples, be sure to assess safety and legal implications, and to comply with all applicable laws and safety standards. See the [transparency note](/legal/cognitive-services/agents/transparency-note) for more information.
+With agents you create using these code samples, be sure to assess safety and legal implications, and to comply with all applicable laws and safety standards. See the [transparency note](/azure/ai-foundry/responsible-ai/agents/transparency-note) for more information.
 
 ## Prerequisites
 

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

@@ -27,7 +27,7 @@ All deployments can perform the exact same inference operations, however the bil
 Azure AI Foundry Agent Service supports the following Azure OpenAI models in the listed regions.
 
 > [!NOTE]
-> * The following table is for standard deployment availability. For information on Provisioned Throughput Unit (PTU) availability, see [provisioned throughput](../../../ai-services/openai/concepts/provisioned-throughput.md) in the Azure OpenAI documentation. `GlobalStandard` customers also have access to [global standard models](../../../ai-services/openai/concepts/models.md#global-standard-model-availability). 
+> * The following table is for serverless API deployment availability. For information on Provisioned Throughput Unit (PTU) availability, see [provisioned throughput](../../../ai-services/openai/concepts/provisioned-throughput.md) in the Azure OpenAI documentation. `GlobalStandard` customers also have access to [global standard models](../../../ai-services/openai/concepts/models.md#global-standard-model-availability). 
 > * [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
 
 | 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 |

articles/ai-foundry/agents/faq.yml

@@ -37,7 +37,7 @@ sections:
       - question: |
           Is my data used by Microsoft for training models? 
         answer: |
-          No. Data is not used by Microsoft for training models. See the [Responsible AI documentation](/legal/cognitive-services/openai/data-privacy?context=%2Fazure%2Fai-services%2Fopenai%2Fcontext%2Fcontext) for more information.
+          No. Data is not used by Microsoft for training models. See the [Responsible AI documentation](/azure/ai-foundry/responsible-ai/openai/data-privacy) for more information.
       - question: |
           Where is data stored geographically?
         answer: |

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

@@ -0,0 +1,106 @@
+---
+title: 'MCP tool code samples'
+titleSuffix: Azure AI Foundry
+description: Find code samples to connect Foundry Agent service with MCP.
+services: cognitive-services
+manager: nitinme
+ms.service: azure-ai-agent-service
+ms.topic: how-to
+ms.date: 06/26/2025
+author: aahill
+ms.author: aahi
+zone_pivot_groups: selection-mcp-code
+ms.custom: azure-ai-agents-code
+---
+
+# How to use the Model Context Protocol (MCP) tool
+
+Use this article to find step-by-step instructions and code samples for connecting Foundry Agent service with MCP.
+
+Follow the [REST API Quickstart](../../quickstart.md?pivots=rest-api#api-call-information) to set the right values for the environment variables `AGENT_TOKEN`, `AZURE_AI_FOUNDRY_PROJECT_ENDPOINT` and `API_VERSION`.
+
+
+## Create an Agent with the MCP tool enabled
+
+To make the MCP tool available to your agent, initialize a tool with the server endpoint, server label and more
+```bash
+curl --request POST \
+  --url $AZURE_AI_FOUNDRY_PROJECT_ENDPOINT/assistants?api-version=$API_VERSION \
+  -H "Authorization: Bearer $AGENT_TOKEN" \
+  -H "Content-Type: application/json" \
+  -d "{
+	  "instructions": "You are a customer support chatbot. Use the tools provided and your knowledge base to best respond to customer queries.",
+  	"tools": [
+          {
+              "type": "mcp",
+              "server_label": "<unique name for your MCP server>",
+              "server_url": "<your MCP server url>",
+              "require_approval": "never",
+          }
+      ],
+  "name": "my-assistant",
+  "model": "gpt-4o",
+}"
+```
+
+## Create a thread
+
+```bash
+curl --request POST \
+  --url $AZURE_AI_FOUNDRY_PROJECT_ENDPOINT/threads?api-version=$API_VERSION \
+  -H "Authorization: Bearer $AGENT_TOKEN" \
+  -H "Content-Type: application/json" \
+  -d ''
+```
+
+## Add a user question to the thread
+
+```bash
+curl --request POST \
+  --url $AZURE_AI_FOUNDRY_PROJECT_ENDPOINT/threads/thread_abc123/messages?api-version=$API_VERSION \
+  -H "Authorization: Bearer $AGENT_TOKEN" \
+  -H "Content-Type: application/json" \
+  -d '{
+      "role": "user",
+      "content": "<user input related to the MCP server you connect>"
+    }'
+```
+
+## Create a run and check the output
+
+Create a run to pass headers for the tool and observe that the model uses the Grounding with Bing Search tool to provide a response to the user's question.
+
+```bash
+curl --request POST \
+  --url $AZURE_AI_FOUNDRY_PROJECT_ENDPOINT/threads/thread_abc123/runs?api-version=$API_VERSION \
+  -H "Authorization: Bearer $AGENT_TOKEN" \
+  -H "Content-Type: application/json" \
+  -d '{
+	    "assistant_id": "<agent_id>",
+    	"tool_resources": {
+          "mcp": [
+            {
+                "server_label": "<the same unique name you provided during agent creation>",
+                "headers": {
+                    "Authorization": "Bearer <token>",
+                }
+            }
+          ]
+      },
+    }'
+```
+## Retrieve the status of the run
+
+```bash
+curl --request GET \
+  --url $AZURE_AI_FOUNDRY_PROJECT_ENDPOINT/threads/thread_abc123/runs/run_abc123?api-version=$API_VERSION \
+  -H "Authorization: Bearer $AGENT_TOKEN"
+```
+
+## Retrieve the agent response
+
+```bash
+curl --request GET \
+  --url $AZURE_AI_FOUNDRY_PROJECT_ENDPOINT/threads/thread_abc123/messages?api-version=$API_VERSION \
+  -H "Authorization: Bearer $AGENT_TOKEN"
+```