[formrecognizer] increase test coverage

sdk/formrecognizer/azure-ai-formrecognizer/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## 1.0.0b2 (Unreleased)
 
+**Fixes and improvements**
+
+- Bug fixed where `confidence` == `0.0` was erroneously getting set to `1.0`
+- `__repr__` has been added to all of the models
+
 
 ## 1.0.0b1 (2020-04-23)
 

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

@@ -12,6 +12,14 @@
 import six
 
 
+def adjust_confidence(score):
+    """Adjust confidence when not returned.
+    """
+    if score is None:
+        return 1.0
+    return score
+
+
 def get_elements(field, read_result):
     text_elements = []
 
@@ -259,7 +267,7 @@ def _from_generated(cls, field, value, read_result):
             value_data=FieldText._from_generated(value, read_result),
             value=get_field_value(field, value, read_result),
             name=field,
-            confidence=value.confidence or 1.0 if value else None,
+            confidence=adjust_confidence(value.confidence) if value else None,
             page_number=value.page if value else None,
         )
 
@@ -270,7 +278,7 @@ def _from_generated_unlabeled(cls, field, idx, page, read_result):
             value_data=FieldText._from_generated_unlabeled(field.value, page, read_result),
             value=field.value.text,
             name="field-" + str(idx),
-            confidence=field.confidence or 1.0,
+            confidence=adjust_confidence(field.confidence),
             page_number=page,
         )
 
@@ -395,7 +403,7 @@ class FormLine(FormContent):
 
     def __init__(self, **kwargs):
         super(FormLine, self).__init__(**kwargs)
-        self.words = kwargs.get("words", None)
+        self.words = kwargs.get("words", [])
 
     @classmethod
     def _from_generated(cls, line, page):
@@ -441,7 +449,7 @@ def _from_generated(cls, word, page):
                 Point(x=word.bounding_box[4], y=word.bounding_box[5]),
                 Point(x=word.bounding_box[6], y=word.bounding_box[7])
             ] if word.bounding_box else None,
-            confidence=word.confidence or 1.0,
+            confidence=adjust_confidence(word.confidence),
             page_number=page
         )
 
@@ -464,7 +472,7 @@ def __init__(self, **kwargs):
     def _from_generated(cls, item):
         return cls(
             type=item.value_string,
-            confidence=item.confidence or 1.0) if item else None
+            confidence=adjust_confidence(item.confidence)) if item else None
 
 
 class USReceiptItem(object):
@@ -513,7 +521,7 @@ class FormTable(object):
     """
 
     def __init__(self, **kwargs):
-        self.cells = kwargs.get("cells", None)
+        self.cells = kwargs.get("cells", [])
         self.row_count = kwargs.get("row_count", None)
         self.column_count = kwargs.get("column_count", None)
 
@@ -569,7 +577,7 @@ def _from_generated(cls, cell, page, read_result):
                 Point(x=cell.bounding_box[4], y=cell.bounding_box[5]),
                 Point(x=cell.bounding_box[6], y=cell.bounding_box[7])
             ] if cell.bounding_box else None,
-            confidence=cell.confidence or 1.0,
+            confidence=adjust_confidence(cell.confidence),
             is_header=cell.is_header or False,
             is_footer=cell.is_footer or False,
             page_number=page,
@@ -605,7 +613,7 @@ def __init__(self, **kwargs):
         self.last_modified = kwargs.get("last_modified", None)
         self.models = kwargs.get("models", None)
         self.errors = kwargs.get("errors", None)
-        self.training_documents = kwargs.get("training_documents", None)
+        self.training_documents = kwargs.get("training_documents", [])
 
     @classmethod
     def _from_generated(cls, model):
@@ -616,7 +624,7 @@ def _from_generated(cls, model):
             last_modified=model.model_info.last_updated_date_time,
             models=CustomFormSubModel._from_generated_unlabeled(model)
             if model.keys else CustomFormSubModel._from_generated_labeled(model),
-            errors=FormRecognizerError._from_generated(model.train_result.errors) if model.train_result else [],
+            errors=FormRecognizerError._from_generated(model.train_result.errors) if model.train_result else None,
             training_documents=TrainingDocumentInfo._from_generated(model.train_result)
             if model.train_result else None
         )
@@ -706,7 +714,7 @@ def __init__(self, **kwargs):
         self.document_name = kwargs.get("document_name", None)
         self.status = kwargs.get("status", None)
         self.page_count = kwargs.get("page_count", None)
-        self.errors = kwargs.get("errors", None)
+        self.errors = kwargs.get("errors", [])
 
     @classmethod
     def _from_generated(cls, train_result):

sdk/formrecognizer/azure-ai-formrecognizer/dev_requirements.txt

@@ -3,6 +3,5 @@
 -e ../../cognitiveservices/azure-mgmt-cognitiveservices
 ../../core/azure-core
 -e ../../identity/azure-identity
-../../storage/azure-storage-blob
 aiohttp>=3.0; python_version >= '3.5'
 msrest>=0.6.12

sdk/formrecognizer/azure-ai-formrecognizer/tests/conftest.py

@@ -9,7 +9,7 @@
 import sys
 
 # fixture needs to be visible from conftest
-from testcase import form_recognizer_account, form_recognizer_and_storage_account
+from testcase import form_recognizer_account
 
 # Ignore async tests for Python < 3.5
 collect_ignore_glob = []
@@ -20,7 +20,4 @@ def pytest_configure(config):
     # register an additional marker
     config.addinivalue_line(
         "usefixtures", "form_recognizer_account"
-    )
-    config.addinivalue_line(
-        "usefixtures", "form_recognizer_and_storage_account"
     )