✨ add object field convenience accessors

Author: sebastianMindee

mindee/parsing/v2/field/object_field.py

@@ -1,8 +1,13 @@
+from typing import TYPE_CHECKING, cast
 from mindee.parsing.common.string_dict import StringDict
 from mindee.parsing.v2.field.base_field import BaseField
 from mindee.parsing.v2.field.dynamic_field import FieldType
 from mindee.parsing.v2.field.inference_fields import InferenceFields
 
+if TYPE_CHECKING:
+    from mindee.parsing.v2.field.list_field import ListField
+    from mindee.parsing.v2.field.simple_field import SimpleField
+
 
 class ObjectField(BaseField):
     """Object field containing multiple fields."""
@@ -37,5 +42,92 @@ def multi_str(self) -> str:
             first = False
         return out_str
 
+    @property
+    def simple_fields(self) -> dict[str, "SimpleField"]:
+        """
+        Extract and return all SimpleField fields from the `fields` attribute.
+
+        :return: A dictionary containing all fields that have a type of `FieldType.SIMPLE`.
+        :rtype: dict[str, SimpleField]
+        """
+        simple_fields = {}
+        for field_key, field_value in self.fields.items():
+            if field_value.field_type == FieldType.SIMPLE:
+                simple_fields[field_key] = cast("SimpleField", field_value)
+        return simple_fields
+
+    @property
+    def list_fields(self) -> dict[str, "ListField"]:
+        """
+        Retrieves all ListField fields from the `fields` attribute.
+
+        :return: A dictionary containing all fields of type `LIST`, with keys
+            representing field keys and values being the corresponding field
+            objects.
+        :rtype: dict[str, ListField]
+        """
+        list_fields = {}
+        for field_key, field_value in self.fields.items():
+            if field_value.field_type == FieldType.LIST:
+                list_fields[field_key] = cast("ListField", field_value)
+        return list_fields
+
+    @property
+    def object_fields(self) -> dict[str, "ObjectField"]:
+        """
+        Retrieves all ObjectField fields from the `fields` attribute of the instance.
+
+        :returns: A dictionary containing fields of type `FieldType.OBJECT`. The keys represent
+            the field names, and the values are corresponding ObjectField objects.
+        :rtype: dict[str, ObjectField]
+        """
+        object_fields = {}
+        for field_key, field_value in self.fields.items():
+            if field_value.field_type == FieldType.OBJECT:
+                object_fields[field_key] = cast("ObjectField", field_value)
+        return object_fields
+
+    def get_simple_field(self, field_name: str) -> "SimpleField":
+        """
+        Retrieves a SimpleField from the provided field name.
+
+        :param field_name: The name of the field to retrieve.
+        :type field_name: str
+        :return: The SimpleField object corresponding to the given field name.
+        :rtype: SimpleField
+        :raises ValueError: If the specified field is not of type SimpleField.
+        """
+        if self.fields[field_name].field_type != FieldType.SIMPLE:
+            raise ValueError(f"Field {field_name} is not a SimpleField.")
+        return cast("SimpleField", self.fields[field_name])
+
+    def get_list_field(self, field_name: str) -> "ListField":
+        """
+        Retrieves the ``ListField`` for the specified field name.
+
+        :param field_name: The name of the field to retrieve.
+        :type field_name: str
+        :return: The corresponding ``ListField`` for the given field name.
+        :rtype: ListField
+        :raises ValueError: If the field is not of type ``ListField``.
+        """
+        if self.fields[field_name].field_type != FieldType.LIST:
+            raise ValueError(f"Field {field_name} is not a ListField.")
+        return cast("ListField", self.fields[field_name])
+
+    def get_object_field(self, field_name: str) -> "ObjectField":
+        """
+        Retrieves the `ObjectField` associated with the specified field name.
+
+        :param field_name: The name of the field to retrieve.
+        :type field_name: str
+        :return: The `ObjectField` associated with the given field name.
+        :rtype: ObjectField
+        :raises ValueError: If the field specified by `field_name` is not an `ObjectField`.
+        """
+        if self.fields[field_name].field_type != FieldType.OBJECT:
+            raise ValueError(f"Field {field_name} is not an ObjectField.")
+        return cast("ObjectField", self.fields[field_name])
+
     def __str__(self) -> str:
         return self.single_str()

