✨ add support for extraction in crop, split, and classification

Author: sebastianMindee

mindee/client_mixin.py

@@ -2,7 +2,11 @@
 from typing import BinaryIO, Union
 
 from mindee.error import MindeeClientError
-from mindee.input import Base64Input, BytesInput, FileInput, PathInput, UrlInputSource
+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
 
 
 class ClientMixin:

mindee/client_v2.py

@@ -16,7 +16,7 @@
     is_valid_post_response,
 )
 from mindee.parsing.v2.common_response import CommonStatus
-from mindee.v2.parsing.inference.base_response import BaseResponse
+from mindee.parsing.v2.base_response import BaseResponse
 from mindee.parsing.v2.inference_response import InferenceResponse
 from mindee.parsing.v2.job_response import JobResponse
 

mindee/parsing/v2/base_inference.py

@@ -0,0 +1,29 @@
+from abc import ABC
+from typing import TypeVar
+
+from mindee.parsing.common.string_dict import StringDict
+from mindee.parsing.v2.inference_file import InferenceFile
+from mindee.parsing.v2.inference_job import InferenceJob
+from mindee.parsing.v2.inference_model import InferenceModel
+
+
+class BaseInference(ABC):
+    """Base class for V2 inference objects."""
+
+    job: InferenceJob
+    """Job the inference belongs to."""
+    model: InferenceModel
+    """Model info for the inference."""
+    file: InferenceFile
+    """File info for the inference."""
+    id: str
+    """ID of the inference."""
+
+    def __init__(self, raw_response: StringDict):
+        self.id = raw_response["id"]
+        self.job = InferenceJob(raw_response["job"])
+        self.model = InferenceModel(raw_response["model"])
+        self.file = InferenceFile(raw_response["file"])
+
+
+TypeBaseInference = TypeVar("TypeBaseInference", bound=BaseInference)

mindee/parsing/v2/base_response.py

@@ -0,0 +1,21 @@
+from abc import ABC
+
+from mindee.parsing.v2.base_inference import BaseInference
+from mindee.parsing.v2.common_response import CommonResponse
+
+
+class BaseResponse(ABC, CommonResponse):
+    """Base class for V2 inference responses."""
+
+    inference: BaseInference
+    """The inference result for a split utility request"""
+    _slug: str
+    """Slug of the inference."""
+
+    def __str__(self) -> str:
+        return str(self.inference)
+
+    @classmethod
+    def get_result_slug(cls) -> str:
+        """Getter for the inference slug."""
+        return cls._slug

mindee/parsing/v2/inference.py

@@ -1,5 +1,5 @@
 from mindee.parsing.common.string_dict import StringDict
-from mindee.v2.parsing.inference import BaseInference
+from mindee.parsing.v2.base_inference import BaseInference
 from mindee.parsing.v2.inference_active_options import InferenceActiveOptions
 from mindee.parsing.v2.inference_result import InferenceResult
 

mindee/parsing/v2/inference_job.py

@@ -0,0 +1,14 @@
+from mindee.parsing.common.string_dict import StringDict
+
+
+class InferenceJob:
+    """Inference Job info."""
+
+    id: str
+    """UUID of the Job."""
+
+    def __init__(self, raw_response: StringDict) -> None:
+        self.id = raw_response["id"]
+
+    def __str__(self) -> str:
+        return f"Job\n===\n:ID: {self.id}"

mindee/parsing/v2/inference_response.py

@@ -1,8 +1,6 @@
 from mindee.parsing.common.string_dict import StringDict
+from mindee.parsing.v2.base_response import BaseResponse
 from mindee.parsing.v2.inference import Inference
-from mindee.v2.parsing.inference.base_response import (
-    BaseResponse,
-)
 
 
 class InferenceResponse(BaseResponse):

mindee/v2/commands/cli_parser.py

@@ -16,7 +16,7 @@
 from mindee.input import BaseParameters
 
 from mindee.input.sources import PathInput, UrlInputSource
-from mindee.v2.parsing import BaseResponse
+from mindee.parsing.v2.base_response import BaseResponse
 
 
 @dataclass

mindee/v2/parsing/__init__.py

@@ -1,5 +1,5 @@
-from mindee.v2.parsing.inference.base_inference import BaseInference
-from mindee.v2.parsing.inference.base_response import BaseResponse
+from mindee.parsing.v2.base_inference import BaseInference
+from mindee.parsing.v2.base_response import BaseResponse
 
 __all__ = [
     "BaseInference",

mindee/v2/parsing/inference/__init__.py

@@ -1,7 +1,5 @@
-from mindee.v2.parsing.inference.base_inference import BaseInference
-from mindee.v2.parsing.inference.base_response import (
-    BaseResponse,
-)
+from mindee.parsing.v2.base_inference import BaseInference
+from mindee.parsing.v2.base_response import BaseResponse
 
 __all__ = [
     "BaseInference",