diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f5dac8bf..5f98b32e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,15 +1,10 @@ repos: - - repo: https://github.com/ambv/black - rev: 25.9.0 + - repo: https://github.com/charliermarsh/ruff-pre-commit + rev: v0.14.3 hooks: - - id: black - - - repo: https://github.com/pycqa/isort - rev: 7.0.0 - hooks: - - id: isort - args: [ "--profile", "black" , "--split-on-trailing-comma", "true"] - additional_dependencies: [toml] + - id: ruff + args: [ --fix, --exit-non-zero-on-fix] + - id: ruff-format - repo: https://github.com/pycqa/pydocstyle rev: 6.3.0 diff --git a/mindee/__init__.py b/mindee/__init__.py index 423acf54..bd6f0e89 100644 --- a/mindee/__init__.py +++ b/mindee/__init__.py @@ -38,6 +38,7 @@ "PredictResponse", "WorkflowResponse", "JobResponse", + "Job", "InferenceResponse", "product", ] diff --git a/mindee/error/__init__.py b/mindee/error/__init__.py index 401872d2..38d09642 100644 --- a/mindee/error/__init__.py +++ b/mindee/error/__init__.py @@ -15,3 +15,19 @@ ) from mindee.error.mindee_image_error import MindeeImageError from mindee.error.mindee_pdf_error import MindeePDFError + +__all__ = [ + "MindeeError", + "MindeeApiError", + "MindeeApiV2Error", + "MindeeClientError", + "MindeeProductError", + "MindeeHTTPError", + "MindeeHTTPClientError", + "MindeeHTTPServerError", + "handle_error", + "MindeeImageError", + "MindeePDFError", + "GeometryError", + "MimeTypeError", +] diff --git a/mindee/extraction/__init__.py b/mindee/extraction/__init__.py index 05629a5d..0e3d7333 100644 --- a/mindee/extraction/__init__.py +++ b/mindee/extraction/__init__.py @@ -6,3 +6,12 @@ from mindee.extraction.multi_receipts_extractor import multi_receipts_extractor from mindee.extraction.pdf_extractor.extracted_pdf import ExtractedPdf from mindee.extraction.pdf_extractor.pdf_extractor import PdfExtractor + +__all__ = [ + "ExtractedImage", + "ExtractedPdf", + "PdfExtractor", + "attach_image_as_new_file", + "extract_multiple_images_from_source", + "multi_receipts_extractor", +] diff --git a/mindee/extraction/common/__init__.py b/mindee/extraction/common/__init__.py index c0301c90..25c45b37 100644 --- a/mindee/extraction/common/__init__.py +++ b/mindee/extraction/common/__init__.py @@ -3,3 +3,9 @@ attach_image_as_new_file, extract_multiple_images_from_source, ) + +__all__ = [ + "ExtractedImage", + "attach_image_as_new_file", + "extract_multiple_images_from_source", +] diff --git a/mindee/extraction/multi_receipts_extractor/__init__.py b/mindee/extraction/multi_receipts_extractor/__init__.py index 84e3fe0f..bb0b1e6b 100644 --- a/mindee/extraction/multi_receipts_extractor/__init__.py +++ b/mindee/extraction/multi_receipts_extractor/__init__.py @@ -1 +1,3 @@ from mindee.extraction.multi_receipts_extractor import multi_receipts_extractor + +__all__ = ["multi_receipts_extractor"] diff --git a/mindee/extraction/pdf_extractor/__init__.py b/mindee/extraction/pdf_extractor/__init__.py index 0c00ba27..cbb431f5 100644 --- a/mindee/extraction/pdf_extractor/__init__.py +++ b/mindee/extraction/pdf_extractor/__init__.py @@ -1,2 +1,4 @@ from mindee.extraction.pdf_extractor.extracted_pdf import ExtractedPdf from mindee.extraction.pdf_extractor.pdf_extractor import PdfExtractor + +__all__ = ["ExtractedPdf", "PdfExtractor"] diff --git a/mindee/geometry/__init__.py b/mindee/geometry/__init__.py index 07c1ef84..55a183b9 100644 --- a/mindee/geometry/__init__.py +++ b/mindee/geometry/__init__.py @@ -14,3 +14,24 @@ get_bounding_box, quadrilateral_from_prediction, ) + +__all__ = [ + "BBox", + "MinMax", + "Point", + "Points", + "Polygon", + "Quadrilateral", + "is_point_in_polygon_x", + "is_point_in_polygon_y", + "is_point_in_y", + "is_point_in_x", + "quadrilateral_from_prediction", + "get_bbox", + "get_min_max_x", + "get_min_max_y", + "get_bounding_box", + "get_centroid", + "polygon_from_prediction", + "merge_polygons", +] diff --git a/mindee/image_operations/__init__.py b/mindee/image_operations/__init__.py index f92bd401..4821cf3e 100644 --- a/mindee/image_operations/__init__.py +++ b/mindee/image_operations/__init__.py @@ -1 +1,3 @@ from mindee.image_operations.image_compressor import compress_image + +__all__ = ["compress_image"] diff --git a/mindee/input/__init__.py b/mindee/input/__init__.py index c55b1647..9ed79985 100644 --- a/mindee/input/__init__.py +++ b/mindee/input/__init__.py @@ -9,3 +9,17 @@ from mindee.input.sources.path_input import PathInput from mindee.input.sources.url_input_source import UrlInputSource from mindee.input.workflow_options import WorkflowOptions + +__all__ = [ + "InputType", + "LocalInputSource", + "UrlInputSource", + "PathInput", + "FileInput", + "Base64Input", + "BytesInput", + "WorkflowOptions", + "PollingOptions", + "PageOptions", + "LocalResponse", +] diff --git a/mindee/mindee_http/__init__.py b/mindee/mindee_http/__init__.py index 964258ef..e8b4cf3d 100644 --- a/mindee/mindee_http/__init__.py +++ b/mindee/mindee_http/__init__.py @@ -8,3 +8,15 @@ ) from mindee.mindee_http.workflow_endpoint import WorkflowEndpoint from mindee.mindee_http.workflow_settings import WorkflowSettings + +__all__ = [ + "BaseEndpoint", + "CustomEndpoint", + "Endpoint", + "MindeeApi", + "clean_request_json", + "is_valid_async_response", + "is_valid_sync_response", + "WorkflowEndpoint", + "WorkflowSettings", +] diff --git a/mindee/mindee_http/response_validation_v2.py b/mindee/mindee_http/response_validation_v2.py index 606f3037..fdf75d63 100644 --- a/mindee/mindee_http/response_validation_v2.py +++ b/mindee/mindee_http/response_validation_v2.py @@ -15,7 +15,7 @@ def is_valid_post_response(response: requests.Response) -> bool: if not is_valid_sync_response(response): return False response_json = json.loads(response.content) - if not "job" in response_json: + if "job" not in response_json: return False if ( "job" in response_json @@ -36,6 +36,6 @@ def is_valid_get_response(response: requests.Response) -> bool: if not is_valid_sync_response(response): return False response_json = json.loads(response.content) - if not "inference" in response_json and not "job" in response_json: + if "inference" not in response_json and "job" not in response_json: return False return True diff --git a/mindee/parsing/__init__.py b/mindee/parsing/__init__.py index 425eb51c..0ac446b4 100644 --- a/mindee/parsing/__init__.py +++ b/mindee/parsing/__init__.py @@ -1 +1,7 @@ -from mindee.parsing import common, custom, standard +from mindee.parsing import ( + common, + custom, + standard, +) + +__all__ = ["common", "custom", "standard"] diff --git a/mindee/parsing/common/__init__.py b/mindee/parsing/common/__init__.py index 8b43a6ff..dce90dad 100644 --- a/mindee/parsing/common/__init__.py +++ b/mindee/parsing/common/__init__.py @@ -21,3 +21,29 @@ line_separator, ) from mindee.parsing.common.workflow_response import WorkflowResponse + +__all__ = [ + "ApiRequest", + "ApiResponse", + "AsyncPredictResponse", + "Document", + "Execution", + "ExecutionFile", + "ExecutionPriority", + "CropperExtra", + "Extras", + "FeedbackResponse", + "Inference", + "TypeInference", + "WorkflowResponse", + "line_separator", + "clean_out_string", + "format_for_display", + "Prediction", + "Job", + "OrientationField", + "Page", + "PredictResponse", + "MVisionV1", + "Ocr", +] diff --git a/mindee/parsing/common/extras/__init__.py b/mindee/parsing/common/extras/__init__.py index a74624fe..e6349e99 100644 --- a/mindee/parsing/common/extras/__init__.py +++ b/mindee/parsing/common/extras/__init__.py @@ -1,2 +1,7 @@ from mindee.parsing.common.extras.cropper_extra import CropperExtra from mindee.parsing.common.extras.extras import Extras + +__all__ = [ + "Extras", + "CropperExtra", +] diff --git a/mindee/parsing/common/ocr/__init__.py b/mindee/parsing/common/ocr/__init__.py index bcce0ab4..c8e760ea 100644 --- a/mindee/parsing/common/ocr/__init__.py +++ b/mindee/parsing/common/ocr/__init__.py @@ -1 +1,3 @@ from mindee.parsing.common.ocr.ocr import Ocr + +__all__ = ["Ocr"] diff --git a/mindee/parsing/common/page.py b/mindee/parsing/common/page.py index d9be8cab..f8468b74 100644 --- a/mindee/parsing/common/page.py +++ b/mindee/parsing/common/page.py @@ -41,7 +41,7 @@ def __init__( def __str__(self) -> str: title = f"Page {self.id}" dashes = "-" * len(title) - return f"{title}\n" f"{dashes}\n" f"{self.prediction}\n" + return f"{title}\n{dashes}\n{self.prediction}\n" TypePage = TypeVar("TypePage", bound=Page) diff --git a/mindee/parsing/common/summary_helper.py b/mindee/parsing/common/summary_helper.py index cdf0f767..10428ca8 100644 --- a/mindee/parsing/common/summary_helper.py +++ b/mindee/parsing/common/summary_helper.py @@ -30,5 +30,5 @@ def format_for_display( return ( out_string if len(out_string) <= max_col_size - else f"{out_string[:max_col_size-3]}..." + else f"{out_string[: max_col_size - 3]}..." ) diff --git a/mindee/parsing/custom/__init__.py b/mindee/parsing/custom/__init__.py index d721f365..6b96ca6f 100644 --- a/mindee/parsing/custom/__init__.py +++ b/mindee/parsing/custom/__init__.py @@ -1,3 +1,11 @@ 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, ListFieldValue + +__all__ = [ + "ClassificationField", + "CustomLine", + "get_line_items", + "ListField", + "ListFieldValue", +] diff --git a/mindee/parsing/generated/__init__.py b/mindee/parsing/generated/__init__.py index 0f6f7f22..ffec05ac 100644 --- a/mindee/parsing/generated/__init__.py +++ b/mindee/parsing/generated/__init__.py @@ -3,3 +3,9 @@ GeneratedObjectField, is_generated_object, ) + +__all__ = [ + "GeneratedListField", + "GeneratedObjectField", + "is_generated_object", +] diff --git a/mindee/parsing/standard/__init__.py b/mindee/parsing/standard/__init__.py index 5d66dd65..74993467 100644 --- a/mindee/parsing/standard/__init__.py +++ b/mindee/parsing/standard/__init__.py @@ -20,3 +20,27 @@ from mindee.parsing.standard.position import PositionField from mindee.parsing.standard.tax import Taxes, TaxField from mindee.parsing.standard.text import StringField + +__all__ = [ + "AddressField", + "AmountField", + "BaseField", + "FieldConfidenceMixin", + "FieldPositionMixin", + "bool_to_string", + "float_to_string", + "int_to_string", + "to_opt_bool", + "to_opt_float", + "to_opt_int", + "BooleanField", + "ClassificationField", + "CompanyRegistrationField", + "DateField", + "LocaleField", + "PaymentDetailsField", + "PositionField", + "Taxes", + "TaxField", + "StringField", +] diff --git a/mindee/parsing/v2/inference_model.py b/mindee/parsing/v2/inference_model.py index 72fc864c..c44c4d0a 100644 --- a/mindee/parsing/v2/inference_model.py +++ b/mindee/parsing/v2/inference_model.py @@ -11,4 +11,4 @@ def __init__(self, raw_response: StringDict) -> None: self.id = raw_response["id"] def __str__(self) -> str: - return f"Model\n=====" f"\n:ID: {self.id}" + return f"Model\n=====\n:ID: {self.id}" diff --git a/mindee/pdf/__init__.py b/mindee/pdf/__init__.py index 4c55dad2..7ca6f7c0 100644 --- a/mindee/pdf/__init__.py +++ b/mindee/pdf/__init__.py @@ -5,3 +5,11 @@ has_source_text, lerp, ) + +__all__ = [ + "PDFCharData", + "compress_pdf", + "extract_text_from_pdf", + "has_source_text", + "lerp", +] diff --git a/mindee/product/__init__.py b/mindee/product/__init__.py index f49443dd..ff7d99c2 100644 --- a/mindee/product/__init__.py +++ b/mindee/product/__init__.py @@ -155,3 +155,75 @@ from mindee.product.resume.resume_v1_social_networks_url import ( ResumeV1SocialNetworksUrl, ) + +__all__ = [ + "fr", + "ind", + "us", + "BarcodeReaderV1", + "BarcodeReaderV1Document", + "BillOfLadingV1", + "BillOfLadingV1Carrier", + "BillOfLadingV1CarrierItem", + "BillOfLadingV1Consignee", + "BillOfLadingV1Document", + "BillOfLadingV1NotifyParty", + "BillOfLadingV1Shipper", + "BusinessCardV1", + "BusinessCardV1Document", + "CropperV1", + "CropperV1Document", + "CropperV1Page", + "CustomV1", + "CustomV1Document", + "CustomV1Page", + "DeliveryNoteV1", + "DeliveryNoteV1Document", + "DriverLicenseV1", + "DriverLicenseV1Document", + "FinancialDocumentV1", + "FinancialDocumentV1Document", + "FinancialDocumentV1LineItem", + "GeneratedV1", + "GeneratedV1Document", + "GeneratedV1Page", + "InternationalIdV2", + "InternationalIdV2Document", + "InvoiceV4", + "InvoiceV4Document", + "InvoiceV4LineItem", + "InvoiceSplitterV1", + "InvoiceSplitterV1Document", + "InvoiceSplitterV1InvoicePageGroup", + "MaterialCertificateV1", + "MaterialCertificateV1Document", + "MultiReceiptsDetectorV1", + "MultiReceiptsDetectorV1Document", + "NutritionFactsLabelV1", + "NutritionFactsLabelV1AddedSugar", + "NutritionFactsLabelV1Calorie", + "NutritionFactsLabelV1Cholesterol", + "NutritionFactsLabelV1DietaryFiber", + "NutritionFactsLabelV1Document", + "NutritionFactsLabelV1Nutrient", + "NutritionFactsLabelV1Protein", + "NutritionFactsLabelV1SaturatedFat", + "NutritionFactsLabelV1ServingSize", + "NutritionFactsLabelV1Sodium", + "NutritionFactsLabelV1TotalCarbohydrate", + "NutritionFactsLabelV1TotalFat", + "NutritionFactsLabelV1TotalSugar", + "NutritionFactsLabelV1TransFat", + "PassportV1", + "PassportV1Document", + "ReceiptV5", + "ReceiptV5Document", + "ReceiptV5LineItem", + "ResumeV1", + "ResumeV1Certificate", + "ResumeV1Document", + "ResumeV1Education", + "ResumeV1Language", + "ResumeV1ProfessionalExperience", + "ResumeV1SocialNetworksUrl", +] diff --git a/mindee/product/barcode_reader/__init__.py b/mindee/product/barcode_reader/__init__.py index 53b1ebd9..2fec6a10 100644 --- a/mindee/product/barcode_reader/__init__.py +++ b/mindee/product/barcode_reader/__init__.py @@ -2,3 +2,8 @@ from mindee.product.barcode_reader.barcode_reader_v1_document import ( BarcodeReaderV1Document, ) + +__all__ = [ + "BarcodeReaderV1", + "BarcodeReaderV1Document", +] diff --git a/mindee/product/barcode_reader/barcode_reader_v1_document.py b/mindee/product/barcode_reader/barcode_reader_v1_document.py index d78759f3..be0a621e 100644 --- a/mindee/product/barcode_reader/barcode_reader_v1_document.py +++ b/mindee/product/barcode_reader/barcode_reader_v1_document.py @@ -36,10 +36,10 @@ def __init__( ] def __str__(self) -> str: - codes_1d = f"\n { ' ' * 13 }".join( + codes_1d = f"\n {' ' * 13}".join( [str(item) for item in self.codes_1d], ) - codes_2d = f"\n { ' ' * 13 }".join( + codes_2d = f"\n {' ' * 13}".join( [str(item) for item in self.codes_2d], ) out_str: str = f":Barcodes 1D: {codes_1d}\n" diff --git a/mindee/product/bill_of_lading/__init__.py b/mindee/product/bill_of_lading/__init__.py index 6f0c5b4e..31d47801 100644 --- a/mindee/product/bill_of_lading/__init__.py +++ b/mindee/product/bill_of_lading/__init__.py @@ -17,3 +17,14 @@ from mindee.product.bill_of_lading.bill_of_lading_v1_shipper import ( BillOfLadingV1Shipper, ) + +__all__ = [ + "BillOfLadingV1", + "BillOfLadingV1Carrier", + "BillOfLadingV1CarrierItem", + "BillOfLadingV1Consignee", + "BillOfLadingV1Document", + "BillOfLadingV1NotifyParty", + "BillOfLadingV1Shipper", + "BillOfLadingV1Document", +] diff --git a/mindee/product/business_card/__init__.py b/mindee/product/business_card/__init__.py index bf544a23..a952f866 100644 --- a/mindee/product/business_card/__init__.py +++ b/mindee/product/business_card/__init__.py @@ -2,3 +2,8 @@ from mindee.product.business_card.business_card_v1_document import ( BusinessCardV1Document, ) + +__all__ = [ + "BusinessCardV1", + "BusinessCardV1Document", +] diff --git a/mindee/product/business_card/business_card_v1_document.py b/mindee/product/business_card/business_card_v1_document.py index 4420edd6..89021c14 100644 --- a/mindee/product/business_card/business_card_v1_document.py +++ b/mindee/product/business_card/business_card_v1_document.py @@ -90,7 +90,7 @@ def __init__( ) def __str__(self) -> str: - social_media = f"\n { ' ' * 14 }".join( + social_media = f"\n {' ' * 14}".join( [str(item) for item in self.social_media], ) out_str: str = f":Firstname: {self.firstname}\n" diff --git a/mindee/product/cropper/__init__.py b/mindee/product/cropper/__init__.py index 8069a29e..219d5b42 100644 --- a/mindee/product/cropper/__init__.py +++ b/mindee/product/cropper/__init__.py @@ -5,3 +5,9 @@ from mindee.product.cropper.cropper_v1_page import ( CropperV1Page, ) + +__all__ = [ + "CropperV1", + "CropperV1Document", + "CropperV1Page", +] diff --git a/mindee/product/cropper/cropper_v1_page.py b/mindee/product/cropper/cropper_v1_page.py index 7081220c..7ad263f5 100644 --- a/mindee/product/cropper/cropper_v1_page.py +++ b/mindee/product/cropper/cropper_v1_page.py @@ -32,7 +32,7 @@ def __init__( ] def __str__(self) -> str: - cropping = f"\n { ' ' * 18 }".join( + cropping = f"\n {' ' * 18}".join( [str(item) for item in self.cropping], ) out_str: str = f":Document Cropper: {cropping}\n" diff --git a/mindee/product/custom/__init__.py b/mindee/product/custom/__init__.py index 33330881..8e801206 100644 --- a/mindee/product/custom/__init__.py +++ b/mindee/product/custom/__init__.py @@ -1 +1,11 @@ -from mindee.product.custom.custom_v1 import CustomV1, CustomV1Document, CustomV1Page +from mindee.product.custom.custom_v1 import ( + CustomV1, + CustomV1Document, + CustomV1Page, +) + +__all__ = [ + "CustomV1", + "CustomV1Document", + "CustomV1Page", +] diff --git a/mindee/product/delivery_note/__init__.py b/mindee/product/delivery_note/__init__.py index 6de4eb38..39142341 100644 --- a/mindee/product/delivery_note/__init__.py +++ b/mindee/product/delivery_note/__init__.py @@ -2,3 +2,8 @@ from mindee.product.delivery_note.delivery_note_v1_document import ( DeliveryNoteV1Document, ) + +__all__ = [ + "DeliveryNoteV1", + "DeliveryNoteV1Document", +] diff --git a/mindee/product/driver_license/__init__.py b/mindee/product/driver_license/__init__.py index 027a0e0a..257c0e91 100644 --- a/mindee/product/driver_license/__init__.py +++ b/mindee/product/driver_license/__init__.py @@ -2,3 +2,8 @@ from mindee.product.driver_license.driver_license_v1_document import ( DriverLicenseV1Document, ) + +__all__ = [ + "DriverLicenseV1", + "DriverLicenseV1Document", +] diff --git a/mindee/product/financial_document/__init__.py b/mindee/product/financial_document/__init__.py index 4f727e64..6cbb4b52 100644 --- a/mindee/product/financial_document/__init__.py +++ b/mindee/product/financial_document/__init__.py @@ -5,3 +5,9 @@ from mindee.product.financial_document.financial_document_v1_line_item import ( FinancialDocumentV1LineItem, ) + +__all__ = [ + "FinancialDocumentV1", + "FinancialDocumentV1Document", + "FinancialDocumentV1LineItem", +] diff --git a/mindee/product/financial_document/financial_document_v1_document.py b/mindee/product/financial_document/financial_document_v1_document.py index 27a68824..57352bdd 100644 --- a/mindee/product/financial_document/financial_document_v1_document.py +++ b/mindee/product/financial_document/financial_document_v1_document.py @@ -268,16 +268,16 @@ def _line_items_to_str(self) -> str: return out_str def __str__(self) -> str: - customer_company_registrations = f"\n { ' ' * 32 }".join( + customer_company_registrations = f"\n {' ' * 32}".join( [str(item) for item in self.customer_company_registrations], ) - reference_numbers = f"\n { ' ' * 19 }".join( + reference_numbers = f"\n {' ' * 19}".join( [str(item) for item in self.reference_numbers], ) - supplier_company_registrations = f"\n { ' ' * 32 }".join( + supplier_company_registrations = f"\n {' ' * 32}".join( [str(item) for item in self.supplier_company_registrations], ) - supplier_payment_details = f"\n { ' ' * 26 }".join( + supplier_payment_details = f"\n {' ' * 26}".join( [str(item) for item in self.supplier_payment_details], ) out_str: str = f":Locale: {self.locale}\n" diff --git a/mindee/product/fr/__init__.py b/mindee/product/fr/__init__.py index 8cfcc41d..a4e4f756 100644 --- a/mindee/product/fr/__init__.py +++ b/mindee/product/fr/__init__.py @@ -113,3 +113,49 @@ from mindee.product.fr.payslip.payslip_v3_salary_detail import ( PayslipV3SalaryDetail, ) + +__all__ = [ + "BankAccountDetailsV1", + "BankAccountDetailsV1Document", + "BankAccountDetailsV2", + "BankAccountDetailsV2Bban", + "BankAccountDetailsV2Document", + "CarteGriseV1", + "CarteGriseV1Document", + "EnergyBillV1", + "EnergyBillV1Document", + "EnergyBillV1EnergyConsumer", + "EnergyBillV1EnergySupplier", + "EnergyBillV1EnergyUsage", + "EnergyBillV1MeterDetail", + "EnergyBillV1Subscription", + "EnergyBillV1TaxesAndContribution", + "HealthCardV1", + "HealthCardV1Document", + "IdCardV1", + "IdCardV1Document", + "IdCardV1Page", + "IdCardV2", + "IdCardV2Document", + "IdCardV2Page", + "PayslipV2", + "PayslipV2BankAccountDetail", + "PayslipV2Document", + "PayslipV2Employee", + "PayslipV2Employer", + "PayslipV2Employment", + "PayslipV2PayDetail", + "PayslipV2PayPeriod", + "PayslipV2Pto", + "PayslipV2SalaryDetail", + "PayslipV3", + "PayslipV3BankAccountDetail", + "PayslipV3Document", + "PayslipV3Employee", + "PayslipV3Employer", + "PayslipV3Employment", + "PayslipV3PaidTimeOff", + "PayslipV3PayDetail", + "PayslipV3PayPeriod", + "PayslipV3SalaryDetail", +] diff --git a/mindee/product/fr/bank_account_details/__init__.py b/mindee/product/fr/bank_account_details/__init__.py index 80beacdc..8ff37aee 100644 --- a/mindee/product/fr/bank_account_details/__init__.py +++ b/mindee/product/fr/bank_account_details/__init__.py @@ -13,3 +13,11 @@ from mindee.product.fr.bank_account_details.bank_account_details_v2_document import ( BankAccountDetailsV2Document, ) + +__all__ = [ + "BankAccountDetailsV1", + "BankAccountDetailsV1Document", + "BankAccountDetailsV2", + "BankAccountDetailsV2Bban", + "BankAccountDetailsV2Document", +] diff --git a/mindee/product/fr/carte_grise/__init__.py b/mindee/product/fr/carte_grise/__init__.py index 1b93152b..dc35100b 100644 --- a/mindee/product/fr/carte_grise/__init__.py +++ b/mindee/product/fr/carte_grise/__init__.py @@ -2,3 +2,8 @@ from mindee.product.fr.carte_grise.carte_grise_v1_document import ( CarteGriseV1Document, ) + +__all__ = [ + "CarteGriseV1", + "CarteGriseV1Document", +] diff --git a/mindee/product/fr/energy_bill/__init__.py b/mindee/product/fr/energy_bill/__init__.py index e633eb01..471fa777 100644 --- a/mindee/product/fr/energy_bill/__init__.py +++ b/mindee/product/fr/energy_bill/__init__.py @@ -20,3 +20,20 @@ from mindee.product.fr.energy_bill.energy_bill_v1_taxes_and_contribution import ( EnergyBillV1TaxesAndContribution, ) + +__all__ = [ + "EnergyBillV1", + "EnergyBillV1Document", + "EnergyBillV1EnergyConsumer", + "EnergyBillV1EnergySupplier", + "EnergyBillV1EnergyUsage", + "EnergyBillV1MeterDetail", + "EnergyBillV1Subscription", + "EnergyBillV1TaxesAndContribution", + "EnergyBillV1Document", + "EnergyBillV1EnergyConsumer", + "EnergyBillV1EnergySupplier", + "EnergyBillV1EnergyUsage", + "EnergyBillV1MeterDetail", + "EnergyBillV1Subscription", +] diff --git a/mindee/product/fr/health_card/__init__.py b/mindee/product/fr/health_card/__init__.py index da216eb0..af8a3138 100644 --- a/mindee/product/fr/health_card/__init__.py +++ b/mindee/product/fr/health_card/__init__.py @@ -2,3 +2,8 @@ from mindee.product.fr.health_card.health_card_v1_document import ( HealthCardV1Document, ) + +__all__ = [ + "HealthCardV1", + "HealthCardV1Document", +] diff --git a/mindee/product/fr/health_card/health_card_v1_document.py b/mindee/product/fr/health_card/health_card_v1_document.py index 1c9e2eab..27486792 100644 --- a/mindee/product/fr/health_card/health_card_v1_document.py +++ b/mindee/product/fr/health_card/health_card_v1_document.py @@ -49,7 +49,7 @@ def __init__( ) def __str__(self) -> str: - given_names = f"\n { ' ' * 15 }".join( + given_names = f"\n {' ' * 15}".join( [str(item) for item in self.given_names], ) out_str: str = f":Given Name(s): {given_names}\n" diff --git a/mindee/product/fr/id_card/__init__.py b/mindee/product/fr/id_card/__init__.py index 3cd8836c..d1e47e96 100644 --- a/mindee/product/fr/id_card/__init__.py +++ b/mindee/product/fr/id_card/__init__.py @@ -12,3 +12,12 @@ from mindee.product.fr.id_card.id_card_v2_page import ( IdCardV2Page, ) + +__all__ = [ + "IdCardV1", + "IdCardV1Document", + "IdCardV1Page", + "IdCardV2", + "IdCardV2Document", + "IdCardV2Page", +] 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 a52d453b..7f1f9187 100644 --- a/mindee/product/fr/id_card/id_card_v1_document.py +++ b/mindee/product/fr/id_card/id_card_v1_document.py @@ -85,7 +85,7 @@ def __init__( ) def __str__(self) -> str: - given_names = f"\n { ' ' * 15 }".join( + given_names = f"\n {' ' * 15}".join( [str(item) for item in self.given_names], ) out_str: str = f":Identity Number: {self.id_number}\n" 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 622264cd..9466a4b0 100644 --- a/mindee/product/fr/id_card/id_card_v2_document.py +++ b/mindee/product/fr/id_card/id_card_v2_document.py @@ -115,7 +115,7 @@ def __init__( ) def __str__(self) -> str: - given_names = f"\n { ' ' * 15 }".join( + given_names = f"\n {' ' * 15}".join( [str(item) for item in self.given_names], ) out_str: str = f":Nationality: {self.nationality}\n" diff --git a/mindee/product/fr/payslip/__init__.py b/mindee/product/fr/payslip/__init__.py index 5ec2c7eb..d104caa4 100644 --- a/mindee/product/fr/payslip/__init__.py +++ b/mindee/product/fr/payslip/__init__.py @@ -54,3 +54,26 @@ from mindee.product.fr.payslip.payslip_v3_salary_detail import ( PayslipV3SalaryDetail, ) + +__all__ = [ + "PayslipV2", + "PayslipV2BankAccountDetail", + "PayslipV2Document", + "PayslipV2Employee", + "PayslipV2Employer", + "PayslipV2Employment", + "PayslipV2PayDetail", + "PayslipV2PayPeriod", + "PayslipV2Pto", + "PayslipV2SalaryDetail", + "PayslipV3", + "PayslipV3BankAccountDetail", + "PayslipV3Document", + "PayslipV3Employee", + "PayslipV3Employer", + "PayslipV3Employment", + "PayslipV3PaidTimeOff", + "PayslipV3PayDetail", + "PayslipV3PayPeriod", + "PayslipV3SalaryDetail", +] diff --git a/mindee/product/generated/__init__.py b/mindee/product/generated/__init__.py index 01c2a2be..36399d60 100644 --- a/mindee/product/generated/__init__.py +++ b/mindee/product/generated/__init__.py @@ -3,3 +3,9 @@ GeneratedV1Document, GeneratedV1Page, ) + +__all__ = [ + "GeneratedV1", + "GeneratedV1Document", + "GeneratedV1Page", +] diff --git a/mindee/product/generated/generated_v1_prediction.py b/mindee/product/generated/generated_v1_prediction.py index 78753746..5c466405 100644 --- a/mindee/product/generated/generated_v1_prediction.py +++ b/mindee/product/generated/generated_v1_prediction.py @@ -43,7 +43,7 @@ def __str__(self) -> str: if isinstance(sub_value, GeneratedObjectField): str_value += re.sub(pattern, r"\1* :", sub_value._str_level(1)) else: - str_value += f" { ' ' * (len(field_name)+2)}{sub_value}\n" + str_value += f" {' ' * (len(field_name) + 2)}{sub_value}\n" str_value = str_value.rstrip() else: str_value = str(field_value) diff --git a/mindee/product/ind/__init__.py b/mindee/product/ind/__init__.py index 26a05e47..aac8be5f 100644 --- a/mindee/product/ind/__init__.py +++ b/mindee/product/ind/__init__.py @@ -2,3 +2,8 @@ from mindee.product.ind.indian_passport.indian_passport_v1_document import ( IndianPassportV1Document, ) + +__all__ = [ + "IndianPassportV1", + "IndianPassportV1Document", +] diff --git a/mindee/product/ind/indian_passport/__init__.py b/mindee/product/ind/indian_passport/__init__.py index 26a05e47..aac8be5f 100644 --- a/mindee/product/ind/indian_passport/__init__.py +++ b/mindee/product/ind/indian_passport/__init__.py @@ -2,3 +2,8 @@ from mindee.product.ind.indian_passport.indian_passport_v1_document import ( IndianPassportV1Document, ) + +__all__ = [ + "IndianPassportV1", + "IndianPassportV1Document", +] diff --git a/mindee/product/international_id/__init__.py b/mindee/product/international_id/__init__.py index a3dba05d..d93a0fd2 100644 --- a/mindee/product/international_id/__init__.py +++ b/mindee/product/international_id/__init__.py @@ -2,3 +2,8 @@ from mindee.product.international_id.international_id_v2_document import ( InternationalIdV2Document, ) + +__all__ = [ + "InternationalIdV2", + "InternationalIdV2Document", +] diff --git a/mindee/product/international_id/international_id_v2_document.py b/mindee/product/international_id/international_id_v2_document.py index 76e9aa2f..0b1278c7 100644 --- a/mindee/product/international_id/international_id_v2_document.py +++ b/mindee/product/international_id/international_id_v2_document.py @@ -128,10 +128,10 @@ def __init__( ] def __str__(self) -> str: - given_names = f"\n { ' ' * 13 }".join( + given_names = f"\n {' ' * 13}".join( [str(item) for item in self.given_names], ) - surnames = f"\n { ' ' * 10 }".join( + surnames = f"\n {' ' * 10}".join( [str(item) for item in self.surnames], ) out_str: str = f":Document Type: {self.document_type}\n" diff --git a/mindee/product/invoice/__init__.py b/mindee/product/invoice/__init__.py index 2a9be25d..76eda3a9 100644 --- a/mindee/product/invoice/__init__.py +++ b/mindee/product/invoice/__init__.py @@ -5,3 +5,9 @@ from mindee.product.invoice.invoice_v4_line_item import ( InvoiceV4LineItem, ) + +__all__ = [ + "InvoiceV4", + "InvoiceV4Document", + "InvoiceV4LineItem", +] diff --git a/mindee/product/invoice/invoice_v4_document.py b/mindee/product/invoice/invoice_v4_document.py index 321d80d1..fc4408ed 100644 --- a/mindee/product/invoice/invoice_v4_document.py +++ b/mindee/product/invoice/invoice_v4_document.py @@ -239,16 +239,16 @@ def _line_items_to_str(self) -> str: return out_str def __str__(self) -> str: - customer_company_registrations = f"\n { ' ' * 32 }".join( + customer_company_registrations = f"\n {' ' * 32}".join( [str(item) for item in self.customer_company_registrations], ) - reference_numbers = f"\n { ' ' * 19 }".join( + reference_numbers = f"\n {' ' * 19}".join( [str(item) for item in self.reference_numbers], ) - supplier_company_registrations = f"\n { ' ' * 32 }".join( + supplier_company_registrations = f"\n {' ' * 32}".join( [str(item) for item in self.supplier_company_registrations], ) - supplier_payment_details = f"\n { ' ' * 26 }".join( + supplier_payment_details = f"\n {' ' * 26}".join( [str(item) for item in self.supplier_payment_details], ) out_str: str = f":Locale: {self.locale}\n" diff --git a/mindee/product/invoice_splitter/__init__.py b/mindee/product/invoice_splitter/__init__.py index 5fe68245..2249036f 100644 --- a/mindee/product/invoice_splitter/__init__.py +++ b/mindee/product/invoice_splitter/__init__.py @@ -5,3 +5,9 @@ from mindee.product.invoice_splitter.invoice_splitter_v1_invoice_page_group import ( InvoiceSplitterV1InvoicePageGroup, ) + +__all__ = [ + "InvoiceSplitterV1", + "InvoiceSplitterV1Document", + "InvoiceSplitterV1InvoicePageGroup", +] diff --git a/mindee/product/material_certificate/__init__.py b/mindee/product/material_certificate/__init__.py index 79100b97..e0a8dbd3 100644 --- a/mindee/product/material_certificate/__init__.py +++ b/mindee/product/material_certificate/__init__.py @@ -4,3 +4,8 @@ from mindee.product.material_certificate.material_certificate_v1_document import ( MaterialCertificateV1Document, ) + +__all__ = [ + "MaterialCertificateV1", + "MaterialCertificateV1Document", +] diff --git a/mindee/product/multi_receipts_detector/__init__.py b/mindee/product/multi_receipts_detector/__init__.py index 59b44a18..8cd99e60 100644 --- a/mindee/product/multi_receipts_detector/__init__.py +++ b/mindee/product/multi_receipts_detector/__init__.py @@ -4,3 +4,8 @@ from mindee.product.multi_receipts_detector.multi_receipts_detector_v1_document import ( MultiReceiptsDetectorV1Document, ) + +__all__ = [ + "MultiReceiptsDetectorV1", + "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 30891025..72be01a3 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 @@ -30,7 +30,7 @@ def __init__( ] def __str__(self) -> str: - receipts = f"\n { ' ' * 18 }".join( + receipts = f"\n {' ' * 18}".join( [str(item) for item in self.receipts], ) out_str: str = f":List of Receipts: {receipts}\n" diff --git a/mindee/product/nutrition_facts_label/__init__.py b/mindee/product/nutrition_facts_label/__init__.py index fb8d6f0d..e2df071e 100644 --- a/mindee/product/nutrition_facts_label/__init__.py +++ b/mindee/product/nutrition_facts_label/__init__.py @@ -43,3 +43,22 @@ from mindee.product.nutrition_facts_label.nutrition_facts_label_v1_trans_fat import ( NutritionFactsLabelV1TransFat, ) + + +__all__ = [ + "NutritionFactsLabelV1", + "NutritionFactsLabelV1Document", + "NutritionFactsLabelV1Nutrient", + "NutritionFactsLabelV1Protein", + "NutritionFactsLabelV1TransFat", + "NutritionFactsLabelV1TotalSugar", + "NutritionFactsLabelV1TotalFat", + "NutritionFactsLabelV1TotalCarbohydrate", + "NutritionFactsLabelV1Sodium", + "NutritionFactsLabelV1ServingSize", + "NutritionFactsLabelV1SaturatedFat", + "NutritionFactsLabelV1AddedSugar", + "NutritionFactsLabelV1DietaryFiber", + "NutritionFactsLabelV1Cholesterol", + "NutritionFactsLabelV1Calorie", +] diff --git a/mindee/product/passport/__init__.py b/mindee/product/passport/__init__.py index 8beca939..00bb91e9 100644 --- a/mindee/product/passport/__init__.py +++ b/mindee/product/passport/__init__.py @@ -2,3 +2,8 @@ from mindee.product.passport.passport_v1_document import ( PassportV1Document, ) + +__all__ = [ + "PassportV1", + "PassportV1Document", +] diff --git a/mindee/product/passport/passport_v1_document.py b/mindee/product/passport/passport_v1_document.py index 1a576e60..1f757604 100644 --- a/mindee/product/passport/passport_v1_document.py +++ b/mindee/product/passport/passport_v1_document.py @@ -91,7 +91,7 @@ def __init__( ) def __str__(self) -> str: - given_names = f"\n { ' ' * 15 }".join( + given_names = f"\n {' ' * 15}".join( [str(item) for item in self.given_names], ) out_str: str = f":Country Code: {self.country}\n" diff --git a/mindee/product/receipt/__init__.py b/mindee/product/receipt/__init__.py index ec8c38d3..b993e38a 100644 --- a/mindee/product/receipt/__init__.py +++ b/mindee/product/receipt/__init__.py @@ -5,3 +5,9 @@ from mindee.product.receipt.receipt_v5_line_item import ( ReceiptV5LineItem, ) + +__all__ = [ + "ReceiptV5", + "ReceiptV5Document", + "ReceiptV5LineItem", +] diff --git a/mindee/product/receipt/receipt_v5_document.py b/mindee/product/receipt/receipt_v5_document.py index 06a9b11a..7a5961db 100644 --- a/mindee/product/receipt/receipt_v5_document.py +++ b/mindee/product/receipt/receipt_v5_document.py @@ -157,7 +157,7 @@ def _line_items_to_str(self) -> str: return out_str def __str__(self) -> str: - supplier_company_registrations = f"\n { ' ' * 32 }".join( + supplier_company_registrations = f"\n {' ' * 32}".join( [str(item) for item in self.supplier_company_registrations], ) out_str: str = f":Expense Locale: {self.locale}\n" diff --git a/mindee/product/resume/__init__.py b/mindee/product/resume/__init__.py index 253a379a..161e28c7 100644 --- a/mindee/product/resume/__init__.py +++ b/mindee/product/resume/__init__.py @@ -17,3 +17,13 @@ from mindee.product.resume.resume_v1_social_networks_url import ( ResumeV1SocialNetworksUrl, ) + +__all__ = [ + "ResumeV1", + "ResumeV1Document", + "ResumeV1Education", + "ResumeV1Language", + "ResumeV1ProfessionalExperience", + "ResumeV1SocialNetworksUrl", + "ResumeV1Certificate", +] diff --git a/mindee/product/resume/resume_v1_document.py b/mindee/product/resume/resume_v1_document.py index ff3fa7dc..46ac8314 100644 --- a/mindee/product/resume/resume_v1_document.py +++ b/mindee/product/resume/resume_v1_document.py @@ -279,16 +279,16 @@ def _certificates_to_str(self) -> str: return out_str def __str__(self) -> str: - given_names = f"\n { ' ' * 13 }".join( + given_names = f"\n {' ' * 13}".join( [str(item) for item in self.given_names], ) - hard_skills = f"\n { ' ' * 13 }".join( + hard_skills = f"\n {' ' * 13}".join( [str(item) for item in self.hard_skills], ) - soft_skills = f"\n { ' ' * 13 }".join( + soft_skills = f"\n {' ' * 13}".join( [str(item) for item in self.soft_skills], ) - surnames = f"\n { ' ' * 10 }".join( + surnames = f"\n {' ' * 10}".join( [str(item) for item in self.surnames], ) out_str: str = f":Document Language: {self.document_language}\n" diff --git a/mindee/product/us/__init__.py b/mindee/product/us/__init__.py index 781e922b..ca53a9ea 100644 --- a/mindee/product/us/__init__.py +++ b/mindee/product/us/__init__.py @@ -22,3 +22,16 @@ from mindee.product.us.us_mail.us_mail_v3_sender_address import ( UsMailV3SenderAddress, ) + +__all__ = [ + "BankCheckV1", + "BankCheckV1Document", + "BankCheckV1Page", + "HealthcareCardV1", + "HealthcareCardV1Copay", + "HealthcareCardV1Document", + "UsMailV3", + "UsMailV3Document", + "UsMailV3RecipientAddress", + "UsMailV3SenderAddress", +] diff --git a/mindee/product/us/bank_check/__init__.py b/mindee/product/us/bank_check/__init__.py index 6341e709..49201c4f 100644 --- a/mindee/product/us/bank_check/__init__.py +++ b/mindee/product/us/bank_check/__init__.py @@ -5,3 +5,9 @@ from mindee.product.us.bank_check.bank_check_v1_page import ( BankCheckV1Page, ) + +__all__ = [ + "BankCheckV1", + "BankCheckV1Document", + "BankCheckV1Page", +] 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 fff0b790..5b320763 100644 --- a/mindee/product/us/bank_check/bank_check_v1_document.py +++ b/mindee/product/us/bank_check/bank_check_v1_document.py @@ -62,7 +62,7 @@ def __init__( ) def __str__(self) -> str: - payees = f"\n { ' ' * 8 }".join( + payees = f"\n {' ' * 8}".join( [str(item) for item in self.payees], ) out_str: str = f":Check Issue Date: {self.date}\n" 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 79300da5..aac6bf47 100644 --- a/mindee/product/us/bank_check/bank_check_v1_page.py +++ b/mindee/product/us/bank_check/bank_check_v1_page.py @@ -38,7 +38,7 @@ def __init__( ] def __str__(self) -> str: - signatures_positions = f"\n { ' ' * 21 }".join( + signatures_positions = f"\n {' ' * 21}".join( [str(item) for item in self.signatures_positions], ) out_str: str = f":Check Position: {self.check_position}\n" diff --git a/mindee/product/us/healthcare_card/__init__.py b/mindee/product/us/healthcare_card/__init__.py index 45cca41f..cf396643 100644 --- a/mindee/product/us/healthcare_card/__init__.py +++ b/mindee/product/us/healthcare_card/__init__.py @@ -5,3 +5,9 @@ from mindee.product.us.healthcare_card.healthcare_card_v1_document import ( HealthcareCardV1Document, ) + +__all__ = [ + "HealthcareCardV1", + "HealthcareCardV1Copay", + "HealthcareCardV1Document", +] 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 9b824d98..303dc97f 100644 --- a/mindee/product/us/healthcare_card/healthcare_card_v1_document.py +++ b/mindee/product/us/healthcare_card/healthcare_card_v1_document.py @@ -135,7 +135,7 @@ def _copays_to_str(self) -> str: return out_str def __str__(self) -> str: - dependents = f"\n { ' ' * 12 }".join( + dependents = f"\n {' ' * 12}".join( [str(item) for item in self.dependents], ) out_str: str = f":Company Name: {self.company_name}\n" diff --git a/mindee/product/us/us_mail/__init__.py b/mindee/product/us/us_mail/__init__.py index b5be043b..1c1637fb 100644 --- a/mindee/product/us/us_mail/__init__.py +++ b/mindee/product/us/us_mail/__init__.py @@ -8,3 +8,10 @@ from mindee.product.us.us_mail.us_mail_v3_sender_address import ( UsMailV3SenderAddress, ) + +__all__ = [ + "UsMailV3", + "UsMailV3Document", + "UsMailV3RecipientAddress", + "UsMailV3SenderAddress", +] diff --git a/mindee/product/us/us_mail/us_mail_v3_document.py b/mindee/product/us/us_mail/us_mail_v3_document.py index ed0928d7..ea17064a 100644 --- a/mindee/product/us/us_mail/us_mail_v3_document.py +++ b/mindee/product/us/us_mail/us_mail_v3_document.py @@ -94,7 +94,7 @@ def _recipient_addresses_to_str(self) -> str: return out_str def __str__(self) -> str: - recipient_names = f"\n { ' ' * 17 }".join( + recipient_names = f"\n {' ' * 17}".join( [str(item) for item in self.recipient_names], ) out_str: str = f":Sender Name: {self.sender_name}\n" diff --git a/pyproject.toml b/pyproject.toml index b7f34d98..5f38fcc0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -51,7 +51,7 @@ lint = [ ] test = [ "toml~=0.10.2", - "pytest~=7.4", + "pytest~=8.0.0", "pytest-cov~=5.0", ] docs = [ @@ -78,19 +78,15 @@ version = {attr = "mindee.versions.__version__"} "mindee" = ["py.typed"] -[tool.black] +[tool.ruff] line-length = 88 -target-version = [ - 'py38', - 'py39', - 'py310', - 'py311', - 'py312', -] -include = '\.pyi?$' +indent-width = 4 +target-version = "py38" -[tool.isort] -profile = "black" +[tool.ruff.format] +quote-style = "double" +indent-style = "space" +skip-magic-trailing-comma = false [tool.mypy] disallow_any_unimported = true diff --git a/tests/utils.py b/tests/utils.py index e67b57a0..252a699c 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -8,11 +8,14 @@ ) ROOT_DATA_DIR = Path(__file__).parent / "data" -V1_DATA_DIR = ROOT_DATA_DIR / "v1" -V2_DATA_DIR = ROOT_DATA_DIR / "v2" -EXTRAS_DIR = V1_DATA_DIR / "extras" FILE_TYPES_DIR = ROOT_DATA_DIR / "file_types" + +V1_DATA_DIR = ROOT_DATA_DIR / "v1" +V1_ERROR_DATA_DIR = V1_DATA_DIR / "errors" V1_PRODUCT_DATA_DIR = V1_DATA_DIR / "products" +V1_EXTRAS_DIR = V1_DATA_DIR / "extras" + +V2_DATA_DIR = ROOT_DATA_DIR / "v2" V2_PRODUCT_DATA_DIR = V2_DATA_DIR / "products" diff --git a/tests/v1/extras/test_full_text_ocr.py b/tests/v1/extras/test_full_text_ocr.py index ca48fae1..f1013efb 100644 --- a/tests/v1/extras/test_full_text_ocr.py +++ b/tests/v1/extras/test_full_text_ocr.py @@ -4,7 +4,7 @@ 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 +from tests.utils import V1_EXTRAS_DIR # NOTE: Implementing extras per pages without content (like the Java library) # would be a breaking change for the Python SDK. @@ -19,7 +19,7 @@ @pytest.fixture def load_document(): - with open(EXTRAS_DIR / "full_text_ocr/complete.json", "r") as file: + with open(V1_EXTRAS_DIR / "full_text_ocr/complete.json", "r") as file: prediction_data = json.load(file) return AsyncPredictResponse(InternationalIdV2, prediction_data).document @@ -29,7 +29,7 @@ def test_get_full_text_ocr_result( load_document, # load_pages ): - expected_text = (EXTRAS_DIR / "full_text_ocr/full_text_ocr.txt").read_text() + expected_text = (V1_EXTRAS_DIR / "full_text_ocr/full_text_ocr.txt").read_text() full_text_ocr = load_document.extras.full_text_ocr # page0_ocr = load_pages[0].extras.full_text_ocr.content diff --git a/tests/v1/mindee_http/__init__.py b/tests/v1/mindee_http/__init__.py index 2101a6f9..e69de29b 100644 --- a/tests/v1/mindee_http/__init__.py +++ b/tests/v1/mindee_http/__init__.py @@ -1 +0,0 @@ -from tests.v1.mindee_http.test_error import V1_ERROR_DATA_DIR diff --git a/tests/v1/mindee_http/test_error.py b/tests/v1/mindee_http/test_error.py index c4b32098..108cd332 100644 --- a/tests/v1/mindee_http/test_error.py +++ b/tests/v1/mindee_http/test_error.py @@ -9,9 +9,7 @@ handle_error, ) from mindee.input.sources.path_input import PathInput -from tests.utils import FILE_TYPES_DIR, V1_DATA_DIR, clear_envvars, dummy_envvars - -V1_ERROR_DATA_DIR = V1_DATA_DIR / "errors" +from tests.utils import FILE_TYPES_DIR, clear_envvars, dummy_envvars, V1_ERROR_DATA_DIR @pytest.fixture diff --git a/tests/v1/product/generated/test_generated_v1.py b/tests/v1/product/generated/test_generated_v1.py index c414eca8..f5a1f465 100644 --- a/tests/v1/product/generated/test_generated_v1.py +++ b/tests/v1/product/generated/test_generated_v1.py @@ -15,9 +15,9 @@ @pytest.fixture -def international_id_v1_complete_doc() -> ( - Document[GeneratedV1Document, Page[GeneratedV1Page]] -): +def international_id_v1_complete_doc() -> Document[ + GeneratedV1Document, Page[GeneratedV1Page] +]: json_data = json.load( open( V1_PRODUCT_DATA_DIR @@ -31,9 +31,9 @@ def international_id_v1_complete_doc() -> ( @pytest.fixture -def international_id_v1_empty_doc() -> ( - Document[GeneratedV1Document, Page[GeneratedV1Page]] -): +def international_id_v1_empty_doc() -> Document[ + GeneratedV1Document, Page[GeneratedV1Page] +]: json_data = json.load( open( V1_PRODUCT_DATA_DIR diff --git a/tests/v1/test_client.py b/tests/v1/test_client.py index da6e44c2..923f6416 100644 --- a/tests/v1/test_client.py +++ b/tests/v1/test_client.py @@ -17,8 +17,8 @@ V1_PRODUCT_DATA_DIR, clear_envvars, dummy_envvars, + V1_ERROR_DATA_DIR, ) -from tests.v1.mindee_http import V1_ERROR_DATA_DIR @pytest.fixture diff --git a/tests/v1/workflows/test_workflow.py b/tests/v1/workflows/test_workflow.py index bf0b7e71..74c74034 100644 --- a/tests/v1/workflows/test_workflow.py +++ b/tests/v1/workflows/test_workflow.py @@ -1,5 +1,4 @@ import json -from pathlib import Path import pytest