Skip to content

Commit

Permalink
testing feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
kristapratico committed Oct 8, 2020
1 parent 6919fb9 commit f63c6d7
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 154 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,7 @@ def test_custom_form_unlabeled(self, client, container_sas_url):
form = poller.result()

self.assertEqual(form[0].form_type, "form-0")
self.assertIsNone(form[0].form_type_confidence)
self.assertIsNotNone(form[0].model_id)
self.assertFormPagesHasValues(form[0].pages)
for label, field in form[0].fields.items():
self.assertIsNotNone(field.confidence)
self.assertIsNotNone(field.name)
self.assertIsNotNone(field.value)
self.assertIsNotNone(field.value_data.text)
self.assertIsNotNone(field.label_data.text)
self.assertUnlabeledRecognizedFormHasValues(form[0], model)

@GlobalFormRecognizerAccountPreparer()
@GlobalClientPreparer(training=True, multipage=True)
Expand All @@ -168,15 +160,7 @@ def test_custom_form_multipage_unlabeled(self, client, container_sas_url):
if form.form_type is None:
continue # blank page
self.assertEqual(form.form_type, "form-0")
self.assertIsNone(form.form_type_confidence)
self.assertIsNotNone(form.model_id)
self.assertFormPagesHasValues(form.pages)
for label, field in form.fields.items():
self.assertIsNotNone(field.confidence)
self.assertIsNotNone(field.name)
self.assertIsNotNone(field.value)
self.assertIsNotNone(field.value_data.text)
self.assertIsNotNone(field.label_data.text)
self.assertUnlabeledRecognizedFormHasValues(form, model)

@GlobalFormRecognizerAccountPreparer()
@GlobalClientPreparer(training=True)
Expand All @@ -197,14 +181,7 @@ def test_custom_form_labeled(self, client, container_sas_url):
form = poller.result()

self.assertEqual(form[0].form_type, "custom:labeled")
self.assertEqual(form[0].form_type_confidence, 1.0)
self.assertIsNotNone(form[0].model_id)
self.assertFormPagesHasValues(form[0].pages)
for label, field in form[0].fields.items():
self.assertIsNotNone(field.confidence)
self.assertIsNotNone(field.name)
self.assertIsNotNone(field.value_data.text)
self.assertIsNotNone(field.value_data.bounding_box)
self.assertLabeledRecognizedFormHasValues(form[0], model)

@GlobalFormRecognizerAccountPreparer()
@GlobalClientPreparer(training=True, multipage=True)
Expand All @@ -229,14 +206,7 @@ def test_custom_form_multipage_labeled(self, client, container_sas_url):

for form in forms:
self.assertEqual(form.form_type, "custom:"+model.model_id)
self.assertEqual(form.form_type_confidence, 1.0)
self.assertIsNotNone(form.model_id)
self.assertFormPagesHasValues(form.pages)
for label, field in form.fields.items():
self.assertIsNotNone(field.confidence)
self.assertIsNotNone(field.name)
self.assertIsNotNone(field.value_data.text)
self.assertIsNotNone(field.value_data.bounding_box)
self.assertLabeledRecognizedFormHasValues(form, model)

@GlobalFormRecognizerAccountPreparer()
@GlobalClientPreparer(training=True)
Expand Down Expand Up @@ -314,7 +284,7 @@ def callback(raw_response, _, headers):
self.assertEqual(form.page_range.first_page_number, actual.page)
self.assertEqual(form.page_range.last_page_number, actual.page)
self.assertIsNone(form.form_type_confidence)
self.assertIsNotNone(form.model_id)
self.assertEqual(form.model_id, model.model_id)
self.assertUnlabeledFormFieldDictTransformCorrect(form.fields, actual.key_value_pairs, read_results)

@GlobalFormRecognizerAccountPreparer()
Expand Down Expand Up @@ -394,7 +364,7 @@ def callback(raw_response, _, headers):
self.assertEqual(form.page_range.last_page_number, actual.page_range[1])
self.assertEqual(form.form_type, "custom:"+model.model_id)
self.assertEqual(form.form_type_confidence, 1.0)
self.assertIsNotNone(form.model_id)
self.assertEqual(form.model_id, model.model_id)
self.assertLabeledFormFieldDictTransformCorrect(form.fields, actual.fields, read_results)

