Merge pull request #248524 from aahill/pnet-add

private network support

Author: American-Dipper

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

@@ -43,7 +43,7 @@ For documents and datasets with long text, you should use the available [data pr
 
 ## Data formats and file types
 
-Azure OpenAI on your data supports the following filetypes:
+Azure OpenAI on your data supports the following filetypes (16 MB or less per file):
 
 * `.txt`
 * `.md`
@@ -65,9 +65,23 @@ There are some caveats about document structure and how it might affect the qual
 
     This will impact the quality of Azure Cognitive Search and the model response. 
 
-## Virtual network support & private link support
+## Virtual network support & private network support
 
-Azure OpenAI on your data does not currently support private endpoints. 
+If you have Azure OpenAI resource protected by a private network, and want to allow Azure OpenAI on your data to access your search service, complete [an application form](https://aka.ms/applyacsvpnaoaionyourdata). The application will be reviewed in five business days and you will be contacted via email about the results. If you are eligible, we will send a private endpoint request to your search service, and you will need to approve the request.
+
+:::image type="content" source="../media/use-your-data/approve-private-endpoint.png" alt-text="A screenshot showing private endpoint approval screen." lightbox="../media/use-your-data/approve-private-endpoint.png":::
+
+Learn more about the [manual approval workflow](/azure/private-link/private-endpoint-overview#access-to-a-private-link-resource-using-approval-workflow).
+
+After you approve the request in your search service, you can start using the [chat completions extensions API](/azure/ai-services/openai/reference#completions-extensions). Public network access can be disabled for that search service. Private network access for Azure OpenAI Studio is not currently supported.
+
+### Azure OpenAI resources in private networks
+
+You can protect Azure OpenAI resource in [private networks](/azure/ai-services/cognitive-services-virtual-networks) the same way as any Azure AI services.
+
+### Storage accounts in private networks
+
+Storage accounts in private networks are currently not supported by Azure OpenAI on your data.
 
 ## Azure Role-based access controls (Azure RBAC)
 
@@ -241,7 +255,7 @@ You can send a streaming request using the `stream` parameter, allowing data to
 
 #### Conversation history for better results
 
-When chatting with a model, providing a history of the chat will help the model return higher quality results. 
+When you chat with a model, providing a history of the chat will help the model return higher quality results. 
 
 ```json
 {

articles/ai-services/openai/includes/connect-your-data-studio.md

@@ -24,7 +24,9 @@ Navigate to [Azure OpenAI Studio](https://oai.azure.com/) and sign-in with crede
 1. In the pane that appears, select **Upload files** under **Select data source**. Select **Upload files**. Azure OpenAI needs both a storage resource and a search resource to access and index your data.
 
     > [!TIP]
-    > * For a list of supported data sources, see [Data source options](../concepts/use-your-data.md#data-source-options)
+    > * See the following resource for more information:
+    >    * [Data source options](../concepts/use-your-data.md#data-source-options)
+    >    * [supported file types and formats](../concepts/use-your-data.md#data-formats-and-file-types)
     > *  For documents and datasets with long text, we recommend using the available [data preparation script](../concepts/use-your-data.md#ingesting-your-data-into-azure-cognitive-search). 
 
     1. For Azure OpenAI to access your storage account, you will need to turn on [Cross-origin resource sharing (CORS)](https://go.microsoft.com/fwlink/?linkid=2237228). If CORS isn't already turned on for the Azure Blob storage resource, select **Turn on CORS**. 

articles/ai-services/openai/includes/use-your-data-rest.md

@@ -23,8 +23,6 @@ To successfully make a call against Azure OpenAI, you need the following variabl
 | `AOAIEndpoint`               | This value can be found in the **Keys & Endpoint** section when examining your Azure OpenAI resource from the Azure portal. Alternatively, you can find the value in **Azure AI studio** > **Chat playground** > **Code view**. An example endpoint is: `https://my-resoruce.openai.azure.com`.|
 | `AOAIKey` | This value can be found in **Resource management** > **Keys & Endpoint** section when examining your Azure OpenAI resource from the Azure portal. You can use either `KEY1` or `KEY2`. Always having two keys allows you to securely rotate and regenerate keys without causing a service disruption. |
 | `AOAIDeploymentId` | This value corresponds to the custom name you chose for your deployment when you deployed a model. This value can be found under **Resource Management** > **Deployments** in the Azure portal or alternatively under **Management** > **Deployments** in Azure AI studio.|
-| `ChatGptUrl` | The Azure OpenAI ChatGPT endpoint that will be used to fulfill the request. This can be the same endpoint as `AoAIEndpoint`. |
-| `ChatGptKey` | If you are using the same Azure OpenAI resource for both `ChatGptUrl` and `AOAIEndpoint`, use the same value as `AOAIKey`. |
 | `SearchEndpoint` | This value can be found in the **Overview** section when examining your Azure Cognitive Search resource from the Azure portal. |
 | `SearchKey` | This value can be found in the **Resource management** > **Keys & Endpoint** section when examining your Azure Cognitive Search resource from the Azure portal. You can use either `KEY1` or `KEY2`. Always having two keys allows you to securely rotate and regenerate keys without causing a service disruption. |
 | `SearchIndex` | This value corresponds to the name of the index you created to store your data. You can find it in the **Overview** section when examining your Azure Cognitive Search resource from the Azure portal. |
@@ -43,12 +41,6 @@ setx AOAIKey REPLACE_WITH_YOUR_AOAI_KEY_VALUE_HERE
 setx AOAIDeploymentId REPLACE_WITH_YOUR_AOAI_DEPLOYMENT_VALUE_HERE
 ```
 ```CMD
-setx ChatGptUrl REPLACE_WITH_YOUR_AOAI_COMPLETION_VALUE_HERE
-```
-```CMD
-setx ChatGptKey REPLACE_WITH_YOUR_AOAI_KEY_VALUE_HERE
-```
-```CMD
 setx SearchEndpoint REPLACE_WITH_YOUR_AZURE_SEARCH_RESOURCE_VALUE_HERE
 ```
 ```CMD
@@ -73,14 +65,6 @@ setx SearchIndex REPLACE_WITH_YOUR_INDEX_NAME_HERE
 [System.Environment]::SetEnvironmentVariable('AOAIDeploymentId', 'REPLACE_WITH_YOUR_AOAI_DEPLOYMENT_VALUE_HERE', 'User')
 ```
 
-```powershell
-[System.Environment]::SetEnvironmentVariable('ChatGptUrl', 'REPLACE_WITH_YOUR_AOAI_COMPLETION_VALUE_HERE', 'User')
-```
-
-```powershell
-[System.Environment]::SetEnvironmentVariable('ChatGptKey', 'REPLACE_WITH_YOUR_AOAI_KEY_VALUE_HERE', 'User')
-```
-
 ```powershell
 [System.Environment]::SetEnvironmentVariable('SearchEndpoint', 'REPLACE_WITH_YOUR_AZURE_SEARCH_RESOURCE_VALUE_HERE', 'User')
 ```
@@ -105,12 +89,6 @@ export AOAIKey=REPLACE_WITH_YOUR_AOAI_KEY_VALUE_HERE
 export AOAIDeploymentId=REPLACE_WITH_YOUR_AOAI_DEPLOYMENT_VALUE_HERE
 ```
 ```Bash
-export ChatGptUrl=REPLACE_WITH_YOUR_AOAI_COMPLETION_VALUE_HERE
-```
-```Bash
-export ChatGptKey=REPLACE_WITH_YOUR_AOAI_KEY_VALUE_HERE
-```
-```Bash
 export SearchEndpoint=REPLACE_WITH_YOUR_AZURE_SEARCH_RESOURCE_VALUE_HERE
 ```
 ```Bash
@@ -138,8 +116,6 @@ To trigger a response from the model, you should end with a user message indicat
 curl -i -X POST $AOAIEndpoint/openai/deployments/$AOAIDeploymentId/extensions/chat/completions?api-version=2023-06-01-preview \
 -H "Content-Type: application/json" \
 -H "api-key: $AOAIKey" \
--H "chatgpt_url: $ChatGptUrl" \
--H "chatgpt_key: $ChatGptKey" \
 -d \
 '
 {

articles/ai-services/openai/media/use-your-data/approve-private-endpoint.png

@@ -310,8 +310,6 @@ POST {your-resource-name}/openai/deployments/{deployment-id}/extensions/chat/com
 curl -i -X POST YOUR_RESOURCE_NAME/openai/deployments/YOUR_DEPLOYMENT_NAME/extensions/chat/completions?api-version=2023-06-01-preview \
 -H "Content-Type: application/json" \
 -H "api-key: YOUR_API_KEY" \
--H "chatgpt_url: YOUR_RESOURCE_URL" \
--H "chatgpt_key: YOUR_API_KEY" \
 -d \
 '
 {

articles/ai-services/openai/reference.md

@@ -18,6 +18,7 @@ keywords:
 ## August 2023
 
 - You can now deploy Azure OpenAI on your data to [Power Virtual Agents](/azure/ai-services/openai/concepts/use-your-data#deploying-the-model).
+- [Azure OpenAI on your data](./concepts/use-your-data.md#virtual-network-support--private-network-support) now supports private endpoints.
 
 ## July 2023