Skip to content

Commit 05fd0a1

Browse files
authored
Merge pull request #265475 from MicrosoftDocs/main
2/6/2024 AM Publish
2 parents 2b72650 + 96163ce commit 05fd0a1

File tree

445 files changed

+978
-1323
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

445 files changed

+978
-1323
lines changed

articles/ai-services/openai/concepts/provisioned-throughput.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ We use a variation of the leaky bucket algorithm to maintain utilization below 1
9494

9595
a. When the current utilization is above 100%, the service returns a 429 code with the `retry-after-ms` header set to the time until utilization is below 100%
9696
97-
b. Otherwise, the service estimates the incremental change to utilization required to serve the request by combining prompt tokens and the specified max_tokens in the call.
97+
b. Otherwise, the service estimates the incremental change to utilization required to serve the request by combining prompt tokens and the specified `max_tokens` in the call. If the `max_tokens` parameter is not specified, the service will estimate a value. This estimation can lead to lower concurrency than expected when the number of actual generated tokens is small. For highest concurrency, ensure that the `max_tokens` value is as close as possible to the true generation size.
9898

9999
3. When a request finishes, we now know the actual compute cost for the call. To ensure an accurate accounting, we correct the utilization using the following logic:
100100

@@ -109,7 +109,9 @@ We use a variation of the leaky bucket algorithm to maintain utilization below 1
109109

110110
:::image type="content" source="../media/provisioned/utilization.jpg" alt-text="Diagram showing how subsequent calls are added to the utilization." lightbox="../media/provisioned/utilization.jpg":::
111111

112+
#### How many concurrent calls can I have on my deployment?
112113

114+
The number of concurrent calls you can have at one time is dependent on each call's shape. The service will continue to accept calls until the utilization is above 100%. To determine the approximate number of concurrent calls you can model out the maximum requests per minute for a particular call shape in the [capacity calculator](https://oai.azure.com/portal/calculator). If `max_tokens` is empty, you can assume a value of 1000
113115

114116
## Next steps
115117

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.author: mbullwin
1111
ms.date: 07/26/2023
1212
---
1313

