Skip to content

[formrecognizer] regenerates on v2.1 #18551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kristapratico merged 14 commits into from
May 11, 2021
Merged

[formrecognizer] regenerates on v2.1 #18551

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5d4e9fe
add v2.1 generation
kristapratico Apr 22, 2021
e661446
some fixes for v2.1
kristapratico May 6, 2021
355011c
add note about 3.5 deprecation
kristapratico May 7, 2021
3625a09
ingest new changes
kristapratico May 8, 2021
6185d84
adjust code for new field value types and remove the old
kristapratico May 8, 2021
1d82f8b
adjustments to tests for changes in models
kristapratico May 8, 2021
a4274b0
update changelog and samples for CountryRegion
kristapratico May 8, 2021
62ca67f
api version compatibility
kristapratico May 9, 2021
50da70f
add recordings for v2.1
kristapratico May 11, 2021
254aa53
merge master
kristapratico May 11, 2021
7ef62ba
Exclude recordings from spellcheck
danieljurek May 11, 2021
b9971e9
Merge branch 'master' into fr2.1
kristapratico May 11, 2021
9fb4110
skip tests for regression in tables bounding box
kristapratico May 11, 2021
d077fb5
review feedback + skip AAD tests since not deployed
kristapratico May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
adjustments to tests for changes in models
  • Loading branch information
@kristapratico
kristapratico committed May 8, 2021
commit 1d82f8b64670dd0d97f4546b6664e32a606667eb
4 changes: 2 additions & 2 deletions sdk/formrecognizer/azure-ai-formrecognizer/tests/test_content.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def test_content_stream_pdf(self, client):
self.assertEqual(layout.page_number, 1)
self.assertFormPagesHasValues(result)
self.assertEqual(layout.tables[0].row_count, 3)
self.assertEqual(layout.tables[0].column_count, 6)
self.assertEqual(layout.tables[0].column_count, 5)
self.assertEqual(layout.tables[0].page_number, 1)

@FormRecognizerPreparer()
Expand Down Expand Up @@ -208,7 +208,7 @@ def test_content_stream_jpg(self, client):
self.assertEqual(layout.page_number, 1)
self.assertFormPagesHasValues(result)
self.assertEqual(layout.tables[0].row_count, 5)
self.assertEqual(layout.tables[0].column_count, 5)
self.assertEqual(layout.tables[0].column_count, 4)
self.assertEqual(layout.tables[1].row_count, 4)
self.assertEqual(layout.tables[1].column_count, 2)
self.assertEqual(layout.tables[0].page_number, 1)
Expand Down
4 changes: 2 additions & 2 deletions sdk/formrecognizer/azure-ai-formrecognizer/tests/test_content_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ async def test_content_stream_pdf(self, client):
self.assertEqual(layout.page_number, 1)
self.assertFormPagesHasValues(result)
self.assertEqual(layout.tables[0].row_count, 3)
self.assertEqual(layout.tables[0].column_count, 6)
self.assertEqual(layout.tables[0].column_count, 5)
self.assertEqual(layout.tables[0].page_number, 1)

@FormRecognizerPreparer()
Expand Down Expand Up @@ -225,7 +225,7 @@ async def test_content_stream_jpg(self, client):
self.assertEqual(layout.page_number, 1)
self.assertFormPagesHasValues(result)
self.assertEqual(layout.tables[0].row_count, 5)
self.assertEqual(layout.tables[0].column_count, 5)
self.assertEqual(layout.tables[0].column_count, 4)
self.assertEqual(layout.tables[1].row_count, 4)
self.assertEqual(layout.tables[1].column_count, 2)
self.assertEqual(layout.tables[0].page_number, 1)
Expand Down
4 changes: 2 additions & 2 deletions sdk/formrecognizer/azure-ai-formrecognizer/tests/test_content_from_url.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def test_content_url_pdf(self, client):
self.assertEqual(layout.page_number, 1)
self.assertFormPagesHasValues(result)
self.assertEqual(layout.tables[0].row_count, 3)
self.assertEqual(layout.tables[0].column_count, 6)
self.assertEqual(layout.tables[0].column_count, 5)
self.assertEqual(layout.tables[0].page_number, 1)

