fixing conflict

Author: aahill

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

@@ -31,7 +31,8 @@ Developers and end users don't have access to raw content returned from Groundin
 ## Setup  
 
 > [!NOTE]
-> Grounding with Bing Search only works with the following Azure OpenAI models: `gpt-3.5-turbo-0125`, `gpt-4-0125-preview`, `gpt-4-turbo-2024-04-09`, `gpt-4o-0513`
+> 1. Grounding with Bing Search only works with the following Azure OpenAI models: `gpt-3.5-turbo-0125`, `gpt-4-0125-preview`, `gpt-4-turbo-2024-04-09`, `gpt-4o-0513`
+> 1. It works in the following regions: `West Central US` and `West US 2`
 
 In one click, you can start creating a **new Azure AI Foundry project and Grounding with Bing Search resource** with the available [deployment template](../../quickstart.md#choose-basic-or-standard-agent-setup). After the deployment, you can find your resources including: an AI hub, project, Grounding with Bing Search resource and more created in your resource group. You can find your Grounding with Bing Search connection in the **connected resources** for your project in Azure AI Foundry portal.
 
@@ -89,7 +90,7 @@ Alternatively, you can also follow the step-by-step guide below:
 
 ## How to display Grounding with Bing Search results
 
-According to Grounding with Bing's [terms of use and use and display requirements](https://www.microsoft.com/en-us/bing/apis/grounding-legal#use-and-display-requirements), you need to display both website URLs and Bing search query URLs in your custom interface. You can find website URLs through `annotations` parameter in API response and Bing search query URLs through `runstep` details.
+According to Grounding with Bing's [terms of use and use and display requirements](https://www.microsoft.com/en-us/bing/apis/grounding-legal#use-and-display-requirements), you need to display both website URLs and Bing search query URLs in your custom interface. You can find website URLs through `annotations` parameter in API response and Bing search query URLs through `runstep` details. To render the webpage, we recommend you replace the endpoint of Bing search query URLs with `www.bing.com` and your Bing search query URL would look like "https://www.bing.com/search?q={search query}"
 
 ```python
 run_steps = project_client.agents.list_run_steps(run_id=run.id, thread_id=thread.id)
@@ -253,6 +254,12 @@ Create a run and observe that the model uses the Grounding with Bing Search tool
 run = project_client.agents.create_and_process_run(thread_id=thread.id, assistant_id=agent.id)
 print(f"Run finished with status: {run.status}")
 
+# Retrieve run step details to get Bing Search query link
+# To render the webpage, we recommend you replace the endpoint of Bing search query URLs with `www.bing.com` and your Bing search query URL would look like "https://www.bing.com/search?q={search query}"
+run_steps = project_client.agents.list_run_steps(run_id=run.id, thread_id=thread.id)
+run_steps_data = run_steps['data']
+print(f"Last run step detail: {run_steps_data}")
+
 if run.status == "failed":
     print(f"Run failed: {run.last_error}")
 

articles/ai-services/agents/how-to/tools/overview.md

@@ -26,16 +26,16 @@ Agents can access multiple tools in parallel. These can be both Azure OpenAI-hos
 
 ## Knowledge tools
 
-|Tool  |Description  | Python SDK |	C# SDK |
-|---------|---------|---------|---------|
-| [Grounding with Bing Search](./bing-grounding.md)     | Allows your agents to incorporate real-time public web data when generating responses.         | ✔️ | ✔️ |
-|[File search](./file-search.md)    | Augments agents with knowledge from outside its model, such as proprietary product information or documents provided by your users.        | ✔️ | ✔️ |
-| [Azure AI Search](./azure-ai-search.md) | Uses an existing Azure AI Search index as a knowledge base. | ✔️ | ✔️ |
+|Tool  |Description  | Python SDK |	C# SDK | Basic agent setup | Standard agent setup |
+|---------|---------|---------|---------|---------|---------|
+| [Grounding with Bing Search](./bing-grounding.md)     | Allows your agents to incorporate real-time public web data when generating responses.         | ✔️ | ✔️ | ✔️ | ✔️ |
+|[File search](./file-search.md)    | Augments agents with knowledge from outside its model, such as proprietary product information or documents provided by your users.        | ✔️ | ✔️ | File upload only | File upload and using blob storage | 
+| [Azure AI Search](./azure-ai-search.md) | Uses an existing Azure AI Search index as a knowledge base. | ✔️ | ✔️ | | ✔️ |
 
 ## Action tools
 
-|Tool  |Description  | Python SDK |	C# SDK |
-|---------|---------|---------|---------|
-| [Code interpreter](./code-interpreter.md)     | Enables agents to write and run Python code in a sandboxed execution environment.        | ✔️ | ✔️ |
-|[Function calling](./function-calling.md)     | Allows you to describe the structure of functions to an agent and then return the functions that need to be called along with their arguments.        | ✔️ | ✔️ |
+|Tool  |Description  | Python SDK |	C# SDK | Basic agent setup | Standard agent setup |
+|---------|---------|---------|---------|---------|---------|
+| [Code interpreter](./code-interpreter.md)     | Enables agents to write and run Python code in a sandboxed execution environment.        | ✔️ | ✔️ | ✔️ | ✔️ |
+|[Function calling](./function-calling.md)     | Allows you to describe the structure of functions to an agent and then return the functions that need to be called along with their arguments.        | ✔️ | ✔️ | ✔️ | ✔️ |
 

articles/ai-services/content-safety/overview.md

@@ -155,7 +155,7 @@ To use the Content Safety APIs, you must create your Azure AI Content Safety res
 |--------------------|--------------------|--------------------|-------|-----------------|-------------------|---------------|---------------------------|---------------------------|------|-------------|
 | Australia East                     | ✅                  |                    | ✅    |                 | ✅                 | ✅             | ✅                         | ✅                         | ✅    | ✅           |
 | Canada East                          |                    |                    | ✅    |                 | ✅                 | ✅             | ✅                         | ✅                         | ✅    | ✅           |
-| Central US                             |                    |                    | ✅    |                 | ✅                 | ✅             | ✅                         | ✅                         | ✅    | ✅           |
+| Central US                             |                    |                    | ✅    |                 | ✅                 |             | ✅                         | ✅                         | ✅    | ✅           |
 | East US                            | ✅                 |                  | ✅    | ✅              | ✅                 | ✅             | ✅                         | ✅                         | ✅    | ✅           |
 | East US 2                           |                    | ✅                 | ✅    |                 | ✅                 | ✅             | ✅                         | ✅                         | ✅    | ✅           |
 | France Central                        |                    | ✅                 | ✅    |                 | ✅                 | ✅             | ✅                         | ✅                         | ✅    | ✅           |

articles/ai-services/content-understanding/audio/overview.md

@@ -20,7 +20,7 @@ ms.custom: ignite-2024-understanding-release
 > * Features, approaches, and processes may change or have constrained capabilities, prior to General Availability (GA).
 > * For more information, *see* [**Supplemental Terms of Use for Microsoft Azure Previews**](https://azure.microsoft.com/support/legal/preview-supplemental-terms).
 
-Content Understanding audio analyzers enable transcription and diarization of conversational audio, extracting structured fields such as summaries, sentiments, and key topics. Customize an audio analyzer template to your business needs using [Azure AI Foundry](https://ai.azure.com/) to start generating results.
+Content Understanding audio analyzers enable transcription and diarization of conversational audio, extracting structured fields such as summaries, sentiments, and key topics. Customize an audio analyzer template to your business needs using [Azure AI Foundry portal](https://ai.azure.com/) to start generating results.
 
 Here are common scenarios for using Content Understanding with conversational audio data:
 
@@ -82,5 +82,5 @@ Developers using Content Understanding should review Microsoft's policies on cus
 
 ## Next steps
 
-* Try processing your audio content using Content Understanding in [Azure AI Foundry](https://ai.azure.com/).
+* Try processing your audio content using Content Understanding in [Azure AI Foundry portal](https://ai.azure.com/).
 * Learn more about audio [**analyzer templates**](../quickstart/use-ai-foundry.md).

articles/ai-services/content-understanding/document/overview.md

@@ -70,5 +70,5 @@ For a detailed list of supported languages and regions, visit our [Language and
 Developers using Content Understanding should review Microsoft's policies on customer data. For more information, visit our [Data, protection, and privacy](https://www.microsoft.com/trust-center/privacy) page.
 
 ## Next step
-* Try processing your document content using Content Understanding in [Azure AI Foundry](https://ai.azure.com/).
+* Try processing your document content using Content Understanding in [Azure ](https://ai.azure.com/).
 * Learn more about document [**analyzer templates**](../quickstart/use-ai-foundry.md).

articles/ai-services/content-understanding/glossary.md

@@ -17,7 +17,7 @@ ms.author: lajanuar
 | **File** | Any type of data, including text, documents, images, videos, and audio. |
 | **File type** | The MIME type of a file, such as text/plain, application/pdf, image/jpeg, audio/wav, and video/mp4. Generic categories like *document* refer to all corresponding MIME types supported by the service. |
 | **Analyzer** | A component that processes and extracts content and structured fields from files. Content Understanding offers a few analyzer templates for common scenarios. |
-| **Analyzer template** | A predefined configuration and field schema for an analyzer. It simplifies creating analyzers by allowing modifications to a template instead of starting from scratch. This feature is available only in AI Foundry, not via REST API/SDKs. |
+| **Analyzer template** | A predefined configuration and field schema for an analyzer. It simplifies creating analyzers by allowing modifications to a template instead of starting from scratch. This feature is available only in Azure AI Foundry portal, not via REST API/SDKs. |
 | **Analyzer result** | The output generated by an analyzer after processing input data. It typically includes extracted content in Markdown, extracted fields, and optional modality-specific details. |
 | **Add-ons** | Added features that enhance content extraction results, such as layout elements, barcodes, and figures in documents. |
 | **Fields** | List of structured key-value pairs derived from the content, as defined by the field schema. [Learn more about supported field value types.](service-limits.md) |

articles/ai-services/content-understanding/image/overview.md

@@ -63,5 +63,5 @@ As with all the Azure AI services, developers using the Content Understanding se
 
 ## Next steps
 
-* Try processing your video content using Content Understanding in [Azure AI Foundry](https://ai.azure.com/).
+* Try processing your video content using Content Understanding in [Azure AI Foundry portal](https://ai.azure.com/).
 * Learn more about video [**analyzer templates**](../quickstart/use-ai-foundry.md).

articles/ai-services/content-understanding/index.yml

@@ -43,7 +43,7 @@ landingContent:
         links:
         - text: Try Content Understanding REST API
           url: quickstart/use-rest-api.md
-        - text: Try Azure AI Foundry
+        - text: Try Azure AI Foundry portal
           url: image/overview.md
 
   - title: How-to guides

articles/ai-services/content-understanding/overview.md

@@ -82,7 +82,7 @@ Developers using the Content Understanding service should review Microsoft's pol
 ## Getting started
 Our quickstart guides help you quickly start using the Content Understanding service:
 
-* [**Azure AI Foundry Quickstart**](quickstart/use-ai-foundry.md)
+* [**Azure AI Foundry portal Quickstart**](quickstart/use-ai-foundry.md)
 * [**Rest API Quickstart**](quickstart/use-rest-api.md)
 
 

articles/ai-services/content-understanding/quickstart/use-ai-foundry.md

@@ -1,7 +1,7 @@
 ---
-title: "Use Azure AI Content Understanding Analyzer templates in Azure AI Foundry"
+title: "Use Azure AI Content Understanding Analyzer templates in Azure AI Foundry portal"
 titleSuffix: Azure AI services
-description: Learn how to use Content Understanding Analyzer templates in Azure AI Foundry
+description: Learn how to use Content Understanding Analyzer templates in Azure AI Foundry portal
 author: laujan
 manager: nitinme
 ms.service: azure-ai-content-understanding
@@ -10,14 +10,14 @@ ms.date: 11/19/2024
 ms.custom: ignite-2024-understanding-release
 ---
 
-# Use Content Understanding in Azure AI Foundry
-[Azure AI Foundry](https://ai.azure.com/) is a comprehensive platform for developing and deploying generative AI applications and APIs responsibly. This guide shows you how to use Content Understanding and build an analyzer, either by creating your own schema from scratch or by using a suggested analyzer template.
+# Use Content Understanding in Azure AI Foundry portal
+[Azure AI Foundry portal](https://ai.azure.com/) is a comprehensive platform for developing and deploying generative AI applications and APIs responsibly. This guide shows you how to use Content Understanding and build an analyzer, either by creating your own schema from scratch or by using a suggested analyzer template.
 
   :::image type="content" source="../media/quickstarts/ai-foundry-overview.png" alt-text="Screenshot of the Content Understanding workflow in the Azure AI Foundry.":::
 
 ## Steps to create a Content Understanding analyzer
 
-Azure AI Foundry enables you to build a Content Understanding analyzer tailored to your specific needs. An analyzer can extract data from your content based on your scenario.
+Azure AI Foundry portal enables you to build a Content Understanding analyzer tailored to your specific needs. An analyzer can extract data from your content based on your scenario.
 
 Follow these steps to create your own analyzer:
 
@@ -71,7 +71,7 @@ To follow is an example of building an analyzer to extract key data from an invo
 
 Content Understanding analyzer templates give you a head start by allowing you to build your analyzer without creating schemas from scratch. They're fully customizable, allowing you to adjust any fields in the schemas to better fit your needs.
 
-The following analyzer templates are available for use in the [Azure AI Foundry Content Understanding experience](https://ai.azure.com/).
+The following analyzer templates are available for use in the [Azure AI Foundry portal Content Understanding experience](https://ai.azure.com/).
 
 # [Document](#tab/document)
 
@@ -118,5 +118,5 @@ The following analyzer templates are available for use in the [Azure AI Foundry
 
 ## Next steps
 
-* In this quickstart, you learned how to create an analyzer in Azure AI Foundry. To use [REST API](/rest/api/contentunderstanding/operation-groups?view=rest-contentunderstanding-2024-12-01-preview&preserve-view=true), *see* the [REST API quickstart](use-rest-api.md).
+ * In this quickstart, you learned how to create an analyzer in Azure portal. To use [REST API](/rest/api/contentunderstanding/operation-groups?view=rest-contentunderstanding-2024-12-01-preview&preserve-view=true), *see* the [REST API quickstart](use-rest-api.md).