Merge branch 'main' into release-postgres-flexible

Author: v-alje

.openpublishing.redirection.active-directory.json

@@ -914,6 +914,11 @@
             "source_path_from_root": "/articles/defender-for-cloud/tutorial-security-incident.md",
             "redirect_url": "/azure/defender-for-cloud/managing-and-responding-alerts",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/how-to-migrate-to-built-in.md",
+            "redirect_url": "/azure/defender-for-cloud/how-to-transition-to-built-in",
+            "redirect_document_id": true
         }
     ]
 }

.openpublishing.redirection.defender-for-cloud.json

@@ -24,4 +24,6 @@ Azure AI Face is a cloud-based service that provides algorithms for face detecti
 - [LargeFaceList APIs](https://westus.dev.cognitive.microsoft.com/docs/services/563879b61984550e40cbbe8d/operations/5a157b68d2de3616c086f2cc): Used to manage a LargeFaceList for [Find Similar](https://westus.dev.cognitive.microsoft.com/docs/services/563879b61984550e40cbbe8d/operations/563879b61984550f30395237).
 - [PersonGroup Person APIs](https://westus.dev.cognitive.microsoft.com/docs/services/563879b61984550e40cbbe8d/operations/563879b61984550f3039523c): Used to manage PersonGroup Person Faces for [Identification](https://westus.dev.cognitive.microsoft.com/docs/services/563879b61984550e40cbbe8d/operations/563879b61984550f30395239).
 - [PersonGroup APIs](https://westus.dev.cognitive.microsoft.com/docs/services/563879b61984550e40cbbe8d/operations/563879b61984550f30395244): Used to manage a PersonGroup dataset for [Identification](https://westus.dev.cognitive.microsoft.com/docs/services/563879b61984550e40cbbe8d/operations/563879b61984550f30395239).
+- [PersonDirectory Person APIs](https://westus.dev.cognitive.microsoft.com/docs/services/face-v1-0-preview/operations/5f06637aad1c4fba7238de25)
+- [PersonDirectory DynamicPersonGroup APIs](https://westus.dev.cognitive.microsoft.com/docs/services/face-v1-0-preview/operations/5f066b475d2e298611e11115)
 - [Snapshot APIs](https://westus.dev.cognitive.microsoft.com/docs/services/563879b61984550e40cbbe8d/operations/snapshot-take): Used to manage a Snapshot for data migration across subscriptions.

.openpublishing.redirection.json

@@ -119,7 +119,7 @@ If you're looking for a specific section in a document, you can use semantic chu
 
 ```python
 
-# Using SDK targeting 2023-10-31-preview
+# Using SDK targeting 2023-10-31-preview, make sure your resource is in one of these regions: East US, West US2, West Europe
 # pip install azure-ai-documentintelligence==1.0.0b1
 # pip install langchain langchain-community azure-ai-documentintelligence
 
@@ -154,4 +154,4 @@ splits
 
 * [Learn how to process your own forms and documents](quickstarts/try-document-intelligence-studio.md) with the [Document Intelligence Studio](https://formrecognizer.appliedai.azure.com/studio).
 
-* Complete a [Document Intelligence quickstart](quickstarts/get-started-sdks-rest-api.md?view=doc-intel-3.1.0&preserve-view=true) and get started creating a document processing app in the development language of your choice.
+* Complete a [Document Intelligence quickstart](quickstarts/get-started-sdks-rest-api.md?view=doc-intel-4.0.0&preserve-view=true) and get started creating a document processing app in the development language of your choice.

articles/ai-services/computer-vision/identity-api-reference.md

@@ -33,7 +33,7 @@ sections:
 
            - There are no changes to pricing. The names "Cognitive Services" and "Azure Applied AI" continue to be used in Azure billing, cost analysis, price list, and price APIs.
 
-           - There are no breaking changes to application programming interfaces (APIs) or SDKs.
+           - There are no breaking changes to application programming interfaces (APIs) or SDKs. Starting from 2023-10-31-preview, API and SDKs will be renamed to "documentintelligence".
 
            - Some platforms are still awaiting the renaming update. All mention of Form Recognizer or Document Intelligence in our documentation refers to the same Azure service.
 
@@ -45,6 +45,13 @@ sections:
 
           A Document Generative AI solution can enable you to chat with your documents, generate captivating content from them and access the power of Azure OpenAI models on your data. With Azure AI Document Intelligence and Azure OpenAI combined, you can build an enterprise application to seamlessly interact with your documents using natural languages, easily find answers and gain valuable insights, effortlessly generate new and engaging content from your existing documents. Check for more details in the [technical community blog](https://techcommunity.microsoft.com/t5/azure-ai-services-blog/document-generative-ai-the-power-of-azure-ai-document/ba-p/3875015).
 
+      - question: |
+          How is Document Intelligence related to Retrieval Augmented Generation (RAG)?
+        answer: |
+
+          Semantic chunking is a key step in RAG to ensure its efficient storage and retrieval. The Document Intelligence [Layout model](concept-layout.md) offers a comprehensive solution for advanced content extraction and document structure analysis capabilities. With the Layout model, you can easily extract text and structural elements to divide large bodies of text into smaller, meaningful chunks based on semantic content rather than arbitrary splits. The extracted information can be conveniently outputted to Markdown format, enabling you to define your semantic chunking strategy based on provided building blocks. Check for more details in this [article](concept-retrieval-augumented-generation.md).
+
+
       - question: |
           Which Document Intelligence use cases require special consideration?
         answer: |
@@ -104,7 +111,7 @@ sections:
       - question: |
            What is the accuracy score and how is it calculated?
         answer: |
-           The output of a `build` (v3.0) or `train` (v2.1) custom model operation includes the estimated accuracy score. This score represents the model's ability to accurately predict the labeled value on a visually similar document.
+           The output of a `build` (v3.0 and later versions) or `train` (v2.1) custom model operation includes the estimated accuracy score. This score represents the model's ability to accurately predict the labeled value on a visually similar document.
 
            Accuracy is measured within a percentage value range between 0% (low) and 100% (high).
 
@@ -159,7 +166,7 @@ sections:
           What is a bounding box?
         answer: |
 
-          A bounding box is an abstract rectangle that surrounds text elements on a document or form and is used as a reference point for object detection.
+          A bounding box (`polygon` in v3.0 and later versions) is an abstract rectangle that surrounds text elements on a document or form and is used as a reference point for object detection.
 
           - The bounding box specifies position using an x and y coordinate plane presented in an array of four numerical pairs. Each pair represents a corner of the box in the following order: top-left, top-right, bottom-right, bottom-left.
 
@@ -205,7 +212,7 @@ sections:
           Where can I find the supported API version for the latest programming language SDKs?
         answer:   |
 
-          This table provides links to the latest SDK versions and shows the relationship between supported Document Intelligence SDK and API versions: |
+          This table provides links to the latest SDK versions and shows the relationship between supported Document Intelligence SDK and API versions: 
             | Supported Language | Azure SDK reference|Supported API version|
             | ----- | -----|-----|
             | C#/.NET| [4.0.0](https://azuresdkdocs.blob.core.windows.net/$web/dotnet/Azure.AI.FormRecognizer/4.0.0/index.html)|[**v3.0**](/rest/api/aiservices/document-models/analyze-document?view=rest-aiservices-2023-07-31&preserve-view=true&tabs=HTTP)</br> [**v2.1**](https://westus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-v2-1/operations/AnalyzeBusinessCardAsync)</br>[**v2.0**](https://westus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-v2/operations/AnalyzeLayoutAsync) |
@@ -242,7 +249,7 @@ sections:
             How can I specify a specific range of pages to be analyzed in a document?
         answer:  |
 
-           - The parameter `pages`(supported in both v2.1 and v3.0 REST API) enables you to specify pages for multi-page PDF and TIFF documents. Accepted input includes the following ranges:
+           - The parameter `pages`(supported in v2.1, v3.0 and later version REST API) enables you to specify pages for multi-page PDF and TIFF documents. Accepted input includes the following ranges:
 
               - Single pages (for example,'1, 2' -> pages 1 and 2 are processed).- Finite (for example '2-5' -> pages 2 to 5 are processed)
               - Open-ended ranges (for example '5-' -> all the pages from page 5 are processed & for example, '-10' -> pages 1 to 10 are processed).
@@ -271,13 +278,13 @@ sections:
         answer: |
          Document Intelligence billing is  calculated monthly based on the model type and number of pages analyzed:
 
-          - When you submit a document for analysis, all pages are analyzed unless you specify a page range with the `pages` parameter in your request. When the service analyzes Microsoft Excel and PowerPoint documents with the new Read OCR model, each worksheet and slide is counted as one page respectively.
+          - When you submit a document for analysis, all pages are analyzed unless you specify a page range with the `pages` parameter in your request. When the service analyzes Microsoft Excel and PowerPoint documents with the Read OCR and Layout model, each worksheet and slide is counted as one page respectively.
 
           - When analyzing PDF and TIFF files, each page in the PDF file or each image in the TIFF file is counted as one page with no maximum character limits.
 
-          - When analyzing Microsoft Word and HTML files supported by only the Read model, pages are counted in blocks of 3,000 characters each. For example, if your document contains 7,000 characters, the two pages with 3,000 characters each and one page with 1,000 characters adds up to a total of three pages.
+          - When analyzing Microsoft Word and HTML files supported by the Read and Layout model, pages are counted in blocks of 3,000 characters each. For example, if your document contains 7,000 characters, the two pages with 3,000 characters each and one page with 1,000 characters adds up to a total of three pages.
 
-          - When using the Read model, if your Microsoft Word, Excel, and PowerPoint pages with embedded images, each image is analyzed and counted as a page. Therefore, the total analyzed pages for Microsoft Office documents are equal to the sum of total text pages and total images analyzed. In the previous example if the document contains two embedded images, the total page count in the service output is three text pages plus two images equaling a total of five pages.
+          - When using the Read or Layout model to analyze Microsoft Word, Excel, PowerPoint and HTML files, embedded or linked images are not supported. So they will not be counted as additional images for chargeing.
 
           - Training a custom model is always free with Document Intelligence. You’re only charged when a model is used to analyze a document.
 

articles/ai-services/document-intelligence/concept-retrieval-augumented-generation.md

@@ -487,6 +487,7 @@ You can use Document Intelligence to automate document processing in application
 > [!div class="nextstepaction"]
 > [Return to custom model types](#custom-models)
 
+::: moniker range=">=doc-intel-3.1.0"
 #### Custom classification model
 
 :::image type="content" source="media/overview/custom-classifier-labeling.png" alt-text="{alt-text}":::

articles/ai-services/document-intelligence/faq.yml

@@ -0,0 +1,53 @@
+---
+title: Azure OpenAI Service API version retirement
+description: Learn more about API version retirement in Azure OpenAI Services
+services: cognitive-services
+manager: nitinme
+ms.service: azure-ai-openai
+ms.topic: conceptual 
+ms.date: 01/08/2024
+author: mrbullwinkle
+ms.author: mbullwin
+recommendations: false
+ms.custom:
+---
+
+# Azure OpenAI API preview lifecycle
+
+This article is to help you understand the support lifecycle for the Azure OpenAI API previews.
+
+## Latest preview API release
+
+Azure OpenAI API version 2023-12-01-preview is currently the latest preview release.
+
+This version contains support for all the latest Azure OpenAI features including:
+
+- [Fine-tuning](./how-to/fine-tuning.md) `gpt-35-turbo`, `babbage-002`, and `davinci-002` models.[**Added in 2023-10-01-preview**]
+- [Whisper](./whisper-quickstart.md). [**Added in 2023-09-01-preview**]
+- [Function calling](./how-to/function-calling.md)  [**Added in 2023-07-01-preview**]
+- [DALL-E](./dall-e-quickstart.md)  [**Added in 2023-06-01-preview**]
+- [Retrieval augmented generation with the on your data feature](./use-your-data-quickstart.md).  [**Added in 2023-06-01-preview**]
+
+## Retiring soon
+
+On April 2, 2024 the following API preview releases will be retired and will stop accepting API requests:
+
+- 2023-03-15-preview
+- 2023-06-01-preview
+- 2023-07-01-preview
+- 2023-08-01-preview
+
+To avoid service disruptions, you must update to use the latest preview version prior to the retirement date.
+
+## Updating API versions
+
+We recommend first testing the upgrade to new API versions to confirm there is no impact to your application from the API update prior to making the change globally across your environment.
+
+If you are using the OpenAI Python client library or the REST API, you will need to update your code directly to the latest preview API version.
+
+If you are using one of the Azure OpenAI SDKs for C#, Go, Java, or JavaScript you will instead need to update to the latest version of the SDK. Each SDK release is hardcoded to work with specific versions of the Azure OpenAI API.
+
+## Next steps
+
+- [Learn more about Azure OpenAI](overview.md)
+- [Learn about working with Azure OpenAI models](./how-to/working-with-models.md)

articles/ai-services/document-intelligence/overview.md

@@ -51,6 +51,7 @@ To force the model to call a specific function set the `tool_choice` parameter w
 > The default behavior (`tool_choice: "auto"`) is for the model to decide on its own whether to call a function and if so which function to call.
 
 ```python
+import os
 from openai import AzureOpenAI
 import json
 
@@ -60,8 +61,6 @@ client = AzureOpenAI(
   api_version="2023-12-01-preview"
 )
 
-from openai import OpenAI
-import json
 
 # Example function hard coded to return the same weather
 # In production, this could be your backend API or an external API

articles/ai-services/openai/api-version-deprecation.md

@@ -196,7 +196,7 @@ client = AzureOpenAI(
 
 response = client.embeddings.create(
     input = "Your text string goes here",
-    model= "text-embedding-ada-002"
+    model= "text-embedding-ada-002"  # model = "deployment_name".
 )
 
 print(response.model_dump_json(indent=2))