Update argument validation

Author: VaghinakDev

pytest.ini

@@ -3,4 +3,4 @@ minversion = 3.7
 log_cli=true
 python_files = test_*.py
 ;pytest_plugins = ['pytest_profiling']
-;addopts = -n 6 --dist loadscope
+addopts = -n 6 --dist loadscope

src/superannotate/lib/app/interface/sdk_interface.py

@@ -2105,7 +2105,10 @@ def update_annotation_class(
 
         """
         project = self.controller.get_project(project)
-
+        if project.type == ProjectType.MULTIMODAL:
+            raise AppException(
+                "This function is not supported for Multimodal projects."
+            )
         # Find the annotation class by nam
         annotation_classes = self.controller.annotation_classes.list(
             condition=Condition("project_id", project.id, EQ)
@@ -3006,6 +3009,10 @@ def create_annotation_class(
         except ValidationError as e:
             raise AppException(wrap_error(e))
         project = self.controller.get_project(project)
+        if project.type == ProjectType.MULTIMODAL:
+            raise AppException(
+                "This function is not supported for Multimodal projects."
+            )
         if (
             project.type != ProjectType.DOCUMENT
             and annotation_class.type == ClassTypeEnum.RELATIONSHIP

src/superannotate/lib/core/entities/base.py

@@ -11,6 +11,7 @@
 from pydantic import BaseModel
 from pydantic import ConfigDict
 from pydantic import Field
+from pydantic import PlainSerializer
 from pydantic_extra_types.color import Color
 
 DATE_TIME_FORMAT_ERROR_MESSAGE = (
@@ -37,7 +38,20 @@ def _validate_string_date(v: datetime) -> str:
     return v.isoformat().split("+")[0] + ".000Z"
 
 
-StringDate = Annotated[datetime, AfterValidator(_validate_string_date)]
+def _serialize_string_date(v) -> str:
+    """Serialize datetime or string to string format."""
+    if isinstance(v, str):
+        return v
+    if isinstance(v, datetime):
+        return v.isoformat().split("+")[0] + ".000Z"
+    return v
+
+
+StringDate = Annotated[
+    datetime,
+    AfterValidator(_validate_string_date),
+    PlainSerializer(_serialize_string_date, return_type=str),
+]
 
 
 class SubSetEntity(BaseModel):

src/superannotate/lib/core/entities/work_managament.py

@@ -205,7 +205,7 @@ class WMAttributeGroup(TimedBaseModel):
     model_config = ConfigDict(extra="ignore")
 
     id: Optional[StrictInt] = None
-    group_type: Optional[WMGroupTypeEnum] = None
+    group_type: WMGroupTypeEnum
     class_id: Optional[StrictInt] = None
     name: Optional[StrictStr] = None
     isRequired: bool = Field(default=False, alias="is_required")

src/superannotate/lib/infrastructure/validators.py

@@ -65,13 +65,55 @@ def get_tabulation() -> int:
         return 48
 
 
+def _is_pydantic_internal_loc(loc_part: typing.Any) -> bool:
+    """
+    Check if a location part is a Pydantic v2 internal type descriptor.
+    These are not human-readable and should be filtered out.
+    Examples of internal descriptors:
+    - 'constrained-str'
+    - 'lax-or-strict[...]'
+    - 'list[SomeModel]'
+    - 'json-or-python[...]'
+    - 'function-after[...]'
+    - 'union[...]'
+    """
+    if not isinstance(loc_part, str):
+        return False
+    # These patterns indicate internal Pydantic type descriptors
+    internal_patterns = (
+        "constrained-",
+        "lax-or-strict[",
+        "json-or-python[",
+        "function-after[",
+        "function-before[",
+        "function-wrap[",
+        "union[",
+        "is-instance[",
+    )
+    if loc_part.startswith(internal_patterns):
+        return True
+    # Also filter out patterns like 'list[Model]' or 'dict[str, Model]'
+    # but keep simple field names
+    if "[" in loc_part and "]" in loc_part:
+        # Check if it looks like a type descriptor (e.g., 'list[Attachment]')
+        # rather than a field name
+        return True
+    return False
+
+
 def wrap_error(e: ValidationError) -> str:
     tabulation = get_tabulation()
     error_messages = defaultdict(list)
     for error in e.errors():
-        errors_list = (
-            list(error["loc"])[:-1] if len(error["loc"]) > 1 else list(error["loc"])
-        )
+        error_loc = list(error["loc"])
+        # Filter out Pydantic v2 internal type descriptors
+        error_loc = [loc for loc in error_loc if not _is_pydantic_internal_loc(loc)]
+        if len(error_loc) == 0:
+            continue
+        if len(error_loc) == 1 and isinstance(error_loc[0], int):
+            errors_list = [f"argument at index {error_loc[0]}"]
+        else:
+            errors_list = list(error_loc)
         if "__root__" in errors_list:
             errors_list.remove("__root__")
         errors_list[1::] = [

tests/integration/folders/test_delete_folders.py

@@ -33,7 +33,7 @@ def test_search_folders(self):
 
         with self.assertRaisesRegex(AppException, "There is no folder to delete."):
             sa.delete_folders(self.PROJECT_NAME, [])
-        pattern = r"(\s+)folder_names(\s+)Input should be a valid list"
+        pattern = r"(\s+)argument at index 2(\s+)Input should be a valid list"
 
         with self.assertRaisesRegex(AppException, pattern):
             sa.delete_folders(self.PROJECT_NAME, None)  # noqa

tests/integration/items/test_attach_items.py

@@ -117,11 +117,11 @@ class TestAttachItemsVectorArguments(TestCase):
     def test_attach_items_invalid_payload(self):
         error_msg = [
             "attachments",
-            "str type expected",
-            "value is not a valid path",
-            r"attachments\[0].url",
-            "field required",
+            "Input should be a valid string",
+            "Input is not a valid path",
+            r"attachments\[0\]\.url",
+            "Field required",
         ]
-        pattern = r"(\s+)" + r"(\s+)".join(error_msg)
+        pattern = r"[\s\S]+" + r"[\s\S]+".join(error_msg)
         with self.assertRaisesRegex(AppException, pattern):
-            sa.attach_items(self.PROJECT_NAME, [{"name": "name"}])
+            sa.attach_items(self.PROJECT_NAME, attachments=[{"name": "name"}])

tests/integration/items/test_set_approval_statuses.py

@@ -81,7 +81,7 @@ def test_set_approval_statuses(self):
     def test_set_invalid_approval_statuses(self):
         sa.attach_items(self.PROJECT_NAME, [ATTACHMENT_LIST[0]])
         with self.assertRaisesRegex(
-            AppException, "Available values are 'Approved', 'Disapproved'."
+            AppException, "Input should be 'Approved', 'Disapproved' or None"
         ):
             sa.set_approval_statuses(
                 self.PROJECT_NAME,

tests/integration/projects/test_create_project.py

@@ -90,7 +90,7 @@ def test_create_project_datetime(self):
     def test_create_project_with_wrong_type(self):
         with self.assertRaisesRegex(
             AppException,
-            "Input should be 'Vector', 'Video', 'Document', 'Tiled', 'PointCloud', 'Multimodal'",
+            "Input should be 'Vector', 'Video', 'Document', 'Tiled', 'PointCloud' or 'Multimodal'",
         ):
             sa.create_project(self.PROJECT, "desc", "wrong_type")
 

tests/integration/projects/test_set_project_status.py

@@ -51,7 +51,7 @@ def test_set_project_status_fail(self, update_function):
     def test_set_project_status_via_invalid_status(self):
         with self.assertRaisesRegex(
             AppException,
-            "Available values are 'NotStarted', 'InProgress', 'Completed', 'OnHold'.",
+            "Input should be 'NotStarted', 'InProgress', 'Completed' or 'OnHold'",
         ):
             sa.set_project_status(project=self.PROJECT_NAME, status="InvalidStatus")