@GlobalFormRecognizerAccountPreparer()
Expand Down Expand Up @@ -458,7 +428,7 @@ def callback(raw_response, _, headers):
self.assertEqual(form.page_range.first_page_number, actual.page)
self.assertEqual(form.page_range.last_page_number, actual.page)
self.assertIsNone(form.form_type_confidence)
self.assertIsNotNone(form.model_id)
self.assertEqual(form.model_id, model.model_id)
self.assertUnlabeledFormFieldDictTransformCorrect(form.fields, actual.key_value_pairs, read_results)

@GlobalFormRecognizerAccountPreparer()
Expand Down Expand Up @@ -499,5 +469,5 @@ def callback(raw_response, _, headers):
self.assertEqual(form.page_range.last_page_number, actual.page_range[1])
self.assertEqual(form.form_type, "custom:"+model.model_id)
self.assertEqual(form.form_type_confidence, 1.0)
self.assertIsNotNone(form.model_id)
self.assertEqual(form.model_id, model.model_id)
self.assertLabeledFormFieldDictTransformCorrect(form.fields, actual.fields, read_results)
Original file line number Diff line number Diff line change
Expand Up @@ -156,15 +156,7 @@ async def test_custom_form_unlabeled(self, client, container_sas_url):
poller = await fr_client.begin_recognize_custom_forms(model.model_id, myfile, content_type=FormContentType.IMAGE_JPEG)
form = await poller.result()
self.assertEqual(form[0].form_type, "form-0")
self.assertIsNone(form[0].form_type_confidence)
self.assertIsNotNone(form[0].model_id)
self.assertFormPagesHasValues(form[0].pages)
for label, field in form[0].fields.items():
self.assertIsNotNone(field.confidence)
self.assertIsNotNone(field.name)
self.assertIsNotNone(field.value)
self.assertIsNotNone(field.value_data.text)
self.assertIsNotNone(field.label_data.text)
self.assertUnlabeledRecognizedFormHasValues(form[0], model)

@GlobalFormRecognizerAccountPreparer()
@GlobalClientPreparer(training=True, multipage=True)
Expand All @@ -189,15 +181,7 @@ async def test_custom_form_multipage_unlabeled(self, client, container_sas_url):
if form.form_type is None:
continue # blank page
self.assertEqual(form.form_type, "form-0")
self.assertIsNone(form.form_type_confidence)
self.assertIsNotNone(form.model_id)
self.assertFormPagesHasValues(form.pages)
for label, field in form.fields.items():
self.assertIsNotNone(field.confidence)
self.assertIsNotNone(field.name)
self.assertIsNotNone(field.value)
self.assertIsNotNone(field.value_data.text)
self.assertIsNotNone(field.label_data.text)
self.assertUnlabeledRecognizedFormHasValues(form, model)

@GlobalFormRecognizerAccountPreparer()
@GlobalClientPreparer(training=True)
Expand All @@ -216,14 +200,7 @@ async def test_custom_form_labeled(self, client, container_sas_url):
form = await poller.result()

self.assertEqual(form[0].form_type, "custom:labeled")
self.assertEqual(form[0].form_type_confidence, 1.0)
self.assertIsNotNone(form[0].model_id)
self.assertFormPagesHasValues(form[0].pages)
for label, field in form[0].fields.items():
self.assertIsNotNone(field.confidence)
self.assertIsNotNone(field.name)
self.assertIsNotNone(field.value_data.text)
self.assertIsNotNone(field.value_data.bounding_box)
self.assertLabeledRecognizedFormHasValues(form[0], model)

@GlobalFormRecognizerAccountPreparer()
@GlobalClientPreparer(training=True, multipage=True)
Expand All @@ -249,15 +226,7 @@ async def test_custom_form_multipage_labeled(self, client, container_sas_url):