14-
[Source code](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/openai/azure-ai-openai) | [Artifact (Maven)](https://central.sonatype.com/artifact/com.azure/azure-ai-openai/1.0.0-beta.3) | [Samples](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/openai/azure-ai-openai/src/samples) | [Retrieval Augmented Generation (RAG) enterprise chat template](/azure/developer/java/quickstarts/get-started-app-chat-template) |
14+
[Source code](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/openai/azure-ai-openai) | [Artifact (Maven)](https://central.sonatype.com/artifact/com.azure/azure-ai-openai/1.0.0-beta.3) | [Samples](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/openai/azure-ai-openai/src/samples) | [Retrieval Augmented Generation (RAG) enterprise chat template](/azure/developer/java/quickstarts/get-started-app-chat-template) | [IntelliJ IDEA](/azure/developer/java/toolkit-for-intellij/chatgpt-intellij)
1515

1616
## Prerequisites
1717

articles/ai-services/policy-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Built-in policy definitions for Azure AI services
33
description: Lists Azure Policy built-in policy definitions for Azure AI services. These built-in policy definitions provide common approaches to managing your Azure resources.
4-
ms.date: 01/30/2024
4+
ms.date: 02/06/2024
55
author: nitinme
66
ms.author: nitinme
77
ms.service: azure-ai-services

articles/ai-studio/concepts/ai-resources.md

Lines changed: 17 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ author: Blackmist
1717

1818
[!INCLUDE [Azure AI Studio preview](../includes/preview-ai-studio.md)]
1919

20-
The 'Azure AI' resource is the top-level Azure resource for AI Studio and provides the working environment for a team to build and manage AI applications. In Azure, resources enable access to Azure services for individuals and teams. Resources also provide a container for billing, security configuration and monitoring.
20+
The Azure AI hub resource is the top-level Azure resource for AI Studio and provides the working environment for a team to build and manage AI applications. In Azure, resources enable access to Azure services for individuals and teams. Resources also provide a container for billing, security configuration and monitoring.
2121

22-
The Azure AI hub resource is used to access multiple Azure AI services with a single setup. Previously, different Azure AI services including [Azure OpenAI](../../ai-services/openai/overview.md), [Azure Machine Learning](../../machine-learning/overview-what-is-azure-machine-learning.md), [Azure Speech](../../ai-services/speech-service/overview.md), required their individual setup.
22+
The Azure AI hub resource can be used to access [multiple Azure AI services](#azure-ai-services-api-access-keys) with a single setup. Previously, different Azure AI services including [Azure OpenAI](../../ai-services/openai/overview.md), [Azure Machine Learning](../../machine-learning/overview-what-is-azure-machine-learning.md), [Azure AI Speech](../../ai-services/speech-service/overview.md), required their individual setup.
2323

2424
In this article, you learn more about Azure AI hub resource's capabilities, and how to set up Azure AI for your organization. You can see the resources created in the [Azure portal](https://portal.azure.com/) and in [Azure AI Studio](https://ai.azure.com).
2525

@@ -32,7 +32,7 @@ The Azure AI hub resource provides the collaboration environment for a team to b
3232

3333
## Central setup and management concepts
3434

35-
Various management concepts are available on Azure AI hub resources to support team leads and admins to centrally manage a team's environment. In [Azure AI Studio](https://ai.azure.com/), you find these on the **Manage** page.
35+
Various management concepts are available on Azure AI hub resources to support team leads and admins to centrally manage a team's environment.
3636

3737
* **Security configuration** including public network access, [virtual networking](#virtual-networking), customer-managed key encryption, and privileged access to whom can create projects for customization. Security settings configured on the Azure AI hub resource automatically pass down to each project. A managed virtual network is shared between all projects that share the same Azure AI hub resource.
3838
* **Connections** are named and authenticated references to Azure and non-Azure resources like data storage providers. Use a connection as a means for making an external resource available to a group of developers without having to expose its stored credential to an individual.
@@ -43,7 +43,7 @@ Various management concepts are available on Azure AI hub resources to support t
4343

4444
## Organize work in projects for customization
4545

46-
An Azure AI hub resource provides the hosting environment for **projects** in AI Studio. A project is an organizational container that has tools for AI customization and orchestration, lets you organize your work, save state across different tools like prompt flow, and collaborate with others. For example, you can share uploaded files and connections to data sources.
46+
An Azure AI hub resource provides the hosting environment for [Azure AI projects](../how-to/create-projects.md) in AI Studio. A project is an organizational container that has tools for AI customization and orchestration, lets you organize your work, save state across different tools like prompt flow, and collaborate with others. For example, you can share uploaded files and connections to data sources.
4747

4848
Multiple projects can use an Azure AI hub resource, and a project can be used by multiple users. A project also helps you keep track of billing, and manage access and provides data isolation. Every project has dedicated storage containers to let you upload files and share it with only other project members when using the 'data' experiences.
4949

@@ -68,16 +68,13 @@ Projects also have specific settings that only hold for that project:
6868
6969
## Azure AI services API access keys
7070

71-
The Azure AI hub resource exposes API endpoints and keys for prebuilt AI services that are created by Microsoft such as Speech services and Language service. Which precise services are available to you is subject to your Azure region and your chosen Azure AI services provider at the time of setup ('advanced' option):
71+
The Azure AI hub resource exposes API endpoints and keys for prebuilt AI services that are created by Microsoft such as Azure OpenAI Service. Which precise services are available to you is subject to your Azure region and your chosen Azure AI services provider at the time of setup ('advanced' option):
7272

73-
* If you create an Azure AI hub resource using the default configuration, you'll have by default capabilities enabled for Azure OpenAI service, Speech, Vision, Content Safety.
74-
* If you create an Azure AI hub resource and choose an existing Azure OpenAI resource as service provider, you'll only have capabilities for Azure OpenAI service. Use this option if you'd like to reuse existing Azure OpenAI quota and models deployments. Currently, there's no upgrade path to get Speech and Vision capabilities after deployment.
73+
* If you create an Azure AI hub resource together with an existing Azure OpenAI Service resource, you only have capabilities for Azure OpenAI Service. Use this option if you'd like to reuse existing Azure OpenAI quota and models deployments. Currently, there's no upgrade path to get Speech and Vision capabilities after the AI hub is created.
74+
* If you create an Azure AI hub resource together with an Azure AI services provider, you can use Azure OpenAI Service and other AI services such as Speech and Vision. Currently, this option is only available via the Azure AI CLI and SDK.
7575

7676
To understand the full layering of Azure AI hub resources and its Azure dependencies including the Azure AI services provider, and how these is represented in Azure AI Studio and in the Azure portal, see [Find Azure AI Studio resources in the Azure portal](#find-azure-ai-studio-resources-in-the-azure-portal).
7777

78-
> [!NOTE]
79-
> This Azure AI services resource is similar but not to be confused with the standalone "Azure AI services multi-service account" resource. Their capabilities vary, and the standalone resource is not supported in Azure AI Studio. Going forward, we recommend using the Azure AI services resource that's provided with your Azure AI hub resource.
80-
8178
With the same API key, you can access all of the following Azure AI services:
8279

8380
| Service | Description |
@@ -121,7 +118,7 @@ When you create a new Azure AI hub resource, a set of dependent Azure resources
121118

122119
|Dependent Azure resource|Note|
123120
|---|---|
124-
|Azure AI services|Either Azure AI services multi-service provider, or Azure OpenAI service. Provides API endpoints and keys for prebuilt AI services.|
121+
|Azure AI services|Either Azure AI services multi-service provider, or Azure OpenAI Service. Provides API endpoints and keys for prebuilt AI services.|
125122
|Azure Storage account|Stores artifacts for your projects like flows and evaluations. For data isolation, storage containers are prefixed using the project GUID, and conditionally secured using Azure ABAC for the project identity.|
126123
|Azure Key Vault| Stores secrets like connection strings for your resource connections. For data isolation, secrets can't be retrieved across projects via APIs.|
127124
|Azure Container Registry| Stores docker images created when using custom runtime for prompt flow. For data isolation, docker images are prefixed using the project GUID.|
@@ -144,36 +141,24 @@ In the Azure portal, you can find resources that correspond to your Azure AI pro
144141
> [!NOTE]
145142
> This section assumes that the Azure AI hub resource and Azure AI project are in the same resource group.
146143
147-
In Azure AI Studio, go to **Build** > **Settings** to view your Azure AI project resources such as connections and API keys. There's a link to view the corresponding resources in the Azure portal and a link to your Azure AI hub resource in Azure AI Studio.
148-
149-
:::image type="content" source="../media/concepts/azureai-project-view-ai-studio.png" alt-text="Screenshot of the Azure AI project and related resources in the Azure AI Studio." lightbox="../media/concepts/azureai-project-view-ai-studio.png":::
150-
151-
In Azure AI Studio, go to **Manage** (or select the Azure AI hub resource link from the project settings page) to view your Azure AI hub resource, including projects and shared connections. There's also a link to view the corresponding resources in the Azure portal.
152-
153-
:::image type="content" source="../media/concepts/azureai-resource-view-ai-studio.png" alt-text="Screenshot of the Azure AI hub resource and related resources in the Azure AI Studio." lightbox="../media/concepts/azureai-resource-view-ai-studio.png":::
154-
155-
After you select **View in the Azure Portal**, you see your Azure AI hub resource in the Azure portal.
156-
157-
:::image type="content" source="../media/concepts/docs-azure-ai-resource.png" alt-text="Screenshot of the Azure AI hub resource in the Azure portal." lightbox="../media/concepts/docs-azure-ai-resource.png":::
158-
159-
Select the resource group name to see all associated resources, including the Azure AI project, storage account, and key vault.
144+
1. In [Azure AI Studio](https://ai.azure.com), go to **Build** > **Settings** to view your Azure AI project resources such as connections and API keys. There's a link to your Azure AI hub resource in Azure AI Studio and links to view the corresponding project resources in the [Azure portal](https://portal.azure.com).
160145

161-
:::image type="content" source="../media/concepts/rg-docs-azure-ai-resource.png" alt-text="Screenshot of the Azure AI hub resource group in the Azure portal." lightbox="../media/concepts/rg-docs-azure-ai-resource.png":::
146+
:::image type="content" source="../media/concepts/azureai-project-view-ai-studio.png" alt-text="Screenshot of the Azure AI project and related resources in the Azure AI Studio." lightbox="../media/concepts/azureai-project-view-ai-studio.png":::
162147

163-
From the resource group, you can select the Azure AI project for more details.
148+
1. Select the AI hub name to view your Azure AI hub's projects and shared connections. There's also a link to view the corresponding resources in the [Azure portal](https://portal.azure.com).
164149

165-
:::image type="content" source="../media/concepts/docs-project.png" alt-text="Screenshot of the Azure AI project in the Azure portal." lightbox="../media/concepts/docs-project.png":::
150+
:::image type="content" source="../media/concepts/azureai-resource-view-ai-studio.png" alt-text="Screenshot of the Azure AI hub resource and related resources in the Azure AI Studio." lightbox="../media/concepts/azureai-resource-view-ai-studio.png":::
166151

167-
Also from the resource group, you can select the **Azure AI service** resource to see the keys and endpoints needed to authenticate your requests to Azure AI services.
152+
1. Select **View in the Azure Portal** to see your Azure AI hub resource in the Azure portal.
168153

169-
:::image type="content" source="../media/concepts/docs-azure-ai-resource-aiservices-keys.png" alt-text="Screenshot of the Azure AI service resource in the Azure portal." lightbox="../media/concepts/docs-azure-ai-resource-aiservices-keys.png":::
154+
:::image type="content" source="../media/concepts/ai-hub-azure-portal.png" alt-text="Screenshot of the Azure AI hub resource in the Azure portal." lightbox="../media/concepts/ai-hub-azure-portal.png":::
170155

171-
You can use the same API key to access all of the supported service endpoints that are listed.
156+
- Select the **AI Services provider** to see the keys and endpoints needed to authenticate your requests to Azure AI services such as Azure OpenAI. For more information, see [Azure AI services API access keys](#azure-ai-services-api-access-keys).
157+
- Also from the Azure AI hub page, you can select the **Project resource group** to find your Azure AI project.
172158

173-
:::image type="content" source="../media/concepts/docs-azure-ai-resource-aiservices-keys-endpoints.png" alt-text="Screenshot of the Azure AI service resource endpoints in the Azure portal." lightbox="../media/concepts/docs-azure-ai-resource-aiservices-keys-endpoints.png":::
174159

175160
## Next steps
176161

177-
- [Quickstart: Generate product name ideas in the Azure AI Studio playground](../quickstarts/playground-completions.md)
162+
- [Quickstart: Analyze images and video with GPT-4 for Vision in the playground](../quickstarts/multimodal-vision.md)
178163
- [Learn more about Azure AI Studio](../what-is-ai-studio.md)
179164
- [Learn more about Azure AI Studio projects](../how-to/create-projects.md)

articles/ai-studio/concepts/connections.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Connections in Azure AI Studio are a way to authenticate and consume both Micros
2121

2222
## Connections to Azure AI services
2323

24-
You can create connections to Azure AI services such as Azure AI Content Safety and Azure OpenAI. You can then use the connection in a prompt flow tool such as the LLM tool.
24+
You can create connections to Azure AI services such as Azure OpenAI and Azure AI Content Safety. You can then use the connection in a prompt flow tool such as the LLM tool.
2525

2626
:::image type="content" source="../media/prompt-flow/llm-tool-connection.png" alt-text="Screenshot of a connection used by the LLM tool in prompt flow." lightbox="../media/prompt-flow/llm-tool-connection.png":::
2727

articles/ai-studio/faq.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
metadata:
33
title: Azure AI frequently asked questions
44
titleSuffix: Azure AI Studio
5-
description: Get answers to the most popular questions about Azure AI services
5+
description: Get answers to the most popular questions about Azure AI services.
66
manager: nitinme
77
ms.service: azure-ai-studio
88
ms.topic: faq
9-
ms.date: 11/15/2023
9+
ms.date: 2/6/2024
1010
ms.reviewer: eur
1111
ms.author: eur
1212
author: eric-urban
@@ -27,7 +27,7 @@ sections:
2727
- question: |
2828
What regions is Azure AI Studio available in?
2929
answer: |
30-
Azure AI Studio is available in these regions: Australia East, Brazil South, Canada Central, East US, East US 2, France Central, Germany West Central, India South, Japan East, North Central US, Norway East, Poland Central, South Africa North, South Central US, Sweden Central, Switzerland North, UK South, West Europe, and West US.
30+
Azure AI Studio is available in most regions where Azure AI services are available. For more information, see [region support for Azure AI Studio](reference/region-support.md).
3131
- question: |
3232
Can I integrate Microsoft Fabric data into Azure AI Studio?
3333
answer: |
@@ -59,7 +59,7 @@ sections:
5959
- question: |
6060
What is the billing model for Model-as-a-Service (MaaS)?
6161
answer: |
62-
Azure AI Studio offers paygo inference APIs and hosted fine-tuning for Llama2. During preview, there's no extra charge for Azure AI Studio outside of typical AI services and other Azure resource charges.
62+
Azure AI Studio offers paygo inference APIs and hosted fine-tuning for [Llama 2 family models](how-to/deploy-models-llama.md). During preview, there's no extra charge for Azure AI Studio outside of typical AI services and other Azure resource charges.
6363
- question: |
6464
Can all models be secured with content filtering?
6565
answer: |

0 commit comments

Comments
 (0)