Skip to content

Commit 557a287

Browse files
authored
Merge pull request #274751 from MicrosoftDocs/main
5/8/2024 PM Publish
2 parents 0d86abb + 7e7772a commit 557a287

File tree

124 files changed

+1946
-1371
lines changed

Some content is hidden

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

124 files changed

+1946
-1371
lines changed

articles/active-directory-b2c/partner-saviynt.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.subservice: B2C
1818

1919
Learn to integrate Azure Active Directory B2C (Azure AD B2C) with the Saviynt Security Manager platform, which has visibility, security, and governance. Saviynt incorporates application risk and governance, infrastructure management, privileged account management, and customer risk analysis.
2020

21-
Learn more: [Saviynt for Azure AD B2C](https://saviynt.com/integrations/old-version-azure-ad/for-b2c/)
21+
Learn more: [Saviynt for Azure AD B2C](https://saviynt.com/fr/integrations/entra-id/for-b2c)
2222

2323
Use the following instructions to set up access control delegated administration for Azure AD B2C users. Saviynt determines if a user is authorized to manage Azure AD B2C users with:
2424

@@ -46,7 +46,7 @@ The Saviynt integration includes the following components:
4646
* **Azure AD B2C** – identity as a service for custom control of customer sign-up, sign-in, and profile management
4747
* See, [Azure AD B2C, Get started](https://azure.microsoft.com/services/active-directory/external-identities/b2c/)
4848
* **Saviynt for Azure AD B2C** – identity governance for delegated administration of user life-cycle management and access governance
49-
* See, [Saviynt for Azure AD B2C](https://saviynt.com/integrations/old-version-azure-ad/for-b2c/)
49+
* See, [Saviynt for Azure AD B2C](https://saviynt.com/fr/integrations/entra-id/for-b2c)
5050
* **Microsoft Graph API** – interface for Saviynt to manage Azure AD B2C users and their access
5151
* See, [Use the Microsoft Graph API](/graph/use-the-api)
5252

articles/ai-services/content-safety/concepts/jailbreak-detection.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: Learn about User Prompt injection attacks and the Prompt Shields fe
66
author: PatrickFarley
77
manager: nitinme
88
ms.service: azure-ai-content-safety
9-
ms.custom: build-2023
9+
ms.custom: build-2023, references_regions
1010
ms.topic: conceptual
1111
ms.date: 03/15/2024
1212
ms.author: pafarley
@@ -73,6 +73,12 @@ Currently, the Prompt Shields API supports the English language. While our API d
7373

7474
The maximum character limit for Prompt Shields allows for a user prompt of up to 10,000 characters, while the document array is restricted to a maximum of 5 documents with a combined total not exceeding 10,000 characters.
7575

76+
### Regions
77+
To use this API, you must create your Azure AI Content Safety resource in the supported regions. Currently, it's available in the following Azure regions:
78+
79+
- East US
80+
- West Europe
81+
7682
### TPS limitations
7783

7884
| Pricing Tier | Requests per 10 seconds |

articles/ai-services/language-service/concepts/developer-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ It additionally enables you to use the following features, without creating any
121121
* [Conversation summarization](../summarization/quickstart.md?pivots=rest-api&tabs=conversation-summarization)
122122
* [Personally Identifiable Information (PII) detection for conversations](../personally-identifiable-information/how-to-call-for-conversations.md?tabs=rest-api#examples)
123123

124-
As you use this API in your application, see the [reference documentation](/rest/api/language/2023-04-01/conversation-analysis-runtime) for additional information.
124+
As you use this API in your application, see the [reference documentation](/rest/api/language) for additional information.
125125

126126

127127
### Text analysis authoring API

articles/ai-services/language-service/concepts/role-based-access-control.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ A user that should only be validating and reviewing the Language apps, typically
7979
Only Export POST operation under:
8080
* [Question Answering Projects](/rest/api/cognitiveservices/questionanswering/question-answering-projects/export)
8181
All the Batch Testing Web APIs
82-
*[Language Runtime CLU APIs](/rest/api/language/2023-04-01/conversation-analysis-runtime)
82+
*[Language Runtime CLU APIs](/rest/api/language)
8383
*[Language Runtime Text Analysis APIs](https://go.microsoft.com/fwlink/?linkid=2239169)
8484
:::column-end:::
8585
:::row-end:::

articles/ai-services/language-service/custom-named-entity-recognition/how-to/call-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.custom: language-service-custom-ner
1717
# Query your custom model
1818

1919
After the deployment is added successfully, you can query the deployment to extract entities from your text based on the model you assigned to the deployment.
20-
You can query the deployment programmatically using the [Prediction API](https://aka.ms/ct-runtime-api) or through the client libraries (Azure SDK).
20+
You can query the deployment programmatically using the [Prediction API](/rest/api/language/text-analysis-runtime/analyze-text) or through the client libraries (Azure SDK).
2121

2222
## Test deployed model
2323

articles/ai-services/language-service/custom-text-analytics-for-health/how-to/call-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.custom: language-service-custom-ta4h
1616
# Send queries to your custom Text Analytics for health model
1717

1818
After the deployment is added successfully, you can query the deployment to extract entities from your text based on the model you assigned to the deployment.
19-
You can query the deployment programmatically using the [Prediction API](https://aka.ms/ct-runtime-api).
19+
You can query the deployment programmatically using the [Prediction API](/rest/api/language/text-analysis-runtime/analyze-text).
2020

2121
## Test deployed model
2222

articles/ai-services/language-service/custom-text-classification/how-to/call-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.custom: language-service-clu
1717
# Send text classification requests to your model
1818

1919
After you've successfully deployed a model, you can query the deployment to classify text based on the model you assigned to the deployment.
20-
You can query the deployment programmatically [Prediction API](https://aka.ms/ct-runtime-api) or through the client libraries (Azure SDK).
20+
You can query the deployment programmatically [Prediction API](/rest/api/language/text-analysis-runtime/analyze-text) or through the client libraries (Azure SDK).
2121

2222
## Test deployed model
2323

articles/ai-services/language-service/sentiment-opinion-mining/custom/how-to/call-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.custom: language-service-custom-ner
1717
# Send a Custom sentiment analysis request to your custom model
1818

1919
After the deployment is added successfully, you can query the deployment to extract entities from your text based on the model you assigned to the deployment.
20-
You can query the deployment programmatically using the [Prediction API](https://aka.ms/ct-runtime-api) or through the client libraries (Azure SDK).
20+
You can query the deployment programmatically using the [Prediction API](/rest/api/language/text-analysis-runtime/analyze-text) or through the client libraries (Azure SDK).
2121

2222
## Test a deployed Custom sentiment analysis model
2323

articles/ai-services/openai/concepts/content-filter.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -982,7 +982,7 @@ data: [DONE]
982982
```
983983
984984
> [!IMPORTANT]
985-
> When content filtering is triggered for a prompt and a `"status": 400` is received as part of the response there may be a charge for this request as the prompt was evaluated by the service. [Charges will also occur](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) when a `"status":200` is received with `"finish_reason": "content_filter"`. In this case the prompt did not have any issues, but the completion generated by the model was detected to violate the content filtering rules which results in the completion being filtered.
985+
> When content filtering is triggered for a prompt and a `"status": 400` is received as part of the response there will be a charge for this request as the prompt was evaluated by the service. [Charges will also occur](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) when a `"status":200` is received with `"finish_reason": "content_filter"`. In this case the prompt did not have any issues, but the completion generated by the model was detected to violate the content filtering rules which results in the completion being filtered.
986986
987987
## Best practices
988988

articles/ai-services/openai/faq.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,15 @@ sections:
113113
How do I fix InternalServerError - 500 - Failed to create completion as the model generated invalid Unicode output?
114114
answer:
115115
You can minimize the occurrence of these errors by reducing the temperature of your prompts to less than 1 and ensuring you're using a client with retry logic. Reattempting the request often results in a successful response.
116+
- question: |
117+
We noticed charges associated with API calls that failed to complete with status code 400. Why are failed API calls generating a charge?
118+
answer:
119+
If the service performs processing, you will be charged even if the status code is not successful (not 200).
120+
Common examples of this are, a 400 error due to a content filter or input limit, or a 408 error due to a timeout. Charges will also occur when a `status 200` is received with a `finish_reason` of `content_filter`.
121+
In this case the prompt did not have any issues, but the completion generated by the model was detected to violate the content filtering rules which results in the completion being filtered.
122+
123+
If the service doesn't perform processing, you won't be charged.
124+
For example, a 401 error due to authentication or a 429 error due to exceeding the Rate Limit.
116125
117126
- name: Getting access to Azure OpenAI Service
118127
questions:

0 commit comments

Comments
 (0)