♻️ fix str representation of V2 objects

Author: sebastianMindee

mindee/parsing/v2/base_field.py

@@ -34,6 +34,7 @@ class InferenceFields(Dict[str, Union["SimpleField", "ObjectField", "ListField"]
 
     def __init__(self, raw_response: StringDict, indent_level: int = 0) -> None:
         super().__init__()
+        self._indent_level = indent_level
         for key, value in raw_response.items():
             field_obj = BaseField.create_field(value, indent_level)
             self[key] = field_obj
@@ -45,10 +46,23 @@ def __getattr__(self, item):
             raise AttributeError(item) from None
 
     def __str__(self) -> str:
-        str_fields = ""
+        out_str = ""
         for field_key, field_value in self.items():
-            str_fields += f":{field_key}: {field_value}"
-        return str_fields
+            if isinstance(field_value, ListField):
+                value_str = " " * self._indent_level
+                if len(field_value.items) > 0:
+                    value_str = (
+                        " " * self._indent_level + str(field_value)
+                        if field_value
+                        else ""
+                    )
+                out_str += f"{' ' * self._indent_level}:{field_key}: {value_str}"
+            elif isinstance(field_value, ObjectField):
+                out_str += f"{' ' * self._indent_level}:{field_key}: {field_value}"
+            else:
+                out_str += f"{' ' * self._indent_level}:{field_key}: {field_value if field_value else ''}"
+            out_str += "\n"
+        return out_str.rstrip()
 
 
 class ListField(BaseField):
@@ -87,20 +101,7 @@ def __init__(self, raw_response: StringDict, indent_level: int = 0):
         self.fields = InferenceFields(inner_fields, self._indent_level + 1)
 
     def __str__(self) -> str:
-        out_str = ""
-        for field_key, field_value in self.fields.items():
-            if isinstance(field_value, ListField):
-                value_str = ""
-                if len(field_value.items) > 0:
-                    value_str = (
-                        " " * self._indent_level + str(field_value)
-                        if field_value
-                        else ""
-                    )
-                out_str += f"{' ' * self._indent_level}:{field_key}: {value_str}"
-            else:
-                out_str += f"{' ' * self._indent_level}:{field_key}: {field_value if field_value else ''}"
-        return out_str
+        return f"\n{self.fields}"
 
 
 class SimpleField(BaseField):
@@ -113,4 +114,4 @@ def __init__(self, raw_response: StringDict, indent_level: int = 0):
         self.value = raw_response["value"] = raw_response.get("value", None)
 
     def __str__(self) -> str:
-        return f"{self.value}\n" if self.value else "\n"
+        return f"{self.value}" if self.value else ""

mindee/parsing/v2/inference.py

@@ -29,7 +29,7 @@ def __str__(self) -> str:
             f"Inference\n"
             f"#########\n"
             f":Model: {self.model.id}\n"
-            f":File: {self.file}\n"
+            f":File:\n"
             f"  :Name: {self.file.name}\n"
             f"  :Alias: {self.file.alias}\n\n"
             f"Result\n"

tests/test_code_samples.sh

@@ -8,7 +8,7 @@ API_KEY=$3
 API_KEY_V2=$4
 MODEL_ID=$5
 
-for f in $(find ./docs/extras/code_samples -maxdepth 1 -name "*.txt" -not -name "workflow_*.txt" | sort -h)
+for f in $(find ./docs/extras/code_samples -maxdepth 1 -name "default_v2.txt" -not -name "workflow_*.txt" | sort -h)
 do
   if echo "${f}" | grep -q "default_v2.txt"; then
     if [ -z "${API_KEY_V2}" ] || [ -z "${MODEL_ID}" ]; then