Merge branch 'MicrosoftDocs:main' into main

Author: JinyuID

.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/environment-setup.md

@@ -8,7 +8,7 @@ ms.author: aahi
 ms.reviewer: fosteramanda 
 ms.service: azure-ai-agent-service
 ms.topic: how-to
-ms.date: 05/09/2025
+ms.date: 06/18/2025
 ms.custom: azure-ai-agents
 ---
 
@@ -25,19 +25,22 @@ Use this article to learn more about setting up your agent environment.
 | Action                                                                 | Required Role                   |
 |------------------------------------------------------------------------|----------------------------------|
 | Create an account and project                                          | Azure AI Account Owner           |
-| **Standard Setup Only:** Assign RBAC for required resources (Cosmos DB, Search, Storage, etc.) | Role Based Access Control Administrator  |
+| [standard setup](#choose-your-setup) Only: Assign RBAC for required resources (Cosmos DB, Search, Storage, etc.) | Role Based Access Control Administrator  |
 | Create and edit agents                                                 | Azure AI User                    |
 
 ## Set up your agent environment
-To get started, you need an account and a project.  
-Agents are scoped at the project level, which ensures data isolation—agents within the same project share access to the same resources. 
+To get started, you need an Azure AI Foundry resource and a Foundry project.  
+Agents are created within a specific project, and each project acts as an isolated workspace. This means:
+* All agents in the same project share access to the same file storage, thread storage (conversation history), and search indexes.
+* Data is isolated between projects. Agents in one project cannot access resources from another.
+Projects are currently the unit of sharing and isolation in Foundry. See the [what is AI foundry](../../ai-foundry/what-is-azure-ai-foundry.md) article for more information on Foundry projects.
 
 ### Prerequisites 
 
 * An Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services).
 * Ensure that the individual creating the account and project has the **Azure AI Account Owner** role at the subscription scope
-* If configuring **Standard Setup**, the same individual must also have permissions to assign roles to required resources (Cosmos DB, Search, Storage).
-    * The built-in role needed is **Role Based Access Control Administrator**.
+* 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).
+    * The built-in role needed is **Role Based Access Administrator**.
     * Alternatively, having the **Owner** role at the subscription level also satisfies this requirement.
     * The key permission needed is: `Microsoft.Authorization/roleAssignments/write`
 
@@ -76,6 +79,12 @@ If you want support for Private Network Isolation see [network-secured setup](ho
 | Deploy a standard agent setup that uses **Managed Identity** for authentication. <br>An account and project are created. <br> A GPT-4o model is deployed. <br> Azure resources for storing customer data - **Azure Storage**, **Azure Cosmos DB**, and **Azure AI Search** - are automatically created if existing resources are't  provided. <br> These resources are connected to your project to store files, threads, and vector data. <br> A Microsoft-managed Key Vault is used by default.</li></ul> <br> [![Deploy To Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fazure-ai-foundry%2Ffoundry-samples%2Frefs%2Fheads%2Fmain%2Fsamples%2Fmicrosoft%2Finfrastructure-setup%2F41-standard-agent-setup%2Fazuredeploy.json) | :::image type="content" source="./media\quickstart\standard-agent-setup.png" alt-text="An architecture diagram for standard agent setup." lightbox="./media\quickstart\standard-agent-setup.png"::: |
 
 ### [Optional] Model selection in autodeploy template
+
+> [!IMPORTANT]
+> **Don't change the modelFormat parameter.** 
+>
+> The templates only support deployment of Azure OpenAI models. See which Azure OpenAI models are supported in the [model support](./concepts/model-region-support.md) article.
+
 You can customize the model used by your agent by editing the model parameters in the autodeploy template. To deploy a different model, you need to update at least the `modelName` and `modelVersion` parameters. 
 
 By default, the deployment template is configured with the following values:
@@ -88,12 +97,6 @@ By default, the deployment template is configured with the following values:
 | modelSkuName     | GlobalStandard |
 | modelLocation    | eastus         |
 
-> [!IMPORTANT]
-> **Don't change the modelFormat parameter.** 
->
-> The templates only support deployment of Azure OpenAI models. See which Azure OpenAI models are supported in the [Azure AI Foundry Agent Service model support](concepts\model-region-support.md) documentation.
-
-
 ### What's next?
 * [Create your first agent](quickstart.md)
 * Explore more:

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: |