Merge pull request #272254 from MicrosoftDocs/main

4/16 11:00 AM IST Publish

Author: Saisang

.openpublishing.publish.config.json

@@ -1189,6 +1189,12 @@
       "url": "https://github.com/Azure-Samples/explore-iot-operations",
       "branch": "main",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "SupportArticles-docs",
+      "url": "https://github.com/MicrosoftDocs/SupportArticles-docs",
+      "branch": "main",
+      "branch_mapping": {}
     }
   ],
   "branch_target_mapping": {

articles/ai-services/document-intelligence/concept-invoice.md

@@ -234,6 +234,7 @@ Following are the line items extracted from an invoice in the JSON output respon
 | Amount | Number | The amount of the line item | $60.00 | 100 |
 | Description | String | The text description for the invoice line item | Consulting service | Consulting service |
 | Quantity | Number | The quantity for this invoice line item | 2 | 2 |
+| OrderQuantity | Number | The ordered quantity for this line item. May differ from the quantity shipped and invoiced | 3 | 3 |
 | UnitPrice | Number | The net or gross price (depending on the gross invoice setting of the invoice) of one unit of this item | $30.00 | 30 |
 | ProductCode | String| Product code, product number, or SKU associated with the specific line item | A123 | |
 | Unit | String| The unit of the line item, e.g,  kg, lb etc. | Hours | |
@@ -301,6 +302,28 @@ The following are the line items extracted from an invoice in the JSON output re
 | Date | date| Date corresponding to each line item. Often it's a date the line item was shipped | 3/4/2021| 2021-03-04 |
 | Tax | number | Tax associated with each line item. Possible values include tax amount, tax %, and tax Y/N | 10% | |
 
+The following are complex fields extracted from an invoice in the JSON output response:
+
+### TaxDetails
+Tax details aims at breaking down the different taxes applied to the invoice total.
+
+|Name| Type | Description | Text (line item #1) | Value (standardized output) |
+|:-----|:----|:----|:----| :----|
+| Items | string | Full string text line of the tax item | V.A.T. 15% $60.00 | |
+| Amount | number | The tax amount of the tax item | 60.00 | 60 |
+| Rate | string | The tax rate of the tax item | 15% | |
+
+### PaymentDetails
+List all the detected payment options detected on the field. 
+
+|Name| Type | Description | Text (line item #1) | Value (standardized output) |
+|:-----|:----|:----|:----| :----|
+| IBAN | string | Internal Bank Account Number | GB33BUKB20201555555555 | |
+| SWIFT | string | SWIFT code | BUKBGB22 | |
+| BPayBillerCode | string | Australian B-Pay Biller Code | 12345 | |
+| BPayReference | string | Australian B-Pay Reference Code | 98765432100 | |
+
+
 ### JSON output
 
 The JSON output has three parts:

articles/ai-services/document-intelligence/how-to-guides/includes/v4-0/javascript-sdk.md

@@ -79,7 +79,7 @@ Create a Node.js Express application.
 1. Install the `ai-document-intelligence` client library and `azure/identity` npm packages:
 
     ```console
-    npm i @azure/[email protected] @azure/identity
+    npm i @azure-rest/[email protected] @azure/identity
     ```
 
   Your app's *package.json* file is updated with the dependencies.
@@ -106,7 +106,7 @@ Open the `index.js` file in Visual Studio Code or your favorite IDE and select o
 ## Use the Read model
 
 ```javascript
-const { AzureKeyCredential, DocumentIntelligence } = require("@azure/ai-document-intelligence");
+const { AzureKeyCredential, DocumentIntelligence } = require("@azure-rest/ai-document-intelligence");
 
 //use your `key` and `endpoint` environment variables
 const key = process.env['DI_KEY'];
@@ -202,7 +202,7 @@ Visit the Azure samples repository on GitHub and view the [`read` model output](
 ## Use the Layout model
 
 ```javascript
-const { AzureKeyCredential, DocumentIntelligence } = require("@azure/ai-document-intelligence");
+const { AzureKeyCredential, DocumentIntelligence } = require("@azure-rest/ai-document-intelligence");
 
 //use your `key` and `endpoint` environment variables
 const key = process.env['DI_KEY'];
@@ -272,7 +272,7 @@ Visit the Azure samples repository on GitHub and view the [layout model output](
 ## Use the General document model
 
 ```javascript
-const { AzureKeyCredential, DocumentIntelligence } = require("@azure/ai-document-intelligence");
+const { AzureKeyCredential, DocumentIntelligence } = require("@azure-rest/ai-document-intelligence");
 
 //use your `key` and `endpoint` environment variables
 const key = process.env['DI_KEY'];
@@ -318,7 +318,7 @@ Visit the Azure samples repository on GitHub and view the [general document mode
 ## Use the W-2 tax model
 
 ```javascript
-const { AzureKeyCredential, DocumentIntelligence } = require("@azure/ai-document-intelligence");
+const { AzureKeyCredential, DocumentIntelligence } = require("@azure-rest/ai-document-intelligence");
 
 //use your `key` and `endpoint` environment variables
 const key = process.env['DI_KEY'];
@@ -397,7 +397,7 @@ Visit the Azure samples repository on GitHub and view the [W-2 tax model output]
 ## Use the Invoice model
 
 ```javascript
-const { AzureKeyCredential, DocumentIntelligence } = require("@azure/ai-document-intelligence");
+const { AzureKeyCredential, DocumentIntelligence } = require("@azure-rest/ai-document-intelligence");
 
 //use your `key` and `endpoint` environment variables
 const key = process.env['DI_KEY'];
@@ -459,7 +459,7 @@ Visit the Azure samples repository on GitHub and view the [invoice model output]
 ## Use the Receipt model
 
 ```javascript
-const { AzureKeyCredential, DocumentIntelligence } = require("@azure/ai-document-intelligence");
+const { AzureKeyCredential, DocumentIntelligence } = require("@azure-rest/ai-document-intelligence");
 
 //use your `key` and `endpoint` environment variables
 const key = process.env['DI_KEY'];
@@ -518,7 +518,7 @@ Visit the Azure samples repository on GitHub and view the [receipt model output]
 ## Use the ID document model
 
 ```javascript
-const { AzureKeyCredential, DocumentIntelligence } = require("@azure/ai-document-intelligence");
+const { AzureKeyCredential, DocumentIntelligence } = require("@azure-rest/ai-document-intelligence");
 
 //use your `key` and `endpoint` environment variables
 const key = process.env['DI_KEY'];

articles/ai-services/document-intelligence/how-to-guides/includes/v4-0/python-sdk.md

@@ -98,11 +98,11 @@ def analyze_read():
     # sample document
     formUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/rest-api/read.png"
 
-    document_intelligence_client = DocumentIntelligenceClient(
+    client = DocumentIntelligenceClient(
         endpoint=endpoint, credential=AzureKeyCredential(key)
     )
 
-    poller = document_intelligence_client.begin_analyze_document(
+    poller = client.begin_analyze_document(
         "prebuilt-read", formUrl
     )
     result = poller.result()
@@ -174,11 +174,11 @@ def analyze_layout():
     # sample document
     formUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/rest-api/layout.png"
 
-    document_intelligence_client = DocumentIntelligenceClient(
+    client = DocumentIntelligenceClient(
         endpoint=endpoint, credential=AzureKeyCredential(key)
     )
 
-    poller = document_intelligence_client.begin_analyze_document(
+    poller = client.begin_analyze_document(
         "prebuilt-layout", formUrl
     )
     result = poller.result()
@@ -295,9 +295,9 @@ def analyze_general_documents():
     docUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/sample-layout.pdf"
 
     # create your `DocumentIntelligenceClient` instance and `AzureKeyCredential` variable
-    document_intelligence_client = DocumentIntelligenceClient(endpoint=endpoint, credential=AzureKeyCredential(key))
+   client = DocumentIntelligenceClient(endpoint=endpoint, credential=AzureKeyCredential(key))
 
-    poller = document_intelligence_client.begin_analyze_document(
+    poller = client.begin_analyze_document(
             "prebuilt-document", docUrl)
     result = poller.result()
 
@@ -416,11 +416,11 @@ def analyze_tax_us_w2():
     # sample document
     formUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/rest-api/w2.png"
 
-    document_intelligence_client = DocumentIntelligenceClient(
+    client = DocumentIntelligenceClient(
         endpoint=endpoint, credential=AzureKeyCredential(key)
     )
 
-    poller = document_intelligence_client.begin_analyze_document(
+    poller = client.begin_analyze_document(
         "prebuilt-tax.us.w2", formUrl
     )
     w2s = poller.result()
@@ -747,11 +747,11 @@ def analyze_invoice():
 
     invoiceUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/sample-invoice.pdf"
 
-    document_intelligence_client = DocumentIntelligenceClient(
+    client = DocumentIntelligenceClient(
         endpoint=endpoint, credential=AzureKeyCredential(key)
     )
 
-    poller = document_intelligence_client.begin_analyze_document(
+    poller = client.begin_analyze_document(
             "prebuilt-invoice", invoiceUrl)
     invoices = poller.result()
 
@@ -1027,10 +1027,10 @@ def analyze_receipts():
     # sample document
     receiptUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/rest-api/receipt.png"
 
-    document_intelligence_client = DocumentIntelligenceClient(
+   client = DocumentIntelligenceClient(
         endpoint=endpoint, credential=AzureKeyCredential(key)
     )
-    poller = document_intelligence_client.begin_analyze_document(
+    poller = client.begin_analyze_document(
         "prebuilt-receipt", receiptUrl, locale="en-US"
     )
     receipts = poller.result()
@@ -1125,11 +1125,11 @@ def analyze_identity_documents():
 # sample document
     identityUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/rest-api/identity_documents.png"
 
-    document_intelligence_client = DocumentIntelligenceClient(
+   client = DocumentIntelligenceClient(
         endpoint=endpoint, credential=AzureKeyCredential(key)
     )
 
-    poller = document_intelligence_client.begin_analyze_document(
+    poller =client.begin_analyze_document(
             "prebuilt-idDocument", identityUrl
         )
     id_documents = poller.result()

articles/ai-services/document-intelligence/quickstarts/includes/javascript-sdk.md

@@ -146,7 +146,7 @@ Extract text, selection marks, text styles, table structures, and bounding regio
 :::moniker range="doc-intel-4.0.0"
 
 ```javascript
-    const { AzureKeyCredential, DocumentIntelligence } = require("@azure-rest/ai-document-intelligence");
+    const { AzureKeyCredential, DocumentIntelligenceClient } = require("@azure-rest/ai-document-intelligence");
 
     // set `<your-key>` and `<your-endpoint>` variables with the values from the Azure portal.
     const key = "<your-key>";
@@ -156,7 +156,7 @@ Extract text, selection marks, text styles, table structures, and bounding regio
   const formUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/sample-layout.pdf"
 
 async function main() {
-    const client = DocumentIntelligence(endpoint, new AzureKeyCredential(key));
+    const client = DocumentIntelligenceClient(endpoint, new AzureKeyCredential(key));
 
     const poller = await client.beginAnalyzeDocument("prebuilt-layout", formUrl);
 
@@ -311,7 +311,7 @@ In this example, we analyze an invoice using the **prebuilt-invoice** model.
 
 ```javascript
 
-const { AzureKeyCredential, DocumentIntelligence } = require("@azure-rest/ai-document-intelligence");
+const { AzureKeyCredential, DocumentIntelligenceClient } = require("@azure-rest/ai-document-intelligence");
 
     // set `<your-key>` and `<your-endpoint>` variables with the values from the Azure portal.
     const key = "<your-key>";
@@ -321,9 +321,9 @@ const { AzureKeyCredential, DocumentIntelligence } = require("@azure-rest/ai-doc
     invoiceUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/sample-invoice.pdf"
 
 async function main() {
-    const client = DocumentIntelligence(endpoint, new AzureKeyCredential(key));
+    const client = DocumentIntelligenceClient(endpoint, new AzureKeyCredential(key));
 
-    const poller = await client.beginAnalyzeDocumentFromUrl("prebuilt-invoice", invoiceUrl);
+    const poller = await client.beginAnalyzeDocument("prebuilt-invoice", invoiceUrl);
 if (pages.length <= 0) {
         console.log("No pages were extracted from the document.");
     } else {

articles/ai-services/openai/concepts/use-your-data.md

@@ -621,6 +621,7 @@ You can use Azure OpenAI On Your Data with an Azure OpenAI resource in the follo
 
 * `gpt-4` (0314)
 * `gpt-4` (0613)
+* `gpt-4` (0125)
 * `gpt-4-32k` (0314)
 * `gpt-4-32k` (0613)
 * `gpt-4` (1106-preview)

articles/ai-services/openai/reference.md

@@ -1026,7 +1026,7 @@ curl -X POST https://{your-resource-name}.openai.azure.com/openai/deployments/{d
   -d '{
     "prompt": "An avocado chair",
     "size": "1024x1024",
-    "n": 3,
+    "n": 1,
     "quality": "hd", 
     "style": "vivid"
   }'

articles/ai-services/openai/whats-new.md

@@ -28,6 +28,10 @@ Fine-tuning is now available in East US 2 with support for:
 
 Check the [models page](concepts/models.md#fine-tuning-models), for the latest information on model availability and fine-tuning support in each region.  
 
+### GPT-4 (0125) is available for Azure OpenAI On Your Data
+
+You can now use the GPT-4 (0125) model in [available regions](./concepts/models.md#public-cloud-regions) with Azure OpenAI On Your Data.
+
 ## March 2024
 
 ### Risks & Safety monitoring in Azure OpenAI Studio