Skip to content

Commit 5630948

Browse files
ShawnJacksonShawnJackson
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ai-agents
2 parents 6aebc8a + d544eee commit 5630948

File tree

69 files changed

+926
-645
lines changed

Some content is hidden

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

69 files changed

+926
-645
lines changed

‎.openpublishing.redirection.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4195,6 +4195,12 @@
41954195
},
41964196
{
41974197

4198+
"source_path_from_root": "/articles/cosmos-db/how-to-move-regions.md",
4199+
"redirect_url": "/azure/operational-excellence/relocation-cosmos-db",
4200+
"redirect_document_id": false
4201+
4202+
},
4203+
{
41984204
"source_path_from_root": "/articles/site-recovery/move-vaults-across-regions.md",
41994205
"redirect_url": "/azure/operational-excellence/relocation-site-recovery",
42004206
"redirect_document_id": false

‎articles/active-directory-b2c/faq.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,12 @@ sections:
274274
275275
* API connectors
276276
* Conditional Access
277+
278+
- question: |
279+
I am using rolling refresh tokens for my application and I am getting an invalid_grant error on redeeming newly acquired refresh tokens well within their set validity period. Why does this happen?
280+
answer: |
281+
While determining validity for rolling refresh tokens, B2C will consider the initial login time of the user in the application also to calculate the token validity skew. If the user haven't logged out of the application for a very long time, this skew value will exceed the validity period of the token and hence for security reasons the tokens will be considered as invalid. Hence the error. Inform the user to perform a proper logout and login back into the application and this should reset the skew. This scenario is not applicable if refresh token rolling is set as infinite rolling.
282+
277283
278284
- question: |
279285
I've revoked the refresh token using Microsoft Graph invalidateAllRefreshTokens, or Microsoft Graph PowerShell, Revoke-MgUserSignInSession. Why is Azure AD B2C still accepting the old refresh token?
@@ -286,6 +292,9 @@ sections:
286292
1. Wait for 10 minutes.
287293
288294
1. Retrieve the `RefreshToken` again.
295+
296+
> [!TIP]
297+
> With Azure AD B2C [custom policy](custom-policy-overview.md), you can reduce the above mentioned skew time of 5 minutes (300000 milliseconds) by adjusting the value for InputParameter "TreatAsEqualIfWithinMillseconds" under claim transformation Id "AssertRefreshTokenIssuedLaterThanValidFromDate". This claim transformation can be found in the TrustFrameworkBase.xml file under latest custom policy [stater-pack](https://learn.microsoft.com/en-us/azure/active-directory-b2c/tutorial-create-user-flows?pivots=b2c-custom-policy#get-the-starter-pack).
289298
290299
- question: |
291300
I use multiple tabs in a web browser to sign in to multiple applications that I registered in the same Azure AD B2C tenant. When I try to perform a single sign-out, not all of the applications are signed out. Why does this happen?

‎articles/active-directory-b2c/javascript-and-page-layout.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ zone_pivot_groups: b2c-policy-type
2323

2424
[!INCLUDE [active-directory-b2c-choose-user-flow-or-custom-policy](../../includes/active-directory-b2c-choose-user-flow-or-custom-policy.md)]
2525

26-
With Azure Active Directory B2C (Azure AD B2C) [HTML templates](customize-ui-with-html.md), you can craft your users' identity experiences. Your HTML templates can contain only certain HTML tags and attributes. Basic HTML tags, such as &lt;b&gt;, &lt;i&gt;, &lt;u&gt;, &lt;h1&gt;, and &lt;hr&gt; are allowed. More advanced tags such as &lt;script&gt;, and &lt;iframe&gt; are removed for security reasons but the `<script>` tag should be added in the `<head>` tag.
26+
With Azure Active Directory B2C (Azure AD B2C) [HTML templates](customize-ui-with-html.md), you can craft your users' identity experiences. Your HTML templates can contain only certain HTML tags and attributes. Basic HTML tags, such as &lt;b&gt;, &lt;i&gt;, &lt;u&gt;, &lt;h1&gt;, and &lt;hr&gt; are allowed. More advanced tags such as &lt;script&gt;, and &lt;iframe&gt; are removed for security reasons but the `<script>` tag should be added in the `<head>` tag. From selfasserted page layout version 2.1.21 / unifiedssp version 2.1.10 / multifactor version 1.2.10 onwards B2C doesn't support adding scripts in `<body>` tag (as this can pose a risk for cross site scripting attack). Migrating existing scripts from `<body>` to `<head>` may at-times require rewriting existing scripts with mutation observers for proper working.
2727

2828
The `<script>` tag should be added in the `<head>` tag in two ways:
2929

‎articles/ai-studio/how-to/deploy-models-timegen-1.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,42 @@ You can deploy TimeGEN-1 as a serverless API with pay-as-you-go billing. Nixtla
4747
- An [Azure AI Studio project](../how-to/create-projects.md).
4848
- Azure role-based access controls (Azure RBAC) are used to grant access to operations in Azure AI Studio. To perform the steps in this article, your user account must be assigned the __Azure AI Developer role__ on the resource group. For more information on permissions, visit [Role-based access control in Azure AI Studio](../concepts/rbac-ai-studio.md).
4949

50+
### Pricing information
51+
52+
#### Estimate the number of tokens needed
53+
54+
Before you create a deployment, it's useful to estimate the number of tokens that you plan to use and be billed for.
55+
One token corresponds to one data point in your input dataset or output dataset.
56+
57+
Suppose you have the following input time series dataset:
58+
59+
| Unique_id | Timestamp | Target Variable | Exogenous Variable 1 | Exogenous Variable 2 |
60+
|:---------:|:-------------------:|:---------------:|:--------------------:|:--------------------:|
61+
| BE | 2016-10-22 00:00:00 | 70.00 | 49593.0 | 57253.0 |
62+
| BE | 2016-10-22 01:00:00 | 37.10 | 46073.0 | 51887.0 |
63+
64+
To determine the number of tokens, multiply the number of rows (in this example, two) and the number of columns used for forecasting—not counting the unique_id and timestamp columns (in this example, three) to get a total of six tokens.
65+
66+
Given the following output dataset:
67+
68+
| Unique_id | Timestamp | Forecasted Target Variable |
69+
|:---------:|:-------------------:|:--------------------------:|
70+
| BE | 2016-10-22 02:00:00 | 46.57 |
71+
| BE | 2016-10-22 03:00:00 | 48.57 |
72+
73+
You can also determine the number of tokens by counting the number of data points returned after data forecasting. In this example, the number of tokens is two.
74+
75+
#### Estimate the pricing
76+
77+
There are four pricing meters, as described in the following table:
78+
79+
| Pricing Meter | Description |
80+
|-----------------------------------------------|-----------------------------------------------------------------------------------------|
81+
| paygo-inference-input-tokens | Costs associated with the tokens used as input for inference when *finetune_steps* = 0 |
82+
| paygo-inference-output-tokens | Costs associated with the tokens used as output for inference when *finetune_steps* = 0 |
83+
| paygo-finetuned-model-inference-input-tokens | Costs associated with the tokens used as input for inference when *finetune_steps* > 0 |
84+
| paygo-finetuned-model-inference-output-tokens | Costs associated with the tokens used as output for inference when *finetune_steps* > 0 |
85+
5086
### Create a new deployment
5187

5288
These steps demonstrate the deployment of TimeGEN-1. To create a deployment:

‎articles/ai-studio/reference/reference-model-inference-api.md

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ Content-Type: application/json
136136

137137
The Azure AI Model Inference API specifies a set of modalities and parameters that models can subscribe to. However, some models may have further capabilities that the ones the API indicates. On those cases, the API allows the developer to pass them as extra parameters in the payload.
138138

139-
By setting a header `extra-parameters: allow`, the API will attempt to pass any unknown parameter directly to the underlying model. If the model can handle that parameter, the request completes.
139+
By setting a header `extra-parameters: pass-through`, the API will attempt to pass any unknown parameter directly to the underlying model. If the model can handle that parameter, the request completes.
140140

141141
The following example shows a request passing the parameter `safe_prompt` supported by Mistral-Large, which isn't specified in the Azure AI Model Inference API:
142142

@@ -163,6 +163,7 @@ var messages = [
163163
];
164164

165165
var response = await client.path("/chat/completions").post({
166+
"extra-parameters": "pass-through",
166167
body: {
167168
messages: messages,
168169
safe_mode: true
@@ -178,7 +179,7 @@ __Request__
178179
POST /chat/completions?api-version=2024-04-01-preview
179180
Authorization: Bearer <bearer-token>
180181
Content-Type: application/json
181-
extra-parameters: allow
182+
extra-parameters: pass-through
182183
```
183184

184185
```JSON
@@ -203,7 +204,7 @@ extra-parameters: allow
203204
---
204205

205206
> [!TIP]
206-
> Alternatively, you can set `extra-parameters: drop` to drop any unknown parameter in the request. Use this capability in case you happen to be sending requests with extra parameters that you know the model won't support but you want the request to completes anyway. A typical example of this is indicating `seed` parameter.
207+
> The default value for `extra-parameters` is `error` which returns an error if an extra parameter is indicated in the payload. Alternatively, you can set `extra-parameters: ignore` to drop any unknown parameter in the request. Use this capability in case you happen to be sending requests with extra parameters that you know the model won't support but you want the request to completes anyway. A typical example of this is indicating `seed` parameter.
207208
208209
### Models with disparate set of capabilities
209210

@@ -426,3 +427,27 @@ __Response__
426427
## Getting started
427428

428429
The Azure AI Model Inference API is currently supported in certain models deployed as [Serverless API endpoints](../how-to/deploy-models-serverless.md) and Managed Online Endpoints. Deploy any of the [supported models](#availability) and use the exact same code to consume their predictions.
430+
431+
# [Python](#tab/python)
432+
433+
The client library `azure-ai-inference` does inference, including chat completions, for AI models deployed by Azure AI Studio and Azure Machine Learning Studio. It supports Serverless API endpoints and Managed Compute endpoints (formerly known as Managed Online Endpoints).
434+
435+
Explore our [samples](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/ai/azure-ai-inference/samples) and read the [API reference documentation](https://aka.ms/azsdk/azure-ai-inference/python/reference) to get yourself started.
436+
437+
# [JavaScript](#tab/javascript)
438+
439+
The client library `@azure-rest/ai-inference` does inference, including chat completions, for AI models deployed by Azure AI Studio and Azure Machine Learning Studio. It supports Serverless API endpoints and Managed Compute endpoints (formerly known as Managed Online Endpoints).
440+
441+
Explore our [samples](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/ai/ai-inference-rest/samples) and read the [API reference documentation](https://aka.ms/AAp1kxa) to get yourself started.
442+
443+
# [REST](#tab/rest)
444+
445+
Explore the reference section of the Azure AI model inference API to see parameters and options to consume models, including chat completions models, deployed by Azure AI Studio and Azure Machine Learning Studio. It supports Serverless API endpoints and Managed Compute endpoints (formerly known as Managed Online Endpoints).
446+
447+
* [Get info](reference-model-inference-info.md): Returns the information about the model deployed under the endpoint.
448+
* [Text embeddings](reference-model-inference-embeddings.md): Creates an embedding vector representing the input text.
449+
* [Text completions](reference-model-inference-completions.md): Creates a completion for the provided prompt and parameters.
450+
* [Chat completions](reference-model-inference-chat-completions.md): Creates a model response for the given chat conversation.
451+
* [Image embeddings](reference-model-inference-images-embeddings.md): Creates an embedding vector representing the input text and image.
452+
453+
---

‎articles/ai-studio/reference/reference-model-inference-chat-completions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ POST /chat/completions?api-version=2024-04-01-preview
3535

3636
| Name | Required | Type | Description |
3737
| --- | --- | --- | --- |
38-
| extra-parameters | | string | The behavior of the API when extra parameters are indicated in the payload. Using `allow` makes the API to pass the parameter to the underlying model. Use this value when you want to pass parameters that you know the underlying model can support. Using `drop` makes the API to drop any unsupported parameter. Use this value when you need to use the same payload across different models, but one of the extra parameters may make a model to error out if not supported. Using `error` makes the API to reject any extra parameter in the payload. Only parameters specified in this API can be indicated, or a 400 error is returned. |
38+
| extra-parameters | | string | The behavior of the API when extra parameters are indicated in the payload. Using `pass-through` makes the API to pass the parameter to the underlying model. Use this value when you want to pass parameters that you know the underlying model can support. Using `ignore` makes the API to drop any unsupported parameter. Use this value when you need to use the same payload across different models, but one of the extra parameters may make a model to error out if not supported. Using `error` makes the API to reject any extra parameter in the payload. Only parameters specified in this API can be indicated, or a 400 error is returned. |
3939
| azureml-model-deployment | | string | Name of the deployment you want to route the request to. Supported for endpoints that support multiple deployments. |
4040

4141
## Request Body

‎articles/ai-studio/reference/reference-model-inference-completions.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ POST /completions?api-version=2024-04-01-preview
2828
| --- | --- | --- | --- | --- |
2929
| api-version | query | True | string | The version of the API in the format "YYYY-MM-DD" or "YYYY-MM-DD-preview". |
3030

31+
## Request Header
32+
33+
34+
| Name | Required | Type | Description |
35+
| --- | --- | --- | --- |
36+
| extra-parameters | | string | The behavior of the API when extra parameters are indicated in the payload. Using `pass-through` makes the API to pass the parameter to the underlying model. Use this value when you want to pass parameters that you know the underlying model can support. Using `ignore` makes the API to drop any unsupported parameter. Use this value when you need to use the same payload across different models, but one of the extra parameters may make a model to error out if not supported. Using `error` makes the API to reject any extra parameter in the payload. Only parameters specified in this API can be indicated, or a 400 error is returned. |
37+
| azureml-model-deployment | | string | Name of the deployment you want to route the request to. Supported for endpoints that support multiple deployments. |
38+
3139

3240
## Request Body
3341

@@ -285,4 +293,4 @@ The object type, which is always "list".
285293
| detail | [Detail](#detail) | |
286294
| error | string | The error description. |
287295
| message | string | The error message. |
288-
| status | integer | The HTTP status code. |
296+
| status | integer | The HTTP status code. |

‎articles/ai-studio/reference/reference-model-inference-embeddings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ POST /embeddings?api-version=2024-04-01-preview
3535

3636
| Name | Required | Type | Description |
3737
| --- | --- | --- | --- |
38-
| extra-parameters | | string | The behavior of the API when extra parameters are indicated in the payload. Using `allow` makes the API to pass the parameter to the underlying model. Use this value when you want to pass parameters that you know the underlying model can support. Using `drop` makes the API to drop any unsupported parameter. Use this value when you need to use the same payload across different models, but one of the extra parameters may make a model to error out if not supported. Using `error` makes the API to reject any extra parameter in the payload. Only parameters specified in this API can be indicated, or a 400 error is returned. |
38+
| extra-parameters | | string | The behavior of the API when extra parameters are indicated in the payload. Using `pass-through` makes the API to pass the parameter to the underlying model. Use this value when you want to pass parameters that you know the underlying model can support. Using `ignore` makes the API to drop any unsupported parameter. Use this value when you need to use the same payload across different models, but one of the extra parameters may make a model to error out if not supported. Using `error` makes the API to reject any extra parameter in the payload. Only parameters specified in this API can be indicated, or a 400 error is returned. |
3939
| azureml-model-deployment | | string | Name of the deployment you want to route the request to. Supported for endpoints that support multiple deployments. |
4040

4141
## Request Body

‎articles/ai-studio/reference/reference-model-inference-images-embeddings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ POST /images/embeddings?api-version=2024-04-01-preview
3535

3636
| Name | Required | Type | Description |
3737
| --- | --- | --- | --- |
38-
| extra-parameters | | string | The behavior of the API when extra parameters are indicated in the payload. Using `allow` makes the API to pass the parameter to the underlying model. Use this value when you want to pass parameters that you know the underlying model can support. Using `drop` makes the API to drop any unsupported parameter. Use this value when you need to use the same payload across different models, but one of the extra parameters may make a model to error out if not supported. Using `error` makes the API to reject any extra parameter in the payload. Only parameters specified in this API can be indicated, or a 400 error is returned. |
38+
| extra-parameters | | string | The behavior of the API when extra parameters are indicated in the payload. Using `pass-through` makes the API to pass the parameter to the underlying model. Use this value when you want to pass parameters that you know the underlying model can support. Using `ignore` makes the API to drop any unsupported parameter. Use this value when you need to use the same payload across different models, but one of the extra parameters may make a model to error out if not supported. Using `error` makes the API to reject any extra parameter in the payload. Only parameters specified in this API can be indicated, or a 400 error is returned. |
3939
| azureml-model-deployment | | string | Name of the deployment you want to route the request to. Supported for endpoints that support multiple deployments. |
4040

4141
## Request Body

‎articles/aks/create-node-pools.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ This article shows you how to create one or more node pools in an AKS cluster.
3131
The following limitations apply when you create AKS clusters that support multiple node pools:
3232

3333
* See [Quotas, virtual machine size restrictions, and region availability in Azure Kubernetes Service (AKS)](quotas-skus-regions.md).
34-
* You can delete system node pools if you have another system node pool to take its place in the AKS cluster. Otherwise, you cannot delete the system node pool.
34+
* You can delete the system node pool if you have another system node pool to take its place in the AKS cluster. Otherwise, you cannot delete the system node pool.
3535
* System pools must contain at least one node, and user node pools may contain zero or more nodes.
3636
* The AKS cluster must use the Standard SKU load balancer to use multiple node pools. This feature isn't supported with Basic SKU load balancers.
3737
* The AKS cluster must use Virtual Machine Scale Sets for the nodes.
@@ -60,7 +60,7 @@ The following limitations apply when you create AKS clusters that support multip
6060
--name $CLUSTER_NAME \
6161
--vm-set-type VirtualMachineScaleSets \
6262
--node-count 2 \
63-
--generate-ssh-keys \
63+
--location $LOCATION \
6464
--load-balancer-sku standard \
6565
--generate-ssh-keys
6666
```

0 commit comments

Comments
 (0)