Merge pull request #274156 from laujan/251008-update-qs-code-samples

update code

Author: prmerger-automator[bot]

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

@@ -209,7 +209,12 @@ DocumentIntelligenceClient client = new DocumentIntelligenceClient(new Uri(endpo
 //sample document
 Uri fileUri = new Uri ("https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/sample-layout.pdf");
 
-Operation<AnalyzeResult> operation = await client.AnalyzeDocumentAsync(WaitUntil.Completed, "prebuilt-layout", fileUri);
+AnalyzeDocumentContent content = new AnalyzeDocumentContent()
+{
+    UrlSource= fileUri
+};
+
+Operation<AnalyzeResult> operation = await client.AnalyzeDocumentAsync(WaitUntil.Completed, "prebuilt-layout", content);
 
 AnalyzeResult result = operation.Value;
 
@@ -641,7 +646,12 @@ DocumentIntelligenceClient client = new DocumentIntelligenceClient(new Uri(endpo
 
 Uri invoiceUri = new Uri ("https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/sample-invoice.pdf");
 
-Operation<AnalyzeResult> operation = await client.AnalyzeDocumentAsync(WaitUntil.Completed, "prebuilt-invoice", invoiceUri);
+AnalyzeDocumentContent content = new AnalyzeDocumentContent()
+{
+    UrlSource = invoiceUri
+};
+
+Operation<AnalyzeResult> operation = await client.AnalyzeDocumentAsync(WaitUntil.Completed, "prebuilt-invoice", content);
 
 AnalyzeResult result = operation.Value;
 

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

@@ -6,7 +6,7 @@ author: laujan
 manager: nitinme
 ms.service: azure-ai-document-intelligence
 ms.topic: include
-ms.date: 03/25/2024
+ms.date: 05/01/2024
 ms.author: lajanuar
 ---
 <!-- markdownlint-disable MD025 -->
@@ -284,18 +284,25 @@ public class DocIntelligence {
 
   public static void main(String[] args) {
 
-    // create your `DocumentAnalysisClient` instance and `AzureKeyCredential` variable
+    // create your `DocumentIntelligenceClient` instance and `AzureKeyCredential` variable
     DocumentIntelligenceClient client = new DocumentIntelligenceClientBuilder()
       .credential(new AzureKeyCredential(key))
       .endpoint(endpoint)
       .buildClient();
 
     // sample document
-    String documentUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/sample-layout.pdf";
     String modelId = "prebuilt-layout";
+    String documentUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/sample-layout.pdf";
 
-    SyncPoller <AnalyzeResultOperation, AnalyzeResultOperation> analyzeLayoutResultPoller =
-      client.beginAnalyzeDocument(modelId, documentUrl);
+    SyncPoller <AnalyzeResultOperation, AnalyzeResultOperation> analyzeLayoutPoller =
+      client.beginAnalyzeDocument(modelId,
+          null,
+          null,
+          null,
+          null,
+          null,
+          null,
+          new AnalyzeDocumentRequest().setUrlSource(documentUrl));
 
     AnalyzeResult analyzeLayoutResult = analyzeLayoutPoller.getFinalResult().getAnalyzeResult();
 
@@ -658,25 +665,27 @@ public class DocIntelligence {
 
   public static void main(String[] args) {
 
-    // create your `DocumentAnalysisClient` instance and `AzureKeyCredential` variable
-    DocumentIntelligenceClient client = new DocumentIntelligenceClientBuilder()
-      .credential(new AzureKeyCredential(key))
-      .endpoint(endpoint)
-      .buildClient();
-
     // sample document
     String modelId = "prebuilt-invoice";
     String invoiceUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/sample-invoice.pdf";
 
     public static void main(final String[] args) throws IOException {
+
       // Instantiate a client that will be used to call the service.
       DocumentIntelligenceClient client = new DocumentIntelligenceClientBuilder()
-        .credential(new AzureKeyCredential("{key}"))
-        .endpoint("https://{endpoint}.cognitiveservices.azure.com/")
+        .credential(new AzureKeyCredential(key))
+        .endpoint(endpoint)
         .buildClient();
 
-      SyncPoller < OperationResult, AnalyzeResult > analyzeLayoutResultPoller =
-        client.beginAnalyzeDocument(modelId, invoiceUrl);
+      SyncPoller<AnalyzeResultOperation, AnalyzeResultOperation > analyzeInvoicesPoller =
+        client.beginAnalyzeDocument(modelId, 
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            new AnalyzeDocumentRequest().setUrlSource(invoiceUrl));
 
       AnalyzeResult analyzeInvoiceResult = analyzeInvoicesPoller.getFinalResult().getAnalyzeResult();
 

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

@@ -6,7 +6,7 @@ author: laujan
 manager: nitinme
 ms.service: azure-ai-document-intelligence
 ms.topic: include
-ms.date: 03/25/2024
+ms.date: 05/02/2024
 ms.author: lajanuar
 ---
 <!-- markdownlint-disable MD025 -->
@@ -146,47 +146,44 @@ Extract text, selection marks, text styles, table structures, and bounding regio
 :::moniker range="doc-intel-4.0.0"
 
 ```javascript
-    const { DocumentIntelligenceClient } = require("@azure-rest/ai-document-intelligence");
-    const  { AzureKeyCredential } = require("@azure/core-auth");
+    const 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";
     const endpoint = "<your-endpoint>";
 
     // sample document
-  const formUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/sample-layout.pdf"
+    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 = DocumentIntelligenceClient(endpoint, new AzureKeyCredential(key));
+   async function main() {
+    const client = DocumentIntelligenceClient(endpoint, {key:key},);
 
-    const poller = await client.beginAnalyzeDocument("prebuilt-layout", formUrl);
 
-const {
-        pages,
-        tables
-    } = await poller.pollUntilDone();
+    const initialResponse = await client
+      .path("/documentModels/{modelId}:analyze", "prebuilt-layout")
+      .post({
+        contentType: "application/json",
+        body: {
+          urlSource: formUrl
+        },
+       });
 
-    if (pages.length <= 0) {
-        console.log("No pages were extracted from the document.");
-    } else {
-        console.log("Pages:");
-        for (const page of pages) {
-            console.log("- Page", page.pageNumber, `(unit: ${page.unit})`);
-            console.log(`  ${page.width}x${page.height}, angle: ${page.angle}`);
-            console.log(`  ${page.lines.length} lines, ${page.words.length} words`);
-        }
-    }
+    const poller = await getLongRunningPoller(client, initialResponse);
+    const analyzeResult = (await poller.pollUntilDone()).body.analyzeResult;
 
-    if (tables.length <= 0) {
-        console.log("No tables were extracted from the document.");
-    } else {
-        console.log("Tables:");
-        for (const table of tables) {
-            console.log(
-                `- Extracted table: ${table.columnCount} columns, ${table.rowCount} rows (${table.cells.length} cells)`
-            );
-        }
+    const documents = analyzeResult?.documents;
+
+    const document = documents && documents[0];
+    if (!document) {
+    throw new Error("Expected at least one document in the result.");
     }
+
+    console.log(
+    "Extracted document:",
+    document.docType,
+    `(confidence: ${document.confidence || "<undefined>"})`,
+    );
+    console.log("Fields:", document.fields);
 }
 
 main().catch((error) => {
@@ -312,8 +309,7 @@ In this example, we analyze an invoice using the **prebuilt-invoice** model.
 
 ```javascript
 
-const { DocumentIntelligenceClient } = require("@azure-rest/ai-document-intelligence");
-const  { AzureKeyCredential } = require("@azure/core-auth");
+const 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>";
@@ -323,32 +319,44 @@ const  { AzureKeyCredential } = require("@azure/core-auth");
     invoiceUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/sample-invoice.pdf"
 
 async function main() {
-    const client = DocumentIntelligenceClient(endpoint, new AzureKeyCredential(key));
 
-    const poller = await client.beginAnalyzeDocument("prebuilt-invoice", invoiceUrl);
-if (pages.length <= 0) {
-        console.log("No pages were extracted from the document.");
-    } else {
-        console.log("Pages:");
-        for (const page of pages) {
-            console.log("- Page", page.pageNumber, `(unit: ${page.unit})`);
-            console.log(`  ${page.width}x${page.height}, angle: ${page.angle}`);
-            console.log(`  ${page.lines.length} lines, ${page.words.length} words`);
-        }
-    }
+    const client = DocumentIntelligenceClient(endpoint, {key: key},
+     );
 
-    if (tables.length <= 0) {
-        console.log("No tables were extracted from the document.");
+    const initialResponse = await client
+    .path("/documentModels/{modelId}:analyze", "prebuilt-invoice")
+    .post({
+      contentType: "application/json",
+      body: {
+        // The Document Intelligence service will access the URL to the invoice image and extract data from it
+        urlSource: invoiceUrl,
+      },
+    });
+
+
+    const poller = await getLongRunningPoller(client, initialResponse);
+
+    poller.onProgress((state) => console.log("Operation:", state.result, state.status));
+    const analyzeResult = (await poller.pollUntilDone()).body.analyzeResult;
+
+    const documents = analyzeResult?.documents;
+
+    const result = documents && documents[0];
+    if (result) {
+      console.log(result.fields);
     } else {
-        console.log("Tables:");
-        for (const table of tables) {
-            console.log(
-                `- Extracted table: ${table.columnCount} columns, ${table.rowCount} rows (${table.cells.length} cells)`
-            );
-        }
+      throw new Error("Expected at least one invoice in the result.");
     }
+
+console.log(
+    "Extracted invoice:",
+    document.docType,
+    `(confidence: ${document.confidence || "<undefined>"})`,
+  );
+  console.log("Fields:", document.fields);
 }
 
+
 main().catch((error) => {
     console.error("An error occurred:", error);
     process.exit(1);

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

@@ -6,7 +6,7 @@ author: laujan
 manager: nitinme
 ms.service: azure-ai-document-intelligence
 ms.topic: include
-ms.date: 03/25/2024
+ms.date: 05/01/2024
 ms.author: lajanuar
 ---
 <!-- markdownlint-disable MD025 -->
@@ -135,6 +135,7 @@ import os
 from azure.core.credentials import AzureKeyCredential
 from azure.ai.documentintelligence import DocumentIntelligenceClient
 from azure.ai.documentintelligence.models import AnalyzeResult
+from azure.ai.documentintelligence.models import AnalyzeDocumentRequest
 
 # set `<your-endpoint>` and `<your-key>` variables with the values from the Azure portal
 endpoint = "<your-endpoint>"
@@ -168,12 +169,8 @@ def analyze_layout():
     )
 
     poller = document_intelligence_client.begin_analyze_document(
-        "prebuilt-layout", formUrl
-    )
-
-    analyze_request = AnalyzeDocumentRequest(
-        url_source=formUrl
-    )
+        "prebuilt-layout", AnalyzeDocumentRequest(url_source=formUrl
+    ))
 
     result: AnalyzeResult = poller.result()
 
@@ -548,6 +545,9 @@ Analyze and extract common fields from specific document types using a prebuilt
 import os
 from azure.core.credentials import AzureKeyCredential
 from azure.ai.documentintelligence import DocumentIntelligenceClient
+from azure.ai.documentintelligence.models import AnalyzeResult
+from azure.ai.documentintelligence.models import AnalyzeDocumentRequest
+
 
 
 # set `<your-endpoint>` and `<your-key>` variables with the values from the Azure portal
@@ -564,7 +564,7 @@ def analyze_invoice():
     )
 
     poller = document_intelligence_client.begin_analyze_document(
-        "prebuilt-invoice", invoiceUrl
+        "prebuilt-invoice", AnalyzeDocumentRequest(url_source=invoiceUrl
     )
     invoices = poller.result()