@FormRecognizerPreparer()
Expand Down Expand Up @@ -119,7 +119,7 @@ def test_content_url_jpg(self, client):
self.assertEqual(layout.page_number, 1)
self.assertFormPagesHasValues(result)
self.assertEqual(layout.tables[0].row_count, 5)
self.assertEqual(layout.tables[0].column_count, 5)
self.assertEqual(layout.tables[0].column_count, 4)
self.assertEqual(layout.tables[1].row_count, 4)
self.assertEqual(layout.tables[1].column_count, 2)
self.assertEqual(layout.tables[0].page_number, 1)
Expand Down
4 changes: 2 additions & 2 deletions sdk/formrecognizer/azure-ai-formrecognizer/tests/test_content_from_url_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ async def test_content_url_pdf(self, client):
self.assertEqual(layout.page_number, 1)
self.assertFormPagesHasValues(result)
self.assertEqual(layout.tables[0].row_count, 3)
self.assertEqual(layout.tables[0].column_count, 6)
self.assertEqual(layout.tables[0].column_count, 5)
self.assertEqual(layout.tables[0].page_number, 1)

@FormRecognizerPreparer()
Expand Down Expand Up @@ -134,7 +134,7 @@ async def test_content_url_jpg(self, client):
self.assertEqual(layout.page_number, 1)
self.assertFormPagesHasValues(result)
self.assertEqual(layout.tables[0].row_count, 5)
self.assertEqual(layout.tables[0].column_count, 5)
self.assertEqual(layout.tables[0].column_count, 4)
self.assertEqual(layout.tables[1].row_count, 4)
self.assertEqual(layout.tables[1].column_count, 2)
self.assertEqual(layout.tables[0].page_number, 1)
Expand Down
6 changes: 3 additions & 3 deletions sdk/formrecognizer/azure-ai-formrecognizer/tests/test_identity_documents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ def test_identity_document_jpg_passport(self, client):
self.assertEqual(passport["DateOfBirth"].value, date(1985,1,1))
self.assertEqual(passport["DateOfExpiration"].value, date(2023,1,14))
self.assertEqual(passport["Sex"].value, "F")
self.assertEqual(passport["Country"].value, "CAN")
self.assertEqual(passport["CountryRegion"].value, "CAN")

@FormRecognizerPreparer()
@GlobalClientPreparer()
Expand All @@ -204,7 +204,7 @@ def test_identity_document_jpg(self, client):
self.assertEqual(id_document.fields.get("DateOfExpiration").value, date(2020,8,12))
self.assertEqual(id_document.fields.get("Sex").value, "M")
self.assertEqual(id_document.fields.get("Address").value, "123 STREET ADDRESS YOUR CITY WA 99999-1234")
self.assertEqual(id_document.fields.get("Country").value, "USA")
self.assertEqual(id_document.fields.get("CountryRegion").value, "USA")
self.assertEqual(id_document.fields.get("Region").value, "Washington")

@FormRecognizerPreparer()
Expand All @@ -221,7 +221,7 @@ def test_identity_document_jpg_include_field_elements(self, client):
self.assertFormPagesHasValues(id_document.pages)

for field in id_document.fields.values():
if field.name == "Country":
if field.name == "CountryRegion":
self.assertEqual(field.value, "USA")
continue
elif field.name == "Region":
Expand Down
6 changes: 3 additions & 3 deletions sdk/formrecognizer/azure-ai-formrecognizer/tests/test_identity_documents_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ async def test_identity_document_jpg_passport(self, client):
self.assertEqual(passport["DateOfBirth"].value, date(1985,1,1))
self.assertEqual(passport["DateOfExpiration"].value, date(2023,1,14))
self.assertEqual(passport["Sex"].value, "F")
self.assertEqual(passport["Country"].value, "CAN")
self.assertEqual(passport["CountryRegion"].value, "CAN")

