cleanup models

Author: pcrespov

services/web/server/src/simcore_service_webserver/scicrunch/models.py

@@ -5,8 +5,10 @@
 import logging
 import re
 from datetime import datetime
+from functools import partial
+from typing import Annotated
 
-from pydantic import BaseModel, ConfigDict, Field, field_validator
+from pydantic import BaseModel, BeforeValidator, ConfigDict, Field
 
 logger = logging.getLogger(__name__)
 
@@ -49,26 +51,29 @@ def normalize_rrid_tags(rrid_tag: str, *, with_prefix: bool = True) -> str:
 
 
 class ResourceHit(BaseModel):
-    rrid: str = Field(..., alias="rid")
+    rrid: Annotated[str, Field(alias="rid")]
     name: str
 
 
 # webserver API models -----------------------------------------
 class ResearchResource(BaseModel):
-    rrid: str = Field(
-        ...,
-        description="Unique identifier used as classifier, i.e. to tag studies and services",
-        pattern=STRICT_RRID_PATTERN,
-    )
+    rrid: Annotated[
+        str,
+        BeforeValidator(
+            partial(normalize_rrid_tags, with_prefix=True),
+        ),
+        Field(
+            description="Unique identifier used as classifier, i.e. to tag studies and services",
+            pattern=STRICT_RRID_PATTERN,
+        ),
+    ]
     name: str
     description: str
 
-    @field_validator("rrid", mode="before")
-    @classmethod
-    def _format_rrid(cls, v):
-        return normalize_rrid_tags(v, with_prefix=True)
-
-    model_config = ConfigDict(from_attributes=True, str_strip_whitespace=True)
+    model_config = ConfigDict(
+        from_attributes=True,
+        str_strip_whitespace=True,
+    )
 
 
 # postgres_database.scicrunch_resources ORM --------------------