🐛 fix handling of tax printing

Author: ianardee

mindee/documents/invoice.py

@@ -105,7 +105,7 @@ def build_from_api_prediction(self, api_prediction: dict, page_n=0):
     def __str__(self) -> str:
         company_numbers = "; ".join([str(n.value) for n in self.company_number])
         payments = ", ".join([str(p) for p in self.payment_details])
-        taxes = ", ".join([f"{t.value} {t.rate}%" for t in self.taxes])
+        taxes = ", ".join(f"{t}" for t in self.taxes)
         return (
             "-----Invoice data-----\n"
             f"Filename: {self.filename}\n"

mindee/documents/receipt.py

@@ -45,7 +45,7 @@ def __init__(
         )
 
     def __str__(self) -> str:
-        taxes = ", ".join([f"{t.value} {t.rate}%" for t in self.taxes])
+        taxes = ", ".join(f"{t}" for t in self.taxes)
         return (
             "-----Receipt data-----\n"
             f"Filename: {self.filename}\n"

mindee/fields/tax.py

@@ -10,13 +10,15 @@ class Tax(Field):
     def __init__(
         self,
         tax_prediction: dict,
-        value_key: str = "amount",
+        value_key: str = "value",
         rate_key: str = "rate",
         code_key: str = "code",
         reconstructed: bool = False,
         page_n=None,
     ):
         """
+        Tax field object.
+
         :param tax_prediction: Tax prediction object from HTTP response
         :param value_key: Key to use in the tax_prediction dict
         :param rate_key: Key to use for getting the Tax rate in the tax_prediction dict
@@ -38,10 +40,10 @@ def __init__(
 
         try:
             self.code = str(tax_prediction[code_key])
-            if self.code == "N/A":
-                self.code = None
         except (TypeError, KeyError):
             self.code = None
+        if self.code in ("N/A", "None"):
+            self.code = None
 
         try:
             self.value = float(tax_prediction[value_key])
@@ -54,17 +56,8 @@ def __str__(self):
         tax_str = ""
         if self.value is not None:
             tax_str += str(self.value)
-        else:
-            tax_str += "_"
-
         if self.rate is not None:
-            tax_str += "; " + str(self.rate) + "%"
-        else:
-            tax_str += "; _"
-
+            tax_str += f" {self.rate}%"
         if self.code is not None:
-            tax_str += "; " + str(self.code)
-        else:
-            tax_str += "; _"
-
-        return tax_str
+            tax_str += f" {self.code}"
+        return tax_str.strip()

tests/fields/test_tax.py

@@ -3,29 +3,42 @@
 
 def test_constructor():
     field_dict = {
-        "value": "2",
+        "value": 2,
         "rate": 0.2,
         "code": "QST",
         "confidence": 0.1,
         "polygon": [[0.016, 0.707], [0.414, 0.707], [0.414, 0.831], [0.016, 0.831]],
     }
-    tax = Tax(field_dict, value_key="value")
+    tax = Tax(field_dict)
     assert tax.value == 2
     assert tax.confidence == 0.1
     assert tax.rate == 0.2
     assert len(tax.bbox) > 0
-    assert type(str(tax)) == str
+    assert str(tax) == "2.0 0.2% QST"
 
 
 def test_constructor_no_rate():
-    field_dict = {"value": "2", "rate": "AA", "confidence": 0.1}
+    field_dict = {"value": 2.0, "confidence": 0.1}
     tax = Tax(field_dict)
     assert tax.rate is None
     assert len(tax.bbox) == 0
+    assert str(tax) == "2.0"
 
 
 def test_constructor_no_amount():
     field_dict = {"value": "NA", "rate": "AA", "code": "N/A", "confidence": 0.1}
     tax = Tax(field_dict)
     assert tax.value is None
-    assert type(str(tax)) == str
+    assert str(tax) == ""
+
+
+def test_constructor_only_code():
+    field_dict = {
+        "value": "NA",
+        "rate": "None",
+        "code": "TAXES AND FEES",
+        "confidence": 0.1,
+    }
+    tax = Tax(field_dict)
+    assert tax.value is None
+    assert str(tax) == "TAXES AND FEES"