@FormRecognizerPreparer()
@GlobalClientPreparer()
Expand All @@ -221,7 +221,7 @@ async def test_identity_document_jpg(self, client):
self.assertEqual(id_document.fields.get("DateOfExpiration").value, date(2020,8,12))
self.assertEqual(id_document.fields.get("Sex").value, "M")
self.assertEqual(id_document.fields.get("Address").value, "123 STREET ADDRESS YOUR CITY WA 99999-1234")
self.assertEqual(id_document.fields.get("Country").value, "USA")
self.assertEqual(id_document.fields.get("CountryRegion").value, "USA")
self.assertEqual(id_document.fields.get("Region").value, "Washington")

@FormRecognizerPreparer()
Expand All @@ -239,7 +239,7 @@ async def test_identity_document_jpg_include_field_elements(self, client):
self.assertFormPagesHasValues(id_document.pages)

for field in id_document.fields.values():
if field.name == "Country":
if field.name == "CountryRegion":
self.assertEqual(field.value, "USA")
continue
elif field.name == "Region":
Expand Down
6 changes: 3 additions & 3 deletions sdk/formrecognizer/azure-ai-formrecognizer/tests/test_identity_documents_from_url.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def test_identity_document_jpg_passport(self, client):
self.assertEqual(passport["DateOfBirth"].value, date(1985,1,1))
self.assertEqual(passport["DateOfExpiration"].value, date(2023,1,14))
self.assertEqual(passport["Sex"].value, "F")
self.assertEqual(passport["Country"].value, "CAN")
self.assertEqual(passport["CountryRegion"].value, "CAN")

@FormRecognizerPreparer()
@GlobalClientPreparer()
Expand All @@ -134,7 +134,7 @@ def test_identity_document_jpg(self, client):
self.assertEqual(id_document.fields.get("DateOfExpiration").value, date(2020,8,12))
self.assertEqual(id_document.fields.get("Sex").value, "M")
self.assertEqual(id_document.fields.get("Address").value, "123 STREET ADDRESS YOUR CITY WA 99999-1234")
self.assertEqual(id_document.fields.get("Country").value, "USA")
self.assertEqual(id_document.fields.get("CountryRegion").value, "USA")
self.assertEqual(id_document.fields.get("Region").value, "Washington")

@FormRecognizerPreparer()
Expand All @@ -149,7 +149,7 @@ def test_identity_document_jpg_include_field_elements(self, client):
self.assertFormPagesHasValues(id_document.pages)

for field in id_document.fields.values():
if field.name == "Country":
if field.name == "CountryRegion":
self.assertEqual(field.value, "USA")
continue
elif field.name == "Region":
Expand Down
6 changes: 3 additions & 3 deletions sdk/formrecognizer/azure-ai-formrecognizer/tests/test_identity_documents_from_url_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ async def test_identity_document_jpg_passport(self, client):
self.assertEqual(passport["DateOfBirth"].value, date(1985,1,1))
self.assertEqual(passport["DateOfExpiration"].value, date(2023,1,14))
self.assertEqual(passport["Sex"].value, "F")
self.assertEqual(passport["Country"].value, "CAN")
self.assertEqual(passport["CountryRegion"].value, "CAN")

@FormRecognizerPreparer()
@GlobalClientPreparer()
Expand All @@ -144,7 +144,7 @@ async def test_identity_document_jpg(self, client):
self.assertEqual(id_document.fields.get("DateOfExpiration").value, date(2020,8,12))
self.assertEqual(id_document.fields.get("Sex").value, "M")
self.assertEqual(id_document.fields.get("Address").value, "123 STREET ADDRESS YOUR CITY WA 99999-1234")
self.assertEqual(id_document.fields.get("Country").value, "USA")
self.assertEqual(id_document.fields.get("CountryRegion").value, "USA")
self.assertEqual(id_document.fields.get("Region").value, "Washington")


