Skip to content

Commit 1ddb90e

Browse files
authored
Merge branch 'MicrosoftDocs:main' into heidist-rag
2 parents f168daf + 95848d1 commit 1ddb90e

File tree

207 files changed

+1882
-2044
lines changed

Some content is hidden

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

207 files changed

+1882
-2044
lines changed

articles/ai-services/computer-vision/concept-object-detection-40.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ Try out the capabilities of object detection quickly and easily in your browser
2323
> [!div class="nextstepaction"]
2424
> [Try Vision Studio](https://portal.vision.cognitive.azure.com/)
2525
26-
> [!TIP]
27-
> You can use the Object detection feature through the [Azure OpenAI](/azure/ai-services/openai/overview) service. The **GPT-4 Turbo with Vision** model lets you chat with an AI assistant that can analyze the images you share, and the Vision Enhancement option uses Image Analysis to provide the AI assistance with more details (readable text and object locations) about the image. For more information, see the [GPT-4 Turbo with Vision quickstart](/azure/ai-services/openai/gpt-v-quickstart).
2826

2927
## Object detection example
3028

articles/ai-services/computer-vision/concept-ocr.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ OCR is a machine-learning-based technique for extracting text from in-the-wild a
2323

2424
The new Azure AI Vision Image Analysis 4.0 REST API offers the ability to extract printed or handwritten text from images in a unified performance-enhanced synchronous API that makes it easy to get all image insights including OCR results in a single API operation. The Read OCR engine is built on top of multiple deep learning models supported by universal script-based models for [global language support](./language-support.md).
2525

26-
> [!TIP]
27-
> You can also use the OCR feature in conjunction with the [Azure OpenAI](/azure/ai-services/openai/overview) service. The **GPT-4 Turbo with Vision** model lets you chat with an AI assistant that can analyze the images you share, and the Vision Enhancement option uses Image Analysis to give the AI assistant more details (readable text and object locations) about the image. For more information, see the [GPT-4 Turbo with Vision quickstart](/azure/ai-services/openai/gpt-v-quickstart).
2826

2927
## Text extraction example
3028

articles/ai-services/computer-vision/overview-image-analysis.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ You can analyze images to provide insights about their visual features and chara
6161
|**Detect the color scheme** (v3.2 only) |Analyze color usage within an image. Azure AI Vision can determine whether an image is black & white or color and, for color images, identify the dominant and accent colors.| [Detect the color scheme](concept-detecting-color-schemes.md)|
6262
|**Moderate content in images** (v3.2 only) |You can use Azure AI Vision to detect adult content in an image and return confidence scores for different classifications. The threshold for flagging content can be set on a sliding scale to accommodate your preferences.|[Detect adult content](concept-detecting-adult-content.md)|
6363

64-
> [!TIP]
65-
> You can leverage the Read text and Object detection features of Image Analysis through the [Azure OpenAI](/azure/ai-services/openai/overview) service. The **GPT-4 Turbo with Vision** model lets you chat with an AI assistant that can analyze the images you share, and the Vision Enhancement option uses Image Analysis to give the AI assistant more details about the image (readable text and object locations). For more information, see the [GPT-4 Turbo with Vision quickstart](/azure/ai-services/openai/gpt-v-quickstart).
6664

6765
## Product Recognition (v4.0 preview only) (deprecated)
6866

articles/ai-services/content-safety/concepts/custom-categories.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ This implementation works on text content and image content.
5151

5252
#### [Custom categories (standard) API](#tab/standard)
5353

54-
The Azure AI Content Safety custom category feature uses a multi-step process for creating, training, and using custom content classification models. Here's a look at the workflow:
54+
The Azure AI Content Safety custom categories feature uses a multi-step process for creating, training, and using custom content classification models. Here's a look at the workflow:
5555

5656
### Step 1: Definition and setup
5757

@@ -73,7 +73,7 @@ You use the **analyzeCustomCategory** API to analyze text content and determine
7373

7474
#### [Custom categories (rapid) API](#tab/rapid)
7575

76-
To use the custom category (rapid) API, you first create an **incident** object with a text description. Then, you upload any number of image or text samples to the incident. The LLM on the backend will then use these to evaluate future input content. No training step is needed.
76+
To use the custom categories (rapid) API, you first create an **incident** object with a text description. Then, you upload any number of image or text samples to the incident. The LLM on the backend will then use these to evaluate future input content. No training step is needed.
7777

7878
You can include your defined incident in a regular text analysis or image analysis request. The service will indicate whether the submitted content is an instance of your incident. The service can still do other content moderation tasks in the same API call.
7979

articles/ai-services/content-safety/faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ sections:
4040
- question: |
4141
Can I detect harmful content in custom categories that I define myself?
4242
answer: |
43-
Yes, you can use the Azure AI Content Safety custom categories API to create categories, upload examples, and train the service to detect similar content. Custom categories are available for both text and image moderation.
43+
Yes, you can use the Azure AI Content Safety custom categories (standard) API to create categories, upload examples, and train the service to detect similar content. Custom categories are available for both text and image moderation.
4444
- question: |
4545
How does billing work for the Azure AI Content Safety service?
4646
answer: |

articles/ai-services/content-safety/how-to/custom-categories.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: "Use the custom category API (preview)"
2+
title: "Use the custom categories API (preview)"
33
titleSuffix: Azure AI services
4-
description: Learn how to use the custom category API to create your own harmful content categories and train the Content Safety model for your use case.
4+
description: Learn how to use the custom categories API to create your own harmful content categories and train the Content Safety model for your use case.
55
#services: cognitive-services
66
author: PatrickFarley
77
manager: nitinme
@@ -227,7 +227,7 @@ print(result)
227227

228228
---
229229

230-
## Other custom category operations
230+
## Other custom categories operations
231231

232232
Remember to replace the placeholders below with your actual values for the API key, endpoint, and specific content (category name, definition, and so on). These examples help you to manage the customized categories in your account.
233233

0 commit comments

Comments
 (0)