Merge branch 'main' into release-scommi

Author: v-alje

articles/active-directory-b2c/partner-saviynt.md

@@ -70,6 +70,9 @@ The following architecture diagram illustrates the implementation.
 2. Create delegated administration policies.
 3. Assign users the delegated administrator role.
 
+>[!NOTE]
+>User administrator role will be required for a Service Principal Name (SPN) to integrate with Saviynt EIC system. 
+
 ## Configure Azure AD B2C with Saviynt
 
 Use the following instructions to create an application, delete users, and more. 

articles/ai-services/openai/concepts/use-your-data.md

@@ -78,7 +78,9 @@ You might want to consider using an Azure AI Search index when you either want t
 * Reuse an index created before by ingesting data from other data sources.
 
 > [!NOTE]
-> To use an existing index, it must have at least one searchable field.
+> * To use an existing index, it must have at least one searchable field.
+> * Set the CORS **Allow Origin Type** option to `all` and the **Allowed origins** option to `*`. 
+
 
 ### Search types
 
@@ -135,6 +137,7 @@ If you want to implement additional value-based criteria for query execution, yo
 
 [!INCLUDE [ai-search-ingestion](../includes/ai-search-ingestion.md)]
 
+[!INCLUDE [authentication](../includes/on-your-data-authentication.md)]
 
 # [Vector Database in Azure Cosmos DB for MongoDB](#tab/mongo-db)
 
