Skip to content

Commit 3b6964b

Browse files
committed
Merge branch 'patch-maas-rebrand' of https://github.com/ssalgadodev/azure-ai-docs-pr into patch-maas-rebrand
2 parents 6cd5bdc + d2e07a7 commit 3b6964b

File tree

8 files changed

+19
-19
lines changed

8 files changed

+19
-19
lines changed

articles/ai-foundry/concepts/deployments-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Azure AI Foundry offers four different deployment options:
2727

2828
|Name | Azure OpenAI | Azure AI model inference | Standard deployment | Managed compute |
2929
|-------------------------------|----------------------|-------------------|----------------|-----------------|
30-
| Which models can be deployed? | [Azure OpenAI models](../../ai-services/openai/concepts/models.md) | [Azure OpenAI models and Standard deployment](../../ai-foundry/model-inference/concepts/models.md) | [Standard deployment](../how-to/model-catalog-overview.md#content-safety-for-models-deployed-via-serverless-apis) | [Open and custom models](../how-to/model-catalog-overview.md#availability-of-models-for-deployment-as-managed-compute) |
30+
| Which models can be deployed? | [Azure OpenAI models](../../ai-services/openai/concepts/models.md) | [Azure OpenAI models and Standard deployment](../../ai-foundry/model-inference/concepts/models.md) | [Standard deployment](../how-to/model-catalog-overview.md#content-safety-for-models-deployed-via-standard-deployments) | [Open and custom models](../how-to/model-catalog-overview.md#availability-of-models-for-deployment-as-managed-compute) |
3131
| Deployment resource | Azure OpenAI resource | Azure AI services resource | AI project resource | AI project resource |
3232
| Requires Hubs/Projects | No | No | Yes | Yes |
3333
| Data processing options | Regional <br /> Data-zone <br /> Global | Global | Regional | Regional |

articles/ai-foundry/concepts/model-benchmarks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Performance metrics are calculated as an aggregate over 14 days, based on 24 tra
7373

7474
| Parameter | Value | Applicable For |
7575
|---------------------------------------|----------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
76-
| Region | East US/East US2 | [Standard deployments](../how-to/model-catalog-overview.md#serverless-api-pay-per-token-billing) and [Azure OpenAI](/azure/ai-services/openai/overview) |
76+
| Region | East US/East US2 | [Standard deployments](../how-to/model-catalog-overview.md#standard-deployment-pay-per-token-offer-billing) and [Azure OpenAI](/azure/ai-services/openai/overview) |
7777
| Tokens per minute (TPM) rate limit | 30k (180 RPM based on Azure OpenAI) for non-reasoning and 100k for reasoning models <br> N/A (standard deployments) | For Azure OpenAI models, selection is available for users with rate limit ranges based on deployment type (standard, global, global standard, and so on.) <br> For standard deployments, this setting is abstracted. |
7878
| Number of requests | Two requests in a trail for every hour (24 trails per day) | Standard deployments, Azure OpenAI |
7979
| Number of trails/runs | 14 days with 24 trails per day for 336 runs | Standard deployments, Azure OpenAI |

articles/ai-foundry/how-to/deploy-models-serverless.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,14 @@ This article uses a Meta Llama model deployment for illustration. However, you c
122122
:::image type="content" source="../media/deploy-monitor/serverless/model-card.png" alt-text="A screenshot showing a model's details page." lightbox="../media/deploy-monitor/serverless/model-card.png":::
123123
124124
125-
The next section covers the steps for subscribing your project to a model offering. You can skip this section and go to [Deploy the model to a standard deployment](#deploy-the-model-to-a-serverless-api-endpoint), if you're deploying a Microsoft model.
125+
The next section covers the steps for subscribing your project to a model offering. You can skip this section and go to [Deploy the model to a standard deployment](#deploy-the-model-to-a-standard-deployment), if you're deploying a Microsoft model.
126126
127127
## Subscribe your project to the model offering
128128
129-
Standard deployments can deploy both Microsoft and non-Microsoft offered models. For Microsoft models (such as Phi-3 models), you don't need to create an Azure Marketplace subscription and you can [deploy them to standard deployment directly](#deploy-the-model-to-a-serverless-api-endpoint) to consume their predictions. For non-Microsoft models, you need to create the subscription first. If it's your first time deploying the model in the project, you have to subscribe your project for the particular model offering from the Azure Marketplace. Each project has its own subscription to the particular Azure Marketplace offering of the model, which allows you to control and monitor spending.
129+
Standard deployments can deploy both Microsoft and non-Microsoft offered models. For Microsoft models (such as Phi-3 models), you don't need to create an Azure Marketplace subscription and you can [deploy them to standard deployment directly](#deploy-the-model-to-a-standard-deployment) to consume their predictions. For non-Microsoft models, you need to create the subscription first. If it's your first time deploying the model in the project, you have to subscribe your project for the particular model offering from the Azure Marketplace. Each project has its own subscription to the particular Azure Marketplace offering of the model, which allows you to control and monitor spending.
130130
131131
> [!TIP]
132-
> Skip this step if you are deploying models from the Phi-3 family of models. Directly [deploy the model to a standard deployment](#deploy-the-model-to-a-serverless-api-endpoint).
132+
> Skip this step if you are deploying models from the Phi-3 family of models. Directly [deploy the model to a standard deployment](#deploy-the-model-to-a-standard-deployment).
133133
134134
> [!NOTE]
135135
> Models offered through the Azure Marketplace are available for deployment to standard deployment in specific regions. Check [Model and region availability for standard deployment](deploy-models-serverless-availability.md) to verify which models and regions are available. If the one you need is not listed, you can deploy to a workspace in a supported region and then [consume standard deployment from a different workspace](deploy-models-serverless-connect.md).
@@ -148,7 +148,7 @@ Standard deployments can deploy both Microsoft and non-Microsoft offered models.
148148
149149
:::image type="content" source="../media/deploy-monitor/serverless/deploy-pay-as-you-go.png" alt-text="A screenshot showing how to deploy a model with the standard deployment option." lightbox="../media/deploy-monitor/serverless/deploy-pay-as-you-go.png":::
150150
151-
1. If you see the note *You already have an Azure Marketplace subscription for this project*, you don't need to create the subscription since you already have one. You can proceed to [Deploy the model to a standard deployment](#deploy-the-model-to-a-serverless-api-endpoint).
151+
1. If you see the note *You already have an Azure Marketplace subscription for this project*, you don't need to create the subscription since you already have one. You can proceed to [Deploy the model to a standard deployment](#deploy-the-model-to-a-standard-deployment).
152152
153153
1. In the deployment wizard, select the link to **Azure Marketplace Terms** to learn more about the terms of use. You can also select the **Pricing and terms** tab to learn about pricing for the selected model.
154154

articles/ai-foundry/how-to/fine-tune-serverless.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,9 @@ Several enterprise scenarios are supported for standard deployment fine-tuning.
217217
>- Storage auth can be changed in Azure Storage > **Settings** > **Configurations** page > **Allow storage account key access**.
218218
>- Storage networking can be changed in Azure Storage > **Networking** page.
219219
220-
| **Storage Networking** | **Storage Auth** | **Data Connection Auth** | **Support** |
220+
| **Storage Networking** | **Storage Auth** | **Data Connection Auth** | **Support** |
221221
| ------------------------------------------------------------ | ------------------------------ | --------------------------------- | ----------------------- |
222-
| Public Network Access = Enabled | Account key enabled | SAS/Account Key | Yes, UX and SDK |
222+
| Public Network Access = Enabled | Account key enabled | SAS/Account Key | Yes, UX and SDK |
223223
| Public Network Access = Enabled | Account key disabled | Entra-Based Auth (Credentialless) | Yes, UX and SDK <br><br> *Note:* for UX, you may need to add Storage Blob Data Reader or Storage Blob Data Contributor for your user ID on the storage account, or change the connection's authentication to use Account key/SAS token | | | |
224224
| Enabled from selected virtual networks and IP addresses | Account key enabled | Account key | Yes, UX and SDK <br><br> *Note:* for UX, the IP of the compute running the browser must be in the selected list |
225225
| Enabled from selected virtual networks and IP addresses | Account key enabled | SAS | Yes, UX and SDK <br><br> *Note:* for UX, the IP of the compute running the browser must be in the selected list |
@@ -584,9 +584,9 @@ Several enterprise scenarios are supported for standard deployment fine-tuning.
584584
>- Storage auth can be changed in Azure Storage > **Settings** > **Configurations** page > **Allow storage account key access**.
585585
>- Storage networking can be changed in Azure Storage > **Networking** page.
586586

587-
| **Storage Networking** | **Storage Auth** | **Data Connection Auth** | **Support** |
587+
| **Storage Networking** | **Storage Auth** | **Data Connection Auth** | **Support** |
588588
| ------------------------------------------------------------ | ------------------------------ | --------------------------------- | ----------------------- |
589-
| Public Network Access = Enabled | Account key enabled | SAS/Account Key | Yes, UX and SDK |
589+
| Public Network Access = Enabled | Account key enabled | SAS/Account Key | Yes, UX and SDK |
590590
| Public Network Access = Enabled | Account key disabled | Entra-Based Auth (Credentialless) | Yes, UX and SDK <br><br> *Note:* for UX, you may need to add Storage Blob Data Reader or Storage Blob Data Contributor for your user ID on the storage account, or change the connection's authentication to use Account key/SAS token | | | |
591591
| Enabled from selected virtual networks and IP addresses | Account key enabled | Account key | Yes, UX and SDK <br><br> *Note:* for UX, the IP of the compute running the browser must be in the selected list |
592592
| Enabled from selected virtual networks and IP addresses | Account key enabled | SAS | Yes, UX and SDK <br><br> *Note:* for UX, the IP of the compute running the browser must be in the selected list |

articles/ai-foundry/how-to/model-catalog-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Features | Managed compute | standard deployment
6969
Deployment experience and billing | Model weights are deployed to dedicated virtual machines with managed compute. A managed compute, which can have one or more deployments, makes available a REST API for inference. You're billed for the virtual machine core hours that the deployments use. | Access to models is through a deployment that provisions an API to access the model. The API provides access to the model that Microsoft hosts and manages, for inference. You're billed for inputs and outputs to the APIs, typically in tokens. Pricing information is provided before you deploy.
7070
API authentication | Keys and Microsoft Entra authentication. | Keys only.
7171
Content safety | Use Azure AI Content Safety service APIs. | Azure AI Content Safety filters are available integrated with inference APIs. Azure AI Content Safety filters are billed separately.
72-
Network isolation | [Configure managed networks for Azure AI Foundry hubs](configure-managed-network.md). | Managed compute follow your hub's public network access (PNA) flag setting. For more information, see the [Network isolation for models deployed via standard deployments](#network-isolation-for-models-deployed-via-serverless-apis) section later in this article.
72+
Network isolation | [Configure managed networks for Azure AI Foundry hubs](configure-managed-network.md). | Managed compute follow your hub's public network access (PNA) flag setting. For more information, see the [Network isolation for models deployed via standard deployments](#network-isolation-for-models-deployed-via-standard-deployments) section later in this article.
7373

7474
### Available models for supported deployment options
7575

@@ -125,7 +125,7 @@ The [Azure AI Content Safety](../../ai-services/content-safety/overview.md) serv
125125

126126
You can refer to [this notebook](https://github.com/Azure/azureml-examples/blob/main/sdk/python/foundation-models/system/inference/text-generation/llama-safe-online-deployment.ipynb) for reference integration with Azure AI Content Safety for Llama 2. Or you can use the Content Safety (Text) tool in prompt flow to pass responses from the model to Azure AI Content Safety for screening. You're billed separately for such use, as described in [Azure AI Content Safety pricing](https://azure.microsoft.com/pricing/details/cognitive-services/content-safety/).
127127

128-
## standard deployment (pay per token offer) billing
128+
## Standard deployment (pay per token offer) billing
129129

130130
You can deploy certain models in the model catalog with pay-per-token billing. This deployment method, also called *standard deployment*, provides a way to consume the models as APIs without hosting them on your subscription. Models are hosted in a Microsoft-managed infrastructure, which enables API-based access to the model provider's model. API-based access can dramatically reduce the cost of accessing a model and simplify the provisioning experience.
131131

articles/machine-learning/how-to-deploy-models-serverless.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@ This article uses a Meta Llama model deployment for illustration. However, you c
105105
106106
:::image type="content" source="media/how-to-deploy-models-serverless/model-card.png" alt-text="A screenshot showing a model's details page." lightbox="media/how-to-deploy-models-serverless/model-card.png":::
107107
108-
The next section covers the steps for subscribing your workspace to a model offering. You can skip this section and go to [Deploy the model to a standard deployment](#deploy-the-model-to-a-serverless-api-endpoint), if you're deploying a Microsoft model.
108+
The next section covers the steps for subscribing your workspace to a model offering. You can skip this section and go to [Deploy the model to a standard deployment](#deploy-the-model-to-a-standard-deployment), if you're deploying a Microsoft model.
109109
110110
## Subscribe your workspace to the model offering
111111
112-
standard deployments can deploy both Microsoft and non-Microsoft offered models. For Microsoft models (such as Phi-3 models), you don't need to create an Azure Marketplace subscription and you can [deploy them to standard deployments directly](#deploy-the-model-to-a-serverless-api-endpoint) to consume their predictions. For non-Microsoft models, you need to create the subscription first. If it's your first time deploying the model in the workspace, you have to subscribe your workspace for the particular model offering from the Azure Marketplace. Each workspace has its own subscription to the particular Azure Marketplace offering of the model, which allows you to control and monitor spending.
112+
standard deployments can deploy both Microsoft and non-Microsoft offered models. For Microsoft models (such as Phi-3 models), you don't need to create an Azure Marketplace subscription and you can [deploy them to standard deployments directly](#deploy-the-model-to-a-standard-deployment) to consume their predictions. For non-Microsoft models, you need to create the subscription first. If it's your first time deploying the model in the workspace, you have to subscribe your workspace for the particular model offering from the Azure Marketplace. Each workspace has its own subscription to the particular Azure Marketplace offering of the model, which allows you to control and monitor spending.
113113
114114
> [!NOTE]
115115
> Models offered through the Azure Marketplace are available for deployment to standard deployments in specific regions. Check [Region availability for models in standard deployments](concept-endpoint-serverless-availability.md) to verify which models and regions are available. If the one you need is not listed, you can deploy to a workspace in a supported region and then [consume standard deployments from a different workspace](how-to-connect-models-serverless.md).
@@ -128,7 +128,7 @@ standard deployments can deploy both Microsoft and non-Microsoft offered models.
128128
129129
:::image type="content" source="media/how-to-deploy-models-serverless/deploy-pay-as-you-go.png" alt-text="A screenshot showing how to deploy a model with the standard deployment option." lightbox="media/how-to-deploy-models-serverless/deploy-pay-as-you-go.png":::
130130
131-
1. If you see the note *You already have an Azure Marketplace subscription for this workspace*, you don't need to create the subscription since you already have one. You can proceed to [Deploy the model to a standard deployment](#deploy-the-model-to-a-serverless-api-endpoint).
131+
1. If you see the note *You already have an Azure Marketplace subscription for this workspace*, you don't need to create the subscription since you already have one. You can proceed to [Deploy the model to a standard deployment](#deploy-the-model-to-a-standard-deployment).
132132
133133
1. In the deployment wizard, select the link to **Azure Marketplace Terms** to learn more about the terms of use. You can also select the **Pricing and terms** tab to learn about pricing for the selected model.
134134

0 commit comments

Comments
 (0)