diff --git a/mindee/__init__.py b/mindee/__init__.py index b377c01a..423acf54 100644 --- a/mindee/__init__.py +++ b/mindee/__init__.py @@ -5,19 +5,20 @@ from mindee.input.local_response import LocalResponse from mindee.input.page_options import PageOptions from mindee.input.polling_options import PollingOptions -from mindee.input.sources.base_64_input import Base64Input -from mindee.input.sources.bytes_input import BytesInput -from mindee.input.sources.file_input import FileInput -from mindee.input.sources.path_input import PathInput -from mindee.input.sources.url_input_source import UrlInputSource +from mindee.input.sources import ( + Base64Input, + BytesInput, + FileInput, + PathInput, + UrlInputSource, +) from mindee.parsing.common.api_response import ApiResponse from mindee.parsing.common.async_predict_response import AsyncPredictResponse from mindee.parsing.common.feedback_response import FeedbackResponse from mindee.parsing.common.job import Job from mindee.parsing.common.predict_response import PredictResponse from mindee.parsing.common.workflow_response import WorkflowResponse -from mindee.parsing.v2.inference_response import InferenceResponse -from mindee.parsing.v2.job_response import JobResponse +from mindee.parsing.v2 import InferenceResponse, JobResponse __all__ = [ "Client", diff --git a/mindee/client_v2.py b/mindee/client_v2.py index 600c7c68..6819b2cf 100644 --- a/mindee/client_v2.py +++ b/mindee/client_v2.py @@ -14,7 +14,7 @@ is_valid_get_response, is_valid_post_response, ) -from mindee.parsing.v2.field.common_response import CommonStatus +from mindee.parsing.v2.common_response import CommonStatus from mindee.parsing.v2.inference_response import InferenceResponse from mindee.parsing.v2.job_response import JobResponse diff --git a/mindee/input/local_response.py b/mindee/input/local_response.py index b9b43c15..c8a27fbb 100644 --- a/mindee/input/local_response.py +++ b/mindee/input/local_response.py @@ -7,7 +7,7 @@ from typing import Any, BinaryIO, Dict, Type, TypeVar, Union from mindee.error.mindee_error import MindeeError -from mindee.parsing.v2.field.common_response import CommonResponse +from mindee.parsing.v2.common_response import CommonResponse class LocalResponse: diff --git a/mindee/input/sources/__init__.py b/mindee/input/sources/__init__.py index c7d9c22a..9d3bab1d 100644 --- a/mindee/input/sources/__init__.py +++ b/mindee/input/sources/__init__.py @@ -5,3 +5,13 @@ from mindee.input.sources.local_input_source import LocalInputSource from mindee.input.sources.path_input import PathInput from mindee.input.sources.url_input_source import UrlInputSource + +__all__ = [ + "Base64Input", + "BytesInput", + "FileInput", + "InputType", + "LocalInputSource", + "PathInput", + "UrlInputSource", +] diff --git a/mindee/parsing/v2/__init__.py b/mindee/parsing/v2/__init__.py index e69de29b..a1e3b587 100644 --- a/mindee/parsing/v2/__init__.py +++ b/mindee/parsing/v2/__init__.py @@ -0,0 +1,17 @@ +from mindee.parsing.v2.error_response import ErrorResponse +from mindee.parsing.v2.inference import Inference +from mindee.parsing.v2.inference_file import InferenceFile +from mindee.parsing.v2.inference_model import InferenceModel +from mindee.parsing.v2.inference_response import InferenceResponse +from mindee.parsing.v2.inference_result import InferenceResult +from mindee.parsing.v2.job_response import JobResponse + +__all__ = [ + "Inference", + "InferenceFile", + "InferenceModel", + "InferenceResponse", + "InferenceResult", + "JobResponse", + "ErrorResponse", +] diff --git a/mindee/parsing/v2/field/common_response.py b/mindee/parsing/v2/common_response.py similarity index 100% rename from mindee/parsing/v2/field/common_response.py rename to mindee/parsing/v2/common_response.py diff --git a/mindee/parsing/v2/field/__init__.py b/mindee/parsing/v2/field/__init__.py index e69de29b..aa3201c6 100644 --- a/mindee/parsing/v2/field/__init__.py +++ b/mindee/parsing/v2/field/__init__.py @@ -0,0 +1,15 @@ +from mindee.parsing.v2.field.base_field import BaseField +from mindee.parsing.v2.field.field_confidence import FieldConfidence +from mindee.parsing.v2.field.field_location import FieldLocation +from mindee.parsing.v2.field.list_field import ListField +from mindee.parsing.v2.field.object_field import ObjectField +from mindee.parsing.v2.field.simple_field import SimpleField + +__all__ = [ + "BaseField", + "FieldConfidence", + "FieldLocation", + "ListField", + "ObjectField", + "SimpleField", +] diff --git a/mindee/parsing/v2/inference_response.py b/mindee/parsing/v2/inference_response.py index 4a73cba7..f1bb71c2 100644 --- a/mindee/parsing/v2/inference_response.py +++ b/mindee/parsing/v2/inference_response.py @@ -1,5 +1,5 @@ from mindee.parsing.common.string_dict import StringDict -from mindee.parsing.v2.field.common_response import CommonResponse +from mindee.parsing.v2.common_response import CommonResponse from mindee.parsing.v2.inference import Inference diff --git a/mindee/parsing/v2/job_response.py b/mindee/parsing/v2/job_response.py index 6ecfbb0d..ae1e3656 100644 --- a/mindee/parsing/v2/job_response.py +++ b/mindee/parsing/v2/job_response.py @@ -1,5 +1,5 @@ from mindee.parsing.common.string_dict import StringDict -from mindee.parsing.v2.field.common_response import CommonResponse +from mindee.parsing.v2.common_response import CommonResponse from mindee.parsing.v2.job import Job diff --git a/tests/input/test_compression.py b/tests/input/test_compression.py index e09d2970..dfba9ec4 100644 --- a/tests/input/test_compression.py +++ b/tests/input/test_compression.py @@ -7,7 +7,7 @@ from PIL import Image from mindee.image_operations.image_compressor import compress_image -from mindee.input.sources.path_input import PathInput +from mindee.input.sources import PathInput from mindee.pdf.pdf_compressor import compress_pdf from mindee.pdf.pdf_utils import extract_text_from_pdf diff --git a/tests/input/test_local_response.py b/tests/input/test_local_response.py index c7d6a9cd..5858e2d6 100644 --- a/tests/input/test_local_response.py +++ b/tests/input/test_local_response.py @@ -2,7 +2,7 @@ import pytest -from mindee.input.local_response import LocalResponse +from mindee.input import LocalResponse from tests.api.test_async_response import ASYNC_DIR diff --git a/tests/test_inputs.py b/tests/test_inputs.py index c76a2417..5f901bfc 100644 --- a/tests/test_inputs.py +++ b/tests/test_inputs.py @@ -7,11 +7,13 @@ from mindee.error.mimetype_error import MimeTypeError from mindee.error.mindee_error import MindeeError, MindeeSourceError from mindee.input.page_options import KEEP_ONLY, REMOVE, PageOptions -from mindee.input.sources.base_64_input import Base64Input -from mindee.input.sources.bytes_input import BytesInput -from mindee.input.sources.file_input import FileInput -from mindee.input.sources.path_input import PathInput -from mindee.input.sources.url_input_source import UrlInputSource +from mindee.input.sources import ( + Base64Input, + BytesInput, + FileInput, + PathInput, + UrlInputSource, +) from tests.product import PRODUCT_DATA_DIR FILE_TYPES_DIR = Path("./tests/data/file_types") diff --git a/tests/v2/test_inference_response.py b/tests/v2/test_inference_response.py index 5afa7ab5..49b21ed4 100644 --- a/tests/v2/test_inference_response.py +++ b/tests/v2/test_inference_response.py @@ -4,14 +4,11 @@ import pytest -from mindee.parsing.v2.field.field_confidence import FieldConfidence -from mindee.parsing.v2.field.list_field import ListField -from mindee.parsing.v2.field.object_field import ObjectField -from mindee.parsing.v2.field.simple_field import SimpleField +from mindee import InferenceResponse +from mindee.parsing.v2.field import FieldConfidence, ListField, ObjectField, SimpleField from mindee.parsing.v2.inference import Inference from mindee.parsing.v2.inference_file import InferenceFile from mindee.parsing.v2.inference_model import InferenceModel -from mindee.parsing.v2.inference_response import InferenceResponse from tests.test_inputs import V2_DATA_DIR @@ -116,6 +113,7 @@ def test_standard_field_types(): field_simple_string = inference_result.inference.result.fields.field_simple_string assert isinstance(field_simple_string, SimpleField) assert field_simple_string.value == "field_simple_string-value" + assert field_simple_string.confidence == FieldConfidence.CERTAIN assert str(field_simple_string) == "field_simple_string-value" field_simple_bool = inference_result.inference.result.fields.field_simple_bool