From 8862a271b57400a1c69e9888abcb810218f8eace Mon Sep 17 00:00:00 2001 From: sebastianMindee Date: Fri, 22 Nov 2024 14:33:03 +0100 Subject: [PATCH 1/7] :bug: fix potential circular import errors --- mindee/product/custom/custom_v1.py | 4 +++- mindee/product/custom/custom_v1_document.py | 7 +++++-- mindee/product/custom/custom_v1_page.py | 4 +++- mindee/product/generated/generated_v1.py | 4 +++- mindee/product/generated/generated_v1_document.py | 7 +++++-- mindee/product/generated/generated_v1_page.py | 7 +++++-- mindee/product/generated/generated_v1_prediction.py | 6 ++++-- 7 files changed, 28 insertions(+), 11 deletions(-) diff --git a/mindee/product/custom/custom_v1.py b/mindee/product/custom/custom_v1.py index af54f7d0..570af288 100644 --- a/mindee/product/custom/custom_v1.py +++ b/mindee/product/custom/custom_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.custom.custom_v1_document import CustomV1Document from mindee.product.custom.custom_v1_page import CustomV1Page diff --git a/mindee/product/custom/custom_v1_document.py b/mindee/product/custom/custom_v1_document.py index 07e19a86..3458cfbd 100644 --- a/mindee/product/custom/custom_v1_document.py +++ b/mindee/product/custom/custom_v1_document.py @@ -1,8 +1,11 @@ from typing import Dict, List -from mindee.parsing.common import Prediction, StringDict, clean_out_string -from mindee.parsing.custom import ClassificationField, ListField +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string +from mindee.parsing.custom.classification import ClassificationField from mindee.parsing.custom.line_items import CustomLine, get_line_items +from mindee.parsing.custom.list import ListField class CustomV1Document(Prediction): diff --git a/mindee/product/custom/custom_v1_page.py b/mindee/product/custom/custom_v1_page.py index ae3a9a89..adf99ce7 100644 --- a/mindee/product/custom/custom_v1_page.py +++ b/mindee/product/custom/custom_v1_page.py @@ -1,6 +1,8 @@ from typing import Dict, List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.custom import ListField from mindee.parsing.custom.line_items import CustomLine, get_line_items diff --git a/mindee/product/generated/generated_v1.py b/mindee/product/generated/generated_v1.py index 147031b5..83a55bbc 100644 --- a/mindee/product/generated/generated_v1.py +++ b/mindee/product/generated/generated_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.generated.generated_v1_document import GeneratedV1Document from mindee.product.generated.generated_v1_page import GeneratedV1Page diff --git a/mindee/product/generated/generated_v1_document.py b/mindee/product/generated/generated_v1_document.py index 1378fc63..b2b80b07 100644 --- a/mindee/product/generated/generated_v1_document.py +++ b/mindee/product/generated/generated_v1_document.py @@ -1,8 +1,11 @@ from typing import Dict, Union -from mindee.parsing.common import StringDict -from mindee.parsing.generated import GeneratedObjectField, is_generated_object +from mindee.parsing.common.string_dict import StringDict from mindee.parsing.generated.generated_list import GeneratedListField +from mindee.parsing.generated.generated_object import ( + GeneratedObjectField, + is_generated_object, +) from mindee.parsing.standard.text import StringField from mindee.product.generated.generated_v1_prediction import GeneratedV1Prediction diff --git a/mindee/product/generated/generated_v1_page.py b/mindee/product/generated/generated_v1_page.py index eef15da3..619f9691 100644 --- a/mindee/product/generated/generated_v1_page.py +++ b/mindee/product/generated/generated_v1_page.py @@ -1,8 +1,11 @@ from typing import Dict, Optional, Union -from mindee.parsing.common import StringDict -from mindee.parsing.generated import GeneratedObjectField, is_generated_object +from mindee.parsing.common.string_dict import StringDict from mindee.parsing.generated.generated_list import GeneratedListField +from mindee.parsing.generated.generated_object import ( + GeneratedObjectField, + is_generated_object, +) from mindee.parsing.standard.text import StringField from mindee.product.generated.generated_v1_prediction import GeneratedV1Prediction diff --git a/mindee/product/generated/generated_v1_prediction.py b/mindee/product/generated/generated_v1_prediction.py index a55109e9..78753746 100644 --- a/mindee/product/generated/generated_v1_prediction.py +++ b/mindee/product/generated/generated_v1_prediction.py @@ -1,9 +1,11 @@ import re from typing import Dict, List, Union -from mindee.parsing.common import Prediction, StringDict, clean_out_string -from mindee.parsing.generated import GeneratedObjectField +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.generated.generated_list import GeneratedListField +from mindee.parsing.generated.generated_object import GeneratedObjectField from mindee.parsing.standard.text import StringField From 8ea9481661601993206fdcbd83cba37f8df753ed Mon Sep 17 00:00:00 2001 From: sebastianMindee Date: Fri, 22 Nov 2024 14:37:58 +0100 Subject: [PATCH 2/7] partially update product syntaxes --- mindee/product/barcode_reader/barcode_reader_v1.py | 4 +++- mindee/product/barcode_reader/barcode_reader_v1_document.py | 4 +++- mindee/product/bill_of_lading/bill_of_lading_v1.py | 4 +++- mindee/product/bill_of_lading/bill_of_lading_v1_carrier.py | 5 +++-- .../product/bill_of_lading/bill_of_lading_v1_carrier_item.py | 5 +++-- mindee/product/bill_of_lading/bill_of_lading_v1_consignee.py | 5 +++-- mindee/product/bill_of_lading/bill_of_lading_v1_document.py | 4 +++- .../product/bill_of_lading/bill_of_lading_v1_notify_party.py | 5 +++-- mindee/product/bill_of_lading/bill_of_lading_v1_shipper.py | 5 +++-- mindee/product/business_card/business_card_v1.py | 4 +++- mindee/product/business_card/business_card_v1_document.py | 4 +++- mindee/product/cropper/cropper_v1.py | 4 +++- mindee/product/cropper/cropper_v1_document.py | 2 +- mindee/product/cropper/cropper_v1_page.py | 3 ++- mindee/product/delivery_note/delivery_note_v1.py | 4 +++- mindee/product/delivery_note/delivery_note_v1_document.py | 4 +++- mindee/product/eu/driver_license/driver_license_v1.py | 4 +++- .../product/eu/driver_license/driver_license_v1_document.py | 4 +++- mindee/product/eu/driver_license/driver_license_v1_page.py | 3 ++- mindee/product/eu/license_plate/license_plate_v1.py | 4 +++- mindee/product/eu/license_plate/license_plate_v1_document.py | 4 +++- mindee/product/financial_document/financial_document_v1.py | 4 +++- .../financial_document/financial_document_v1_document.py | 4 +++- .../financial_document/financial_document_v1_line_item.py | 5 +++-- .../fr/bank_account_details/bank_account_details_v1.py | 4 +++- .../bank_account_details/bank_account_details_v1_document.py | 4 +++- .../fr/bank_account_details/bank_account_details_v2.py | 4 +++- .../fr/bank_account_details/bank_account_details_v2_bban.py | 5 +++-- .../bank_account_details/bank_account_details_v2_document.py | 4 +++- mindee/product/fr/carte_grise/carte_grise_v1.py | 4 +++- mindee/product/fr/carte_grise/carte_grise_v1_document.py | 4 +++- mindee/product/fr/carte_vitale/carte_vitale_v1.py | 4 +++- mindee/product/fr/carte_vitale/carte_vitale_v1_document.py | 4 +++- mindee/product/fr/energy_bill/energy_bill_v1.py | 4 +++- mindee/product/fr/energy_bill/energy_bill_v1_document.py | 4 +++- .../product/fr/energy_bill/energy_bill_v1_energy_consumer.py | 5 +++-- .../product/fr/energy_bill/energy_bill_v1_energy_supplier.py | 5 +++-- mindee/product/fr/energy_bill/energy_bill_v1_energy_usage.py | 5 +++-- mindee/product/fr/energy_bill/energy_bill_v1_meter_detail.py | 5 +++-- mindee/product/fr/energy_bill/energy_bill_v1_subscription.py | 5 +++-- .../fr/energy_bill/energy_bill_v1_taxes_and_contribution.py | 5 +++-- mindee/product/fr/id_card/id_card_v1.py | 4 +++- mindee/product/fr/id_card/id_card_v1_document.py | 4 +++- mindee/product/fr/id_card/id_card_v1_page.py | 3 ++- mindee/product/fr/id_card/id_card_v2.py | 4 +++- mindee/product/fr/id_card/id_card_v2_document.py | 4 +++- mindee/product/fr/id_card/id_card_v2_page.py | 3 ++- mindee/product/fr/payslip/payslip_v2.py | 4 +++- mindee/product/fr/payslip/payslip_v2_bank_account_detail.py | 5 +++-- mindee/product/fr/payslip/payslip_v2_document.py | 4 +++- mindee/product/fr/payslip/payslip_v2_employee.py | 5 +++-- mindee/product/fr/payslip/payslip_v2_employer.py | 5 +++-- mindee/product/fr/payslip/payslip_v2_employment.py | 5 +++-- mindee/product/fr/payslip/payslip_v2_pay_detail.py | 5 +++-- mindee/product/fr/payslip/payslip_v2_pay_period.py | 5 +++-- mindee/product/fr/payslip/payslip_v2_pto.py | 5 +++-- mindee/product/fr/payslip/payslip_v2_salary_detail.py | 5 +++-- mindee/product/ind/indian_passport/indian_passport_v1.py | 4 +++- .../ind/indian_passport/indian_passport_v1_document.py | 4 +++- mindee/product/international_id/international_id_v2.py | 4 +++- .../product/international_id/international_id_v2_document.py | 4 +++- mindee/product/invoice/invoice_v4.py | 4 +++- mindee/product/invoice/invoice_v4_document.py | 4 +++- mindee/product/invoice/invoice_v4_line_item.py | 5 +++-- .../product/material_certificate/material_certificate_v1.py | 4 +++- .../material_certificate/material_certificate_v1_document.py | 4 +++- .../multi_receipts_detector/multi_receipts_detector_v1.py | 4 +++- .../multi_receipts_detector_v1_document.py | 4 +++- .../nutrition_facts_label/nutrition_facts_label_v1.py | 4 +++- .../nutrition_facts_label_v1_added_sugar.py | 5 +++-- .../nutrition_facts_label_v1_calorie.py | 5 +++-- .../nutrition_facts_label_v1_cholesterol.py | 5 +++-- .../nutrition_facts_label_v1_dietary_fiber.py | 5 +++-- .../nutrition_facts_label_v1_document.py | 4 +++- .../nutrition_facts_label_v1_nutrient.py | 5 +++-- .../nutrition_facts_label_v1_protein.py | 5 +++-- .../nutrition_facts_label_v1_saturated_fat.py | 5 +++-- .../nutrition_facts_label_v1_serving_size.py | 5 +++-- .../nutrition_facts_label/nutrition_facts_label_v1_sodium.py | 5 +++-- .../nutrition_facts_label_v1_total_carbohydrate.py | 5 +++-- .../nutrition_facts_label_v1_total_fat.py | 5 +++-- .../nutrition_facts_label_v1_total_sugar.py | 5 +++-- .../nutrition_facts_label_v1_trans_fat.py | 5 +++-- mindee/product/passport/passport_v1.py | 4 +++- mindee/product/passport/passport_v1_document.py | 4 +++- mindee/product/proof_of_address/proof_of_address_v1.py | 4 +++- .../product/proof_of_address/proof_of_address_v1_document.py | 4 +++- mindee/product/receipt/receipt_v5.py | 4 +++- mindee/product/receipt/receipt_v5_document.py | 4 +++- mindee/product/receipt/receipt_v5_line_item.py | 5 +++-- mindee/product/resume/resume_v1.py | 4 +++- mindee/product/resume/resume_v1_certificate.py | 5 +++-- mindee/product/resume/resume_v1_document.py | 4 +++- mindee/product/resume/resume_v1_education.py | 5 +++-- mindee/product/resume/resume_v1_language.py | 5 +++-- mindee/product/resume/resume_v1_professional_experience.py | 5 +++-- mindee/product/resume/resume_v1_social_networks_url.py | 5 +++-- mindee/product/us/bank_check/bank_check_v1.py | 4 +++- mindee/product/us/bank_check/bank_check_v1_document.py | 4 +++- mindee/product/us/bank_check/bank_check_v1_page.py | 3 ++- mindee/product/us/driver_license/driver_license_v1.py | 4 +++- .../product/us/driver_license/driver_license_v1_document.py | 4 +++- mindee/product/us/driver_license/driver_license_v1_page.py | 3 ++- mindee/product/us/healthcare_card/healthcare_card_v1.py | 4 +++- .../product/us/healthcare_card/healthcare_card_v1_copay.py | 5 +++-- .../us/healthcare_card/healthcare_card_v1_document.py | 4 +++- mindee/product/us/us_mail/us_mail_v2.py | 4 +++- mindee/product/us/us_mail/us_mail_v2_document.py | 4 +++- mindee/product/us/us_mail/us_mail_v2_recipient_address.py | 5 +++-- mindee/product/us/us_mail/us_mail_v2_sender_address.py | 5 +++-- mindee/product/us/w9/w9_v1.py | 4 +++- mindee/product/us/w9/w9_v1_document.py | 2 +- mindee/product/us/w9/w9_v1_page.py | 3 ++- 113 files changed, 328 insertions(+), 157 deletions(-) diff --git a/mindee/product/barcode_reader/barcode_reader_v1.py b/mindee/product/barcode_reader/barcode_reader_v1.py index 2c1b202a..c6290b70 100644 --- a/mindee/product/barcode_reader/barcode_reader_v1.py +++ b/mindee/product/barcode_reader/barcode_reader_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.barcode_reader.barcode_reader_v1_document import ( BarcodeReaderV1Document, ) diff --git a/mindee/product/barcode_reader/barcode_reader_v1_document.py b/mindee/product/barcode_reader/barcode_reader_v1_document.py index f4bd17ef..56876cb2 100644 --- a/mindee/product/barcode_reader/barcode_reader_v1_document.py +++ b/mindee/product/barcode_reader/barcode_reader_v1_document.py @@ -1,6 +1,8 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import StringField diff --git a/mindee/product/bill_of_lading/bill_of_lading_v1.py b/mindee/product/bill_of_lading/bill_of_lading_v1.py index e0a3fa63..9bc6c26e 100644 --- a/mindee/product/bill_of_lading/bill_of_lading_v1.py +++ b/mindee/product/bill_of_lading/bill_of_lading_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.bill_of_lading.bill_of_lading_v1_document import ( BillOfLadingV1Document, ) diff --git a/mindee/product/bill_of_lading/bill_of_lading_v1_carrier.py b/mindee/product/bill_of_lading/bill_of_lading_v1_carrier.py index dcf4602f..d0629362 100644 --- a/mindee/product/bill_of_lading/bill_of_lading_v1_carrier.py +++ b/mindee/product/bill_of_lading/bill_of_lading_v1_carrier.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import FieldConfidenceMixin, FieldPositionMixin +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import FieldConfidenceMixin, FieldPositionMixin class BillOfLadingV1Carrier(FieldPositionMixin, FieldConfidenceMixin): diff --git a/mindee/product/bill_of_lading/bill_of_lading_v1_carrier_item.py b/mindee/product/bill_of_lading/bill_of_lading_v1_carrier_item.py index e7a4e612..13bfc0ac 100644 --- a/mindee/product/bill_of_lading/bill_of_lading_v1_carrier_item.py +++ b/mindee/product/bill_of_lading/bill_of_lading_v1_carrier_item.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/bill_of_lading/bill_of_lading_v1_consignee.py b/mindee/product/bill_of_lading/bill_of_lading_v1_consignee.py index d5fe8215..6f219d04 100644 --- a/mindee/product/bill_of_lading/bill_of_lading_v1_consignee.py +++ b/mindee/product/bill_of_lading/bill_of_lading_v1_consignee.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import FieldConfidenceMixin, FieldPositionMixin +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import FieldConfidenceMixin, FieldPositionMixin class BillOfLadingV1Consignee(FieldPositionMixin, FieldConfidenceMixin): diff --git a/mindee/product/bill_of_lading/bill_of_lading_v1_document.py b/mindee/product/bill_of_lading/bill_of_lading_v1_document.py index 07ae03af..e6426a3c 100644 --- a/mindee/product/bill_of_lading/bill_of_lading_v1_document.py +++ b/mindee/product/bill_of_lading/bill_of_lading_v1_document.py @@ -1,6 +1,8 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import DateField, StringField from mindee.product.bill_of_lading.bill_of_lading_v1_carrier import ( BillOfLadingV1Carrier, diff --git a/mindee/product/bill_of_lading/bill_of_lading_v1_notify_party.py b/mindee/product/bill_of_lading/bill_of_lading_v1_notify_party.py index 64cc30c4..f4dd14ff 100644 --- a/mindee/product/bill_of_lading/bill_of_lading_v1_notify_party.py +++ b/mindee/product/bill_of_lading/bill_of_lading_v1_notify_party.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import FieldConfidenceMixin, FieldPositionMixin +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import FieldConfidenceMixin, FieldPositionMixin class BillOfLadingV1NotifyParty(FieldPositionMixin, FieldConfidenceMixin): diff --git a/mindee/product/bill_of_lading/bill_of_lading_v1_shipper.py b/mindee/product/bill_of_lading/bill_of_lading_v1_shipper.py index 2ca23b35..3c80c42d 100644 --- a/mindee/product/bill_of_lading/bill_of_lading_v1_shipper.py +++ b/mindee/product/bill_of_lading/bill_of_lading_v1_shipper.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import FieldConfidenceMixin, FieldPositionMixin +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import FieldConfidenceMixin, FieldPositionMixin class BillOfLadingV1Shipper(FieldPositionMixin, FieldConfidenceMixin): diff --git a/mindee/product/business_card/business_card_v1.py b/mindee/product/business_card/business_card_v1.py index 297e1d26..abf379c8 100644 --- a/mindee/product/business_card/business_card_v1.py +++ b/mindee/product/business_card/business_card_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.business_card.business_card_v1_document import ( BusinessCardV1Document, ) diff --git a/mindee/product/business_card/business_card_v1_document.py b/mindee/product/business_card/business_card_v1_document.py index c9831425..30a9e857 100644 --- a/mindee/product/business_card/business_card_v1_document.py +++ b/mindee/product/business_card/business_card_v1_document.py @@ -1,6 +1,8 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import StringField diff --git a/mindee/product/cropper/cropper_v1.py b/mindee/product/cropper/cropper_v1.py index 0456444b..76e128e6 100644 --- a/mindee/product/cropper/cropper_v1.py +++ b/mindee/product/cropper/cropper_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.cropper.cropper_v1_document import ( CropperV1Document, ) diff --git a/mindee/product/cropper/cropper_v1_document.py b/mindee/product/cropper/cropper_v1_document.py index e3ece747..1e575620 100644 --- a/mindee/product/cropper/cropper_v1_document.py +++ b/mindee/product/cropper/cropper_v1_document.py @@ -1,4 +1,4 @@ -from mindee.parsing.common import Prediction +from mindee.parsing.common.prediction import Prediction class CropperV1Document(Prediction): diff --git a/mindee/product/cropper/cropper_v1_page.py b/mindee/product/cropper/cropper_v1_page.py index 7d359836..81de1132 100644 --- a/mindee/product/cropper/cropper_v1_page.py +++ b/mindee/product/cropper/cropper_v1_page.py @@ -1,6 +1,7 @@ from typing import List, Optional -from mindee.parsing.common import StringDict, clean_out_string +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import PositionField from mindee.product.cropper.cropper_v1_document import ( CropperV1Document, diff --git a/mindee/product/delivery_note/delivery_note_v1.py b/mindee/product/delivery_note/delivery_note_v1.py index 6364eb7d..7cea46e7 100644 --- a/mindee/product/delivery_note/delivery_note_v1.py +++ b/mindee/product/delivery_note/delivery_note_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.delivery_note.delivery_note_v1_document import ( DeliveryNoteV1Document, ) diff --git a/mindee/product/delivery_note/delivery_note_v1_document.py b/mindee/product/delivery_note/delivery_note_v1_document.py index 0e09922f..4461081f 100644 --- a/mindee/product/delivery_note/delivery_note_v1_document.py +++ b/mindee/product/delivery_note/delivery_note_v1_document.py @@ -1,6 +1,8 @@ from typing import Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import AmountField, DateField, StringField diff --git a/mindee/product/eu/driver_license/driver_license_v1.py b/mindee/product/eu/driver_license/driver_license_v1.py index 28c06856..ece001ed 100644 --- a/mindee/product/eu/driver_license/driver_license_v1.py +++ b/mindee/product/eu/driver_license/driver_license_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.eu.driver_license.driver_license_v1_document import ( DriverLicenseV1Document, ) diff --git a/mindee/product/eu/driver_license/driver_license_v1_document.py b/mindee/product/eu/driver_license/driver_license_v1_document.py index 1aff8604..0bab8925 100644 --- a/mindee/product/eu/driver_license/driver_license_v1_document.py +++ b/mindee/product/eu/driver_license/driver_license_v1_document.py @@ -1,6 +1,8 @@ from typing import Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import DateField, StringField diff --git a/mindee/product/eu/driver_license/driver_license_v1_page.py b/mindee/product/eu/driver_license/driver_license_v1_page.py index 3430e11e..e901ca87 100644 --- a/mindee/product/eu/driver_license/driver_license_v1_page.py +++ b/mindee/product/eu/driver_license/driver_license_v1_page.py @@ -1,6 +1,7 @@ from typing import Optional -from mindee.parsing.common import StringDict, clean_out_string +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import PositionField from mindee.product.eu.driver_license.driver_license_v1_document import ( DriverLicenseV1Document, diff --git a/mindee/product/eu/license_plate/license_plate_v1.py b/mindee/product/eu/license_plate/license_plate_v1.py index a88fe62c..7a52f192 100644 --- a/mindee/product/eu/license_plate/license_plate_v1.py +++ b/mindee/product/eu/license_plate/license_plate_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.eu.license_plate.license_plate_v1_document import ( LicensePlateV1Document, ) diff --git a/mindee/product/eu/license_plate/license_plate_v1_document.py b/mindee/product/eu/license_plate/license_plate_v1_document.py index 569d961c..6288c6f5 100644 --- a/mindee/product/eu/license_plate/license_plate_v1_document.py +++ b/mindee/product/eu/license_plate/license_plate_v1_document.py @@ -1,6 +1,8 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import StringField diff --git a/mindee/product/financial_document/financial_document_v1.py b/mindee/product/financial_document/financial_document_v1.py index a93876c6..9880d71d 100644 --- a/mindee/product/financial_document/financial_document_v1.py +++ b/mindee/product/financial_document/financial_document_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.financial_document.financial_document_v1_document import ( FinancialDocumentV1Document, ) diff --git a/mindee/product/financial_document/financial_document_v1_document.py b/mindee/product/financial_document/financial_document_v1_document.py index 03eb16d5..019e10b6 100644 --- a/mindee/product/financial_document/financial_document_v1_document.py +++ b/mindee/product/financial_document/financial_document_v1_document.py @@ -1,6 +1,8 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import ( AmountField, ClassificationField, diff --git a/mindee/product/financial_document/financial_document_v1_line_item.py b/mindee/product/financial_document/financial_document_v1_line_item.py index 57f0cd9b..90065406 100644 --- a/mindee/product/financial_document/financial_document_v1_line_item.py +++ b/mindee/product/financial_document/financial_document_v1_line_item.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/fr/bank_account_details/bank_account_details_v1.py b/mindee/product/fr/bank_account_details/bank_account_details_v1.py index 9944081b..008d68c2 100644 --- a/mindee/product/fr/bank_account_details/bank_account_details_v1.py +++ b/mindee/product/fr/bank_account_details/bank_account_details_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.fr.bank_account_details.bank_account_details_v1_document import ( BankAccountDetailsV1Document, ) diff --git a/mindee/product/fr/bank_account_details/bank_account_details_v1_document.py b/mindee/product/fr/bank_account_details/bank_account_details_v1_document.py index 75871fb4..13a1519e 100644 --- a/mindee/product/fr/bank_account_details/bank_account_details_v1_document.py +++ b/mindee/product/fr/bank_account_details/bank_account_details_v1_document.py @@ -1,6 +1,8 @@ from typing import Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import StringField diff --git a/mindee/product/fr/bank_account_details/bank_account_details_v2.py b/mindee/product/fr/bank_account_details/bank_account_details_v2.py index 41f2ba41..e1468274 100644 --- a/mindee/product/fr/bank_account_details/bank_account_details_v2.py +++ b/mindee/product/fr/bank_account_details/bank_account_details_v2.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.fr.bank_account_details.bank_account_details_v2_document import ( BankAccountDetailsV2Document, ) diff --git a/mindee/product/fr/bank_account_details/bank_account_details_v2_bban.py b/mindee/product/fr/bank_account_details/bank_account_details_v2_bban.py index be6e8b3a..9ad1b404 100644 --- a/mindee/product/fr/bank_account_details/bank_account_details_v2_bban.py +++ b/mindee/product/fr/bank_account_details/bank_account_details_v2_bban.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import FieldConfidenceMixin, FieldPositionMixin +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import FieldConfidenceMixin, FieldPositionMixin class BankAccountDetailsV2Bban(FieldPositionMixin, FieldConfidenceMixin): diff --git a/mindee/product/fr/bank_account_details/bank_account_details_v2_document.py b/mindee/product/fr/bank_account_details/bank_account_details_v2_document.py index 74f81258..f2550ff3 100644 --- a/mindee/product/fr/bank_account_details/bank_account_details_v2_document.py +++ b/mindee/product/fr/bank_account_details/bank_account_details_v2_document.py @@ -1,6 +1,8 @@ from typing import Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import StringField from mindee.product.fr.bank_account_details.bank_account_details_v2_bban import ( BankAccountDetailsV2Bban, diff --git a/mindee/product/fr/carte_grise/carte_grise_v1.py b/mindee/product/fr/carte_grise/carte_grise_v1.py index 0550c86a..ad8a920d 100644 --- a/mindee/product/fr/carte_grise/carte_grise_v1.py +++ b/mindee/product/fr/carte_grise/carte_grise_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.fr.carte_grise.carte_grise_v1_document import ( CarteGriseV1Document, ) diff --git a/mindee/product/fr/carte_grise/carte_grise_v1_document.py b/mindee/product/fr/carte_grise/carte_grise_v1_document.py index f617031a..2b1fec85 100644 --- a/mindee/product/fr/carte_grise/carte_grise_v1_document.py +++ b/mindee/product/fr/carte_grise/carte_grise_v1_document.py @@ -1,6 +1,8 @@ from typing import Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import DateField, StringField diff --git a/mindee/product/fr/carte_vitale/carte_vitale_v1.py b/mindee/product/fr/carte_vitale/carte_vitale_v1.py index 6456a392..a70184b1 100644 --- a/mindee/product/fr/carte_vitale/carte_vitale_v1.py +++ b/mindee/product/fr/carte_vitale/carte_vitale_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.fr.carte_vitale.carte_vitale_v1_document import ( CarteVitaleV1Document, ) diff --git a/mindee/product/fr/carte_vitale/carte_vitale_v1_document.py b/mindee/product/fr/carte_vitale/carte_vitale_v1_document.py index cfb6393d..0416da60 100644 --- a/mindee/product/fr/carte_vitale/carte_vitale_v1_document.py +++ b/mindee/product/fr/carte_vitale/carte_vitale_v1_document.py @@ -1,6 +1,8 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import DateField, StringField diff --git a/mindee/product/fr/energy_bill/energy_bill_v1.py b/mindee/product/fr/energy_bill/energy_bill_v1.py index 8a73ffc8..a344522e 100644 --- a/mindee/product/fr/energy_bill/energy_bill_v1.py +++ b/mindee/product/fr/energy_bill/energy_bill_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.fr.energy_bill.energy_bill_v1_document import ( EnergyBillV1Document, ) diff --git a/mindee/product/fr/energy_bill/energy_bill_v1_document.py b/mindee/product/fr/energy_bill/energy_bill_v1_document.py index 1f35fd86..d58ae11c 100644 --- a/mindee/product/fr/energy_bill/energy_bill_v1_document.py +++ b/mindee/product/fr/energy_bill/energy_bill_v1_document.py @@ -1,6 +1,8 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import AmountField, DateField, StringField from mindee.product.fr.energy_bill.energy_bill_v1_energy_consumer import ( EnergyBillV1EnergyConsumer, diff --git a/mindee/product/fr/energy_bill/energy_bill_v1_energy_consumer.py b/mindee/product/fr/energy_bill/energy_bill_v1_energy_consumer.py index ceb0d1d3..3b03d04b 100644 --- a/mindee/product/fr/energy_bill/energy_bill_v1_energy_consumer.py +++ b/mindee/product/fr/energy_bill/energy_bill_v1_energy_consumer.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import FieldConfidenceMixin, FieldPositionMixin +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import FieldConfidenceMixin, FieldPositionMixin class EnergyBillV1EnergyConsumer(FieldPositionMixin, FieldConfidenceMixin): diff --git a/mindee/product/fr/energy_bill/energy_bill_v1_energy_supplier.py b/mindee/product/fr/energy_bill/energy_bill_v1_energy_supplier.py index 20053694..0523ce4c 100644 --- a/mindee/product/fr/energy_bill/energy_bill_v1_energy_supplier.py +++ b/mindee/product/fr/energy_bill/energy_bill_v1_energy_supplier.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import FieldConfidenceMixin, FieldPositionMixin +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import FieldConfidenceMixin, FieldPositionMixin class EnergyBillV1EnergySupplier(FieldPositionMixin, FieldConfidenceMixin): diff --git a/mindee/product/fr/energy_bill/energy_bill_v1_energy_usage.py b/mindee/product/fr/energy_bill/energy_bill_v1_energy_usage.py index ba0aa9b7..0c9472d1 100644 --- a/mindee/product/fr/energy_bill/energy_bill_v1_energy_usage.py +++ b/mindee/product/fr/energy_bill/energy_bill_v1_energy_usage.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/fr/energy_bill/energy_bill_v1_meter_detail.py b/mindee/product/fr/energy_bill/energy_bill_v1_meter_detail.py index 33bb9127..c1273c11 100644 --- a/mindee/product/fr/energy_bill/energy_bill_v1_meter_detail.py +++ b/mindee/product/fr/energy_bill/energy_bill_v1_meter_detail.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import FieldConfidenceMixin, FieldPositionMixin +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import FieldConfidenceMixin, FieldPositionMixin class EnergyBillV1MeterDetail(FieldPositionMixin, FieldConfidenceMixin): diff --git a/mindee/product/fr/energy_bill/energy_bill_v1_subscription.py b/mindee/product/fr/energy_bill/energy_bill_v1_subscription.py index ce6b87bb..a370f30a 100644 --- a/mindee/product/fr/energy_bill/energy_bill_v1_subscription.py +++ b/mindee/product/fr/energy_bill/energy_bill_v1_subscription.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/fr/energy_bill/energy_bill_v1_taxes_and_contribution.py b/mindee/product/fr/energy_bill/energy_bill_v1_taxes_and_contribution.py index 80a437b6..ede9191d 100644 --- a/mindee/product/fr/energy_bill/energy_bill_v1_taxes_and_contribution.py +++ b/mindee/product/fr/energy_bill/energy_bill_v1_taxes_and_contribution.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/fr/id_card/id_card_v1.py b/mindee/product/fr/id_card/id_card_v1.py index 196bbe2a..f46ad87c 100644 --- a/mindee/product/fr/id_card/id_card_v1.py +++ b/mindee/product/fr/id_card/id_card_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.fr.id_card.id_card_v1_document import ( IdCardV1Document, ) diff --git a/mindee/product/fr/id_card/id_card_v1_document.py b/mindee/product/fr/id_card/id_card_v1_document.py index 5eda0ae8..24f66afc 100644 --- a/mindee/product/fr/id_card/id_card_v1_document.py +++ b/mindee/product/fr/id_card/id_card_v1_document.py @@ -1,6 +1,8 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import DateField, StringField diff --git a/mindee/product/fr/id_card/id_card_v1_page.py b/mindee/product/fr/id_card/id_card_v1_page.py index 0e47bcbf..13879734 100644 --- a/mindee/product/fr/id_card/id_card_v1_page.py +++ b/mindee/product/fr/id_card/id_card_v1_page.py @@ -1,6 +1,7 @@ from typing import Optional -from mindee.parsing.common import StringDict, clean_out_string +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import ClassificationField from mindee.product.fr.id_card.id_card_v1_document import ( IdCardV1Document, diff --git a/mindee/product/fr/id_card/id_card_v2.py b/mindee/product/fr/id_card/id_card_v2.py index b86dee72..dff7f9f9 100644 --- a/mindee/product/fr/id_card/id_card_v2.py +++ b/mindee/product/fr/id_card/id_card_v2.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.fr.id_card.id_card_v2_document import ( IdCardV2Document, ) diff --git a/mindee/product/fr/id_card/id_card_v2_document.py b/mindee/product/fr/id_card/id_card_v2_document.py index 5f90b6d6..6f955ea9 100644 --- a/mindee/product/fr/id_card/id_card_v2_document.py +++ b/mindee/product/fr/id_card/id_card_v2_document.py @@ -1,6 +1,8 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import DateField, StringField diff --git a/mindee/product/fr/id_card/id_card_v2_page.py b/mindee/product/fr/id_card/id_card_v2_page.py index 4747b9d0..96e86d94 100644 --- a/mindee/product/fr/id_card/id_card_v2_page.py +++ b/mindee/product/fr/id_card/id_card_v2_page.py @@ -1,6 +1,7 @@ from typing import Optional -from mindee.parsing.common import StringDict, clean_out_string +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import ClassificationField from mindee.product.fr.id_card.id_card_v2_document import ( IdCardV2Document, diff --git a/mindee/product/fr/payslip/payslip_v2.py b/mindee/product/fr/payslip/payslip_v2.py index f6a079e5..109ac248 100644 --- a/mindee/product/fr/payslip/payslip_v2.py +++ b/mindee/product/fr/payslip/payslip_v2.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.fr.payslip.payslip_v2_document import ( PayslipV2Document, ) diff --git a/mindee/product/fr/payslip/payslip_v2_bank_account_detail.py b/mindee/product/fr/payslip/payslip_v2_bank_account_detail.py index 0e71a0d5..194fb22a 100644 --- a/mindee/product/fr/payslip/payslip_v2_bank_account_detail.py +++ b/mindee/product/fr/payslip/payslip_v2_bank_account_detail.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import FieldConfidenceMixin, FieldPositionMixin +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import FieldConfidenceMixin, FieldPositionMixin class PayslipV2BankAccountDetail(FieldPositionMixin, FieldConfidenceMixin): diff --git a/mindee/product/fr/payslip/payslip_v2_document.py b/mindee/product/fr/payslip/payslip_v2_document.py index 656a5fcc..208d581e 100644 --- a/mindee/product/fr/payslip/payslip_v2_document.py +++ b/mindee/product/fr/payslip/payslip_v2_document.py @@ -1,6 +1,8 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.product.fr.payslip.payslip_v2_bank_account_detail import ( PayslipV2BankAccountDetail, ) diff --git a/mindee/product/fr/payslip/payslip_v2_employee.py b/mindee/product/fr/payslip/payslip_v2_employee.py index be4d393c..6fccf9eb 100644 --- a/mindee/product/fr/payslip/payslip_v2_employee.py +++ b/mindee/product/fr/payslip/payslip_v2_employee.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import FieldConfidenceMixin, FieldPositionMixin +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import FieldConfidenceMixin, FieldPositionMixin class PayslipV2Employee(FieldPositionMixin, FieldConfidenceMixin): diff --git a/mindee/product/fr/payslip/payslip_v2_employer.py b/mindee/product/fr/payslip/payslip_v2_employer.py index fa2a1b76..b1bf8ac5 100644 --- a/mindee/product/fr/payslip/payslip_v2_employer.py +++ b/mindee/product/fr/payslip/payslip_v2_employer.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import FieldConfidenceMixin, FieldPositionMixin +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import FieldConfidenceMixin, FieldPositionMixin class PayslipV2Employer(FieldPositionMixin, FieldConfidenceMixin): diff --git a/mindee/product/fr/payslip/payslip_v2_employment.py b/mindee/product/fr/payslip/payslip_v2_employment.py index d30c3bb0..683a624c 100644 --- a/mindee/product/fr/payslip/payslip_v2_employment.py +++ b/mindee/product/fr/payslip/payslip_v2_employment.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/fr/payslip/payslip_v2_pay_detail.py b/mindee/product/fr/payslip/payslip_v2_pay_detail.py index 23a51a93..3ef7144c 100644 --- a/mindee/product/fr/payslip/payslip_v2_pay_detail.py +++ b/mindee/product/fr/payslip/payslip_v2_pay_detail.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/fr/payslip/payslip_v2_pay_period.py b/mindee/product/fr/payslip/payslip_v2_pay_period.py index c401f8da..fc7f7d23 100644 --- a/mindee/product/fr/payslip/payslip_v2_pay_period.py +++ b/mindee/product/fr/payslip/payslip_v2_pay_period.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import FieldConfidenceMixin, FieldPositionMixin +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import FieldConfidenceMixin, FieldPositionMixin class PayslipV2PayPeriod(FieldPositionMixin, FieldConfidenceMixin): diff --git a/mindee/product/fr/payslip/payslip_v2_pto.py b/mindee/product/fr/payslip/payslip_v2_pto.py index 9635593d..b6208af5 100644 --- a/mindee/product/fr/payslip/payslip_v2_pto.py +++ b/mindee/product/fr/payslip/payslip_v2_pto.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/fr/payslip/payslip_v2_salary_detail.py b/mindee/product/fr/payslip/payslip_v2_salary_detail.py index 0120bb45..4494916c 100644 --- a/mindee/product/fr/payslip/payslip_v2_salary_detail.py +++ b/mindee/product/fr/payslip/payslip_v2_salary_detail.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/ind/indian_passport/indian_passport_v1.py b/mindee/product/ind/indian_passport/indian_passport_v1.py index a1504e63..2a676f5f 100644 --- a/mindee/product/ind/indian_passport/indian_passport_v1.py +++ b/mindee/product/ind/indian_passport/indian_passport_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.ind.indian_passport.indian_passport_v1_document import ( IndianPassportV1Document, ) diff --git a/mindee/product/ind/indian_passport/indian_passport_v1_document.py b/mindee/product/ind/indian_passport/indian_passport_v1_document.py index e1772135..320b77dc 100644 --- a/mindee/product/ind/indian_passport/indian_passport_v1_document.py +++ b/mindee/product/ind/indian_passport/indian_passport_v1_document.py @@ -1,6 +1,8 @@ from typing import Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import ClassificationField, DateField, StringField diff --git a/mindee/product/international_id/international_id_v2.py b/mindee/product/international_id/international_id_v2.py index 8c87f2c6..c6b1d8a1 100644 --- a/mindee/product/international_id/international_id_v2.py +++ b/mindee/product/international_id/international_id_v2.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.international_id.international_id_v2_document import ( InternationalIdV2Document, ) diff --git a/mindee/product/international_id/international_id_v2_document.py b/mindee/product/international_id/international_id_v2_document.py index 10cf9e33..75c163b6 100644 --- a/mindee/product/international_id/international_id_v2_document.py +++ b/mindee/product/international_id/international_id_v2_document.py @@ -1,6 +1,8 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import ClassificationField, DateField, StringField diff --git a/mindee/product/invoice/invoice_v4.py b/mindee/product/invoice/invoice_v4.py index 7091c177..159ea964 100644 --- a/mindee/product/invoice/invoice_v4.py +++ b/mindee/product/invoice/invoice_v4.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.invoice.invoice_v4_document import ( InvoiceV4Document, ) diff --git a/mindee/product/invoice/invoice_v4_document.py b/mindee/product/invoice/invoice_v4_document.py index 8bb30ea7..e322475c 100644 --- a/mindee/product/invoice/invoice_v4_document.py +++ b/mindee/product/invoice/invoice_v4_document.py @@ -1,6 +1,8 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import ( AmountField, ClassificationField, diff --git a/mindee/product/invoice/invoice_v4_line_item.py b/mindee/product/invoice/invoice_v4_line_item.py index 673b382a..68ee439f 100644 --- a/mindee/product/invoice/invoice_v4_line_item.py +++ b/mindee/product/invoice/invoice_v4_line_item.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/material_certificate/material_certificate_v1.py b/mindee/product/material_certificate/material_certificate_v1.py index 9a5aee15..9b3efd5b 100644 --- a/mindee/product/material_certificate/material_certificate_v1.py +++ b/mindee/product/material_certificate/material_certificate_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.material_certificate.material_certificate_v1_document import ( MaterialCertificateV1Document, ) diff --git a/mindee/product/material_certificate/material_certificate_v1_document.py b/mindee/product/material_certificate/material_certificate_v1_document.py index 2c6f9d91..ac7188dc 100644 --- a/mindee/product/material_certificate/material_certificate_v1_document.py +++ b/mindee/product/material_certificate/material_certificate_v1_document.py @@ -1,6 +1,8 @@ from typing import Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import StringField diff --git a/mindee/product/multi_receipts_detector/multi_receipts_detector_v1.py b/mindee/product/multi_receipts_detector/multi_receipts_detector_v1.py index 1fde65a5..062cc70a 100644 --- a/mindee/product/multi_receipts_detector/multi_receipts_detector_v1.py +++ b/mindee/product/multi_receipts_detector/multi_receipts_detector_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.multi_receipts_detector.multi_receipts_detector_v1_document import ( MultiReceiptsDetectorV1Document, ) diff --git a/mindee/product/multi_receipts_detector/multi_receipts_detector_v1_document.py b/mindee/product/multi_receipts_detector/multi_receipts_detector_v1_document.py index fe5c3738..85d61a99 100644 --- a/mindee/product/multi_receipts_detector/multi_receipts_detector_v1_document.py +++ b/mindee/product/multi_receipts_detector/multi_receipts_detector_v1_document.py @@ -1,6 +1,8 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import PositionField diff --git a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1.py b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1.py index a6560cd1..129110be 100644 --- a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1.py +++ b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.nutrition_facts_label.nutrition_facts_label_v1_document import ( NutritionFactsLabelV1Document, ) diff --git a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_added_sugar.py b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_added_sugar.py index 3d01cd09..70d03e68 100644 --- a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_added_sugar.py +++ b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_added_sugar.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_calorie.py b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_calorie.py index 625cae28..4da5bba2 100644 --- a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_calorie.py +++ b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_calorie.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_cholesterol.py b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_cholesterol.py index 142712e9..579d6135 100644 --- a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_cholesterol.py +++ b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_cholesterol.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_dietary_fiber.py b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_dietary_fiber.py index 54ccc2b4..0a560286 100644 --- a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_dietary_fiber.py +++ b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_dietary_fiber.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_document.py b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_document.py index 83398900..b145ae70 100644 --- a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_document.py +++ b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_document.py @@ -1,6 +1,8 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import AmountField from mindee.product.nutrition_facts_label.nutrition_facts_label_v1_added_sugar import ( NutritionFactsLabelV1AddedSugar, diff --git a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_nutrient.py b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_nutrient.py index 93fe7a0c..0138d26b 100644 --- a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_nutrient.py +++ b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_nutrient.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_protein.py b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_protein.py index 1ea78e07..2c04ffce 100644 --- a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_protein.py +++ b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_protein.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_saturated_fat.py b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_saturated_fat.py index 08fc4cbb..4fab4a77 100644 --- a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_saturated_fat.py +++ b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_saturated_fat.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_serving_size.py b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_serving_size.py index 6ae24556..211ba215 100644 --- a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_serving_size.py +++ b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_serving_size.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_sodium.py b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_sodium.py index ba791a42..ce8e654f 100644 --- a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_sodium.py +++ b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_sodium.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_total_carbohydrate.py b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_total_carbohydrate.py index 6b1a3e75..8ab62b06 100644 --- a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_total_carbohydrate.py +++ b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_total_carbohydrate.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_total_fat.py b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_total_fat.py index 81e0103b..befb9986 100644 --- a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_total_fat.py +++ b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_total_fat.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_total_sugar.py b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_total_sugar.py index d3406362..b44be085 100644 --- a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_total_sugar.py +++ b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_total_sugar.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_trans_fat.py b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_trans_fat.py index 4e189007..25ef328d 100644 --- a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_trans_fat.py +++ b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_trans_fat.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/passport/passport_v1.py b/mindee/product/passport/passport_v1.py index 02bf9950..e6333c37 100644 --- a/mindee/product/passport/passport_v1.py +++ b/mindee/product/passport/passport_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.passport.passport_v1_document import ( PassportV1Document, ) diff --git a/mindee/product/passport/passport_v1_document.py b/mindee/product/passport/passport_v1_document.py index 06dc9de9..dbcdc408 100644 --- a/mindee/product/passport/passport_v1_document.py +++ b/mindee/product/passport/passport_v1_document.py @@ -1,6 +1,8 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import DateField, StringField diff --git a/mindee/product/proof_of_address/proof_of_address_v1.py b/mindee/product/proof_of_address/proof_of_address_v1.py index a83a2670..4744d619 100644 --- a/mindee/product/proof_of_address/proof_of_address_v1.py +++ b/mindee/product/proof_of_address/proof_of_address_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.proof_of_address.proof_of_address_v1_document import ( ProofOfAddressV1Document, ) diff --git a/mindee/product/proof_of_address/proof_of_address_v1_document.py b/mindee/product/proof_of_address/proof_of_address_v1_document.py index db933263..c2f7ef03 100644 --- a/mindee/product/proof_of_address/proof_of_address_v1_document.py +++ b/mindee/product/proof_of_address/proof_of_address_v1_document.py @@ -1,6 +1,8 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import ( CompanyRegistrationField, DateField, diff --git a/mindee/product/receipt/receipt_v5.py b/mindee/product/receipt/receipt_v5.py index fd24fed9..a11e8754 100644 --- a/mindee/product/receipt/receipt_v5.py +++ b/mindee/product/receipt/receipt_v5.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.receipt.receipt_v5_document import ( ReceiptV5Document, ) diff --git a/mindee/product/receipt/receipt_v5_document.py b/mindee/product/receipt/receipt_v5_document.py index 31a6b3af..a5652c0b 100644 --- a/mindee/product/receipt/receipt_v5_document.py +++ b/mindee/product/receipt/receipt_v5_document.py @@ -1,6 +1,8 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import ( AmountField, ClassificationField, diff --git a/mindee/product/receipt/receipt_v5_line_item.py b/mindee/product/receipt/receipt_v5_line_item.py index 13723175..d2fbbf7e 100644 --- a/mindee/product/receipt/receipt_v5_line_item.py +++ b/mindee/product/receipt/receipt_v5_line_item.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/resume/resume_v1.py b/mindee/product/resume/resume_v1.py index 0abdb6cd..0ad4eca8 100644 --- a/mindee/product/resume/resume_v1.py +++ b/mindee/product/resume/resume_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.resume.resume_v1_document import ( ResumeV1Document, ) diff --git a/mindee/product/resume/resume_v1_certificate.py b/mindee/product/resume/resume_v1_certificate.py index e5ce1747..bc5c3282 100644 --- a/mindee/product/resume/resume_v1_certificate.py +++ b/mindee/product/resume/resume_v1_certificate.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import FieldConfidenceMixin, FieldPositionMixin +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import FieldConfidenceMixin, FieldPositionMixin class ResumeV1Certificate(FieldPositionMixin, FieldConfidenceMixin): diff --git a/mindee/product/resume/resume_v1_document.py b/mindee/product/resume/resume_v1_document.py index 00c7ce56..d04b509e 100644 --- a/mindee/product/resume/resume_v1_document.py +++ b/mindee/product/resume/resume_v1_document.py @@ -1,6 +1,8 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import ClassificationField, StringField from mindee.product.resume.resume_v1_certificate import ResumeV1Certificate from mindee.product.resume.resume_v1_education import ResumeV1Education diff --git a/mindee/product/resume/resume_v1_education.py b/mindee/product/resume/resume_v1_education.py index bd2612ae..9f15ba85 100644 --- a/mindee/product/resume/resume_v1_education.py +++ b/mindee/product/resume/resume_v1_education.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import FieldConfidenceMixin, FieldPositionMixin +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import FieldConfidenceMixin, FieldPositionMixin class ResumeV1Education(FieldPositionMixin, FieldConfidenceMixin): diff --git a/mindee/product/resume/resume_v1_language.py b/mindee/product/resume/resume_v1_language.py index 722d8796..d08a1485 100644 --- a/mindee/product/resume/resume_v1_language.py +++ b/mindee/product/resume/resume_v1_language.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import FieldConfidenceMixin, FieldPositionMixin +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import FieldConfidenceMixin, FieldPositionMixin class ResumeV1Language(FieldPositionMixin, FieldConfidenceMixin): diff --git a/mindee/product/resume/resume_v1_professional_experience.py b/mindee/product/resume/resume_v1_professional_experience.py index b3d42605..c19d042d 100644 --- a/mindee/product/resume/resume_v1_professional_experience.py +++ b/mindee/product/resume/resume_v1_professional_experience.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import FieldConfidenceMixin, FieldPositionMixin +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import FieldConfidenceMixin, FieldPositionMixin class ResumeV1ProfessionalExperience(FieldPositionMixin, FieldConfidenceMixin): diff --git a/mindee/product/resume/resume_v1_social_networks_url.py b/mindee/product/resume/resume_v1_social_networks_url.py index 4116f220..b5669765 100644 --- a/mindee/product/resume/resume_v1_social_networks_url.py +++ b/mindee/product/resume/resume_v1_social_networks_url.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import FieldConfidenceMixin, FieldPositionMixin +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import FieldConfidenceMixin, FieldPositionMixin class ResumeV1SocialNetworksUrl(FieldPositionMixin, FieldConfidenceMixin): diff --git a/mindee/product/us/bank_check/bank_check_v1.py b/mindee/product/us/bank_check/bank_check_v1.py index f80f94da..a48d3315 100644 --- a/mindee/product/us/bank_check/bank_check_v1.py +++ b/mindee/product/us/bank_check/bank_check_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.us.bank_check.bank_check_v1_document import ( BankCheckV1Document, ) diff --git a/mindee/product/us/bank_check/bank_check_v1_document.py b/mindee/product/us/bank_check/bank_check_v1_document.py index b24e20c3..a6b7a071 100644 --- a/mindee/product/us/bank_check/bank_check_v1_document.py +++ b/mindee/product/us/bank_check/bank_check_v1_document.py @@ -1,6 +1,8 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import AmountField, DateField, StringField diff --git a/mindee/product/us/bank_check/bank_check_v1_page.py b/mindee/product/us/bank_check/bank_check_v1_page.py index 58d26e61..9bb03e4f 100644 --- a/mindee/product/us/bank_check/bank_check_v1_page.py +++ b/mindee/product/us/bank_check/bank_check_v1_page.py @@ -1,6 +1,7 @@ from typing import List, Optional -from mindee.parsing.common import StringDict, clean_out_string +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import PositionField from mindee.product.us.bank_check.bank_check_v1_document import ( BankCheckV1Document, diff --git a/mindee/product/us/driver_license/driver_license_v1.py b/mindee/product/us/driver_license/driver_license_v1.py index d88707f4..87d4af30 100644 --- a/mindee/product/us/driver_license/driver_license_v1.py +++ b/mindee/product/us/driver_license/driver_license_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.us.driver_license.driver_license_v1_document import ( DriverLicenseV1Document, ) diff --git a/mindee/product/us/driver_license/driver_license_v1_document.py b/mindee/product/us/driver_license/driver_license_v1_document.py index 8af35047..86e6742b 100644 --- a/mindee/product/us/driver_license/driver_license_v1_document.py +++ b/mindee/product/us/driver_license/driver_license_v1_document.py @@ -1,6 +1,8 @@ from typing import Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import DateField, StringField diff --git a/mindee/product/us/driver_license/driver_license_v1_page.py b/mindee/product/us/driver_license/driver_license_v1_page.py index 4e0932ee..819587ba 100644 --- a/mindee/product/us/driver_license/driver_license_v1_page.py +++ b/mindee/product/us/driver_license/driver_license_v1_page.py @@ -1,6 +1,7 @@ from typing import Optional -from mindee.parsing.common import StringDict, clean_out_string +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import PositionField from mindee.product.us.driver_license.driver_license_v1_document import ( DriverLicenseV1Document, diff --git a/mindee/product/us/healthcare_card/healthcare_card_v1.py b/mindee/product/us/healthcare_card/healthcare_card_v1.py index b426028b..71d48a16 100644 --- a/mindee/product/us/healthcare_card/healthcare_card_v1.py +++ b/mindee/product/us/healthcare_card/healthcare_card_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.us.healthcare_card.healthcare_card_v1_document import ( HealthcareCardV1Document, ) diff --git a/mindee/product/us/healthcare_card/healthcare_card_v1_copay.py b/mindee/product/us/healthcare_card/healthcare_card_v1_copay.py index 0e9f4ae7..46da8148 100644 --- a/mindee/product/us/healthcare_card/healthcare_card_v1_copay.py +++ b/mindee/product/us/healthcare_card/healthcare_card_v1_copay.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, diff --git a/mindee/product/us/healthcare_card/healthcare_card_v1_document.py b/mindee/product/us/healthcare_card/healthcare_card_v1_document.py index 2c0eadf0..d3911474 100644 --- a/mindee/product/us/healthcare_card/healthcare_card_v1_document.py +++ b/mindee/product/us/healthcare_card/healthcare_card_v1_document.py @@ -1,6 +1,8 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import DateField, StringField from mindee.product.us.healthcare_card.healthcare_card_v1_copay import ( HealthcareCardV1Copay, diff --git a/mindee/product/us/us_mail/us_mail_v2.py b/mindee/product/us/us_mail/us_mail_v2.py index 6fcc4b7a..ae1a8cca 100644 --- a/mindee/product/us/us_mail/us_mail_v2.py +++ b/mindee/product/us/us_mail/us_mail_v2.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.us.us_mail.us_mail_v2_document import ( UsMailV2Document, ) diff --git a/mindee/product/us/us_mail/us_mail_v2_document.py b/mindee/product/us/us_mail/us_mail_v2_document.py index e41c0d2e..2cd3903b 100644 --- a/mindee/product/us/us_mail/us_mail_v2_document.py +++ b/mindee/product/us/us_mail/us_mail_v2_document.py @@ -1,6 +1,8 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import StringField from mindee.product.us.us_mail.us_mail_v2_recipient_address import ( UsMailV2RecipientAddress, diff --git a/mindee/product/us/us_mail/us_mail_v2_recipient_address.py b/mindee/product/us/us_mail/us_mail_v2_recipient_address.py index 6a59df10..e3f171e0 100644 --- a/mindee/product/us/us_mail/us_mail_v2_recipient_address.py +++ b/mindee/product/us/us_mail/us_mail_v2_recipient_address.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, bool_to_string, diff --git a/mindee/product/us/us_mail/us_mail_v2_sender_address.py b/mindee/product/us/us_mail/us_mail_v2_sender_address.py index 94857063..a2324636 100644 --- a/mindee/product/us/us_mail/us_mail_v2_sender_address.py +++ b/mindee/product/us/us_mail/us_mail_v2_sender_address.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import FieldConfidenceMixin, FieldPositionMixin +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import FieldConfidenceMixin, FieldPositionMixin class UsMailV2SenderAddress(FieldPositionMixin, FieldConfidenceMixin): diff --git a/mindee/product/us/w9/w9_v1.py b/mindee/product/us/w9/w9_v1.py index 551ba278..ef51345c 100644 --- a/mindee/product/us/w9/w9_v1.py +++ b/mindee/product/us/w9/w9_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.us.w9.w9_v1_document import ( W9V1Document, ) diff --git a/mindee/product/us/w9/w9_v1_document.py b/mindee/product/us/w9/w9_v1_document.py index 98f631fd..56c22e8b 100644 --- a/mindee/product/us/w9/w9_v1_document.py +++ b/mindee/product/us/w9/w9_v1_document.py @@ -1,4 +1,4 @@ -from mindee.parsing.common import Prediction +from mindee.parsing.common.prediction import Prediction class W9V1Document(Prediction): diff --git a/mindee/product/us/w9/w9_v1_page.py b/mindee/product/us/w9/w9_v1_page.py index c7a0e43a..6de8e7bd 100644 --- a/mindee/product/us/w9/w9_v1_page.py +++ b/mindee/product/us/w9/w9_v1_page.py @@ -1,6 +1,7 @@ from typing import Optional -from mindee.parsing.common import StringDict, clean_out_string +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.parsing.standard import PositionField, StringField from mindee.product.us.w9.w9_v1_document import ( W9V1Document, From cf3c878c4f86e978c330d2b6c7a230ffe82bcbb9 Mon Sep 17 00:00:00 2001 From: sebastianMindee Date: Fri, 22 Nov 2024 14:59:19 +0100 Subject: [PATCH 3/7] fix lint --- .../barcode_reader_v1_document.py | 2 +- .../bill_of_lading_v1_document.py | 3 ++- .../business_card/business_card_v1_document.py | 2 +- mindee/product/cropper/cropper_v1_page.py | 2 +- .../delivery_note/delivery_note_v1_document.py | 4 +++- .../driver_license_v1_document.py | 3 ++- .../driver_license/driver_license_v1_page.py | 2 +- .../license_plate/license_plate_v1_document.py | 2 +- .../financial_document_v1_document.py | 18 ++++++++---------- .../bank_account_details_v1_document.py | 2 +- .../bank_account_details_v2_document.py | 2 +- .../fr/carte_grise/carte_grise_v1_document.py | 3 ++- .../carte_vitale/carte_vitale_v1_document.py | 3 ++- .../fr/energy_bill/energy_bill_v1_document.py | 4 +++- .../product/fr/id_card/id_card_v1_document.py | 3 ++- mindee/product/fr/id_card/id_card_v1_page.py | 2 +- .../product/fr/id_card/id_card_v2_document.py | 3 ++- mindee/product/fr/id_card/id_card_v2_page.py | 2 +- .../indian_passport_v1_document.py | 4 +++- .../international_id_v2_document.py | 4 +++- mindee/product/invoice/invoice_v4_document.py | 18 ++++++++---------- .../material_certificate_v1_document.py | 2 +- .../multi_receipts_detector_v1_document.py | 2 +- .../nutrition_facts_label_v1_document.py | 2 +- .../product/passport/passport_v1_document.py | 3 ++- .../proof_of_address_v1_document.py | 10 ++++------ mindee/product/receipt/receipt_v5_document.py | 16 +++++++--------- mindee/product/resume/resume_v1_document.py | 3 ++- .../us/bank_check/bank_check_v1_document.py | 4 +++- .../us/bank_check/bank_check_v1_page.py | 2 +- .../driver_license_v1_document.py | 3 ++- .../driver_license/driver_license_v1_page.py | 2 +- .../healthcare_card_v1_document.py | 3 ++- .../product/us/us_mail/us_mail_v2_document.py | 2 +- mindee/product/us/w9/w9_v1_page.py | 3 ++- 35 files changed, 79 insertions(+), 66 deletions(-) diff --git a/mindee/product/barcode_reader/barcode_reader_v1_document.py b/mindee/product/barcode_reader/barcode_reader_v1_document.py index 56876cb2..d78759f3 100644 --- a/mindee/product/barcode_reader/barcode_reader_v1_document.py +++ b/mindee/product/barcode_reader/barcode_reader_v1_document.py @@ -3,7 +3,7 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import StringField +from mindee.parsing.standard.text import StringField class BarcodeReaderV1Document(Prediction): diff --git a/mindee/product/bill_of_lading/bill_of_lading_v1_document.py b/mindee/product/bill_of_lading/bill_of_lading_v1_document.py index e6426a3c..1e194ada 100644 --- a/mindee/product/bill_of_lading/bill_of_lading_v1_document.py +++ b/mindee/product/bill_of_lading/bill_of_lading_v1_document.py @@ -3,7 +3,8 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import DateField, StringField +from mindee.parsing.standard.date import DateField +from mindee.parsing.standard.text import StringField from mindee.product.bill_of_lading.bill_of_lading_v1_carrier import ( BillOfLadingV1Carrier, ) diff --git a/mindee/product/business_card/business_card_v1_document.py b/mindee/product/business_card/business_card_v1_document.py index 30a9e857..4420edd6 100644 --- a/mindee/product/business_card/business_card_v1_document.py +++ b/mindee/product/business_card/business_card_v1_document.py @@ -3,7 +3,7 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import StringField +from mindee.parsing.standard.text import StringField class BusinessCardV1Document(Prediction): diff --git a/mindee/product/cropper/cropper_v1_page.py b/mindee/product/cropper/cropper_v1_page.py index 81de1132..7081220c 100644 --- a/mindee/product/cropper/cropper_v1_page.py +++ b/mindee/product/cropper/cropper_v1_page.py @@ -2,7 +2,7 @@ from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import PositionField +from mindee.parsing.standard.position import PositionField from mindee.product.cropper.cropper_v1_document import ( CropperV1Document, ) diff --git a/mindee/product/delivery_note/delivery_note_v1_document.py b/mindee/product/delivery_note/delivery_note_v1_document.py index 4461081f..0b42de9c 100644 --- a/mindee/product/delivery_note/delivery_note_v1_document.py +++ b/mindee/product/delivery_note/delivery_note_v1_document.py @@ -3,7 +3,9 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import AmountField, DateField, StringField +from mindee.parsing.standard.amount import AmountField +from mindee.parsing.standard.date import DateField +from mindee.parsing.standard.text import StringField class DeliveryNoteV1Document(Prediction): diff --git a/mindee/product/eu/driver_license/driver_license_v1_document.py b/mindee/product/eu/driver_license/driver_license_v1_document.py index 0bab8925..6754dec1 100644 --- a/mindee/product/eu/driver_license/driver_license_v1_document.py +++ b/mindee/product/eu/driver_license/driver_license_v1_document.py @@ -3,7 +3,8 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import DateField, StringField +from mindee.parsing.standard.date import DateField +from mindee.parsing.standard.text import StringField class DriverLicenseV1Document(Prediction): diff --git a/mindee/product/eu/driver_license/driver_license_v1_page.py b/mindee/product/eu/driver_license/driver_license_v1_page.py index e901ca87..0b1d35c5 100644 --- a/mindee/product/eu/driver_license/driver_license_v1_page.py +++ b/mindee/product/eu/driver_license/driver_license_v1_page.py @@ -2,7 +2,7 @@ from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import PositionField +from mindee.parsing.standard.position import PositionField from mindee.product.eu.driver_license.driver_license_v1_document import ( DriverLicenseV1Document, ) diff --git a/mindee/product/eu/license_plate/license_plate_v1_document.py b/mindee/product/eu/license_plate/license_plate_v1_document.py index 6288c6f5..7d38a646 100644 --- a/mindee/product/eu/license_plate/license_plate_v1_document.py +++ b/mindee/product/eu/license_plate/license_plate_v1_document.py @@ -3,7 +3,7 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import StringField +from mindee.parsing.standard.text import StringField class LicensePlateV1Document(Prediction): diff --git a/mindee/product/financial_document/financial_document_v1_document.py b/mindee/product/financial_document/financial_document_v1_document.py index 019e10b6..c4a4dccb 100644 --- a/mindee/product/financial_document/financial_document_v1_document.py +++ b/mindee/product/financial_document/financial_document_v1_document.py @@ -3,16 +3,14 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import ( - AmountField, - ClassificationField, - CompanyRegistrationField, - DateField, - LocaleField, - PaymentDetailsField, - StringField, - Taxes, -) +from mindee.parsing.standard.amount import AmountField +from mindee.parsing.standard.classification import ClassificationField +from mindee.parsing.standard.company_registration import CompanyRegistrationField +from mindee.parsing.standard.date import DateField +from mindee.parsing.standard.locale import LocaleField +from mindee.parsing.standard.payment_details import PaymentDetailsField +from mindee.parsing.standard.tax import Taxes +from mindee.parsing.standard.text import StringField from mindee.product.financial_document.financial_document_v1_line_item import ( FinancialDocumentV1LineItem, ) diff --git a/mindee/product/fr/bank_account_details/bank_account_details_v1_document.py b/mindee/product/fr/bank_account_details/bank_account_details_v1_document.py index 13a1519e..4a43b3e1 100644 --- a/mindee/product/fr/bank_account_details/bank_account_details_v1_document.py +++ b/mindee/product/fr/bank_account_details/bank_account_details_v1_document.py @@ -3,7 +3,7 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import StringField +from mindee.parsing.standard.text import StringField class BankAccountDetailsV1Document(Prediction): diff --git a/mindee/product/fr/bank_account_details/bank_account_details_v2_document.py b/mindee/product/fr/bank_account_details/bank_account_details_v2_document.py index f2550ff3..53d996f9 100644 --- a/mindee/product/fr/bank_account_details/bank_account_details_v2_document.py +++ b/mindee/product/fr/bank_account_details/bank_account_details_v2_document.py @@ -3,7 +3,7 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import StringField +from mindee.parsing.standard.text import StringField from mindee.product.fr.bank_account_details.bank_account_details_v2_bban import ( BankAccountDetailsV2Bban, ) diff --git a/mindee/product/fr/carte_grise/carte_grise_v1_document.py b/mindee/product/fr/carte_grise/carte_grise_v1_document.py index 2b1fec85..bd8a573c 100644 --- a/mindee/product/fr/carte_grise/carte_grise_v1_document.py +++ b/mindee/product/fr/carte_grise/carte_grise_v1_document.py @@ -3,7 +3,8 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import DateField, StringField +from mindee.parsing.standard.date import DateField +from mindee.parsing.standard.text import StringField class CarteGriseV1Document(Prediction): diff --git a/mindee/product/fr/carte_vitale/carte_vitale_v1_document.py b/mindee/product/fr/carte_vitale/carte_vitale_v1_document.py index 0416da60..0120f23d 100644 --- a/mindee/product/fr/carte_vitale/carte_vitale_v1_document.py +++ b/mindee/product/fr/carte_vitale/carte_vitale_v1_document.py @@ -3,7 +3,8 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import DateField, StringField +from mindee.parsing.standard.date import DateField +from mindee.parsing.standard.text import StringField class CarteVitaleV1Document(Prediction): diff --git a/mindee/product/fr/energy_bill/energy_bill_v1_document.py b/mindee/product/fr/energy_bill/energy_bill_v1_document.py index d58ae11c..1fcff58e 100644 --- a/mindee/product/fr/energy_bill/energy_bill_v1_document.py +++ b/mindee/product/fr/energy_bill/energy_bill_v1_document.py @@ -3,7 +3,9 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import AmountField, DateField, StringField +from mindee.parsing.standard.amount import AmountField +from mindee.parsing.standard.date import DateField +from mindee.parsing.standard.text import StringField from mindee.product.fr.energy_bill.energy_bill_v1_energy_consumer import ( EnergyBillV1EnergyConsumer, ) diff --git a/mindee/product/fr/id_card/id_card_v1_document.py b/mindee/product/fr/id_card/id_card_v1_document.py index 24f66afc..a52d453b 100644 --- a/mindee/product/fr/id_card/id_card_v1_document.py +++ b/mindee/product/fr/id_card/id_card_v1_document.py @@ -3,7 +3,8 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import DateField, StringField +from mindee.parsing.standard.date import DateField +from mindee.parsing.standard.text import StringField class IdCardV1Document(Prediction): diff --git a/mindee/product/fr/id_card/id_card_v1_page.py b/mindee/product/fr/id_card/id_card_v1_page.py index 13879734..f82e7672 100644 --- a/mindee/product/fr/id_card/id_card_v1_page.py +++ b/mindee/product/fr/id_card/id_card_v1_page.py @@ -2,7 +2,7 @@ from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import ClassificationField +from mindee.parsing.standard.classification import ClassificationField from mindee.product.fr.id_card.id_card_v1_document import ( IdCardV1Document, ) diff --git a/mindee/product/fr/id_card/id_card_v2_document.py b/mindee/product/fr/id_card/id_card_v2_document.py index 6f955ea9..622264cd 100644 --- a/mindee/product/fr/id_card/id_card_v2_document.py +++ b/mindee/product/fr/id_card/id_card_v2_document.py @@ -3,7 +3,8 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import DateField, StringField +from mindee.parsing.standard.date import DateField +from mindee.parsing.standard.text import StringField class IdCardV2Document(Prediction): diff --git a/mindee/product/fr/id_card/id_card_v2_page.py b/mindee/product/fr/id_card/id_card_v2_page.py index 96e86d94..5c5758e0 100644 --- a/mindee/product/fr/id_card/id_card_v2_page.py +++ b/mindee/product/fr/id_card/id_card_v2_page.py @@ -2,7 +2,7 @@ from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import ClassificationField +from mindee.parsing.standard.classification import ClassificationField from mindee.product.fr.id_card.id_card_v2_document import ( IdCardV2Document, ) diff --git a/mindee/product/ind/indian_passport/indian_passport_v1_document.py b/mindee/product/ind/indian_passport/indian_passport_v1_document.py index 320b77dc..7758ac20 100644 --- a/mindee/product/ind/indian_passport/indian_passport_v1_document.py +++ b/mindee/product/ind/indian_passport/indian_passport_v1_document.py @@ -3,7 +3,9 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import ClassificationField, DateField, StringField +from mindee.parsing.standard.classification import ClassificationField +from mindee.parsing.standard.date import DateField +from mindee.parsing.standard.text import StringField class IndianPassportV1Document(Prediction): diff --git a/mindee/product/international_id/international_id_v2_document.py b/mindee/product/international_id/international_id_v2_document.py index 75c163b6..071b0638 100644 --- a/mindee/product/international_id/international_id_v2_document.py +++ b/mindee/product/international_id/international_id_v2_document.py @@ -3,7 +3,9 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import ClassificationField, DateField, StringField +from mindee.parsing.standard.classification import ClassificationField +from mindee.parsing.standard.date import DateField +from mindee.parsing.standard.text import StringField class InternationalIdV2Document(Prediction): diff --git a/mindee/product/invoice/invoice_v4_document.py b/mindee/product/invoice/invoice_v4_document.py index e322475c..ed2cfbf2 100644 --- a/mindee/product/invoice/invoice_v4_document.py +++ b/mindee/product/invoice/invoice_v4_document.py @@ -3,16 +3,14 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import ( - AmountField, - ClassificationField, - CompanyRegistrationField, - DateField, - LocaleField, - PaymentDetailsField, - StringField, - Taxes, -) +from mindee.parsing.standard.amount import AmountField +from mindee.parsing.standard.classification import ClassificationField +from mindee.parsing.standard.company_registration import CompanyRegistrationField +from mindee.parsing.standard.date import DateField +from mindee.parsing.standard.locale import LocaleField +from mindee.parsing.standard.payment_details import PaymentDetailsField +from mindee.parsing.standard.tax import Taxes +from mindee.parsing.standard.text import StringField from mindee.product.invoice.invoice_v4_line_item import InvoiceV4LineItem diff --git a/mindee/product/material_certificate/material_certificate_v1_document.py b/mindee/product/material_certificate/material_certificate_v1_document.py index ac7188dc..78c5d657 100644 --- a/mindee/product/material_certificate/material_certificate_v1_document.py +++ b/mindee/product/material_certificate/material_certificate_v1_document.py @@ -3,7 +3,7 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import StringField +from mindee.parsing.standard.text import StringField class MaterialCertificateV1Document(Prediction): diff --git a/mindee/product/multi_receipts_detector/multi_receipts_detector_v1_document.py b/mindee/product/multi_receipts_detector/multi_receipts_detector_v1_document.py index 85d61a99..30891025 100644 --- a/mindee/product/multi_receipts_detector/multi_receipts_detector_v1_document.py +++ b/mindee/product/multi_receipts_detector/multi_receipts_detector_v1_document.py @@ -3,7 +3,7 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import PositionField +from mindee.parsing.standard.position import PositionField class MultiReceiptsDetectorV1Document(Prediction): diff --git a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_document.py b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_document.py index b145ae70..2cd74147 100644 --- a/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_document.py +++ b/mindee/product/nutrition_facts_label/nutrition_facts_label_v1_document.py @@ -3,7 +3,7 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import AmountField +from mindee.parsing.standard.amount import AmountField from mindee.product.nutrition_facts_label.nutrition_facts_label_v1_added_sugar import ( NutritionFactsLabelV1AddedSugar, ) diff --git a/mindee/product/passport/passport_v1_document.py b/mindee/product/passport/passport_v1_document.py index dbcdc408..1a576e60 100644 --- a/mindee/product/passport/passport_v1_document.py +++ b/mindee/product/passport/passport_v1_document.py @@ -3,7 +3,8 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import DateField, StringField +from mindee.parsing.standard.date import DateField +from mindee.parsing.standard.text import StringField class PassportV1Document(Prediction): diff --git a/mindee/product/proof_of_address/proof_of_address_v1_document.py b/mindee/product/proof_of_address/proof_of_address_v1_document.py index c2f7ef03..8ebbf710 100644 --- a/mindee/product/proof_of_address/proof_of_address_v1_document.py +++ b/mindee/product/proof_of_address/proof_of_address_v1_document.py @@ -3,12 +3,10 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import ( - CompanyRegistrationField, - DateField, - LocaleField, - StringField, -) +from mindee.parsing.standard.company_registration import CompanyRegistrationField +from mindee.parsing.standard.date import DateField +from mindee.parsing.standard.locale import LocaleField +from mindee.parsing.standard.text import StringField class ProofOfAddressV1Document(Prediction): diff --git a/mindee/product/receipt/receipt_v5_document.py b/mindee/product/receipt/receipt_v5_document.py index a5652c0b..6d6db0fd 100644 --- a/mindee/product/receipt/receipt_v5_document.py +++ b/mindee/product/receipt/receipt_v5_document.py @@ -3,15 +3,13 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import ( - AmountField, - ClassificationField, - CompanyRegistrationField, - DateField, - LocaleField, - StringField, - Taxes, -) +from mindee.parsing.standard.amount import AmountField +from mindee.parsing.standard.classification import ClassificationField +from mindee.parsing.standard.company_registration import CompanyRegistrationField +from mindee.parsing.standard.date import DateField +from mindee.parsing.standard.locale import LocaleField +from mindee.parsing.standard.tax import Taxes +from mindee.parsing.standard.text import StringField from mindee.product.receipt.receipt_v5_line_item import ReceiptV5LineItem diff --git a/mindee/product/resume/resume_v1_document.py b/mindee/product/resume/resume_v1_document.py index d04b509e..902868e2 100644 --- a/mindee/product/resume/resume_v1_document.py +++ b/mindee/product/resume/resume_v1_document.py @@ -3,7 +3,8 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import ClassificationField, StringField +from mindee.parsing.standard.classification import ClassificationField +from mindee.parsing.standard.text import StringField from mindee.product.resume.resume_v1_certificate import ResumeV1Certificate from mindee.product.resume.resume_v1_education import ResumeV1Education from mindee.product.resume.resume_v1_language import ResumeV1Language diff --git a/mindee/product/us/bank_check/bank_check_v1_document.py b/mindee/product/us/bank_check/bank_check_v1_document.py index a6b7a071..fff0b790 100644 --- a/mindee/product/us/bank_check/bank_check_v1_document.py +++ b/mindee/product/us/bank_check/bank_check_v1_document.py @@ -3,7 +3,9 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import AmountField, DateField, StringField +from mindee.parsing.standard.amount import AmountField +from mindee.parsing.standard.date import DateField +from mindee.parsing.standard.text import StringField class BankCheckV1Document(Prediction): diff --git a/mindee/product/us/bank_check/bank_check_v1_page.py b/mindee/product/us/bank_check/bank_check_v1_page.py index 9bb03e4f..79300da5 100644 --- a/mindee/product/us/bank_check/bank_check_v1_page.py +++ b/mindee/product/us/bank_check/bank_check_v1_page.py @@ -2,7 +2,7 @@ from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import PositionField +from mindee.parsing.standard.position import PositionField from mindee.product.us.bank_check.bank_check_v1_document import ( BankCheckV1Document, ) diff --git a/mindee/product/us/driver_license/driver_license_v1_document.py b/mindee/product/us/driver_license/driver_license_v1_document.py index 86e6742b..38f0905a 100644 --- a/mindee/product/us/driver_license/driver_license_v1_document.py +++ b/mindee/product/us/driver_license/driver_license_v1_document.py @@ -3,7 +3,8 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import DateField, StringField +from mindee.parsing.standard.date import DateField +from mindee.parsing.standard.text import StringField class DriverLicenseV1Document(Prediction): diff --git a/mindee/product/us/driver_license/driver_license_v1_page.py b/mindee/product/us/driver_license/driver_license_v1_page.py index 819587ba..ded1b300 100644 --- a/mindee/product/us/driver_license/driver_license_v1_page.py +++ b/mindee/product/us/driver_license/driver_license_v1_page.py @@ -2,7 +2,7 @@ from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import PositionField +from mindee.parsing.standard.position import PositionField from mindee.product.us.driver_license.driver_license_v1_document import ( DriverLicenseV1Document, ) diff --git a/mindee/product/us/healthcare_card/healthcare_card_v1_document.py b/mindee/product/us/healthcare_card/healthcare_card_v1_document.py index d3911474..25e51f19 100644 --- a/mindee/product/us/healthcare_card/healthcare_card_v1_document.py +++ b/mindee/product/us/healthcare_card/healthcare_card_v1_document.py @@ -3,7 +3,8 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import DateField, StringField +from mindee.parsing.standard.date import DateField +from mindee.parsing.standard.text import StringField from mindee.product.us.healthcare_card.healthcare_card_v1_copay import ( HealthcareCardV1Copay, ) diff --git a/mindee/product/us/us_mail/us_mail_v2_document.py b/mindee/product/us/us_mail/us_mail_v2_document.py index 2cd3903b..f551daa1 100644 --- a/mindee/product/us/us_mail/us_mail_v2_document.py +++ b/mindee/product/us/us_mail/us_mail_v2_document.py @@ -3,7 +3,7 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import StringField +from mindee.parsing.standard.text import StringField from mindee.product.us.us_mail.us_mail_v2_recipient_address import ( UsMailV2RecipientAddress, ) diff --git a/mindee/product/us/w9/w9_v1_page.py b/mindee/product/us/w9/w9_v1_page.py index 6de8e7bd..1c5cf585 100644 --- a/mindee/product/us/w9/w9_v1_page.py +++ b/mindee/product/us/w9/w9_v1_page.py @@ -2,7 +2,8 @@ from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard import PositionField, StringField +from mindee.parsing.standard.position import PositionField +from mindee.parsing.standard.text import StringField from mindee.product.us.w9.w9_v1_document import ( W9V1Document, ) From c4b3dcea771c8117b0c47e2e73942a4b65e4371c Mon Sep 17 00:00:00 2001 From: sebastianMindee Date: Fri, 22 Nov 2024 15:46:45 +0100 Subject: [PATCH 4/7] fix more import paths --- ...auto_invoice_splitter_extraction_example.py | 5 +++-- mindee/client.py | 8 ++++---- mindee/extraction/common/extracted_image.py | 4 ++-- mindee/extraction/common/image_extractor.py | 7 ++++--- .../multi_receipts_extractor.py | 6 +++--- .../extraction/pdf_extractor/extracted_pdf.py | 4 ++-- .../extraction/pdf_extractor/pdf_extractor.py | 2 +- mindee/input/local_response.py | 2 +- mindee/mindee_http/response_validation.py | 2 +- mindee/product/custom/custom_v1_page.py | 2 +- .../fr/petrol_receipt/petrol_receipt_v1.py | 4 +++- .../petrol_receipt_v1_document.py | 13 ++++++------- .../petrol_receipt/petrol_receipt_v1_fuel.py | 5 +++-- .../petrol_receipt/petrol_receipt_v1_total.py | 8 ++++---- .../international_id/international_id_v1.py | 4 +++- .../international_id_v1_document.py | 8 ++++++-- .../invoice_splitter/invoice_splitter_v1.py | 4 +++- .../invoice_splitter_v1_document.py | 4 +++- .../invoice_splitter_v1_page_group.py | 2 +- mindee/product/receipt/receipt_v4.py | 4 +++- mindee/product/receipt/receipt_v4_document.py | 18 +++++++++--------- tests/api/test_response.py | 2 +- tests/extraction/test_image_extractor.py | 6 +++--- .../test_invoice_splitter_auto_extraction.py | 7 ++++--- .../test_multi_receipts_extractor.py | 6 ++++-- tests/extraction/test_pdf_extractor.py | 8 ++++++-- tests/extras/test_extras_integration.py | 3 ++- tests/extras/test_full_text_ocr.py | 4 ++-- tests/input/test_local_response.py | 2 +- .../barcode_reader/test_barcode_reader_v1.py | 2 +- .../test_barcode_reader_v1_regression.py | 2 +- .../bill_of_lading/test_bill_of_lading_v1.py | 2 +- .../business_card/test_business_card_v1.py | 2 +- tests/product/cropper/test_cropper_v1.py | 2 +- .../cropper/test_cropper_v1_regression.py | 2 +- tests/product/custom/test_custom_v1.py | 3 ++- tests/product/custom/test_custom_v1_v2.py | 3 ++- .../delivery_note/test_delivery_note_v1.py | 2 +- .../driver_license/test_driver_license_v1.py | 2 +- .../eu/license_plate/test_license_plate_v1.py | 2 +- .../test_financial_document_v1.py | 2 +- .../test_financial_document_v1_regression.py | 2 +- .../test_bank_account_details_v1.py | 4 +++- .../test_bank_account_details_v2.py | 4 +++- .../fr/carte_grise/test_carte_grise_v1.py | 2 +- .../fr/carte_vitale/test_carte_vitale_v1.py | 2 +- .../fr/energy_bill/test_energy_bill_v1.py | 2 +- tests/product/fr/id_card/test_id_card_v1.py | 2 +- tests/product/fr/id_card/test_id_card_v2.py | 2 +- tests/product/fr/payslip/test_payslip_v2.py | 2 +- .../indian_passport/test_indian_passport_v1.py | 2 +- .../test_international_id_v1.py | 2 +- .../test_international_id_v2.py | 2 +- tests/product/invoice/test_invoice_v4.py | 2 +- .../invoice/test_invoice_v4_regression.py | 2 +- .../test_invoice_splitter_v1_regression.py | 2 +- .../test_material_certificate_v1.py | 4 +++- .../test_multi_receipts_detector_v1.py | 4 +++- ...st_multi_receipts_detector_v1_regression.py | 4 +++- .../test_nutrition_facts_label_v1.py | 4 +++- tests/product/passport/test_passport_v1.py | 2 +- .../passport/test_passport_v1_regression.py | 2 +- .../test_proof_of_address_v1.py | 2 +- tests/product/receipt/test_receipt_v5.py | 2 +- .../receipt/test_receipt_v5_regression.py | 2 +- tests/product/resume/test_resume_v1.py | 2 +- .../us/bank_check/test_bank_check_v1.py | 2 +- .../driver_license/test_driver_license_v1.py | 2 +- .../healthcare_card/test_healthcare_card_v1.py | 2 +- tests/product/us/us_mail/test_us_mail_v2.py | 2 +- tests/product/us/w9/test_w9_v1.py | 2 +- tests/test_client.py | 5 +++-- 72 files changed, 148 insertions(+), 109 deletions(-) diff --git a/examples/auto_invoice_splitter_extraction_example.py b/examples/auto_invoice_splitter_extraction_example.py index 69267c4b..2c02225f 100644 --- a/examples/auto_invoice_splitter_extraction_example.py +++ b/examples/auto_invoice_splitter_extraction_example.py @@ -1,7 +1,8 @@ from mindee import Client from mindee.extraction.pdf_extractor import PdfExtractor -from mindee.input import PathInput -from mindee.product import InvoiceSplitterV1, InvoiceV4 +from mindee.input.sources import PathInput +from mindee.product.invoice import InvoiceV4 +from mindee.product.invoice_splitter import InvoiceSplitterV1 mindee_client = Client(api_key="my-api-key") # mindee_client = Client() # Optionally, set from env. diff --git a/mindee/client.py b/mindee/client.py index ca2a0560..3edd23e0 100644 --- a/mindee/client.py +++ b/mindee/client.py @@ -4,7 +4,7 @@ from mindee.error.mindee_error import MindeeClientError, MindeeError from mindee.error.mindee_http_error import handle_error -from mindee.input import LocalResponse +from mindee.input.local_response import LocalResponse from mindee.input.page_options import PageOptions from mindee.input.sources import ( Base64Input, @@ -15,13 +15,13 @@ UrlInputSource, ) from mindee.logger import logger -from mindee.mindee_http import ( +from mindee.mindee_http.endpoint import CustomEndpoint, Endpoint +from mindee.mindee_http.mindee_api import MindeeApi +from mindee.mindee_http.response_validation import ( clean_request_json, is_valid_async_response, is_valid_sync_response, ) -from mindee.mindee_http.endpoint import CustomEndpoint, Endpoint -from mindee.mindee_http.mindee_api import MindeeApi from mindee.parsing.common.async_predict_response import AsyncPredictResponse from mindee.parsing.common.feedback_response import FeedbackResponse from mindee.parsing.common.inference import Inference diff --git a/mindee/extraction/common/extracted_image.py b/mindee/extraction/common/extracted_image.py index 43c434fb..3d6b6f22 100644 --- a/mindee/extraction/common/extracted_image.py +++ b/mindee/extraction/common/extracted_image.py @@ -4,8 +4,8 @@ from PIL import Image -from mindee.error import MindeeError -from mindee.input import FileInput, LocalInputSource +from mindee.error.mindee_error import MindeeError +from mindee.input.sources import FileInput, LocalInputSource from mindee.logger import logger diff --git a/mindee/extraction/common/image_extractor.py b/mindee/extraction/common/image_extractor.py index 2b4869d2..046b312c 100644 --- a/mindee/extraction/common/image_extractor.py +++ b/mindee/extraction/common/image_extractor.py @@ -4,10 +4,11 @@ import pypdfium2 as pdfium from PIL import Image -from mindee.error import MindeeError +from mindee.error.mindee_error import MindeeError from mindee.extraction.common.extracted_image import ExtractedImage -from mindee.geometry import Point, get_min_max_x, get_min_max_y -from mindee.input import BytesInput, LocalInputSource +from mindee.geometry.point import Point +from mindee.geometry.polygon import get_min_max_x, get_min_max_y +from mindee.input.sources import BytesInput, LocalInputSource def attach_image_as_new_file( # type: ignore diff --git a/mindee/extraction/multi_receipts_extractor/multi_receipts_extractor.py b/mindee/extraction/multi_receipts_extractor/multi_receipts_extractor.py index 6f380499..89ad63b9 100644 --- a/mindee/extraction/multi_receipts_extractor/multi_receipts_extractor.py +++ b/mindee/extraction/multi_receipts_extractor/multi_receipts_extractor.py @@ -1,12 +1,12 @@ from typing import List -from mindee.error import MindeeError +from mindee.error.mindee_error import MindeeError from mindee.extraction.common.extracted_image import ExtractedImage from mindee.extraction.common.image_extractor import ( extract_multiple_images_from_source, ) -from mindee.input import LocalInputSource -from mindee.parsing.common import Inference +from mindee.input.sources import LocalInputSource +from mindee.parsing.common.inference import Inference def extract_receipts( diff --git a/mindee/extraction/pdf_extractor/extracted_pdf.py b/mindee/extraction/pdf_extractor/extracted_pdf.py index 353e2868..fd02ce90 100644 --- a/mindee/extraction/pdf_extractor/extracted_pdf.py +++ b/mindee/extraction/pdf_extractor/extracted_pdf.py @@ -3,8 +3,8 @@ import pypdfium2 as pdfium -from mindee.error import MindeeError -from mindee.input import BytesInput +from mindee.error.mindee_error import MindeeError +from mindee.input.sources import BytesInput class ExtractedPdf: diff --git a/mindee/extraction/pdf_extractor/pdf_extractor.py b/mindee/extraction/pdf_extractor/pdf_extractor.py index ebd1983f..8bc6df87 100644 --- a/mindee/extraction/pdf_extractor/pdf_extractor.py +++ b/mindee/extraction/pdf_extractor/pdf_extractor.py @@ -5,7 +5,7 @@ import pypdfium2 as pdfium from PIL import Image -from mindee.error import MindeeError +from mindee.error.mindee_error import MindeeError from mindee.extraction.pdf_extractor.extracted_pdf import ExtractedPdf from mindee.input.sources import LocalInputSource from mindee.product.invoice_splitter import InvoiceSplitterV1PageGroup diff --git a/mindee/input/local_response.py b/mindee/input/local_response.py index 1ac46b69..bb57420c 100644 --- a/mindee/input/local_response.py +++ b/mindee/input/local_response.py @@ -6,7 +6,7 @@ from pathlib import Path from typing import Any, BinaryIO, Dict, Union -from mindee.error import MindeeError +from mindee.error.mindee_error import MindeeError class LocalResponse: diff --git a/mindee/mindee_http/response_validation.py b/mindee/mindee_http/response_validation.py index b0f3ff36..5976a803 100644 --- a/mindee/mindee_http/response_validation.py +++ b/mindee/mindee_http/response_validation.py @@ -2,7 +2,7 @@ import requests -from mindee.parsing.common import StringDict +from mindee.parsing.common.string_dict import StringDict def is_valid_sync_response(response: requests.Response) -> bool: diff --git a/mindee/product/custom/custom_v1_page.py b/mindee/product/custom/custom_v1_page.py index adf99ce7..027d2f67 100644 --- a/mindee/product/custom/custom_v1_page.py +++ b/mindee/product/custom/custom_v1_page.py @@ -3,8 +3,8 @@ from mindee.parsing.common.prediction import Prediction from mindee.parsing.common.string_dict import StringDict from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.custom import ListField from mindee.parsing.custom.line_items import CustomLine, get_line_items +from mindee.parsing.custom.list import ListField class CustomV1Page(Prediction): diff --git a/mindee/product/fr/petrol_receipt/petrol_receipt_v1.py b/mindee/product/fr/petrol_receipt/petrol_receipt_v1.py index e4862c77..59435fe8 100644 --- a/mindee/product/fr/petrol_receipt/petrol_receipt_v1.py +++ b/mindee/product/fr/petrol_receipt/petrol_receipt_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.fr.petrol_receipt.petrol_receipt_v1_document import ( PetrolReceiptV1Document, ) diff --git a/mindee/product/fr/petrol_receipt/petrol_receipt_v1_document.py b/mindee/product/fr/petrol_receipt/petrol_receipt_v1_document.py index 80c392d1..ed2138b9 100644 --- a/mindee/product/fr/petrol_receipt/petrol_receipt_v1_document.py +++ b/mindee/product/fr/petrol_receipt/petrol_receipt_v1_document.py @@ -1,7 +1,9 @@ from typing import Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string -from mindee.parsing.standard import AmountField +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string +from mindee.parsing.standard.amount import AmountField from mindee.product.fr.petrol_receipt.petrol_receipt_v1_fuel import PetrolReceiptV1Fuel from mindee.product.fr.petrol_receipt.petrol_receipt_v1_total import ( PetrolReceiptV1Total, @@ -20,17 +22,14 @@ class PetrolReceiptV1Document(Prediction): volume: AmountField """The volume of fuel purchased.""" - def __init__( - self, - raw_prediction: StringDict, - page_id: Optional[int] = None, - ): + def __init__(self, raw_prediction: StringDict, page_id: Optional[int] = None): """ Petrol Receipt document. :param raw_prediction: Raw prediction from HTTP response :param page_id: Page number for multi pages pdf input """ + super().__init__(raw_prediction, page_id) self.fuel = PetrolReceiptV1Fuel( raw_prediction["fuel"], page_id=page_id, diff --git a/mindee/product/fr/petrol_receipt/petrol_receipt_v1_fuel.py b/mindee/product/fr/petrol_receipt/petrol_receipt_v1_fuel.py index 9b64efd9..e45a3f55 100644 --- a/mindee/product/fr/petrol_receipt/petrol_receipt_v1_fuel.py +++ b/mindee/product/fr/petrol_receipt/petrol_receipt_v1_fuel.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string, format_for_display -from mindee.parsing.standard import FieldConfidenceMixin, FieldPositionMixin +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string, format_for_display +from mindee.parsing.standard.base import FieldConfidenceMixin, FieldPositionMixin class PetrolReceiptV1Fuel(FieldPositionMixin, FieldConfidenceMixin): diff --git a/mindee/product/fr/petrol_receipt/petrol_receipt_v1_total.py b/mindee/product/fr/petrol_receipt/petrol_receipt_v1_total.py index 5a5a91f4..33a3bb28 100644 --- a/mindee/product/fr/petrol_receipt/petrol_receipt_v1_total.py +++ b/mindee/product/fr/petrol_receipt/petrol_receipt_v1_total.py @@ -1,7 +1,8 @@ from typing import Dict, Optional -from mindee.parsing.common import StringDict, clean_out_string -from mindee.parsing.standard import ( +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string +from mindee.parsing.standard.base import ( FieldConfidenceMixin, FieldPositionMixin, float_to_string, @@ -37,8 +38,7 @@ def __init__( def _printable_values(self) -> Dict[str, str]: """Return values for printing.""" - out_dict: Dict[str, str] = {} - out_dict["amount"] = float_to_string(self.amount) + out_dict: Dict[str, str] = {"amount": float_to_string(self.amount)} return out_dict def to_field_list(self) -> str: diff --git a/mindee/product/international_id/international_id_v1.py b/mindee/product/international_id/international_id_v1.py index cdc832be..ccb1d7c2 100644 --- a/mindee/product/international_id/international_id_v1.py +++ b/mindee/product/international_id/international_id_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.international_id.international_id_v1_document import ( InternationalIdV1Document, ) diff --git a/mindee/product/international_id/international_id_v1_document.py b/mindee/product/international_id/international_id_v1_document.py index c8fe9ded..0eb2e33c 100644 --- a/mindee/product/international_id/international_id_v1_document.py +++ b/mindee/product/international_id/international_id_v1_document.py @@ -1,7 +1,11 @@ from typing import List, Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string -from mindee.parsing.standard import ClassificationField, DateField, StringField +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string +from mindee.parsing.standard.classification import ClassificationField +from mindee.parsing.standard.date import DateField +from mindee.parsing.standard.text import StringField class InternationalIdV1Document(Prediction): diff --git a/mindee/product/invoice_splitter/invoice_splitter_v1.py b/mindee/product/invoice_splitter/invoice_splitter_v1.py index c88c40ce..478abd09 100644 --- a/mindee/product/invoice_splitter/invoice_splitter_v1.py +++ b/mindee/product/invoice_splitter/invoice_splitter_v1.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.invoice_splitter.invoice_splitter_v1_document import ( InvoiceSplitterV1Document, ) diff --git a/mindee/product/invoice_splitter/invoice_splitter_v1_document.py b/mindee/product/invoice_splitter/invoice_splitter_v1_document.py index 6fee18f9..502c725d 100644 --- a/mindee/product/invoice_splitter/invoice_splitter_v1_document.py +++ b/mindee/product/invoice_splitter/invoice_splitter_v1_document.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Prediction, StringDict, clean_out_string +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string from mindee.product.invoice_splitter.invoice_splitter_v1_page_group import ( InvoiceSplitterV1PageGroup, ) diff --git a/mindee/product/invoice_splitter/invoice_splitter_v1_page_group.py b/mindee/product/invoice_splitter/invoice_splitter_v1_page_group.py index 754c6136..003aec57 100644 --- a/mindee/product/invoice_splitter/invoice_splitter_v1_page_group.py +++ b/mindee/product/invoice_splitter/invoice_splitter_v1_page_group.py @@ -1,6 +1,6 @@ from typing import List -from mindee.parsing.common import StringDict +from mindee.parsing.common.string_dict import StringDict class InvoiceSplitterV1PageGroup: diff --git a/mindee/product/receipt/receipt_v4.py b/mindee/product/receipt/receipt_v4.py index 6b322ae8..8bbf7ecd 100644 --- a/mindee/product/receipt/receipt_v4.py +++ b/mindee/product/receipt/receipt_v4.py @@ -1,6 +1,8 @@ from typing import List -from mindee.parsing.common import Inference, Page, StringDict +from mindee.parsing.common.inference import Inference +from mindee.parsing.common.page import Page +from mindee.parsing.common.string_dict import StringDict from mindee.product.receipt.receipt_v4_document import ReceiptV4Document diff --git a/mindee/product/receipt/receipt_v4_document.py b/mindee/product/receipt/receipt_v4_document.py index c7107800..374083e7 100644 --- a/mindee/product/receipt/receipt_v4_document.py +++ b/mindee/product/receipt/receipt_v4_document.py @@ -1,14 +1,14 @@ from typing import Optional -from mindee.parsing.common import Prediction, StringDict, clean_out_string -from mindee.parsing.standard import ( - AmountField, - ClassificationField, - DateField, - LocaleField, - StringField, - Taxes, -) +from mindee.parsing.common.prediction import Prediction +from mindee.parsing.common.string_dict import StringDict +from mindee.parsing.common.summary_helper import clean_out_string +from mindee.parsing.standard.amount import AmountField +from mindee.parsing.standard.classification import ClassificationField +from mindee.parsing.standard.date import DateField +from mindee.parsing.standard.locale import LocaleField +from mindee.parsing.standard.tax import Taxes +from mindee.parsing.standard.text import StringField class ReceiptV4Document(Prediction): diff --git a/tests/api/test_response.py b/tests/api/test_response.py index 5a4d9eae..bea6548f 100644 --- a/tests/api/test_response.py +++ b/tests/api/test_response.py @@ -1,7 +1,6 @@ import json from mindee.parsing.common.predict_response import PredictResponse -from mindee.product import ReceiptV4 from mindee.product.financial_document.financial_document_v1 import FinancialDocumentV1 from mindee.product.financial_document.financial_document_v1_document import ( FinancialDocumentV1Document, @@ -13,6 +12,7 @@ from mindee.product.invoice.invoice_v4_document import InvoiceV4Document from mindee.product.passport.passport_v1 import PassportV1 from mindee.product.passport.passport_v1_document import PassportV1Document +from mindee.product.receipt.receipt_v4 import ReceiptV4 from mindee.product.receipt.receipt_v4_document import ReceiptV4Document diff --git a/tests/extraction/test_image_extractor.py b/tests/extraction/test_image_extractor.py index b6509077..f41dc4a4 100644 --- a/tests/extraction/test_image_extractor.py +++ b/tests/extraction/test_image_extractor.py @@ -3,9 +3,9 @@ import pytest from PIL import Image -from mindee.extraction.common import extract_multiple_images_from_source -from mindee.input import PathInput -from mindee.product import BarcodeReaderV1 +from mindee.extraction.common.image_extractor import extract_multiple_images_from_source +from mindee.input.sources import PathInput +from mindee.product.barcode_reader.barcode_reader_v1 import BarcodeReaderV1 from tests.test_inputs import PRODUCT_DATA_DIR diff --git a/tests/extraction/test_invoice_splitter_auto_extraction.py b/tests/extraction/test_invoice_splitter_auto_extraction.py index 5d160476..716628e7 100644 --- a/tests/extraction/test_invoice_splitter_auto_extraction.py +++ b/tests/extraction/test_invoice_splitter_auto_extraction.py @@ -4,9 +4,10 @@ from mindee import Client from mindee.extraction.pdf_extractor.pdf_extractor import PdfExtractor -from mindee.input import PathInput -from mindee.parsing.common import Document -from mindee.product import InvoiceSplitterV1, InvoiceV4 +from mindee.input.sources import PathInput +from mindee.parsing.common.document import Document +from mindee.product.invoice.invoice_v4 import InvoiceV4 +from mindee.product.invoice_splitter.invoice_splitter_v1 import InvoiceSplitterV1 from tests.product import get_id, get_version from tests.test_inputs import PRODUCT_DATA_DIR from tests.utils import levenshtein_ratio diff --git a/tests/extraction/test_multi_receipts_extractor.py b/tests/extraction/test_multi_receipts_extractor.py index f71ee295..0f71d1fe 100644 --- a/tests/extraction/test_multi_receipts_extractor.py +++ b/tests/extraction/test_multi_receipts_extractor.py @@ -6,8 +6,10 @@ from mindee.extraction.multi_receipts_extractor.multi_receipts_extractor import ( extract_receipts, ) -from mindee.input import PathInput -from mindee.product import MultiReceiptsDetectorV1 +from mindee.input.sources import PathInput +from mindee.product.multi_receipts_detector.multi_receipts_detector_v1 import ( + MultiReceiptsDetectorV1, +) from tests.test_inputs import PRODUCT_DATA_DIR diff --git a/tests/extraction/test_pdf_extractor.py b/tests/extraction/test_pdf_extractor.py index abfdfb4e..e323cd2c 100644 --- a/tests/extraction/test_pdf_extractor.py +++ b/tests/extraction/test_pdf_extractor.py @@ -2,8 +2,12 @@ from mindee import Client from mindee.extraction.pdf_extractor.pdf_extractor import PdfExtractor -from mindee.input import LocalResponse, PathInput -from mindee.product import InvoiceSplitterV1, InvoiceSplitterV1Document +from mindee.input.local_response import LocalResponse +from mindee.input.sources import PathInput +from mindee.product.invoice_splitter.invoice_splitter_v1 import InvoiceSplitterV1 +from mindee.product.invoice_splitter.invoice_splitter_v1_document import ( + InvoiceSplitterV1Document, +) from tests.test_inputs import PRODUCT_DATA_DIR diff --git a/tests/extras/test_extras_integration.py b/tests/extras/test_extras_integration.py index f6e5761b..ab6681d8 100644 --- a/tests/extras/test_extras_integration.py +++ b/tests/extras/test_extras_integration.py @@ -1,7 +1,8 @@ import pytest from mindee import Client -from mindee.product import InternationalIdV2, InvoiceV4 +from mindee.product.international_id.international_id_v2 import InternationalIdV2 +from mindee.product.invoice.invoice_v4 import InvoiceV4 from tests.product import PRODUCT_DATA_DIR diff --git a/tests/extras/test_full_text_ocr.py b/tests/extras/test_full_text_ocr.py index 9d4a84df..ca48fae1 100644 --- a/tests/extras/test_full_text_ocr.py +++ b/tests/extras/test_full_text_ocr.py @@ -2,8 +2,8 @@ import pytest -from mindee import AsyncPredictResponse -from mindee.product import InternationalIdV2 +from mindee.parsing.common.async_predict_response import AsyncPredictResponse +from mindee.product.international_id.international_id_v2 import InternationalIdV2 from tests.utils import EXTRAS_DIR # NOTE: Implementing extras per pages without content (like the Java library) diff --git a/tests/input/test_local_response.py b/tests/input/test_local_response.py index 5858e2d6..c7d6a9cd 100644 --- a/tests/input/test_local_response.py +++ b/tests/input/test_local_response.py @@ -2,7 +2,7 @@ import pytest -from mindee.input import LocalResponse +from mindee.input.local_response import LocalResponse from tests.api.test_async_response import ASYNC_DIR diff --git a/tests/product/barcode_reader/test_barcode_reader_v1.py b/tests/product/barcode_reader/test_barcode_reader_v1.py index 2ade14f0..06195188 100644 --- a/tests/product/barcode_reader/test_barcode_reader_v1.py +++ b/tests/product/barcode_reader/test_barcode_reader_v1.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product import BarcodeReaderV1 +from mindee.product.barcode_reader.barcode_reader_v1 import BarcodeReaderV1 from mindee.product.barcode_reader.barcode_reader_v1_document import ( BarcodeReaderV1Document, ) diff --git a/tests/product/barcode_reader/test_barcode_reader_v1_regression.py b/tests/product/barcode_reader/test_barcode_reader_v1_regression.py index f937067f..17339f04 100644 --- a/tests/product/barcode_reader/test_barcode_reader_v1_regression.py +++ b/tests/product/barcode_reader/test_barcode_reader_v1_regression.py @@ -1,7 +1,7 @@ import pytest from mindee.client import Client -from mindee.product import BarcodeReaderV1 +from mindee.product.barcode_reader.barcode_reader_v1 import BarcodeReaderV1 from tests.product import PRODUCT_DATA_DIR, get_id, get_version diff --git a/tests/product/bill_of_lading/test_bill_of_lading_v1.py b/tests/product/bill_of_lading/test_bill_of_lading_v1.py index 0b84d3d1..3283824c 100644 --- a/tests/product/bill_of_lading/test_bill_of_lading_v1.py +++ b/tests/product/bill_of_lading/test_bill_of_lading_v1.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product import BillOfLadingV1 +from mindee.product.bill_of_lading.bill_of_lading_v1 import BillOfLadingV1 from mindee.product.bill_of_lading.bill_of_lading_v1_document import ( BillOfLadingV1Document, ) diff --git a/tests/product/business_card/test_business_card_v1.py b/tests/product/business_card/test_business_card_v1.py index 3956adeb..a844d450 100644 --- a/tests/product/business_card/test_business_card_v1.py +++ b/tests/product/business_card/test_business_card_v1.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product import BusinessCardV1 +from mindee.product.business_card.business_card_v1 import BusinessCardV1 from mindee.product.business_card.business_card_v1_document import ( BusinessCardV1Document, ) diff --git a/tests/product/cropper/test_cropper_v1.py b/tests/product/cropper/test_cropper_v1.py index 4375a208..510c757c 100644 --- a/tests/product/cropper/test_cropper_v1.py +++ b/tests/product/cropper/test_cropper_v1.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product import CropperV1 +from mindee.product.cropper.cropper_v1 import CropperV1 from mindee.product.cropper.cropper_v1_document import ( CropperV1Document, ) diff --git a/tests/product/cropper/test_cropper_v1_regression.py b/tests/product/cropper/test_cropper_v1_regression.py index 4b2be91a..f68152d2 100644 --- a/tests/product/cropper/test_cropper_v1_regression.py +++ b/tests/product/cropper/test_cropper_v1_regression.py @@ -1,7 +1,7 @@ import pytest from mindee.client import Client -from mindee.product import CropperV1 +from mindee.product.cropper.cropper_v1 import CropperV1 from tests.product import PRODUCT_DATA_DIR, get_id, get_version diff --git a/tests/product/custom/test_custom_v1.py b/tests/product/custom/test_custom_v1.py index b12eb875..28ce8673 100644 --- a/tests/product/custom/test_custom_v1.py +++ b/tests/product/custom/test_custom_v1.py @@ -5,7 +5,8 @@ from mindee.geometry.quadrilateral import Quadrilateral from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.parsing.custom import ClassificationField, ListField, ListFieldValue +from mindee.parsing.custom.classification import ClassificationField +from mindee.parsing.custom.list import ListField, ListFieldValue from mindee.product.custom.custom_v1 import CustomV1 from mindee.product.custom.custom_v1_document import CustomV1Document from mindee.product.custom.custom_v1_page import CustomV1Page diff --git a/tests/product/custom/test_custom_v1_v2.py b/tests/product/custom/test_custom_v1_v2.py index 74be7ab0..f640be81 100644 --- a/tests/product/custom/test_custom_v1_v2.py +++ b/tests/product/custom/test_custom_v1_v2.py @@ -5,7 +5,8 @@ from mindee.geometry.quadrilateral import Quadrilateral from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.parsing.custom import ClassificationField, ListField, ListFieldValue +from mindee.parsing.custom.classification import ClassificationField +from mindee.parsing.custom.list import ListField, ListFieldValue from mindee.product.custom.custom_v1 import CustomV1 from mindee.product.custom.custom_v1_document import CustomV1Document from mindee.product.custom.custom_v1_page import CustomV1Page diff --git a/tests/product/delivery_note/test_delivery_note_v1.py b/tests/product/delivery_note/test_delivery_note_v1.py index 324cc48f..0c4fc6ed 100644 --- a/tests/product/delivery_note/test_delivery_note_v1.py +++ b/tests/product/delivery_note/test_delivery_note_v1.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product import DeliveryNoteV1 +from mindee.product.delivery_note.delivery_note_v1 import DeliveryNoteV1 from mindee.product.delivery_note.delivery_note_v1_document import ( DeliveryNoteV1Document, ) diff --git a/tests/product/eu/driver_license/test_driver_license_v1.py b/tests/product/eu/driver_license/test_driver_license_v1.py index 2b0fab18..ce525240 100644 --- a/tests/product/eu/driver_license/test_driver_license_v1.py +++ b/tests/product/eu/driver_license/test_driver_license_v1.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product.eu import DriverLicenseV1 +from mindee.product.eu.driver_license.driver_license_v1 import DriverLicenseV1 from mindee.product.eu.driver_license.driver_license_v1_document import ( DriverLicenseV1Document, ) diff --git a/tests/product/eu/license_plate/test_license_plate_v1.py b/tests/product/eu/license_plate/test_license_plate_v1.py index 72510aa9..89d5ba04 100644 --- a/tests/product/eu/license_plate/test_license_plate_v1.py +++ b/tests/product/eu/license_plate/test_license_plate_v1.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product.eu import LicensePlateV1 +from mindee.product.eu.license_plate.license_plate_v1 import LicensePlateV1 from mindee.product.eu.license_plate.license_plate_v1_document import ( LicensePlateV1Document, ) diff --git a/tests/product/financial_document/test_financial_document_v1.py b/tests/product/financial_document/test_financial_document_v1.py index 3dfee996..d7875ede 100644 --- a/tests/product/financial_document/test_financial_document_v1.py +++ b/tests/product/financial_document/test_financial_document_v1.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product import FinancialDocumentV1 +from mindee.product.financial_document.financial_document_v1 import FinancialDocumentV1 from mindee.product.financial_document.financial_document_v1_document import ( FinancialDocumentV1Document, ) diff --git a/tests/product/financial_document/test_financial_document_v1_regression.py b/tests/product/financial_document/test_financial_document_v1_regression.py index f7ee4ef6..36805af4 100644 --- a/tests/product/financial_document/test_financial_document_v1_regression.py +++ b/tests/product/financial_document/test_financial_document_v1_regression.py @@ -1,7 +1,7 @@ import pytest from mindee.client import Client -from mindee.product import FinancialDocumentV1 +from mindee.product.financial_document.financial_document_v1 import FinancialDocumentV1 from tests.product import PRODUCT_DATA_DIR, get_id, get_version diff --git a/tests/product/fr/bank_account_details/test_bank_account_details_v1.py b/tests/product/fr/bank_account_details/test_bank_account_details_v1.py index a84636e5..758a0b5d 100644 --- a/tests/product/fr/bank_account_details/test_bank_account_details_v1.py +++ b/tests/product/fr/bank_account_details/test_bank_account_details_v1.py @@ -4,7 +4,9 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product.fr import BankAccountDetailsV1 +from mindee.product.fr.bank_account_details.bank_account_details_v1 import ( + BankAccountDetailsV1, +) from mindee.product.fr.bank_account_details.bank_account_details_v1_document import ( BankAccountDetailsV1Document, ) diff --git a/tests/product/fr/bank_account_details/test_bank_account_details_v2.py b/tests/product/fr/bank_account_details/test_bank_account_details_v2.py index 45e2b0f9..e9e86692 100644 --- a/tests/product/fr/bank_account_details/test_bank_account_details_v2.py +++ b/tests/product/fr/bank_account_details/test_bank_account_details_v2.py @@ -4,7 +4,9 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product.fr import BankAccountDetailsV2 +from mindee.product.fr.bank_account_details.bank_account_details_v2 import ( + BankAccountDetailsV2, +) from mindee.product.fr.bank_account_details.bank_account_details_v2_document import ( BankAccountDetailsV2Document, ) diff --git a/tests/product/fr/carte_grise/test_carte_grise_v1.py b/tests/product/fr/carte_grise/test_carte_grise_v1.py index 8f028753..009b701e 100644 --- a/tests/product/fr/carte_grise/test_carte_grise_v1.py +++ b/tests/product/fr/carte_grise/test_carte_grise_v1.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product.fr import CarteGriseV1 +from mindee.product.fr.carte_grise.carte_grise_v1 import CarteGriseV1 from mindee.product.fr.carte_grise.carte_grise_v1_document import ( CarteGriseV1Document, ) diff --git a/tests/product/fr/carte_vitale/test_carte_vitale_v1.py b/tests/product/fr/carte_vitale/test_carte_vitale_v1.py index 73efc90a..514d1c49 100644 --- a/tests/product/fr/carte_vitale/test_carte_vitale_v1.py +++ b/tests/product/fr/carte_vitale/test_carte_vitale_v1.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product.fr import CarteVitaleV1 +from mindee.product.fr.carte_vitale.carte_vitale_v1 import CarteVitaleV1 from mindee.product.fr.carte_vitale.carte_vitale_v1_document import ( CarteVitaleV1Document, ) diff --git a/tests/product/fr/energy_bill/test_energy_bill_v1.py b/tests/product/fr/energy_bill/test_energy_bill_v1.py index 19db6b4f..259d8d59 100644 --- a/tests/product/fr/energy_bill/test_energy_bill_v1.py +++ b/tests/product/fr/energy_bill/test_energy_bill_v1.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product.fr import EnergyBillV1 +from mindee.product.fr.energy_bill.energy_bill_v1 import EnergyBillV1 from mindee.product.fr.energy_bill.energy_bill_v1_document import ( EnergyBillV1Document, ) diff --git a/tests/product/fr/id_card/test_id_card_v1.py b/tests/product/fr/id_card/test_id_card_v1.py index 84fbb1bd..fc363b3e 100644 --- a/tests/product/fr/id_card/test_id_card_v1.py +++ b/tests/product/fr/id_card/test_id_card_v1.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product.fr import IdCardV1 +from mindee.product.fr.id_card.id_card_v1 import IdCardV1 from mindee.product.fr.id_card.id_card_v1_document import ( IdCardV1Document, ) diff --git a/tests/product/fr/id_card/test_id_card_v2.py b/tests/product/fr/id_card/test_id_card_v2.py index 404e3854..8d456a3b 100644 --- a/tests/product/fr/id_card/test_id_card_v2.py +++ b/tests/product/fr/id_card/test_id_card_v2.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product.fr import IdCardV2 +from mindee.product.fr.id_card.id_card_v2 import IdCardV2 from mindee.product.fr.id_card.id_card_v2_document import ( IdCardV2Document, ) diff --git a/tests/product/fr/payslip/test_payslip_v2.py b/tests/product/fr/payslip/test_payslip_v2.py index 10e9c152..77f4580f 100644 --- a/tests/product/fr/payslip/test_payslip_v2.py +++ b/tests/product/fr/payslip/test_payslip_v2.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product.fr import PayslipV2 +from mindee.product.fr.payslip.payslip_v2 import PayslipV2 from mindee.product.fr.payslip.payslip_v2_document import ( PayslipV2Document, ) diff --git a/tests/product/ind/indian_passport/test_indian_passport_v1.py b/tests/product/ind/indian_passport/test_indian_passport_v1.py index 477a09eb..bcdefd4b 100644 --- a/tests/product/ind/indian_passport/test_indian_passport_v1.py +++ b/tests/product/ind/indian_passport/test_indian_passport_v1.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product.ind import IndianPassportV1 +from mindee.product.ind.indian_passport.indian_passport_v1 import IndianPassportV1 from mindee.product.ind.indian_passport.indian_passport_v1_document import ( IndianPassportV1Document, ) diff --git a/tests/product/international_id/test_international_id_v1.py b/tests/product/international_id/test_international_id_v1.py index 54c4d950..141da283 100644 --- a/tests/product/international_id/test_international_id_v1.py +++ b/tests/product/international_id/test_international_id_v1.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product import InternationalIdV1 +from mindee.product.international_id.international_id_v1 import InternationalIdV1 from mindee.product.international_id.international_id_v1_document import ( InternationalIdV1Document, ) diff --git a/tests/product/international_id/test_international_id_v2.py b/tests/product/international_id/test_international_id_v2.py index 4b748403..9b4b839e 100644 --- a/tests/product/international_id/test_international_id_v2.py +++ b/tests/product/international_id/test_international_id_v2.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product import InternationalIdV2 +from mindee.product.international_id.international_id_v2 import InternationalIdV2 from mindee.product.international_id.international_id_v2_document import ( InternationalIdV2Document, ) diff --git a/tests/product/invoice/test_invoice_v4.py b/tests/product/invoice/test_invoice_v4.py index d07acbaa..3d373961 100644 --- a/tests/product/invoice/test_invoice_v4.py +++ b/tests/product/invoice/test_invoice_v4.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product import InvoiceV4 +from mindee.product.invoice.invoice_v4 import InvoiceV4 from mindee.product.invoice.invoice_v4_document import ( InvoiceV4Document, ) diff --git a/tests/product/invoice/test_invoice_v4_regression.py b/tests/product/invoice/test_invoice_v4_regression.py index 904e8497..42cbfae5 100644 --- a/tests/product/invoice/test_invoice_v4_regression.py +++ b/tests/product/invoice/test_invoice_v4_regression.py @@ -1,7 +1,7 @@ import pytest from mindee.client import Client -from mindee.product import InvoiceV4 +from mindee.product.invoice import InvoiceV4 from tests.product import PRODUCT_DATA_DIR, get_id, get_version diff --git a/tests/product/invoice_splitter/test_invoice_splitter_v1_regression.py b/tests/product/invoice_splitter/test_invoice_splitter_v1_regression.py index 704e0171..ae09c77f 100644 --- a/tests/product/invoice_splitter/test_invoice_splitter_v1_regression.py +++ b/tests/product/invoice_splitter/test_invoice_splitter_v1_regression.py @@ -1,7 +1,7 @@ import pytest from mindee.client import Client -from mindee.product import InvoiceSplitterV1 +from mindee.product.invoice_splitter.invoice_splitter_v1 import InvoiceSplitterV1 from tests.product import PRODUCT_DATA_DIR, get_id, get_version diff --git a/tests/product/material_certificate/test_material_certificate_v1.py b/tests/product/material_certificate/test_material_certificate_v1.py index 11b9f5b3..732fcb9b 100644 --- a/tests/product/material_certificate/test_material_certificate_v1.py +++ b/tests/product/material_certificate/test_material_certificate_v1.py @@ -4,7 +4,9 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product import MaterialCertificateV1 +from mindee.product.material_certificate.material_certificate_v1 import ( + MaterialCertificateV1, +) from mindee.product.material_certificate.material_certificate_v1_document import ( MaterialCertificateV1Document, ) diff --git a/tests/product/multi_receipts_detector/test_multi_receipts_detector_v1.py b/tests/product/multi_receipts_detector/test_multi_receipts_detector_v1.py index f710b1bb..6f97b18b 100644 --- a/tests/product/multi_receipts_detector/test_multi_receipts_detector_v1.py +++ b/tests/product/multi_receipts_detector/test_multi_receipts_detector_v1.py @@ -4,7 +4,9 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product import MultiReceiptsDetectorV1 +from mindee.product.multi_receipts_detector.multi_receipts_detector_v1 import ( + MultiReceiptsDetectorV1, +) from mindee.product.multi_receipts_detector.multi_receipts_detector_v1_document import ( MultiReceiptsDetectorV1Document, ) diff --git a/tests/product/multi_receipts_detector/test_multi_receipts_detector_v1_regression.py b/tests/product/multi_receipts_detector/test_multi_receipts_detector_v1_regression.py index c9bed235..7c6c3ff5 100644 --- a/tests/product/multi_receipts_detector/test_multi_receipts_detector_v1_regression.py +++ b/tests/product/multi_receipts_detector/test_multi_receipts_detector_v1_regression.py @@ -1,7 +1,9 @@ import pytest from mindee.client import Client -from mindee.product import MultiReceiptsDetectorV1 +from mindee.product.multi_receipts_detector.multi_receipts_detector_v1 import ( + MultiReceiptsDetectorV1, +) from tests.product import PRODUCT_DATA_DIR, get_id, get_version diff --git a/tests/product/nutrition_facts_label/test_nutrition_facts_label_v1.py b/tests/product/nutrition_facts_label/test_nutrition_facts_label_v1.py index 8a1ee39c..16bb29f2 100644 --- a/tests/product/nutrition_facts_label/test_nutrition_facts_label_v1.py +++ b/tests/product/nutrition_facts_label/test_nutrition_facts_label_v1.py @@ -4,7 +4,9 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product import NutritionFactsLabelV1 +from mindee.product.nutrition_facts_label.nutrition_facts_label_v1 import ( + NutritionFactsLabelV1, +) from mindee.product.nutrition_facts_label.nutrition_facts_label_v1_document import ( NutritionFactsLabelV1Document, ) diff --git a/tests/product/passport/test_passport_v1.py b/tests/product/passport/test_passport_v1.py index d6a2da54..3bbb2ea3 100644 --- a/tests/product/passport/test_passport_v1.py +++ b/tests/product/passport/test_passport_v1.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product import PassportV1 +from mindee.product.passport.passport_v1 import PassportV1 from mindee.product.passport.passport_v1_document import ( PassportV1Document, ) diff --git a/tests/product/passport/test_passport_v1_regression.py b/tests/product/passport/test_passport_v1_regression.py index 171bf31f..13869838 100644 --- a/tests/product/passport/test_passport_v1_regression.py +++ b/tests/product/passport/test_passport_v1_regression.py @@ -1,7 +1,7 @@ import pytest from mindee.client import Client -from mindee.product import PassportV1 +from mindee.product.passport.passport_v1 import PassportV1 from tests.product import PRODUCT_DATA_DIR, get_id, get_version diff --git a/tests/product/proof_of_address/test_proof_of_address_v1.py b/tests/product/proof_of_address/test_proof_of_address_v1.py index 214a9d4e..7360b9d6 100644 --- a/tests/product/proof_of_address/test_proof_of_address_v1.py +++ b/tests/product/proof_of_address/test_proof_of_address_v1.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product import ProofOfAddressV1 +from mindee.product.proof_of_address.proof_of_address_v1 import ProofOfAddressV1 from mindee.product.proof_of_address.proof_of_address_v1_document import ( ProofOfAddressV1Document, ) diff --git a/tests/product/receipt/test_receipt_v5.py b/tests/product/receipt/test_receipt_v5.py index 44157d02..2c57d903 100644 --- a/tests/product/receipt/test_receipt_v5.py +++ b/tests/product/receipt/test_receipt_v5.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product import ReceiptV5 +from mindee.product.receipt.receipt_v5 import ReceiptV5 from mindee.product.receipt.receipt_v5_document import ( ReceiptV5Document, ) diff --git a/tests/product/receipt/test_receipt_v5_regression.py b/tests/product/receipt/test_receipt_v5_regression.py index a1f142c7..83444883 100644 --- a/tests/product/receipt/test_receipt_v5_regression.py +++ b/tests/product/receipt/test_receipt_v5_regression.py @@ -1,7 +1,7 @@ import pytest from mindee.client import Client -from mindee.product import ReceiptV5 +from mindee.product.receipt.receipt_v5 import ReceiptV5 from tests.product import PRODUCT_DATA_DIR, get_id, get_version diff --git a/tests/product/resume/test_resume_v1.py b/tests/product/resume/test_resume_v1.py index 3bea6d42..66541882 100644 --- a/tests/product/resume/test_resume_v1.py +++ b/tests/product/resume/test_resume_v1.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product import ResumeV1 +from mindee.product.resume.resume_v1 import ResumeV1 from mindee.product.resume.resume_v1_document import ( ResumeV1Document, ) diff --git a/tests/product/us/bank_check/test_bank_check_v1.py b/tests/product/us/bank_check/test_bank_check_v1.py index 97015b2f..755fe6c8 100644 --- a/tests/product/us/bank_check/test_bank_check_v1.py +++ b/tests/product/us/bank_check/test_bank_check_v1.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product.us import BankCheckV1 +from mindee.product.us.bank_check.bank_check_v1 import BankCheckV1 from mindee.product.us.bank_check.bank_check_v1_document import ( BankCheckV1Document, ) diff --git a/tests/product/us/driver_license/test_driver_license_v1.py b/tests/product/us/driver_license/test_driver_license_v1.py index f3a7c21c..189ace20 100644 --- a/tests/product/us/driver_license/test_driver_license_v1.py +++ b/tests/product/us/driver_license/test_driver_license_v1.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product.us import DriverLicenseV1 +from mindee.product.us.driver_license.driver_license_v1 import DriverLicenseV1 from mindee.product.us.driver_license.driver_license_v1_document import ( DriverLicenseV1Document, ) diff --git a/tests/product/us/healthcare_card/test_healthcare_card_v1.py b/tests/product/us/healthcare_card/test_healthcare_card_v1.py index b8d33d87..6cc1fd10 100644 --- a/tests/product/us/healthcare_card/test_healthcare_card_v1.py +++ b/tests/product/us/healthcare_card/test_healthcare_card_v1.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product.us import HealthcareCardV1 +from mindee.product.us.healthcare_card.healthcare_card_v1 import HealthcareCardV1 from mindee.product.us.healthcare_card.healthcare_card_v1_document import ( HealthcareCardV1Document, ) diff --git a/tests/product/us/us_mail/test_us_mail_v2.py b/tests/product/us/us_mail/test_us_mail_v2.py index 1858a883..d5dbe708 100644 --- a/tests/product/us/us_mail/test_us_mail_v2.py +++ b/tests/product/us/us_mail/test_us_mail_v2.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product.us import UsMailV2 +from mindee.product.us.us_mail.us_mail_v2 import UsMailV2 from mindee.product.us.us_mail.us_mail_v2_document import ( UsMailV2Document, ) diff --git a/tests/product/us/w9/test_w9_v1.py b/tests/product/us/w9/test_w9_v1.py index e7f4f0e9..64d98b13 100644 --- a/tests/product/us/w9/test_w9_v1.py +++ b/tests/product/us/w9/test_w9_v1.py @@ -4,7 +4,7 @@ from mindee.parsing.common.document import Document from mindee.parsing.common.page import Page -from mindee.product.us import W9V1 +from mindee.product.us.w9.w9_v1 import W9V1 from mindee.product.us.w9.w9_v1_document import ( W9V1Document, ) diff --git a/tests/test_client.py b/tests/test_client.py index b00e1684..c6bdf4ea 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -5,9 +5,10 @@ from mindee import AsyncPredictResponse, Client, PageOptions, PredictResponse, product from mindee.error.mindee_error import MindeeClientError, MindeeError from mindee.error.mindee_http_error import MindeeHTTPError -from mindee.input import LocalResponse +from mindee.input.local_response import LocalResponse from mindee.input.sources import LocalInputSource -from mindee.product import InternationalIdV2, InvoiceV4 +from mindee.product.international_id import InternationalIdV2 +from mindee.product.invoice import InvoiceV4 from mindee.product.invoice_splitter.invoice_splitter_v1 import InvoiceSplitterV1 from mindee.product.receipt.receipt_v4 import ReceiptV4 from tests.mindee_http.test_error import ERROR_DATA_DIR From 704b9c7bfcd3d5f41dc8bb94f9430437d8f07e0b Mon Sep 17 00:00:00 2001 From: sebastianMindee Date: Fri, 22 Nov 2024 16:11:43 +0100 Subject: [PATCH 5/7] :coffin: remove support for International ID V1 --- .../international_id_v1_async.txt | 17 --- mindee/product/__init__.py | 6 - mindee/product/international_id/__init__.py | 4 - .../international_id/international_id_v1.py | 39 ----- .../international_id_v1_document.py | 140 ------------------ .../test_international_id_v1.py | 79 ---------- 6 files changed, 285 deletions(-) delete mode 100644 docs/extras/code_samples/international_id_v1_async.txt delete mode 100644 mindee/product/international_id/international_id_v1.py delete mode 100644 mindee/product/international_id/international_id_v1_document.py delete mode 100644 tests/product/international_id/test_international_id_v1.py diff --git a/docs/extras/code_samples/international_id_v1_async.txt b/docs/extras/code_samples/international_id_v1_async.txt deleted file mode 100644 index 6bd07584..00000000 --- a/docs/extras/code_samples/international_id_v1_async.txt +++ /dev/null @@ -1,17 +0,0 @@ -from mindee import Client, product, AsyncPredictResponse -from time import sleep - -# Init a new client -mindee_client = Client(api_key="my-api-key") - -# Load a file from disk -input_doc = mindee_client.source_from_path("/path/to/the/file.ext") - -# Load a file from disk and enqueue it. -result: AsyncPredictResponse = mindee_client.enqueue_and_parse( - product.InternationalIdV1, - input_doc, -) - -# Print a brief summary of the parsed data -print(result.document) diff --git a/mindee/product/__init__.py b/mindee/product/__init__.py index bcb213bd..9c718f4d 100644 --- a/mindee/product/__init__.py +++ b/mindee/product/__init__.py @@ -19,12 +19,6 @@ FinancialDocumentV1LineItem, ) from mindee.product.generated import GeneratedV1, GeneratedV1Document, GeneratedV1Page -from mindee.product.international_id import ( - InternationalIdV1, - InternationalIdV1Document, - InternationalIdV2, - InternationalIdV2Document, -) from mindee.product.invoice import InvoiceV4, InvoiceV4Document, InvoiceV4LineItem from mindee.product.invoice_splitter import InvoiceSplitterV1, InvoiceSplitterV1Document from mindee.product.material_certificate import ( diff --git a/mindee/product/international_id/__init__.py b/mindee/product/international_id/__init__.py index ef36d586..a3dba05d 100644 --- a/mindee/product/international_id/__init__.py +++ b/mindee/product/international_id/__init__.py @@ -1,7 +1,3 @@ -from mindee.product.international_id.international_id_v1 import InternationalIdV1 -from mindee.product.international_id.international_id_v1_document import ( - InternationalIdV1Document, -) from mindee.product.international_id.international_id_v2 import InternationalIdV2 from mindee.product.international_id.international_id_v2_document import ( InternationalIdV2Document, diff --git a/mindee/product/international_id/international_id_v1.py b/mindee/product/international_id/international_id_v1.py deleted file mode 100644 index ccb1d7c2..00000000 --- a/mindee/product/international_id/international_id_v1.py +++ /dev/null @@ -1,39 +0,0 @@ -from typing import List - -from mindee.parsing.common.inference import Inference -from mindee.parsing.common.page import Page -from mindee.parsing.common.string_dict import StringDict -from mindee.product.international_id.international_id_v1_document import ( - InternationalIdV1Document, -) - - -class InternationalIdV1(Inference): - """Inference prediction for International ID, API version 1.""" - - prediction: InternationalIdV1Document - """Document-level prediction.""" - pages: List[Page[InternationalIdV1Document]] - """Page-level prediction(s).""" - endpoint_name = "international_id" - """Name of the endpoint.""" - endpoint_version = "1" - """Version of the endpoint.""" - - def __init__(self, raw_prediction: StringDict): - """ - International ID v1 inference. - - :param raw_prediction: Raw prediction from the HTTP response. - """ - super().__init__(raw_prediction) - - self.prediction = InternationalIdV1Document(raw_prediction["prediction"]) - self.pages = [] - for page in raw_prediction["pages"]: - try: - page_prediction = page["prediction"] - except KeyError: - continue - if page_prediction: - self.pages.append(Page(InternationalIdV1Document, page)) diff --git a/mindee/product/international_id/international_id_v1_document.py b/mindee/product/international_id/international_id_v1_document.py deleted file mode 100644 index 0eb2e33c..00000000 --- a/mindee/product/international_id/international_id_v1_document.py +++ /dev/null @@ -1,140 +0,0 @@ -from typing import List, Optional - -from mindee.parsing.common.prediction import Prediction -from mindee.parsing.common.string_dict import StringDict -from mindee.parsing.common.summary_helper import clean_out_string -from mindee.parsing.standard.classification import ClassificationField -from mindee.parsing.standard.date import DateField -from mindee.parsing.standard.text import StringField - - -class InternationalIdV1Document(Prediction): - """Document data for International ID, API version 1.""" - - address: StringField - """The physical location of the document holder's residence.""" - birth_date: DateField - """The date of birth of the document holder.""" - birth_place: StringField - """The location where the document holder was born.""" - country_of_issue: StringField - """The country that issued the identification document.""" - document_number: StringField - """The unique identifier assigned to the identification document.""" - document_type: ClassificationField - """The type of identification document being used.""" - expiry_date: DateField - """The date when the document will no longer be valid for use.""" - given_names: List[StringField] - """The first names or given names of the document holder.""" - issue_date: DateField - """The date when the document was issued.""" - mrz1: StringField - """First line of information in a standardized format for easy machine reading and processing.""" - mrz2: StringField - """Second line of information in a standardized format for easy machine reading and processing.""" - mrz3: StringField - """Third line of information in a standardized format for easy machine reading and processing.""" - nationality: StringField - """Indicates the country of citizenship or nationality of the document holder.""" - sex: StringField - """The document holder's biological sex, such as male or female.""" - surnames: List[StringField] - """The surnames of the document holder.""" - - def __init__( - self, - raw_prediction: StringDict, - page_id: Optional[int] = None, - ): - """ - International ID document. - - :param raw_prediction: Raw prediction from HTTP response - :param page_id: Page number for multi pages pdf input - """ - super().__init__(raw_prediction, page_id) - self.address = StringField( - raw_prediction["address"], - page_id=page_id, - ) - self.birth_date = DateField( - raw_prediction["birth_date"], - page_id=page_id, - ) - self.birth_place = StringField( - raw_prediction["birth_place"], - page_id=page_id, - ) - self.country_of_issue = StringField( - raw_prediction["country_of_issue"], - page_id=page_id, - ) - self.document_number = StringField( - raw_prediction["document_number"], - page_id=page_id, - ) - self.document_type = ClassificationField( - raw_prediction["document_type"], - page_id=page_id, - ) - self.expiry_date = DateField( - raw_prediction["expiry_date"], - page_id=page_id, - ) - self.given_names = [ - StringField(prediction, page_id=page_id) - for prediction in raw_prediction["given_names"] - ] - self.issue_date = DateField( - raw_prediction["issue_date"], - page_id=page_id, - ) - self.mrz1 = StringField( - raw_prediction["mrz1"], - page_id=page_id, - ) - self.mrz2 = StringField( - raw_prediction["mrz2"], - page_id=page_id, - ) - self.mrz3 = StringField( - raw_prediction["mrz3"], - page_id=page_id, - ) - self.nationality = StringField( - raw_prediction["nationality"], - page_id=page_id, - ) - self.sex = StringField( - raw_prediction["sex"], - page_id=page_id, - ) - self.surnames = [ - StringField(prediction, page_id=page_id) - for prediction in raw_prediction["surnames"] - ] - - def __str__(self) -> str: - given_names = f"\n { ' ' * 13 }".join( - [str(item) for item in self.given_names], - ) - surnames = f"\n { ' ' * 10 }".join( - [str(item) for item in self.surnames], - ) - out_str: str = f":Document Type: {self.document_type}\n" - out_str += f":Document Number: {self.document_number}\n" - out_str += f":Country of Issue: {self.country_of_issue}\n" - out_str += f":Surnames: {surnames}\n" - out_str += f":Given Names: {given_names}\n" - out_str += f":Gender: {self.sex}\n" - out_str += f":Birth date: {self.birth_date}\n" - out_str += f":Birth Place: {self.birth_place}\n" - out_str += f":Nationality: {self.nationality}\n" - out_str += f":Issue Date: {self.issue_date}\n" - out_str += f":Expiry Date: {self.expiry_date}\n" - out_str += f":Address: {self.address}\n" - out_str += f":Machine Readable Zone Line 1: {self.mrz1}\n" - out_str += f":Machine Readable Zone Line 2: {self.mrz2}\n" - out_str += f":Machine Readable Zone Line 3: {self.mrz3}\n" - return clean_out_string(out_str) diff --git a/tests/product/international_id/test_international_id_v1.py b/tests/product/international_id/test_international_id_v1.py deleted file mode 100644 index 141da283..00000000 --- a/tests/product/international_id/test_international_id_v1.py +++ /dev/null @@ -1,79 +0,0 @@ -import json - -import pytest - -from mindee.parsing.common.document import Document -from mindee.parsing.common.page import Page -from mindee.product.international_id.international_id_v1 import InternationalIdV1 -from mindee.product.international_id.international_id_v1_document import ( - InternationalIdV1Document, -) -from tests.product import PRODUCT_DATA_DIR - - -@pytest.fixture -def complete_doc() -> ( - Document[InternationalIdV1Document, Page[InternationalIdV1Document]] -): - json_data = json.load( - open( - PRODUCT_DATA_DIR / "international_id" / "response_v1" / "complete.json", - encoding="utf-8", - ) - ) - return Document(InternationalIdV1, json_data["document"]) - - -@pytest.fixture -def empty_doc() -> Document[InternationalIdV1Document, Page[InternationalIdV1Document]]: - json_data = json.load( - open( - PRODUCT_DATA_DIR / "international_id" / "response_v1" / "empty.json", - encoding="utf-8", - ) - ) - return Document(InternationalIdV1, json_data["document"]) - - -@pytest.fixture -def complete_page_0() -> Page[InternationalIdV1Document]: - json_data = json.load( - open( - PRODUCT_DATA_DIR / "international_id" / "response_v1" / "complete.json", - encoding="utf-8", - ) - ) - return Page( - InternationalIdV1Document, json_data["document"]["inference"]["pages"][0] - ) - - -def test_complete_doc( - complete_doc: Document[InternationalIdV1Document, Page[InternationalIdV1Document]] -): - reference_str = open( - PRODUCT_DATA_DIR / "international_id" / "response_v1" / "summary_full.rst", - "r", - encoding="utf-8", - ).read() - assert str(complete_doc) == reference_str - - -def test_empty_doc( - empty_doc: Document[InternationalIdV1Document, Page[InternationalIdV1Document]] -): - prediction = empty_doc.inference.prediction - assert prediction.document_number.value is None - assert prediction.country_of_issue.value is None - assert len(prediction.surnames) == 0 - assert len(prediction.given_names) == 0 - assert prediction.sex.value is None - assert prediction.birth_date.value is None - assert prediction.birth_place.value is None - assert prediction.nationality.value is None - assert prediction.issue_date.value is None - assert prediction.expiry_date.value is None - assert prediction.address.value is None - assert prediction.mrz1.value is None - assert prediction.mrz2.value is None - assert prediction.mrz3.value is None From d7f997dfee590b61a29e395dade1d24e1756da55 Mon Sep 17 00:00:00 2001 From: sebastianMindee Date: Fri, 22 Nov 2024 16:21:38 +0100 Subject: [PATCH 6/7] fix missing import --- mindee/product/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mindee/product/__init__.py b/mindee/product/__init__.py index 9c718f4d..2ffcd5f7 100644 --- a/mindee/product/__init__.py +++ b/mindee/product/__init__.py @@ -19,6 +19,7 @@ FinancialDocumentV1LineItem, ) from mindee.product.generated import GeneratedV1, GeneratedV1Document, GeneratedV1Page +from mindee.product.international_id import InternationalIdV2, InternationalIdV2Document from mindee.product.invoice import InvoiceV4, InvoiceV4Document, InvoiceV4LineItem from mindee.product.invoice_splitter import InvoiceSplitterV1, InvoiceSplitterV1Document from mindee.product.material_certificate import ( From 6f368856d99de61609f59ad960fb806e56b6cf9c Mon Sep 17 00:00:00 2001 From: sebastianMindee Date: Fri, 22 Nov 2024 16:50:06 +0100 Subject: [PATCH 7/7] fix lingering imports --- examples/auto_invoice_splitter_extraction_example.py | 4 ++-- mindee/extraction/pdf_extractor/pdf_extractor.py | 4 +++- tests/api/test_async_response.py | 2 +- tests/product/invoice/test_invoice_v4_regression.py | 2 +- tests/test_client.py | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/examples/auto_invoice_splitter_extraction_example.py b/examples/auto_invoice_splitter_extraction_example.py index 2c02225f..161075d0 100644 --- a/examples/auto_invoice_splitter_extraction_example.py +++ b/examples/auto_invoice_splitter_extraction_example.py @@ -1,8 +1,8 @@ from mindee import Client from mindee.extraction.pdf_extractor import PdfExtractor from mindee.input.sources import PathInput -from mindee.product.invoice import InvoiceV4 -from mindee.product.invoice_splitter import InvoiceSplitterV1 +from mindee.product.invoice.invoice_v4 import InvoiceV4 +from mindee.product.invoice_splitter.invoice_splitter_v1 import InvoiceSplitterV1 mindee_client = Client(api_key="my-api-key") # mindee_client = Client() # Optionally, set from env. diff --git a/mindee/extraction/pdf_extractor/pdf_extractor.py b/mindee/extraction/pdf_extractor/pdf_extractor.py index 8bc6df87..91685be2 100644 --- a/mindee/extraction/pdf_extractor/pdf_extractor.py +++ b/mindee/extraction/pdf_extractor/pdf_extractor.py @@ -8,7 +8,9 @@ from mindee.error.mindee_error import MindeeError from mindee.extraction.pdf_extractor.extracted_pdf import ExtractedPdf from mindee.input.sources import LocalInputSource -from mindee.product.invoice_splitter import InvoiceSplitterV1PageGroup +from mindee.product.invoice_splitter.invoice_splitter_v1_page_group import ( + InvoiceSplitterV1PageGroup, +) class PdfExtractor: diff --git a/tests/api/test_async_response.py b/tests/api/test_async_response.py index dda6715e..31319095 100644 --- a/tests/api/test_async_response.py +++ b/tests/api/test_async_response.py @@ -9,7 +9,7 @@ from mindee.mindee_http.response_validation import is_valid_async_response from mindee.parsing.common.api_request import RequestStatus from mindee.parsing.common.async_predict_response import AsyncPredictResponse -from mindee.product.invoice_splitter import InvoiceSplitterV1 +from mindee.product.invoice_splitter.invoice_splitter_v1 import InvoiceSplitterV1 ASYNC_DIR = Path("./tests/data/async") diff --git a/tests/product/invoice/test_invoice_v4_regression.py b/tests/product/invoice/test_invoice_v4_regression.py index 42cbfae5..212fd901 100644 --- a/tests/product/invoice/test_invoice_v4_regression.py +++ b/tests/product/invoice/test_invoice_v4_regression.py @@ -1,7 +1,7 @@ import pytest from mindee.client import Client -from mindee.product.invoice import InvoiceV4 +from mindee.product.invoice.invoice_v4 import InvoiceV4 from tests.product import PRODUCT_DATA_DIR, get_id, get_version diff --git a/tests/test_client.py b/tests/test_client.py index c6bdf4ea..574ad51b 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -7,8 +7,8 @@ from mindee.error.mindee_http_error import MindeeHTTPError from mindee.input.local_response import LocalResponse from mindee.input.sources import LocalInputSource -from mindee.product.international_id import InternationalIdV2 -from mindee.product.invoice import InvoiceV4 +from mindee.product.international_id.international_id_v2 import InternationalIdV2 +from mindee.product.invoice.invoice_v4 import InvoiceV4 from mindee.product.invoice_splitter.invoice_splitter_v1 import InvoiceSplitterV1 from mindee.product.receipt.receipt_v4 import ReceiptV4 from tests.mindee_http.test_error import ERROR_DATA_DIR