Merge pull request #152 from SuffolkLITLab/mypy-fixes

Typing and unit test fixes

Author: nonprofittechy

formfyxer/pdf_wrangling.py

@@ -53,7 +53,7 @@ class FieldType(Enum):
     CHOICE = "choice"  # allows only one selection
     RADIO = "radio"
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.value
 
 
@@ -131,7 +131,7 @@ def __init__(
             self.configs.update(configs)
 
     @classmethod
-    def make_textbox(cls, label: str, field_bbox: BoundingBox, font_size):
+    def make_textbox(cls, label: str, field_bbox: BoundingBox, font_size: int) -> "FormField":
         return FormField(
             label,
             FieldType.TEXT,
@@ -142,7 +142,7 @@ def make_textbox(cls, label: str, field_bbox: BoundingBox, font_size):
         )
 
     @classmethod
-    def make_textarea(cls, label: str, field_bbox: BoundingBox, font_size):
+    def make_textarea(cls, label: str, field_bbox: BoundingBox, font_size: int) -> "FormField":
         return FormField(
             label,
             FieldType.AREA,
@@ -153,7 +153,7 @@ def make_textarea(cls, label: str, field_bbox: BoundingBox, font_size):
         )
 
     @classmethod
-    def make_checkbox(cls, label: str, bbox: BoundingBox):
+    def make_checkbox(cls, label: str, bbox: BoundingBox) -> "FormField":
         return FormField(
             label,
             FieldType.CHECK_BOX,
@@ -163,7 +163,7 @@ def make_checkbox(cls, label: str, bbox: BoundingBox):
         )
 
     @classmethod
-    def from_pikefield(cls, pike_field: PikeField):
+    def from_pikefield(cls, pike_field: PikeField) -> "FormField":
         if pike_field["type"] == "/Tx":
             var_type = FieldType.TEXT
         elif pike_field["type"] == "/Btn":
@@ -174,10 +174,10 @@ def from_pikefield(cls, pike_field: PikeField):
             var_type = FieldType.TEXT
 
         if hasattr(pike_field["all"], "Rect"):
-            x = float(pike_field["all"].Rect[0])  # type: ignore
-            y = float(pike_field["all"].Rect[1])  # type: ignore
-            width = float(pike_field["all"].Rect[2]) - x  # type: ignore
-            height = float(pike_field["all"].Rect[3]) - y  # type: ignore
+            x = float(pike_field["all"].Rect[0])
+            y = float(pike_field["all"].Rect[1])
+            width = float(pike_field["all"].Rect[2]) - x
+            height = float(pike_field["all"].Rect[3]) - y
         else:
             x = 0
             y = 0
@@ -1134,8 +1134,12 @@ def get_possible_radios(img: Union[str, BinaryIO, cv2.Mat]):
     if isinstance(img, str):
         # 0 is for the flags: means nothing special is being used
         img_mat = cv2.imread(img, 0)
+        if img_mat is None:
+            return []
     elif isinstance(img, BinaryIO):
         img_mat = cv2.imdecode(np.frombuffer(img.read(), np.uint8), 0)
+        if img_mat is None:
+            return []
     else:
         img_mat = img
 
@@ -1184,8 +1188,12 @@ def get_possible_text_fields(
     if isinstance(img, str):
         # 0 is for the flags: means nothing special is being used
         img_mat = cv2.imread(img, 0)
+        if img_mat is None:
+            return []
     elif isinstance(img, BinaryIO):
         img_mat = cv2.imdecode(np.frombuffer(img.read(), np.uint8), 0)
+        if img_mat is None:
+            return []
     else:
         img_mat = img
 

formfyxer/tests/test_lit_explorer.py

@@ -134,7 +134,7 @@ def setUp(self) -> None:
     def test_calls_spot(self, mock_post):
         text = "The quick brown fox jumps over the lazy dog."
         self.request_args["data"]["text"] = text
-        spot(text)
+        spot(text, token="your_SPOT_API_token goes here")
         mock_post.assert_called_with(
             self.request_args["url"],
             headers=self.request_args["headers"],
@@ -146,7 +146,7 @@ def test_calls_spot_with_reduced_character_count(self, mock_post):
         text = "a" * 5001
         reduced_text = "a" * 5000
         self.request_args["data"]["text"] = reduced_text
-        spot(text)
+        spot(text, token="your_SPOT_API_token goes here")
         mock_post.assert_called_with(
             self.request_args["url"],
             headers=self.request_args["headers"],

pyproject.toml

@@ -8,6 +8,8 @@ extend-exclude = '(__init__.py|setup.py)'
 [tool.mypy]
 exclude= '''(?x)(
     ^setup.py$
+    | ^test_.*\.py$
+    | ^.*/tests/.*\.py$
   )'''
 
 [[tool.mypy.overrides]]