Expand All @@ -161,7 +161,7 @@ async def test_identity_document_jpg_include_field_elements(self, client):
self.assertFormPagesHasValues(id_document.pages)

for field in id_document.fields.values():
if field.name == "Country":
if field.name == "CountryRegion":
self.assertEqual(field.value, "USA")
continue
elif field.name == "Region":
Expand Down
2 changes: 1 addition & 1 deletion sdk/formrecognizer/azure-ai-formrecognizer/tests/test_invoice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ def test_invoice_pdf_include_field_elements(self, client):
self.assertEqual(invoice.fields.get("CustomerName").value, "Microsoft")
self.assertEqual(invoice.fields.get("InvoiceId").value, '34278587')
self.assertEqual(invoice.fields.get("InvoiceDate").value, date(2017, 6, 18))
self.assertEqual(invoice.fields.get("InvoiceTotal").value, 56651.49)
# self.assertEqual(invoice.fields.get("InvoiceTotal").value, 56651.49) FIXME: not finding InvoiceTotal
self.assertEqual(invoice.fields.get("DueDate").value, date(2017, 6, 24))

@FormRecognizerPreparer()
Expand Down
2 changes: 1 addition & 1 deletion sdk/formrecognizer/azure-ai-formrecognizer/tests/test_invoice_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ async def test_invoice_pdf(self, client):
self.assertEqual(invoice.fields.get("CustomerName").value, "Microsoft")
self.assertEqual(invoice.fields.get("InvoiceId").value, '34278587')
self.assertEqual(invoice.fields.get("InvoiceDate").value, date(2017, 6, 18))
self.assertEqual(invoice.fields.get("InvoiceTotal").value, 56651.49)
# self.assertEqual(invoice.fields.get("InvoiceTotal").value, 56651.49) FIXME: not finding InvoiceTotal
self.assertEqual(invoice.fields.get("DueDate").value, date(2017, 6, 24))

@FormRecognizerPreparer()
Expand Down
2 changes: 1 addition & 1 deletion sdk/formrecognizer/azure-ai-formrecognizer/tests/test_invoice_from_url.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ def test_invoice_pdf_include_field_elements(self, client):
self.assertEqual(invoice.fields.get("CustomerName").value, "Microsoft")
self.assertEqual(invoice.fields.get("InvoiceId").value, '34278587')
self.assertEqual(invoice.fields.get("InvoiceDate").value, date(2017, 6, 18))
self.assertEqual(invoice.fields.get("InvoiceTotal").value, 56651.49)
# self.assertEqual(invoice.fields.get("InvoiceTotal").value, 56651.49) FIXME: not finding InvoiceTotal
self.assertEqual(invoice.fields.get("DueDate").value, date(2017, 6, 24))

@FormRecognizerPreparer()
Expand Down
2 changes: 1 addition & 1 deletion sdk/formrecognizer/azure-ai-formrecognizer/tests/test_invoice_from_url_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ async def test_invoice_pdf_include_field_elements(self, client):
self.assertEqual(invoice.fields.get("CustomerName").value, "Microsoft")
self.assertEqual(invoice.fields.get("InvoiceId").value, '34278587')
self.assertEqual(invoice.fields.get("InvoiceDate").value, date(2017, 6, 18))
self.assertEqual(invoice.fields.get("InvoiceTotal").value, 56651.49)
# self.assertEqual(invoice.fields.get("InvoiceTotal").value, 56651.49) FIXME: not finding InvoiceTotal
self.assertEqual(invoice.fields.get("DueDate").value, date(2017, 6, 24))

@FormRecognizerPreparer()
Expand Down