@@ -202,6 +205,8 @@ To modify the schedule, you can use the [Azure portal](https://portal.azure.com/
 
 [!INCLUDE [ai-search-ingestion](../includes/ai-search-ingestion.md)]
 
+[!INCLUDE [authentication](../includes/on-your-data-authentication.md)]
+
 # [Upload files (preview)](#tab/file-upload)
 
 Using Azure OpenAI Studio, you can upload files from your machine to try Azure OpenAI On Your Data. You also have the option to create a new Azure Blob Storage account and Azure AI Search resource. The service then stores the files to an Azure storage container and performs ingestion from the container. You can use the [quickstart](../use-your-data-quickstart.md) article to learn how to use this data source option.
@@ -210,6 +215,8 @@ Using Azure OpenAI Studio, you can upload files from your machine to try Azure O
 
 [!INCLUDE [ai-search-ingestion](../includes/ai-search-ingestion.md)]
 
+[!INCLUDE [authentication](../includes/on-your-data-authentication.md)]
+
 # [URL/Web address (preview)](#tab/web-pages)
 
 You can paste URLs and the service will store the webpage content, using it when generating responses from the model. The content in URLs/web addresses that you use need to have the following characteristics to be properly ingested:
@@ -224,6 +231,10 @@ You can paste URLs and the service will store the webpage content, using it when
 
 Once you have added the URL/web address for data ingestion, the web pages from your URL are fetched and saved to Azure Blob Storage with a container name: `webpage-<index name>`. Each URL will be saved into a different container within the account. Then the files are indexed into an Azure AI Search index, which is used for retrieval when you’re chatting with the model.
 
+[!INCLUDE [ai-search-ingestion](../includes/ai-search-ingestion.md)]
+
+[!INCLUDE [authentication](../includes/on-your-data-authentication.md)]
+
 # [Elasticsearch (preview)](#tab/elasticsearch)
 
 You can connect to your [Elasticsearch vector database](https://www.elastic.co/guide/en/elasticsearch/reference/current/elasticsearch-intro.html) and chat with your data.

articles/ai-services/openai/faq.yml

@@ -248,6 +248,10 @@ sections:
           Can I bring my own data store to use with Assistants? 
         answer: |
           No. Currently Assistants supports only local files uploaded to the Assistants-managed storage. You cannot use your private storage account with Assistants. 
+      - question: | 
+          Does Assistants support customer-managed key encryption (CMK)?
+        answer: |
+          Today we support CMK for Threads and Files in Assistants. See the [What's new page](./whats-new.md#customer-managed-key-cmk-support-for-assistants) for available regions for this feature.
       - question: |
           Is my data used by Microsoft for training models? 
         answer: |
@@ -259,9 +263,8 @@ sections:
       - question: |
           How am I charged for Assistants?
         answer: |
-          Currently, when you use Assistants API, you're billed for the following: 
-          - Inference cost (input and output) of the base model you're using for each Assistant (for example gpt-4-0125). If you've created multiple Assistants, you will be charged for the base model attached to each Assistant. 
-          - If you've enabled the Code Interpreter tool. For example if your assistant calls Code Interpreter simultaneously in two different threads, this would create two Code Interpreter sessions, each of which would be charged. Each session is active by default for one hour, which means that you would only pay this fee once if your user keeps giving instructions to Code Interpreter in the same thread for up to one hour. 
+          * Inference cost (input and output) of the base model you're using for each Assistant (for example gpt-4-0125). If you've created multiple Assistants, you will be charged for the base model attached to each Assistant.
+          * If you've enabled the Code Interpreter tool. For example if your assistant calls Code Interpreter simultaneously in two different threads, this would create two Code Interpreter sessions, each of which would be charged. Each session is active by default for one hour, which means that you would only pay this fee once if your user keeps giving instructions to Code Interpreter in the same thread for up to one hour.
 
           For more information, see the [pricing page](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/).
       - question: |

articles/ai-services/openai/includes/assistants-ai-studio.md

@@ -12,7 +12,7 @@ ms.author: mbullwin
 author: mrbullwinkle
 ---
 
-[!INCLUDE [Feature preview](../../../ai-studio/includes/feature-preview.md)]
+[!INCLUDE [Feature preview](~/reusable-content/ce-skilling/azure/includes/ai-studio/includes/feature-preview.md)]
 
 ## Prerequisites
 

articles/ai-services/openai/includes/fine-tuning-openai-in-ai-studio.md

@@ -9,7 +9,7 @@
 ms.custom: include, build-2024
 ---
 
-[!INCLUDE [Feature preview](../../../ai-studio/includes/feature-preview.md)]
+[!INCLUDE [Feature preview](~/reusable-content/ce-skilling/azure/includes/ai-studio/includes/feature-preview.md)]
 
 ## Prerequisites
 

articles/ai-services/openai/includes/on-your-data-authentication.md

@@ -0,0 +1,20 @@
+---
+manager: nitinme
+author: aahill
+ms.author: aahi
+ms.service: azure-ai-openai
+ms.topic: include
+ms.date: 03/27/2024
+---
+
+## Data connection
+
+You need to select how you want to authenticate the connection from Azure OpenAI, Azure AI Search, and Azure blob storage. You can choose a *System assigned managed identity* or an *API key*. By selecting *API key* as the authentication type, the system will automatically populate the API key for you to connect with your Azure AI Search resource. By selecting *System assigned managed identity*, the authentication will be based on the [role assignment](../how-to/use-your-data-securely.md#role-assignments) you have. *System assigned managed identity* is selected by default for security. 
+
+
+:::image type="content" source="../media/use-your-data/data-connection-authentication.png" alt-text="A screenshot showing the managed identity option in Azure OpenAI Studio." lightbox="../media/use-your-data/data-connection-authentication.png":::
+
+Once you select the **next** button, it will automatically validate your setup to use the selected authentication method. If you encounter an error, see the [role assignments article](../how-to/use-your-data-securely.md#role-assignments) to update your setup.
+
+Once you have fixed the setup, select **next** again to validate and proceed. API users can also [configure authentication](../references/azure-search.md#api-key-authentication-options) with assigned managed identity and API keys.
+

articles/ai-services/openai/media/use-your-data/data-connection-authentication.png

@@ -41,7 +41,6 @@ The configurable options of Azure AI Search when using Azure OpenAI On Your Data
 | `allow_partial_result` | integer | False | If specified as true, the system will allow partial search results to be used and the request fails if all the queries fail. If not specified, or specified as false, the request will fail if any search query fails. |
 | `include_contexts` | array | False | The included properties of the output context. If not specified, the default value is `citations` and `intent`. Values can be `citations`,`intent`, `all_retrieved_documents`.|
 
-
 ## API key authentication options
 
 The authentication options for Azure OpenAI On Your Data when using an API key.

articles/ai-services/openai/references/azure-search.md

@@ -18,6 +18,13 @@ recommendations: false
 
 This article provides a summary of the latest releases and major documentation updates for Azure OpenAI.
 
+## June 2024
+
+### Customer-managed key (CMK) support for Assistants
+
+Threads and Files in Assistants now supports CMK in the following region:
+* West US 3
+
 ## May 2024
 
 ### GPT-4o provisioned deployments

articles/ai-services/openai/whats-new.md

@@ -8,7 +8,7 @@ ms.date: 5/21/2024
 ms.author: eur
 ---
 
-[!INCLUDE [Feature preview](../../../../../ai-studio/includes/feature-preview.md)]
+[!INCLUDE [Feature preview](~/reusable-content/ce-skilling/azure/includes/ai-studio/includes/feature-preview.md)]
 
 In this quickstart, you try real-time speech to text in [Azure AI Studio](https://ai.azure.com).