Skip to content

Commit 33e6a5d

Browse files
authored
Merge pull request #262026 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 093c020 + d8bc718 commit 33e6a5d

File tree

5 files changed

+31
-22
lines changed

5 files changed

+31
-22
lines changed

articles/advisor/advisor-reference-cost-recommendations.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,17 @@ We noticed that your virtual network gateway has been idle for over 90 days. Thi
261261

262262
Learn more about [Virtual network gateway - IdleVNetGateway (Repurpose or delete idle virtual network gateways)](https://aka.ms/aa_idlevpngateway_learnmore).
263263

264+
### Consider migrating to Front Door Standard/Premium
264265

266+
Your Front Door Classic tier contains a large number of domains or routing rules, which adds extra charges. Front Door Standard or Premium do not charge per additional domain or routing rule. Consider migrating to save costs.
265267

268+
Learn more about [Front Door pricing](https://aka.ms/afd-pricing).
269+
270+
### Consider using multiple endpoints under one single Front Door Standard/Premium profile
271+
272+
We detected your subscription contains multiple Front Door Standard/Premium profiles with a small number of endpoints on them. You can save costs in base fees by using multiple endpoints within one profile. You can use a maximum of 10 endpoints with Standard tier and 25 endpoints with Premium tier.
273+
274+
Learn more about [Front Door endpoints](https://aka.ms/afd-endpoints).
266275

267276
## Reserved instances
268277

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

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ monikerRange: '>=doc-intel-3.1.0'
1919

2020
## Introduction
2121

22-
Retrieval-Augmented Generation (RAG) is a document generative AI solution that combines a pretrained Large Language Model (LLM) like ChatGPT with an external data retrieval system to generate an enhanced response incorporating new data outside of the original training data. Adding an information retrieval system to your applications enables you to chat with your documents, generate captivating content, and access the power of Azure OpenAI models for your data. You also have more control over the data used by the LLM as it formulates a response.
22+
Retrieval-Augmented Generation (RAG) is a design pattern that combines a pretrained Large Language Model (LLM) like ChatGPT with an external data retrieval system to generate an enhanced response incorporating new data outside of the original training data. Adding an information retrieval system to your applications enables you to chat with your documents, generate captivating content, and access the power of Azure OpenAI models for your data. You also have more control over the data used by the LLM as it formulates a response.
2323

24-
The Document Intelligence [Layout model](concept-layout.md) is an advanced machine-learning based document analysis API. With semantic chunking, the Layout model offers a comprehensive solution for advanced content extraction and document structure analysis capabilities. With the Layout model, you can easily extract text and structural 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 the provided building blocks.
24+
The Document Intelligence [Layout model](concept-layout.md) is an advanced machine-learning based document analysis API. The Layout model offers a comprehensive solution for advanced content extraction and document structure analysis capabilities. With the Layout model, you can easily extract text and structural 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 the provided building blocks.
2525

2626
:::image type="content" source="media/rag/azure-rag-processing.png" alt-text="Screenshot depicting semantic chunking with RAG using Azure AI Document Intelligence.":::
2727

@@ -47,7 +47,7 @@ Markdown is a structured and formatted markup language and a popular input for e
4747

4848
* **Large learning model (LLM) compatibility**. The Layout model Markdown formatted output is LLM friendly and facilitates seamless integration into your workflows. You can turn any table in a document into Markdown format and avoid extensive effort parsing the documents for greater LLM understanding.
4949

50-
**Text image processed with Document Intelligence Studio using Layout model**
50+
**Text image processed with Document Intelligence Studio and output to markdown using Layout model**
5151

5252
:::image type="content" source="media/rag/markdown-text-output.png" alt-text="Screenshot of newspaper article processed by Layout model and outputted to Markdown.":::
5353

@@ -103,13 +103,15 @@ You can follow the [Document Intelligence Studio quickstart](quickstarts/try-doc
103103

104104
* [Java](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/documentintelligence/azure-ai-documentintelligence/src/samples/java/com/azure/ai/documentintelligence/AnalyzeLayoutMarkdownOutput.java)
105105

106+
* [.NET](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/Sample_ExtractLayout.md)
107+
106108
## Build document chat with semantic chunking
107109

108110
* [Azure OpenAI on your data](../openai/concepts/use-your-data.md) enables you to run supported chat on your documents. Azure OpenAI on your data applies the Document Intelligence Layout model to extract and parse document data by chunking long text based on tables and paragraphs. You can also customize your chunking strategy using [Azure OpenAI sample scripts](https://github.com/microsoft/sample-app-aoai-chatGPT/tree/main/scripts) located in our GitHub repo.
109111

110-
* Azure AI Document Intelligence is now integrated with [LangChain](https://python.langchain.com/docs/integrations/document_loaders/azure_document_intelligence) as one of its document loaders. You can use it to easily load the data and output to Markdown format. This [notebook](https://microsoft.github.io/SynapseML/docs/Explore%20Algorithms/AI%20Services/Quickstart%20-%20Document%20Question%20and%20Answering%20with%20PDFs/) shows a simple demo for RAG pattern with Azure AI Document Intelligence as document loader and Azure Search as retriever in LangChain.
112+
* Azure AI Document Intelligence is now integrated with [LangChain](https://python.langchain.com/docs/integrations/document_loaders/azure_document_intelligence) as one of its document loaders. You can use it to easily load the data and output to Markdown format. This [notebook](https://github.com/microsoft/Form-Recognizer-Toolkit/blob/main/SampleCode/Python/sample_rag_langchain.ipynb) shows a simple demo for RAG pattern with Azure AI Document Intelligence as document loader and Azure Search as retriever in LangChain.
111113

112-
* The chat with your data solution accelerator[code sample](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator) demonstrates an end-to-end baseline RAG pattern sample. It uses Azure AI Search as a retriever and Azure AI Document Intelligence for document loading and semantic chunking.
114+
* The chat with your data solution accelerator [code sample](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator) demonstrates an end-to-end baseline RAG pattern sample. It uses Azure AI Search as a retriever and Azure AI Document Intelligence for document loading and semantic chunking.
113115

114116
## Use case
115117

@@ -122,20 +124,15 @@ If you're looking for a specific section in a document, you can use semantic chu
122124
# pip install langchain langchain-community azure-ai-documentintelligence
123125

124126
from azure.ai.documentintelligence import DocumentIntelligenceClient
125-
from azure.core.credentials import AzureKeyCredential
126127

127-
endpoint = "https://<my-custom-subdomain>.cognitiveservices.azure.com/"
128-
credential = AzureKeyCredential("<api_key>")
128+
endpoint = "https://<my-custom-subdomain>.cognitiveservices.azure.com/"
129+
key = "<api_key>"
129130

130-
document_intelligence_client = DocumentIntelligenceClient(
131-
endpoint, credential)
132-
133131
from langchain_community.document_loaders import AzureAIDocumentIntelligenceLoader
134-
135132
from langchain.text_splitter import MarkdownHeaderTextSplitter
136133

137134
# Initiate Azure AI Document Intelligence to load the document. You can either specify file_path or url_path to load the document.
138-
loader = AzureAIDocumentIntelligenceLoader(file_path="<path to your file>", api_key = doc_intelligence_key, api_endpoint = doc_intelligence_endpoint, api_model="prebuilt-layout")
135+
loader = AzureAIDocumentIntelligenceLoader(file_path="<path to your file>", api_key = key, api_endpoint = endpoint, api_model="prebuilt-layout")
139136
docs = loader.load()
140137

141138
# Split the document into chunks base on markdown headers.

articles/azure-resource-manager/bicep/deployment-stacks.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ New-AzResourceGroupDeploymentStack `
626626
-TemplateFile "<bicep-file-name>" `
627627
-DenySettingsMode "DenyDelete" `
628628
-DenySettingsExcludedAction "Microsoft.Compute/virtualMachines/write Microsoft.StorageAccounts/delete" `
629-
-DenySettingsExcludedPrincipal "<object-id>" "<object-id>"
629+
-DenySettingsExcludedPrincipal "<object-id> <object-id>"
630630
```
631631

632632
# [CLI](#tab/azure-cli)
@@ -638,7 +638,7 @@ az stack group create \
638638
--template-file '<bicep-file-name>' \
639639
--deny-settings-mode 'denyDelete' \
640640
--deny-settings-excluded-actions 'Microsoft.Compute/virtualMachines/write Microsoft.StorageAccounts/delete' \
641-
--deny-settings-excluded-principals '<object-id>' '<object-id>'
641+
--deny-settings-excluded-principals '<object-id> <object-id>'
642642
```
643643

644644
# [Portal](#tab/azure-portal)
@@ -658,7 +658,7 @@ New-AzSubscriptionDeploymentStack `
658658
-TemplateFile "<bicep-file-name>" `
659659
-DenySettingsMode "DenyDelete" `
660660
-DenySettingsExcludedAction "Microsoft.Compute/virtualMachines/write Microsoft.StorageAccounts/delete" `
661-
-DenySettingsExcludedPrincipal "<object-id>" "<object-id>"
661+
-DenySettingsExcludedPrincipal "<object-id> <object-id>"
662662
```
663663

664664
Use the `DeploymentResourceGroupName` parameter to specify the resource group name at which the deployment stack is created. If a scope isn't specified, it uses the scope of the deployment stack.
@@ -672,7 +672,7 @@ az stack sub create \
672672
--template-file '<bicep-file-name>' \
673673
--deny-settings-mode 'denyDelete' \
674674
--deny-settings-excluded-actions 'Microsoft.Compute/virtualMachines/write Microsoft.StorageAccounts/delete' \
675-
--deny-settings-excluded-principals '<object-id>' '<object-id>'
675+
--deny-settings-excluded-principals '<object-id> <object-id>'
676676
```
677677

678678
Use the `deployment-resource-group` parameter to specify the resource group at which the deployment stack is created. If a scope isn't specified, it uses the scope of the deployment stack.
@@ -694,7 +694,7 @@ New-AzManagmentGroupDeploymentStack `
694694
-TemplateFile "<bicep-file-name>" `
695695
-DenySettingsMode "DenyDelete" `
696696
-DenySettingsExcludedActions "Microsoft.Compute/virtualMachines/write Microsoft.StorageAccounts/delete" `
697-
-DenySettingsExcludedPrincipal "<object-id>" "<object-id>"
697+
-DenySettingsExcludedPrincipal "<object-id> <object-id>"
698698
```
699699

700700
Use the `DeploymentSubscriptionId ` parameter to specify the subscription ID at which the deployment stack is created. If a scope isn't specified, it uses the scope of the deployment stack.
@@ -708,7 +708,7 @@ az stack mg create \
708708
--template-file '<bicep-file-name>' \
709709
--deny-settings-mode 'denyDelete' \
710710
--deny-settings-excluded-actions 'Microsoft.Compute/virtualMachines/write Microsoft.StorageAccounts/delete' \
711-
--deny-settings-excluded-principals '<object-id>' '<object-id>'
711+
--deny-settings-excluded-principals '<object-id> <object-id>'
712712
```
713713

714714
Use the `deployment-subscription ` parameter to specify the subscription ID at which the deployment stack is created. If a scope isn't specified, it uses the scope of the deployment stack.

articles/communication-services/concepts/email/email-domain-and-sender-authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Email Communication Service resources are designed to enable domain validation s
4545

4646
* [Get started with create and manage Email Communication Service in Azure Communication Service](../../quickstarts/email/create-email-communication-resource.md)
4747

48-
* [Get started by connecting Email Communication Service with an Azure Communication Service resource](../../quickstarts/email/connect-email-communication-resource.md)
48+
* [Get started by connecting Email Communication Service with Azure Communication Service resource](../../quickstarts/email/connect-email-communication-resource.md)
4949

5050
The following documents may be interesting to you:
5151

articles/key-vault/keys/quick-create-go.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Quickstart - Azure Key Vault Go client library - manage keys
33
description: Learn how to create, retrieve, and delete keys from an Azure key vault using the Go client library
44
author: Duffney
55
ms.author: jduffney
6-
ms.date: 02/28/2022
6+
ms.date: 12/27/2023
77
ms.service: key-vault
88
ms.subservice: keys
99
ms.topic: quickstart
@@ -86,7 +86,10 @@ func main() {
8686
}
8787
8888
// create azkeys client
89-
client := azkeys.NewClient(keyVaultUrl, cred, nil)
89+
client, err := azkeys.NewClient(keyVaultUrl, cred, nil)
90+
if err != nil {
91+
log.Fatal(err)
92+
}
9093
9194
// create RSA Key
9295
rsaKeyParams := azkeys.CreateKeyParameters{

0 commit comments

Comments
 (0)