Skip to content

Commit bf5457b

Browse files
kristapraticokristapratico
authored
remove test code that works around service bug (fixed) (Azure#11961)
1 parent 2614fa1 commit bf5457b

File tree

6 files changed

+28
-32
lines changed

6 files changed

+28
-32
lines changed

‎sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/_models.py

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,20 @@ def adjust_confidence(score):
2323
def get_elements(field, read_result):
2424
text_elements = []
2525

26-
try:
27-
for item in field.elements:
28-
nums = [int(s) for s in re.findall(r"\d+", item)]
29-
read = nums[0]
30-
line = nums[1]
31-
if len(nums) == 3:
32-
word = nums[2]
33-
ocr_word = read_result[read].lines[line].words[word]
34-
extracted_word = FormWord._from_generated(ocr_word, page=read + 1)
35-
text_elements.append(extracted_word)
36-
continue
37-
ocr_line = read_result[read].lines[line]
38-
extracted_line = FormLine._from_generated(ocr_line, page=read + 1)
39-
text_elements.append(extracted_line)
40-
return text_elements
41-
except IndexError:
42-
return None # https://github.com/Azure/azure-sdk-for-python/issues/11014
26+
for item in field.elements:
27+
nums = [int(s) for s in re.findall(r"\d+", item)]
28+
read = nums[0]
29+
line = nums[1]
30+
if len(nums) == 3:
31+
word = nums[2]
32+
ocr_word = read_result[read].lines[line].words[word]
33+
extracted_word = FormWord._from_generated(ocr_word, page=read + 1)
34+
text_elements.append(extracted_word)
35+
continue
36+
ocr_line = read_result[read].lines[line]
37+
extracted_line = FormLine._from_generated(ocr_line, page=read + 1)
38+
text_elements.append(extracted_line)
39+
return text_elements
4340

4441

4542
def get_field_value(field, value, read_result): # pylint: disable=too-many-return-statements

‎sdk/formrecognizer/azure-ai-formrecognizer/tests/test_custom_forms.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,12 +257,12 @@ def callback(raw_response, _, headers):
257257
read_results = actual.analyze_result.read_results
258258
page_results = actual.analyze_result.page_results
259259

260-
self.assertFormPagesTransformCorrect(recognized_form, read_results, page_results, bug_skip_text_content=True)
260+
self.assertFormPagesTransformCorrect(recognized_form, read_results, page_results)
261261

262262
for form, actual in zip(recognized_form, page_results):
263263
self.assertEqual(form.page_range.first_page_number, actual.page)
264264
self.assertEqual(form.page_range.last_page_number, actual.page)
265-
self.assertUnlabeledFormFieldDictTransformCorrect(form.fields, actual.key_value_pairs, read_results, bug_skip_text_content=True)
265+
self.assertUnlabeledFormFieldDictTransformCorrect(form.fields, actual.key_value_pairs, read_results)
266266

267267
@GlobalFormRecognizerAccountPreparer()
268268
@GlobalTrainingAccountPreparer()

‎sdk/formrecognizer/azure-ai-formrecognizer/tests/test_custom_forms_async.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,13 +261,12 @@ def callback(raw_response, _, headers):
261261
read_results = actual.analyze_result.read_results
262262
page_results = actual.analyze_result.page_results
263263

264-
# bug_skip_text_content should be removed after bug fix: https://github.com/Azure/azure-sdk-for-python/issues/11014
265-
self.assertFormPagesTransformCorrect(recognized_form, read_results, page_results, bug_skip_text_content=True)
264+
self.assertFormPagesTransformCorrect(recognized_form, read_results, page_results)
266265

267266
for form, actual in zip(recognized_form, page_results):
268267
self.assertEqual(form.page_range.first_page_number, actual.page)
269268
self.assertEqual(form.page_range.last_page_number, actual.page)
270-
self.assertUnlabeledFormFieldDictTransformCorrect(form.fields, actual.key_value_pairs, read_results, bug_skip_text_content=True)
269+
self.assertUnlabeledFormFieldDictTransformCorrect(form.fields, actual.key_value_pairs, read_results)
271270

272271

273272
@GlobalFormRecognizerAccountPreparer()

‎sdk/formrecognizer/azure-ai-formrecognizer/tests/test_custom_forms_from_url.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,12 +231,12 @@ def callback(raw_response, _, headers):
231231
read_results = actual.analyze_result.read_results
232232
page_results = actual.analyze_result.page_results
233233

234-
self.assertFormPagesTransformCorrect(recognized_form, read_results, page_results, bug_skip_text_content=True)
234+
self.assertFormPagesTransformCorrect(recognized_form, read_results, page_results)
235235

236236
for form, actual in zip(recognized_form, page_results):
237237
self.assertEqual(form.page_range.first_page_number, actual.page)
238238
self.assertEqual(form.page_range.last_page_number, actual.page)
239-
self.assertUnlabeledFormFieldDictTransformCorrect(form.fields, actual.key_value_pairs, read_results, bug_skip_text_content=True)
239+
self.assertUnlabeledFormFieldDictTransformCorrect(form.fields, actual.key_value_pairs, read_results)
240240

241241

242242
@GlobalFormRecognizerAccountPreparer()

‎sdk/formrecognizer/azure-ai-formrecognizer/tests/test_custom_forms_from_url_async.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,12 +236,12 @@ def callback(raw_response, _, headers):
236236
read_results = actual.analyze_result.read_results
237237
page_results = actual.analyze_result.page_results
238238

239-
self.assertFormPagesTransformCorrect(recognized_form, read_results, page_results, bug_skip_text_content=True)
239+
self.assertFormPagesTransformCorrect(recognized_form, read_results, page_results)
240240

241241
for form, actual in zip(recognized_form, page_results):
242242
self.assertEqual(form.page_range.first_page_number, actual.page)
243243
self.assertEqual(form.page_range.last_page_number, actual.page)
244-
self.assertUnlabeledFormFieldDictTransformCorrect(form.fields, actual.key_value_pairs, read_results, bug_skip_text_content=True)
244+
self.assertUnlabeledFormFieldDictTransformCorrect(form.fields, actual.key_value_pairs, read_results)
245245

246246
@GlobalFormRecognizerAccountPreparer()
247247
@GlobalTrainingAccountPreparer()

‎sdk/formrecognizer/azure-ai-formrecognizer/tests/testcase.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -214,22 +214,22 @@ def assertLabeledFormFieldDictTransformCorrect(self, form_fields, actual_fields,
214214
read_results
215215
)
216216

217-
def assertUnlabeledFormFieldDictTransformCorrect(self, form_fields, actual_fields, read_results=None, **kwargs):
217+
def assertUnlabeledFormFieldDictTransformCorrect(self, form_fields, actual_fields, read_results=None):
218218
if actual_fields is None:
219219
return
220220
for idx, a in enumerate(actual_fields):
221221
self.assertEqual(a.confidence, form_fields["field-"+str(idx)].confidence if a.confidence is not None else 1.0)
222222
self.assertEqual(a.key.text, form_fields["field-"+str(idx)].label_data.text)
223223
self.assertBoundingBoxTransformCorrect(form_fields["field-"+str(idx)].label_data.bounding_box, a.key.bounding_box)
224-
if read_results and not kwargs.get("bug_skip_text_content", False):
224+
if read_results:
225225
self.assertTextContentTransformCorrect(
226226
form_fields["field-"+str(idx)].label_data.text_content,
227227
a.key.elements,
228228
read_results
229229
)
230230
self.assertEqual(a.value.text, form_fields["field-" + str(idx)].value_data.text)
231231
self.assertBoundingBoxTransformCorrect(form_fields["field-" + str(idx)].value_data.bounding_box, a.value.bounding_box)
232-
if read_results and not kwargs.get("bug_skip_text_content", False):
232+
if read_results:
233233
self.assertTextContentTransformCorrect(
234234
form_fields["field-"+str(idx)].value_data.text_content,
235235
a.value.elements,
@@ -287,8 +287,7 @@ def assertTablesTransformCorrect(self, layout, actual_layout, read_results=None,
287287
self.assertEqual(cell.is_header, actual_cell.is_header if actual_cell.is_header is not None else False)
288288
self.assertEqual(cell.is_footer, actual_cell.is_footer if actual_cell.is_footer is not None else False)
289289
self.assertBoundingBoxTransformCorrect(cell.bounding_box, actual_cell.bounding_box)
290-
if not kwargs.get("bug_skip_text_content", False):
291-
self.assertTextContentTransformCorrect(cell.text_content, actual_cell.elements, read_results)
290+
self.assertTextContentTransformCorrect(cell.text_content, actual_cell.elements, read_results)
292291

293292
def assertReceiptItemsHasValues(self, items, page_number, include_text_content):
294293
for item in items:
@@ -537,14 +536,15 @@ def form_recognizer_account():
537536
name_prefix='pycog',
538537
location="westcentralus"
539538
)
540-
time.sleep(60) # current ask until race condition bug fixed
541539

542540
try:
543541
rg_name, rg_kwargs = rg_preparer._prepare_create_resource(test_case)
544542
FormRecognizerTest._RESOURCE_GROUP = rg_kwargs['resource_group']
545543
try:
546544
form_recognizer_name, form_recognizer_kwargs = form_recognizer_preparer._prepare_create_resource(
547545
test_case, **rg_kwargs)
546+
if test_case.is_live:
547+
time.sleep(60) # current ask until race condition bug fixed
548548
FormRecognizerTest._FORM_RECOGNIZER_ACCOUNT = form_recognizer_kwargs['cognitiveservices_account']
549549
FormRecognizerTest._FORM_RECOGNIZER_KEY = form_recognizer_kwargs['cognitiveservices_account_key']
550550
FormRecognizerTest._FORM_RECOGNIZER_NAME = form_recognizer_name

0 commit comments

Comments
 (0)