for form in forms:
self.assertEqual(form.form_type, "custom:"+model.model_id)
self.assertEqual(form.form_type_confidence, 1.0)
self.assertIsNotNone(form.model_id)
self.assertFormPagesHasValues(form.pages)
for label, field in form.fields.items():
self.assertIsNotNone(field.confidence)
self.assertIsNotNone(field.name)
self.assertIsNotNone(field.value_data.text)
self.assertIsNotNone(field.value_data.bounding_box)

self.assertLabeledRecognizedFormHasValues(form, model)

@GlobalFormRecognizerAccountPreparer()
@GlobalClientPreparer(training=True)
Expand Down Expand Up @@ -340,7 +309,7 @@ def callback(raw_response, _, headers):
self.assertEqual(form.page_range.first_page_number, actual.page)
self.assertEqual(form.page_range.last_page_number, actual.page)
self.assertIsNone(form.form_type_confidence)
self.assertIsNotNone(form.model_id)
self.assertEqual(form.model_id, model.model_id)
self.assertUnlabeledFormFieldDictTransformCorrect(form.fields, actual.key_value_pairs, read_results)


Expand Down Expand Up @@ -427,7 +396,7 @@ def callback(raw_response, _, headers):
self.assertEqual(form.page_range.last_page_number, actual.page_range[1])
self.assertEqual(form.form_type, "custom:"+model.model_id)
self.assertEqual(form.form_type_confidence, 1.0)
self.assertIsNotNone(form.model_id)
self.assertEqual(form.model_id, model.model_id)
self.assertLabeledFormFieldDictTransformCorrect(form.fields, actual.fields, read_results)

@GlobalFormRecognizerAccountPreparer()
Expand Down Expand Up @@ -496,7 +465,7 @@ def callback(raw_response, _, headers):
self.assertEqual(form.page_range.first_page_number, actual.page)
self.assertEqual(form.page_range.last_page_number, actual.page)
self.assertIsNone(form.form_type_confidence)
self.assertIsNotNone(form.model_id)
self.assertEqual(form.model_id, model.model_id)
self.assertUnlabeledFormFieldDictTransformCorrect(form.fields, actual.key_value_pairs, read_results)

@GlobalFormRecognizerAccountPreparer()
Expand Down Expand Up @@ -539,5 +508,5 @@ def callback(raw_response, _, headers):
self.assertEqual(form.page_range.last_page_number, actual.page_range[1])
self.assertEqual(form.form_type, "custom:"+model.model_id)
self.assertEqual(form.form_type_confidence, 1.0)
self.assertIsNotNone(form.model_id)
self.assertEqual(form.model_id, model.model_id)
self.assertLabeledFormFieldDictTransformCorrect(form.fields, actual.fields, read_results)
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,7 @@ def test_custom_form_unlabeled(self, client, container_sas_url):
form = poller.result()

self.assertEqual(form[0].form_type, "form-0")
self.assertIsNone(form[0].form_type_confidence)
self.assertIsNotNone(form[0].model_id)
self.assertFormPagesHasValues(form[0].pages)
for label, field in form[0].fields.items():
self.assertIsNotNone(field.confidence)
self.assertIsNotNone(field.name)
self.assertIsNotNone(field.value)
self.assertIsNotNone(field.value_data.text)
self.assertIsNotNone(field.label_data.text)
self.assertUnlabeledRecognizedFormHasValues(form[0], model)

@GlobalFormRecognizerAccountPreparer()
@GlobalClientPreparer(training=True, multipage=True, blob_sas_url=True)
Expand All @@ -130,15 +122,7 @@ def test_form_multipage_unlabeled(self, client, container_sas_url, blob_sas_url)
if form.form_type is None:
continue # blank page
self.assertEqual(form.form_type, "form-0")
self.assertIsNone(form.form_type_confidence)
self.assertIsNotNone(form.model_id)
self.assertFormPagesHasValues(form.pages)
for label, field in form.fields.items():
self.assertIsNotNone(field.confidence)
self.assertIsNotNone(field.name)
self.assertIsNotNone(field.value)
self.assertIsNotNone(field.value_data.text)
self.assertIsNotNone(field.label_data.text)
self.assertUnlabeledRecognizedFormHasValues(form, model)

