aoai freshness

Author: PatrickFarley

articles/ai-services/openai/includes/dall-e-dotnet.md

@@ -8,7 +8,7 @@ ms.service: azure-ai-openai
 ms.topic: include
 author: PatrickFarley
 ms.author: pafarley
-ms.date: 08/16/2023
+ms.date: 06/26/2024
 ---
 
 Use this guide to get started generating images with the Azure OpenAI SDK for C#.
@@ -24,9 +24,9 @@ Use this guide to get started generating images with the Azure OpenAI SDK for C#
 - An Azure OpenAI resource created in the East US region. For more information, see [Create a resource and deploy a model with Azure OpenAI](../how-to/create-resource.md).
 
 > [!NOTE]
-> Currently, you must submit an application to access Azure OpenAI Service. To apply for access, complete [this form](https://aka.ms/oai/access). If you need assistance, open an issue on this repo to contact Microsoft.
+> Currently, you must submit an application to access Azure OpenAI Service. To apply for access, complete the form at [https://aka.ms/oai/access](https://aka.ms/oai/access?azure-portal=true). If you need assistance, open an issue on this repo to contact Microsoft.
 
-## Set up
+## Setup
 
 [!INCLUDE [get-key-endpoint](get-key-endpoint.md)]
 
@@ -67,7 +67,7 @@ dotnet add package Azure.AI.OpenAI --version 1.0.0-beta.6
 
 ## Generate images with DALL-E
 
-From the project directory, open the *program.cs* file and replace with the following code:
+From the project directory, open the *program.cs* file and replace the contents with the following code:
 
 ```csharp
 using System;

articles/ai-services/openai/includes/dall-e-go.md

@@ -22,9 +22,9 @@ Use this guide to get started generating images with the Azure OpenAI SDK for Go
 - An Azure OpenAI resource created in the East US region. For more information, see [Create a resource and deploy a model with Azure OpenAI](../how-to/create-resource.md).
 
 > [!NOTE]
-> Currently, you must submit an application to access Azure OpenAI Service. To apply for access, complete [this form](https://aka.ms/oai/access). If you need assistance, open an issue on this repo to contact Microsoft.
+> Currently, you must submit an application to access Azure OpenAI Service. To apply for access, complete the form at <a href="https://aka.ms/oai/access" target="_blank">https://aka.ms/oai/access</a>. If you need assistance, open an issue on this repo to contact Microsoft.
 
-## Set up
+## Setup
 
 [!INCLUDE [get-key-endpoint](get-key-endpoint.md)]
 

articles/ai-services/openai/includes/dall-e-java.md

@@ -25,9 +25,9 @@ Use this guide to get started generating images with the Azure OpenAI SDK for Ja
 - An Azure OpenAI resource created in the East US region. For more information, see [Create a resource and deploy a model with Azure OpenAI](../how-to/create-resource.md).
 
 > [!NOTE]
-> Currently, you must submit an application to access Azure OpenAI Service. To apply for access, complete [this form](https://aka.ms/oai/access). If you need assistance, open an issue on this repo to contact Microsoft.
+> Currently, you must submit an application to access Azure OpenAI Service. To apply for access, complete the form at [https://aka.ms/oai/access](https://aka.ms/oai/access?azure-portal=true). If you need assistance, open an issue on this repo to contact Microsoft.
 
-## Set up
+## Setup
 
 [!INCLUDE [get-key-endpoint](get-key-endpoint.md)]
 

articles/ai-services/openai/includes/dall-e-javascript.md

@@ -26,7 +26,7 @@ Use this guide to get started generating images with the Azure OpenAI SDK for Ja
 > [!NOTE]
 > Currently, you must submit an application to access Azure OpenAI Service. To apply for access, complete [this form](https://aka.ms/oai/access). If you need assistance, open an issue on this repo to contact Microsoft.
 
-## Set up
+## Setup
 
 [!INCLUDE [get-key-endpoint](get-key-endpoint.md)]
 

articles/ai-services/openai/includes/dall-e-powershell.md

@@ -24,54 +24,11 @@ Use this guide to get started calling the Azure OpenAI Service image generation
 > [!NOTE]
 > Currently, you must submit an application to access Azure OpenAI Service. To apply for access, complete [this form](https://aka.ms/oai/access). If you need assistance, open an issue on this repo to contact Microsoft.
 
-## Retrieve key and endpoint
+## Setup
 
-To successfully call the Azure OpenAI APIs, you need the following information about your Azure OpenAI resource:
+[!INCLUDE [get-key-endpoint](get-key-endpoint.md)]
 
-| Variable     | Name       | Value                                                                                                                                                                                                                                                                  |
-| ------------ | ---------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Endpoint** | `api_base` | The endpoint value is located under **Keys and Endpoint** for your resource in the Azure portal. Alternatively, you can find the value in **Azure OpenAI Studio** > **Playground** > **Code View**. An example endpoint is: `https://docs-test-001.openai.azure.com/`. |
-| **Key**      | `api_key`  | The key value is also located under **Keys and Endpoint** for your resource in the Azure portal. Azure generates two keys for your resource. You can use either value.                                                                                                 |
-
-Go to your resource in the Azure portal. On the navigation pane, select **Keys and Endpoint** under **Resource Management**. Copy the **Endpoint** value and an access key value. You can use either the **KEY 1** or **KEY 2** value. Always having two keys allows you to securely rotate and regenerate keys without causing a service disruption.
-
-:::image type="content" source="../media/quickstarts/endpoint.png" alt-text="Screenshot that shows the Keys and Endpoint page for an Azure OpenAI resource in the Azure portal." lightbox="../media/quickstarts/endpoint.png":::
-
-Create and assign persistent environment variables for your key and endpoint.
-
-### Environment variables
-
-# [PowerShell](#tab/powershell)
-
-```powershell
-$Env:AZURE_OPENAI_API_KEY = 'YOUR_KEY_VALUE'
-```
-
-```powershell
-$Env:AZURE_OPENAI_ENDPOINT = 'YOUR_ENDPOINT'
-```
-
-# [Command Line](#tab/command-line)
-
-```CMD
-setx AZURE_OPENAI_API_KEY "REPLACE_WITH_YOUR_KEY_VALUE_HERE"
-```
-
-```CMD
-setx AZURE_OPENAI_ENDPOINT "REPLACE_WITH_YOUR_ENDPOINT_HERE"
-```
-
-# [Bash](#tab/bash)
-
-```Bash
-echo export AZURE_OPENAI_API_KEY="REPLACE_WITH_YOUR_KEY_VALUE_HERE" >> /etc/environment && source /etc/environment
-```
-
-```Bash
-echo export AZURE_OPENAI_ENDPOINT="REPLACE_WITH_YOUR_ENDPOINT_HERE" >> /etc/environment && source /etc/environment
-```
-
----
+[!INCLUDE [environment-variables](environment-variables.md)]
 
 > [!div class="nextstepaction"]
 > [I ran into an issue with the setup.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=POWERSHELL&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Set-up)

articles/ai-services/openai/includes/dall-e-python.md

@@ -20,24 +20,24 @@ Use this guide to get started generating images with the Azure OpenAI SDK for Py
 #### [DALL-E 3](#tab/dalle3)
 
 - An Azure subscription. <a href="https://azure.microsoft.com/free/ai-services" target="_blank">Create one for free</a>.
-- Access granted to DALL-E in the desired Azure subscription.
+- Access granted to DALL-E in the desired Azure subscription. You can apply for access to Azure OpenAI Service by completing the form at [https://aka.ms/oai/access](https://aka.ms/oai/access?azure-portal=true).
 - <a href="https://www.python.org/" target="_blank">Python 3.8 or later version</a>.
 - An Azure OpenAI resource created in the `EastUS`, `AustraliaEast`, or `SwedenCentral` region.
 - Then, you need to deploy a `dalle3` model with your Azure resource. For more information, see [Create a resource and deploy a model with Azure OpenAI](../how-to/create-resource.md).
 
 #### [DALL-E 2 (preview)](#tab/dalle2)
 
 - An Azure subscription. <a href="https://azure.microsoft.com/free/ai-services" target="_blank">Create one for free</a>.
-- Access granted to DALL-E in the desired Azure subscription.
+- Access granted to DALL-E in the desired Azure subscription. You can apply for access to Azure OpenAI Service by completing the form at [https://aka.ms/oai/access](https://aka.ms/oai/access?azure-portal=true).
 - <a href="https://www.python.org/" target="_blank">Python 3.8 or later version</a>.
 - An Azure OpenAI resource created in the `EastUS` region. For more information, see [Create a resource and deploy a model with Azure OpenAI](../how-to/create-resource.md).
 
 ---
 
 > [!NOTE]
-> Currently, you must submit an application to access Azure OpenAI Service. To apply for access, complete [this form](https://aka.ms/oai/access). If you need assistance, open an issue on this repo to contact Microsoft.
+> Currently, you must submit an application to access Azure OpenAI Service. To apply for access, complete the form at [https://aka.ms/oai/access](https://aka.ms/oai/access?azure-portal=true). If you need assistance, open an issue on this repo to contact Microsoft.
 
-## Set up
+## Setup
 
 ### Retrieve key and endpoint
 
@@ -57,14 +57,11 @@ Create and assign persistent environment variables for your key and endpoint.
 [!INCLUDE [environment-variables](environment-variables.md)]
 
 
-## Create a new Python application
-
-Open a command prompt and browse to your project folder. Create a new python file, _quickstart.py_.
 
 ## Install the Python SDK
 
 
-Install the OpenAI Python SDK by using the following command:
+Open a command prompt and browse to your project folder. Install the OpenAI Python SDK by using the following command:
 
 #### [DALL-E 3](#tab/dalle3)
 
@@ -89,9 +86,10 @@ pip install requests
 pip install pillow 
 ```
 
+
 ## Generate images with DALL-E
 
-Open _quickstart.py in your preferred editor or IDE.
+Create a new python file, _quickstart.py_. Open it in your preferred editor or IDE.
 
 Replace the contents of _quickstart.py_ with the following code. 
 

articles/ai-services/openai/includes/dall-e-rest.md

@@ -19,6 +19,7 @@ Use this guide to get started calling the Azure OpenAI Service image generation
 
 - An Azure subscription. <a href="https://azure.microsoft.com/free/ai-services" target="_blank">Create one for free</a>.
 - Access granted to DALL-E in the desired Azure subscription.
+    Currently, access to this service is granted only by application. You can apply for access to Azure OpenAI by completing the form at <a href="https://aka.ms/oai/access" target="_blank">https://aka.ms/oai/access</a>. Existing Azure OpenAI customers need to re-enter the form to get access to DALL-E. Open an issue on this repo to contact us if you have an issue.
 - <a href="https://www.python.org/" target="_blank">Python 3.8 or later version</a>.
 - The following Python libraries installed: `os`, `requests`, `json`.
 - An Azure OpenAI resource created in the `EastUS`, `AustraliaEast`, or `SwedenCentral` region.
@@ -28,16 +29,18 @@ Use this guide to get started calling the Azure OpenAI Service image generation
 
 - An Azure subscription. <a href="https://azure.microsoft.com/free/ai-services" target="_blank">Create one for free</a>.
 - Access granted to DALL-E in the desired Azure subscription.
+    Currently, access to this service is granted only by application. You can apply for access to Azure OpenAI by completing the form at <a href="https://aka.ms/oai/access" target="_blank">https://aka.ms/oai/access</a>. Existing Azure OpenAI customers need to re-enter the form to get access to DALL-E. Open an issue on this repo to contact us if you have an issue.
 - <a href="https://www.python.org/" target="_blank">Python 3.8 or later version</a>.
 - The following Python libraries installed: `os`, `requests`, `json`.
 - An Azure OpenAI resource created in the East US region. For more information, see [Create a resource and deploy a model with Azure OpenAI](../how-to/create-resource.md).
 
 ---
 
 > [!NOTE]
-> Currently, you must submit an application to access Azure OpenAI Service. To apply for access, complete [this form](https://aka.ms/oai/access). If you need assistance, open an issue on this repo to contact Microsoft.
+> Currently, you must submit an application to access Azure OpenAI Service. To apply for access, complete the form at <a href="https://aka.ms/oai/access" target="_blank">https://aka.ms/oai/access</a>. If you need assistance, open an issue on this repo to contact Microsoft.
 
-## Retrieve key and endpoint
+## Setup 
+### Retrieve key and endpoint
 
 To successfully call the Azure OpenAI APIs, you need the following information about your Azure OpenAI resource:
 
@@ -50,14 +53,13 @@ Go to your resource in the Azure portal. On the navigation pane, select **Keys a
 
 :::image type="content" source="../media/quickstarts/endpoint.png" alt-text="Screenshot that shows the Keys and Endpoint page for an Azure OpenAI resource in the Azure portal." lightbox="../media/quickstarts/endpoint.png":::
 
+[!INCLUDE [environment-variables](environment-variables.md)]
 
 ## Create a new Python application
 
 Create a new Python file named _quickstart.py_. Open the new file in your preferred editor or IDE.
 
-1. Replace the contents of _quickstart.py_ with the following code. Enter your endpoint URL and key in the appropriate fields. Change the value of `prompt` to your preferred text.
-
-    
+1. Replace the contents of _quickstart.py_ with the following code. Change the value of `prompt` to your preferred text.
 
     #### [DALL-E 3](#tab/dalle3)
 
@@ -67,8 +69,8 @@ Create a new Python file named _quickstart.py_. Open the new file in your prefer
     import requests
     import time
     import os
-    api_base = '<your_endpoint>'  # Enter your endpoint here
-    api_key = '<your_key>'        # Enter your API key here
+    api_base = os.environ['AZURE_OPENAI_ENDPOINT']  # Enter your endpoint here
+    api_key = os.environ['AZURE_OPENAI_API_KEY']         # Enter your API key here
 
     api_version = '2024-02-01'
     url = f"{api_base}/openai/deployments/<dalle3>/images/generations?api-version={api_version}"
@@ -97,8 +99,8 @@ Create a new Python file named _quickstart.py_. Open the new file in your prefer
     import time
     import os
 
-    api_base = '<your_endpoint>'  # Enter your endpoint here
-    api_key = '<your_key>'        # Enter your API key here
+    api_base = os.environ['AZURE_OPENAI_ENDPOINT'] # Enter your endpoint here
+    api_key = os.environ['AZURE_OPENAI_API_KEY']         # Enter your API key here
 
     # Assign the API version (DALL-E is currently supported for the 2023-06-01-preview API version only)
     api_version = '2023-06-01-preview'