tests/data

@@ -17,7 +17,6 @@
 
 V2_DATA_DIR = ROOT_DATA_DIR / "v2"
 V2_PRODUCT_DATA_DIR = V2_DATA_DIR / "products"
-V2_UTILITIES_DATA_DIR = V2_DATA_DIR / "utilities"
 
 
 def clear_envvars(monkeypatch) -> None:

tests/utils.py

@@ -11,7 +11,9 @@
 from tests.utils import V2_DATA_DIR
 
 expected_data_schema_dict = json.loads(
-    (V2_DATA_DIR / "inference" / "data_schema_replace_param.json").read_text()
+    (
+        V2_DATA_DIR / "products" / "extraction" / "data_schema_replace_param.json"
+    ).read_text()
 )
 expected_data_schema_str = json.dumps(
     expected_data_schema_dict, indent=None, sort_keys=True

tests/v2/input/__init__.py

@@ -9,12 +9,12 @@
 
 @pytest.fixture
 def file_path() -> Path:
-    return V2_DATA_DIR / "inference" / "standard_field_types.json"
+    return V2_DATA_DIR / "products" / "extraction" / "standard_field_types.json"
 
 
 def _assert_local_response(local_response):
     fake_hmac_signing = "ogNjY44MhvKPGTtVsI8zG82JqWQa68woYQH"
-    signature = "f390d9f7f57ac04f47b6309d8a40236b0182610804fc20e91b1f6028aaca07a7"
+    signature = "e51bdf80f1a08ed44ee161100fc30a25cb35b4ede671b0a575dc9064a3f5dbf1"
 
     assert local_response._file is not None
     assert not local_response.is_valid_hmac_signature(

tests/v2/input/test_inference_parameters.py

@@ -6,7 +6,10 @@
 
 from mindee import InferenceResponse
 from mindee.parsing.v2 import InferenceActiveOptions
-from mindee.parsing.v2.field import FieldConfidence, ListField, ObjectField, SimpleField
+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.parsing.v2.field.inference_fields import InferenceFields
 from mindee.parsing.v2.inference import Inference
 from mindee.parsing.v2.inference_file import InferenceFile
@@ -27,14 +30,14 @@ def _get_samples(json_path: Path, rst_path: Path) -> Tuple[dict, str]:
 
 
 def _get_inference_samples(name: str) -> Tuple[dict, str]:
-    json_path = V2_DATA_DIR / "inference" / f"{name}.json"
-    rst_path = V2_DATA_DIR / "inference" / f"{name}.rst"
+    json_path = V2_DATA_DIR / "products" / "extraction" / f"{name}.json"
+    rst_path = V2_DATA_DIR / "products" / "extraction" / f"{name}.rst"
     return _get_samples(json_path, rst_path)
 
 
 def _get_product_samples(product, name: str) -> Tuple[dict, str]:
-    json_path = V2_DATA_DIR / "products" / product / f"{name}.json"
-    rst_path = V2_DATA_DIR / "products" / product / f"{name}.rst"
+    json_path = V2_DATA_DIR / "products" / "extraction" / product / f"{name}.json"
+    rst_path = V2_DATA_DIR / "products" / "extraction" / product / f"{name}.rst"
     return _get_samples(json_path, rst_path)
 
 
@@ -53,42 +56,54 @@ def test_deep_nested_fields():
         response.inference.result.fields["field_object"].fields["sub_object_object"],
         ObjectField,
     )
+    fields = response.inference.result.fields
+    assert isinstance(fields.get("field_object"), ObjectField)
     assert isinstance(
-        response.inference.result.fields["field_object"]
-        .fields["sub_object_object"]
-        .fields,
+        fields.get("field_object").get_simple_field("sub_object_simple"), SimpleField
+    )
+    assert isinstance(
+        fields.get("field_object").get_list_field("sub_object_list"), ListField
+    )
+    assert isinstance(
+        fields.get("field_object").get_object_field("sub_object_object"), ObjectField
+    )
+    assert len(fields.get("field_object").simple_fields) == 1
+    assert len(fields.get("field_object").list_fields) == 1
+    assert len(fields.get("field_object").object_fields) == 1
+    assert isinstance(
+        fields["field_object"].fields["sub_object_object"].fields,
         dict,
     )
     assert isinstance(
-        response.inference.result.fields["field_object"]
+        fields["field_object"]
         .fields["sub_object_object"]
         .fields["sub_object_object_sub_object_list"],
         ListField,
     )
     assert isinstance(
-        response.inference.result.fields["field_object"]
+        fields["field_object"]
         .fields["sub_object_object"]
         .fields["sub_object_object_sub_object_list"]
         .items,
         list,
     )
     assert isinstance(
-        response.inference.result.fields["field_object"]
+        fields["field_object"]
         .fields["sub_object_object"]
         .fields["sub_object_object_sub_object_list"]
         .items[0],
         ObjectField,
     )
     assert isinstance(
-        response.inference.result.fields["field_object"]
+        fields["field_object"]
         .fields["sub_object_object"]
         .fields["sub_object_object_sub_object_list"]
         .items[0]
         .fields["sub_object_object_sub_object_list_simple"],
         SimpleField,
     )
     assert (
-        response.inference.result.fields["field_object"]
+        fields["field_object"]
         .fields["sub_object_object"]
         .fields["sub_object_object_sub_object_list"]
         .items[0]
@@ -299,7 +314,9 @@ def test_text_context_field_is_false() -> None:
 
 @pytest.mark.v2
 def test_text_context_field_is_true() -> None:
-    with open(V2_DATA_DIR / "inference" / "text_context_enabled.json", "r") as file:
+    with open(
+        V2_DATA_DIR / "products" / "extraction" / "text_context_enabled.json", "r"
+    ) as file:
         json_sample = json.load(file)
     response = InferenceResponse(json_sample)
     assert isinstance(response.inference.active_options, InferenceActiveOptions)

tests/v2/input/test_local_response.py

@@ -4,7 +4,7 @@
 
 from mindee import ClientV2, PathInput
 from mindee.v2 import ClassificationParameters, ClassificationResponse
-from tests.utils import V2_UTILITIES_DATA_DIR
+from tests.utils import V2_PRODUCT_DATA_DIR
 
 
 @pytest.fixture(scope="session")
@@ -24,7 +24,7 @@ def test_classification_default_sample(
     v2_client: ClientV2, classification_model_id: str
 ):
     input_source = PathInput(
-        V2_UTILITIES_DATA_DIR / "classification" / "default_invoice.jpg"
+        V2_PRODUCT_DATA_DIR / "classification" / "default_invoice.jpg"
     )
     response = v2_client.enqueue_and_get_result(
         ClassificationResponse,

tests/v2/parsing/test_inference_response.py

@@ -9,13 +9,13 @@
     ClassificationResponse,
 )
 from mindee.v2.product.classification.classification_result import ClassificationResult
-from tests.utils import V2_UTILITIES_DATA_DIR
+from tests.utils import V2_PRODUCT_DATA_DIR
 
 
 @pytest.mark.v2
 def test_classification_single():
     input_inference = LocalResponse(
-        V2_UTILITIES_DATA_DIR / "classification" / "classification_single.json"
+        V2_PRODUCT_DATA_DIR / "classification" / "classification_single.json"
     )
     classification_response = input_inference.deserialize_response(
         ClassificationResponse

tests/v2/product/classification/test_classification_integration.py

@@ -4,7 +4,7 @@
 
 from mindee import ClientV2, PathInput
 from mindee.v2 import CropParameters, CropResponse
-from tests.utils import V2_UTILITIES_DATA_DIR
+from tests.utils import V2_PRODUCT_DATA_DIR
 
 
 @pytest.fixture(scope="session")
@@ -21,7 +21,7 @@ def v2_client() -> ClientV2:
 @pytest.mark.integration
 @pytest.mark.v2
 def test_crop_default_sample(v2_client: ClientV2, crop_model_id: str):
-    input_source = PathInput(V2_UTILITIES_DATA_DIR / "crop" / "default_sample.jpg")
+    input_source = PathInput(V2_PRODUCT_DATA_DIR / "crop" / "default_sample.jpg")
     response = v2_client.enqueue_and_get_result(
         CropResponse, input_source, CropParameters(crop_model_id)
     )