@GlobalFormRecognizerAccountPreparer()
@GlobalClientPreparer(training=True)
Expand All @@ -152,14 +136,7 @@ def test_custom_form_labeled(self, client, container_sas_url):
form = poller.result()

self.assertEqual(form[0].form_type, "custom:labeled")
self.assertEqual(form[0].form_type_confidence, 1.0)
self.assertIsNotNone(form[0].model_id)
self.assertFormPagesHasValues(form[0].pages)
for label, field in form[0].fields.items():
self.assertIsNotNone(field.confidence)
self.assertIsNotNone(field.name)
self.assertIsNotNone(field.value_data.text)
self.assertIsNotNone(field.value_data.bounding_box)
self.assertLabeledRecognizedFormHasValues(form[0], model)

@GlobalFormRecognizerAccountPreparer()
@GlobalClientPreparer(training=True, multipage=True, blob_sas_url=True)
Expand All @@ -180,15 +157,7 @@ def test_form_multipage_labeled(self, client, container_sas_url, blob_sas_url):

for form in forms:
self.assertEqual(form.form_type, "custom:"+model.model_id)
self.assertEqual(form.form_type_confidence, 1.0)
self.assertIsNotNone(form.model_id)
self.assertFormPagesHasValues(form.pages)
for label, field in form.fields.items():
self.assertIsNotNone(field.confidence)
self.assertIsNotNone(field.name)
self.assertIsNotNone(field.value_data.text)
self.assertIsNotNone(field.value_data.bounding_box)

self.assertLabeledRecognizedFormHasValues(form, model)

@GlobalFormRecognizerAccountPreparer()
@GlobalClientPreparer(training=True)
Expand Down Expand Up @@ -260,7 +229,7 @@ def callback(raw_response, _, headers):
self.assertEqual(form.page_range.first_page_number, actual.page)
self.assertEqual(form.page_range.last_page_number, actual.page)
self.assertIsNone(form.form_type_confidence)
self.assertIsNotNone(form.model_id)
self.assertEqual(form.model_id, model.model_id)
self.assertUnlabeledFormFieldDictTransformCorrect(form.fields, actual.key_value_pairs, read_results)


Expand Down Expand Up @@ -335,7 +304,7 @@ def callback(raw_response, _, headers):
self.assertEqual(form.page_range.last_page_number, actual.page_range[1])
self.assertEqual(form.form_type, "custom:"+model.model_id)
self.assertEqual(form.form_type_confidence, 1.0)
self.assertIsNotNone(form.model_id)
self.assertEqual(form.model_id, model.model_id)
self.assertLabeledFormFieldDictTransformCorrect(form.fields, actual.fields, read_results)

@GlobalFormRecognizerAccountPreparer()
Expand Down Expand Up @@ -396,7 +365,7 @@ def callback(raw_response, _, headers):
self.assertEqual(form.page_range.first_page_number, actual.page)
self.assertEqual(form.page_range.last_page_number, actual.page)
self.assertIsNone(form.form_type_confidence)
self.assertIsNotNone(form.model_id)
self.assertEqual(form.model_id, model.model_id)
self.assertUnlabeledFormFieldDictTransformCorrect(form.fields, actual.key_value_pairs, read_results)

@GlobalFormRecognizerAccountPreparer()
Expand Down Expand Up @@ -434,5 +403,5 @@ def callback(raw_response, _, headers):
self.assertEqual(form.page_range.last_page_number, actual.page_range[1])
self.assertEqual(form.form_type, "custom:"+model.model_id)
self.assertEqual(form.form_type_confidence, 1.0)
self.assertIsNotNone(form.model_id)
self.assertEqual(form.model_id, model.model_id)
self.assertLabeledFormFieldDictTransformCorrect(form.fields, actual.fields, read_results)
Loading

0 comments on commit f63c6d7

Please sign in to comment.