Skip to content

Commit 8715dec

Browse files
committed
Merge branch 'main' into release-maas-model-deprecation
2 parents 89f5e68 + 13a631e commit 8715dec

31 files changed

+7
-141
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Content extraction for video includes transcription, shot detection, key frame e
4848
* **Shot detection**: Identifies segments of the video aligned with shot boundaries where possible, allowing for precise editing and repackaging of content with breaks exactly on shot boundaries.
4949
* **Key frame extraction**: Extracts key frames from videos to represent each shot completely, ensuring each shot has enough key frames to enable Field Extraction to work effectively.
5050
* **Face grouping**: Grouped faces appearing in a video to extract one representative face image for each person and provides segments where each one is present. The grouped face data is available as metadata and can be used to generate customized metadata fields.
51-
* This feature is limited access and involves face identification and grouping; customers need to register for access at [Face Registration](https://aka.ms/faceregistration).
51+
* This feature is limited access and involves face identification and grouping; customers need to register for access at [Face Recognition](https://aka.ms/facerecognition).
5252

5353
### Field extraction
5454

@@ -91,4 +91,4 @@ As with all the Azure AI services, developers using the Content Understanding se
9191
## Next steps
9292

9393
* Try processing your video content using Content Understanding in [Azure AI Foundry](https://ai.azure.com/).
94-
* Learn more about video [**analyzer templates**](../quickstart/use-ai-foundry.md).
94+
* Learn more about video [**analyzer templates**](../quickstart/use-ai-foundry.md).

articles/ai-services/openai/includes/chatgpt-dotnet.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ ms.date: 11/15/2023
1919
- An Azure OpenAI Service resource with either the `gpt-35-turbo` or the `gpt-4` models deployed. For more information about model deployment, see the [resource deployment guide](../how-to/create-resource.md).
2020

2121

22-
> [!div class="nextstepaction"]
23-
> [I ran into an issue with the prerequisites.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=DOTNET&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Prerequisites)
24-
2522
## Set up
2623

2724
[!INCLUDE [Create a new .NET application](./dotnet-new-application.md)]
@@ -31,9 +28,6 @@ ms.date: 11/15/2023
3128
[!INCLUDE [environment-variables](environment-variables.md)]
3229

3330

34-
> [!div class="nextstepaction"]
35-
> [I ran into an issue with the setup.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=DOTNET&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Set-up)
36-
3731
## Create a sample application
3832

3933
From the project directory, open the *program.cs* file and replace with the following code:
@@ -121,8 +115,6 @@ await foreach(var chatUpdate in chatUpdates)
121115
}
122116
```
123117

124-
> [!div class="nextstepaction"]
125-
> [I ran into an issue when running the code samples.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=DOTNET&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Create-dotnet-application)
126118

127119
## Clean up resources
128120

articles/ai-services/openai/includes/chatgpt-java.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ ms.date: 07/03/2024
2020
- The [Gradle build tool](https://gradle.org/install/), or another dependency manager.
2121
- An Azure OpenAI Service resource with either the `gpt-35-turbo` or the `gpt-4` models deployed. For more information about model deployment, see the [resource deployment guide](../how-to/create-resource.md).
2222

23-
> [!div class="nextstepaction"]
24-
> [I ran into an issue with the prerequisites.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=JAVA&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Prerequisites)
2523

2624
## Set up
2725

@@ -48,9 +46,6 @@ gradle init --type basic
4846
When prompted to choose a **DSL**, select **Kotlin**.
4947

5048

51-
> [!div class="nextstepaction"]
52-
> [I ran into an issue with the setup.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=JAVA&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Set-up-the-environment)
53-
5449
## Install the Java SDK
5550

5651
This quickstart uses the Gradle dependency manager. You can find the client library and information for other dependency managers on the [Maven Central Repository](https://central.sonatype.com/search?q=azure-ai-openai).
@@ -175,8 +170,6 @@ Yes, most of the Azure AI services support customer managed keys. However, there
175170
Usage: number of prompt token is 59, number of completion token is 36, and number of total tokens in request and response is 95.
176171
```
177172

178-
> [!div class="nextstepaction"]
179-
> [I ran into an issue when running the code sample.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=JAVA&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Create-application)
180173

181174
## Clean up resources
182175

articles/ai-services/openai/includes/chatgpt-javascript.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ ms.date: 10/22
2323
- [Azure CLI](/cli/azure/install-azure-cli) used for passwordless authentication in a local development environment, create the necessary context by signing in with the Azure CLI.
2424
- An Azure OpenAI Service resource with either a `gpt-35-turbo` or `gpt-4` series models deployed. For more information about model deployment, see the [resource deployment guide](../how-to/create-resource.md).
2525

26-
> [!div class="nextstepaction"]
27-
> [I ran into an issue with the prerequisites.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=JAVASCRIPT&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Prerequisites)
28-
2926

3027
## Set up
3128

@@ -47,9 +44,6 @@ npm install openai @azure/identity
4744

4845
Your app's _package.json_ file will be updated with the dependencies.
4946

50-
> [!div class="nextstepaction"]
51-
> [I ran into an issue with the setup.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=JAVASCRIPT&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Set-up-the-environment)
52-
5347
## Create a sample application
5448

5549
Open a command prompt where you want the new project, and create a new file named ChatCompletion.js. Copy the following code into the ChatCompletion.js file.
@@ -166,8 +160,6 @@ node.exe ChatCompletion.js
166160
> [!NOTE]
167161
> If your receive the error: *Error occurred: OpenAIError: The `apiKey` and `azureADTokenProvider` arguments are mutually exclusive; only one can be passed at a time.* You may need to remove a pre-existing environment variable for the API key from your system. Even though the Microsoft Entra ID code sample is not explicitly referencing the API key environment variable, if one is present on the system executing this sample, this error will still be generated.
168162
169-
> [!div class="nextstepaction"]
170-
> [I ran into an issue when running the code sample.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=JAVASCRIPT&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Create-application)
171163

172164
## Clean up resources
173165

articles/ai-services/openai/includes/chatgpt-powershell.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ ms.date: 08/28/2023
1717
- An Azure OpenAI Service resource with a model deployed. For more information about model deployment, see the [resource deployment guide](../how-to/create-resource.md).
1818
- An Azure OpenAI Service resource with either the `gpt-35-turbo` or the `gpt-4` models deployed. For more information about model deployment, see the [resource deployment guide](../how-to/create-resource.md).
1919

20-
> [!div class="nextstepaction"]
21-
> [I ran into an issue with the prerequisites.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=POWERSHELL&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Prerequisites)
22-
2320
### Retrieve key and endpoint
2421

2522
To successfully make a call against Azure OpenAI, you'll need an **endpoint** and a **key**.
@@ -62,8 +59,6 @@ echo export AZURE_OPENAI_ENDPOINT="REPLACE_WITH_YOUR_ENDPOINT_HERE" >> /etc/envi
6259

6360
---
6461

65-
> [!div class="nextstepaction"]
66-
> [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)
6762

6863
## Create a new PowerShell script
6964

@@ -144,8 +139,6 @@ $reponse = ./quickstart.ps1
144139
$response.choices.message.content
145140
```
146141

147-
> [!div class="nextstepaction"]
148-
> [I ran into an issue when running the code sample.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=POWERSHELL&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Create-powershell-script)
149142

150143
### Understanding the message structure
151144

articles/ai-services/openai/includes/chatgpt-python.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ ms.date: 11/15/2023
2020
- The following Python libraries: os.
2121
- An Azure OpenAI Service resource with either the `gpt-35-turbo` or the `gpt-4` models deployed. For more information about model deployment, see the [resource deployment guide](../how-to/create-resource.md).
2222

23-
> [!div class="nextstepaction"]
24-
> [I ran into an issue with the prerequisites.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=PYTHON&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Prerequisites)
2523

2624
## Set up
2725

@@ -50,8 +48,6 @@ pip install openai==0.28.1
5048

5149
[!INCLUDE [environment-variables](environment-variables.md)]
5250

53-
> [!div class="nextstepaction"]
54-
> [I ran into an issue with the setup.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=PYTHON&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Set-up)
5551

5652
## Create a new Python application
5753

@@ -150,9 +146,6 @@ print(response['choices'][0]['message']['content'])
150146
Yes, most of the Azure AI services support customer managed keys. However, not all services support it. You can check the documentation of each service to confirm if customer managed keys are supported.
151147
```
152148

153-
> [!div class="nextstepaction"]
154-
> [I ran into an issue when running the code sample.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=PYTHON&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Create-python-application)
155-
156149
### Understanding the message structure
157150

158151
The GPT-35-Turbo and GPT-4 models are optimized to work with inputs formatted as a conversation. The `messages` variable passes an array of dictionaries with different roles in the conversation delineated by system, user, and assistant. The system message can be used to prime the model by including context or instructions on how the model should respond.

articles/ai-services/openai/includes/chatgpt-rest.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ ms.date: 03/21/2023
2525
[!INCLUDE [environment-variables](environment-variables.md)]
2626

2727

28-
> [!div class="nextstepaction"]
29-
> [I ran into an issue with the setup.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=REST&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Set-up)
3028

3129
## REST API
3230

@@ -62,8 +60,6 @@ If you want to run this command in a normal Windows command prompt you would nee
6260

6361
Output formatting adjusted for ease of reading, actual output is a single block of text without line breaks.
6462

65-
> [!div class="nextstepaction"]
66-
> [I ran into an issue when running the code sample.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=REST&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Create-sample-code)
6763

6864
### Understanding the message structure
6965

articles/ai-services/openai/includes/chatgpt-spring.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,13 @@ ms.date: 11/27/2023
1717
- The [Spring Boot CLI tool](https://docs.spring.io/spring-boot/docs/current/reference/html/getting-started.html#getting-started.installing.cli)
1818
- An Azure OpenAI Service resource with the `gpt-35-turbo` model deployed. For more information about model deployment, see the [resource deployment guide](../how-to/create-resource.md). This example assumes that your deployment name matches the model name `gpt-35-turbo`
1919

20-
> [!div class="nextstepaction"]
21-
> [I ran into an issue with the prerequisites.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=SPRING&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Prerequisites)
22-
2320
## Set up
2421

2522
[!INCLUDE [get-key-endpoint](get-key-endpoint.md)]
2623

2724
[!INCLUDE [environment-variables](spring-environment-variables.md)]
2825

29-
> [!div class="nextstepaction"]
30-
> [I ran into an issue with the setup.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=SPRING&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Set-up-the-environment)
26+
3127

3228
## Create a new Spring application
3329

@@ -217,8 +213,6 @@ Prompt created 1 generated response(s).
217213
Generated respose from "assistant": Yes, other Azure AI services also support customer managed keys. Azure AI Services, Azure Machine Learning, and other AI services in Azure provide options for customers to manage and control their encryption keys. This allows customers to have greater control over their data and security.
218214
```
219215

220-
> [!div class="nextstepaction"]
221-
> [I ran into an issue when running the code sample.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=SPRING&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Create-application)
222216

223217
## Clean up resources
224218

articles/ai-services/openai/includes/chatgpt-typescript.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ ms.date: 10/22
2525
- [Azure CLI](/cli/azure/install-azure-cli) used for passwordless authentication in a local development environment, create the necessary context by signing in with the Azure CLI.
2626
- An Azure OpenAI Service resource with a `gpt-35-turbo` or `gpt-4` series models deployed. For more information about model deployment, see the [resource deployment guide](../how-to/create-resource.md).
2727

28-
> [!div class="nextstepaction"]
29-
> [I ran into an issue with the prerequisites.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=JAVASCRIPT&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Prerequisites)
3028

3129

3230
## Set up
@@ -49,8 +47,6 @@ npm install openai @azure/identity
4947

5048
Your app's _package.json_ file will be updated with the dependencies.
5149

52-
> [!div class="nextstepaction"]
53-
> [I ran into an issue with the setup.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=JAVASCRIPT&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Set-up-the-environment)
5450

5551
## Create a sample application
5652

@@ -225,8 +221,6 @@ node.exe ChatCompletion.js
225221
> [!NOTE]
226222
> If your receive the error: *Error occurred: OpenAIError: The `apiKey` and `azureADTokenProvider` arguments are mutually exclusive; only one can be passed at a time.* You may need to remove a pre-existing environment variable for the API key from your system. Even though the Microsoft Entra ID code sample is not explicitly referencing the API key environment variable, if one is present on the system executing this sample, this error will still be generated.
227223
228-
> [!div class="nextstepaction"]
229-
> [I ran into an issue when running the code sample.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=JAVASCRIPT&Pillar=AOAI&Product=Chatgpt&Page=quickstart&Section=Create-application)
230224

231225
## Clean up resources
232226

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,4 @@ Navigate to [Azure AI Foundry](https://ai.azure.com/) and sign-in with credentia
5454
5555
1. Review the details you entered, and select **Save and close**. You can now chat with the model and it will use information from your data to construct the response.
5656

57-
> [!div class="nextstepaction"]
58-
> [I ran into an issue adding my data.](https://microsoft.qualtrics.com/jfe/form/SV_0Cl5zkG3CnDjq6O?PLanguage=STUDIO&Pillar=AOAI&Product=ownData&Page=quickstart&Section=Adding-data)
57+

0 commit comments

Comments
 (0)