Skip to content

Commit 412e57e

Browse files
laujanlaujan
committed
update code
1 parent a0f9798 commit 412e57e

File tree

4 files changed

+95
-62
lines changed

4 files changed

+95
-62
lines changed

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,12 @@ DocumentIntelligenceClient client = new DocumentIntelligenceClient(new Uri(endpo
209209
//sample document
210210
Uri fileUri = new Uri ("https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/sample-layout.pdf");
211211

212-
Operation<AnalyzeResult> operation = await client.AnalyzeDocumentAsync(WaitUntil.Completed, "prebuilt-layout", fileUri);
212+
AnalyzeDocumentContent content = new AnalyzeDocumentContent()
213+
{
214+
UrlSource= fileUri
215+
};
216+
217+
Operation<AnalyzeResult> operation = await client.AnalyzeDocumentAsync(WaitUntil.Completed, "prebuilt-layout", content);
213218

214219
AnalyzeResult result = operation.Value;
215220

@@ -641,7 +646,12 @@ DocumentIntelligenceClient client = new DocumentIntelligenceClient(new Uri(endpo
641646
642647
Uri invoiceUri = new Uri ("https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/sample-invoice.pdf");
643648

644-
Operation<AnalyzeResult> operation = await client.AnalyzeDocumentAsync(WaitUntil.Completed, "prebuilt-invoice", invoiceUri);
649+
AnalyzeDocumentContent content = new AnalyzeDocumentContent()
650+
{
651+
UrlSource= invoiceUri
652+
};
653+
654+
Operation<AnalyzeResult> operation = await client.AnalyzeDocumentAsync(WaitUntil.Completed, "prebuilt-invoice", content);
645655

646656
AnalyzeResult result = operation.Value;
647657

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

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: laujan
66
manager: nitinme
77
ms.service: azure-ai-document-intelligence
88
ms.topic: include
9-
ms.date: 03/25/2024
9+
ms.date: 05/01/2024
1010
ms.author: lajanuar
1111
---
1212
<!-- markdownlint-disable MD025 -->
@@ -291,11 +291,18 @@ public class DocIntelligence {
291291
.buildClient();
292292

293293
// sample document
294-
String documentUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/sample-layout.pdf";
295294
String modelId = "prebuilt-layout";
295+
String documentUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/sample-layout.pdf";
296296

297-
SyncPoller <AnalyzeResultOperation, AnalyzeResultOperation> analyzeLayoutResultPoller =
298-
client.beginAnalyzeDocument(modelId, documentUrl);
297+
SyncPoller <AnalyzeResultOperation, AnalyzeResultOperation> analyzeLayoutPoller =
298+
client.beginAnalyzeDocument(modelId,
299+
null,
300+
null,
301+
null,
302+
null,
303+
null,
304+
null,
305+
new AnalyzeDocumentRequest().setUrlSource(documentUrl));
299306

300307
AnalyzeResult analyzeLayoutResult = analyzeLayoutPoller.getFinalResult().getAnalyzeResult();
301308

@@ -675,8 +682,15 @@ public class DocIntelligence {
675682
.endpoint("https://{endpoint}.cognitiveservices.azure.com/")
676683
.buildClient();
677684

678-
SyncPoller < OperationResult, AnalyzeResult > analyzeLayoutResultPoller =
679-
client.beginAnalyzeDocument(modelId, invoiceUrl);
685+
SyncPoller < AnalyzeResultOperation, AnalyzeResultOperation > analyzeLayoutPoller =
686+
client.beginAnalyzeDocument(modelId,
687+
null,
688+
null,
689+
null,
690+
null,
691+
null,
692+
null,
693+
new AnalyzeDocumentRequest().setUrlSource(invoiceUrl));
680694

681695
AnalyzeResult analyzeInvoiceResult = analyzeInvoicesPoller.getFinalResult().getAnalyzeResult();
682696

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

Lines changed: 55 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: laujan
66
manager: nitinme
77
ms.service: azure-ai-document-intelligence
88
ms.topic: include
9-
ms.date: 03/25/2024
9+
ms.date: 05/02/2024
1010
ms.author: lajanuar
1111
---
1212
<!-- markdownlint-disable MD025 -->
@@ -154,39 +154,37 @@ Extract text, selection marks, text styles, table structures, and bounding regio
154154
const endpoint = "<your-endpoint>";
155155

156156
// sample document
157-
const formUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/sample-layout.pdf"
157+
const formUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/sample-layout.pdf"
158158

159-
async function main() {
159+
async function main() {
160160
const client = DocumentIntelligenceClient(endpoint, new AzureKeyCredential(key));
161161

162-
const poller = await client.beginAnalyzeDocument("prebuilt-layout", formUrl);
163162

164-
const {
165-
pages,
166-
tables
167-
} = await poller.pollUntilDone();
163+
const initialResponse = await client
164+
.path("/documentModels/{modelId}:analyze", "prebuilt-layout")
165+
.post: ({
166+
contentType: "application/json",
167+
body: {
168+
urlSource: formUrl
169+
},
170+
});
168171

169-
if (pages.length <= 0) {
170-
console.log("No pages were extracted from the document.");
171-
} else {
172-
console.log("Pages:");
173-
for (const page of pages) {
174-
console.log("- Page", page.pageNumber, `(unit: ${page.unit})`);
175-
console.log(` ${page.width}x${page.height}, angle: ${page.angle}`);
176-
console.log(` ${page.lines.length} lines, ${page.words.length} words`);
177-
}
178-
}
172+
const poller = await getLongRunningPoller(client, initialResponse);
173+
const analyzeResult = (await poller.pollUntilDone()).body.analyzeResult;
179174

180-
if (tables.length <= 0) {
181-
console.log("No tables were extracted from the document.");
182-
} else {
183-
console.log("Tables:");
184-
for (const table of tables) {
185-
console.log(
186-
`- Extracted table: ${table.columnCount} columns, ${table.rowCount} rows (${table.cells.length} cells)`
187-
);
188-
}
175+
const documents = analyzeResult?.documents;
176+
177+
const document = documents && documents[0];
178+
if (!document) {
179+
throw new Error("Expected at least one document in the result.");
189180
}
181+
182+
console.log(
183+
"Extracted document:",
184+
document.docType,
185+
`(confidence: ${document.confidence || "<undefined>"})`,
186+
);
187+
console.log("Fields:", document.fields);
190188
}
191189

192190
main().catch((error) => {
@@ -323,32 +321,43 @@ const { AzureKeyCredential } = require("@azure/core-auth");
323321
invoiceUrl = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-REST-api-samples/master/curl/form-recognizer/sample-invoice.pdf"
324322

325323
async function main() {
324+
326325
const client = DocumentIntelligenceClient(endpoint, new AzureKeyCredential(key));
327326

328-
const poller = await client.beginAnalyzeDocument("prebuilt-invoice", invoiceUrl);
329-
if (pages.length <= 0) {
330-
console.log("No pages were extracted from the document.");
331-
} else {
332-
console.log("Pages:");
333-
for (const page of pages) {
334-
console.log("- Page", page.pageNumber, `(unit: ${page.unit})`);
335-
console.log(` ${page.width}x${page.height}, angle: ${page.angle}`);
336-
console.log(` ${page.lines.length} lines, ${page.words.length} words`);
337-
}
338-
}
327+
const initialResponse = await client
328+
.path("/documentModels/{modelId}:analyze", "prebuilt-invoice")
329+
.post({
330+
contentType: "application/json",
331+
body: {
332+
// The Document Intelligence service will access the URL to the invoice image and extract data from it
333+
urlSource: invoiceUrl,
334+
},
335+
});
339336

340-
if (tables.length <= 0) {
341-
console.log("No tables were extracted from the document.");
337+
338+
const poller = await getLongRunningPoller(client, initialResponse);
339+
340+
poller.onProgress((state) => console.log("Operation:", state.result, state.status));
341+
const analyzeResult = (await poller.pollUntilDone()).body.analyzeResult;
342+
343+
const documents = analyzeResult?.documents;
344+
345+
const result = documents && documents[0];
346+
if (result) {
347+
console.log(result.fields);
342348
} else {
343-
console.log("Tables:");
344-
for (const table of tables) {
345-
console.log(
346-
`- Extracted table: ${table.columnCount} columns, ${table.rowCount} rows (${table.cells.length} cells)`
347-
);
348-
}
349+
throw new Error("Expected at least one invoice in the result.");
349350
}
351+
352+
console.log(
353+
"Extracted invoice:",
354+
document.docType,
355+
`(confidence: ${document.confidence || "<undefined>"})`,
356+
);
357+
console.log("Fields:", document.fields);
350358
}
351359

360+
352361
main().catch((error) => {
353362
console.error("An error occurred:", error);
354363
process.exit(1);

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: laujan
66
manager: nitinme
77
ms.service: azure-ai-document-intelligence
88
ms.topic: include
9-
ms.date: 03/25/2024
9+
ms.date: 05/01/2024
1010
ms.author: lajanuar
1111
---
1212
<!-- markdownlint-disable MD025 -->
@@ -135,6 +135,7 @@ import os
135135
from azure.core.credentials import AzureKeyCredential
136136
from azure.ai.documentintelligence import DocumentIntelligenceClient
137137
from azure.ai.documentintelligence.models import AnalyzeResult
138+
from azure.ai.documentintelligence.models import AnalyzeDocumentRequest
138139

139140
# set `<your-endpoint>` and `<your-key>` variables with the values from the Azure portal
140141
endpoint = "<your-endpoint>"
@@ -168,12 +169,8 @@ def analyze_layout():
168169
)
169170

170171
poller = document_intelligence_client.begin_analyze_document(
171-
"prebuilt-layout", formUrl
172-
)
173-
174-
analyze_request = AnalyzeDocumentRequest(
175-
url_source=formUrl
176-
)
172+
"prebuilt-layout", AnalyzeDocumentRequest(url_source=formUrl
173+
))
177174

178175
result: AnalyzeResult = poller.result()
179176

@@ -548,6 +545,9 @@ Analyze and extract common fields from specific document types using a prebuilt
548545
import os
549546
from azure.core.credentials import AzureKeyCredential
550547
from azure.ai.documentintelligence import DocumentIntelligenceClient
548+
from azure.ai.documentintelligence.models import AnalyzeResult
549+
from azure.ai.documentintelligence.models import AnalyzeDocumentRequest
550+
551551

552552

553553
# set `<your-endpoint>` and `<your-key>` variables with the values from the Azure portal
@@ -564,7 +564,7 @@ def analyze_invoice():
564564
)
565565

566566
poller = document_intelligence_client.begin_analyze_document(
567-
"prebuilt-invoice", invoiceUrl
567+
"prebuilt-invoice", AnalyzeDocumentRequest(url_source=invoiceUrl
568568
)
569569
invoices = poller.result()
570570

0 commit comments

Comments
 (0)