🐛 vip-syncer: fixed parsing items in Features string (ITISFoundation#7247)

Author: pcrespov

packages/models-library/src/models_library/licenses.py

@@ -29,7 +29,7 @@ class LicensedResourceType(StrAutoEnum):
 VIP_FEATURES_EXAMPLE = {
     "name": "Duke",
     "version": "V2.0",
-    "sex": "Male",
+    "sex": "Mas bien poco",
     "age": "34 years",
     "weight": "70.2 Kg",
     "height": "1.77 m",
@@ -41,15 +41,17 @@ class LicensedResourceType(StrAutoEnum):
 
 
 class FeaturesDict(TypedDict):
-    name: NotRequired[str]
-    version: NotRequired[str]
-    sex: NotRequired[str]
+    # keep alphabetical
     age: NotRequired[str]
-    weight: NotRequired[str]
-    height: NotRequired[str]
     date: date
     ethnicity: NotRequired[str]
     functionality: NotRequired[str]
+    height: NotRequired[str]
+    name: NotRequired[str]
+    sex: NotRequired[str]
+    species: NotRequired[str]
+    version: NotRequired[str]
+    weight: NotRequired[str]
 
 
 VIP_DETAILS_EXAMPLE = {

services/web/server/VERSION

@@ -1 +1 @@
-0.58.0
+0.58.1

services/web/server/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.58.0
+current_version = 0.58.1
 commit = True
 message = services/webserver api version: {current_version} → {new_version}
 tag = False

services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml

@@ -2,7 +2,7 @@ openapi: 3.1.0
 info:
   title: simcore-service-webserver
   description: Main service with an interface (http-API & websockets) to the web front-end
-  version: 0.58.0
+  version: 0.58.1
 servers:
 - url: ''
   description: webserver
@@ -9868,24 +9868,9 @@ components:
       title: ErrorItemType
     FeaturesDict:
       properties:
-        name:
-          type: string
-          title: Name
-        version:
-          type: string
-          title: Version
-        sex:
-          type: string
-          title: Sex
         age:
           type: string
           title: Age
-        weight:
-          type: string
-          title: Weight
-        height:
-          type: string
-          title: Height
         date:
           type: string
           format: date
@@ -9896,6 +9881,24 @@ components:
         functionality:
           type: string
           title: Functionality
+        height:
+          type: string
+          title: Height
+        name:
+          type: string
+          title: Name
+        sex:
+          type: string
+          title: Sex
+        species:
+          type: string
+          title: Species
+        version:
+          type: string
+          title: Version
+        weight:
+          type: string
+          title: Weight
       type: object
       required:
       - date

services/web/server/src/simcore_service_webserver/licenses/_itis_vip_models.py

@@ -41,7 +41,7 @@ def _clean_dict_data(data_dict):
 def _feature_descriptor_to_dict(descriptor: str) -> dict[str, Any]:
     # NOTE: this is manually added in the server side so be more robust to errors
     descriptor = _max_str_adapter.validate_python(descriptor.strip("{}"))
-    pattern = r"(\w{1,100}): ([^,]{1,100})"
+    pattern = r"(\w{1,100}):\s*([^,]{1,100})"
     matches = re.findall(pattern, descriptor)
     return dict(matches)
 

services/web/server/tests/unit/with_dbs/04/licenses/test_itis_vip_models.py

@@ -5,6 +5,9 @@
 # pylint: disable=unused-variable
 
 
+import datetime
+from typing import Any
+
 import pytest
 from faker import Faker
 from pydantic import ValidationError
@@ -25,23 +28,54 @@ def test_pre_validator_feature_descriptor_to_dict():
     assert err_info.value.errors()[0]["type"] == "string_too_long"
 
 
-def test_validation_of_itis_vip_response_model(faker: Faker):
+@pytest.mark.parametrize(
+    "features_str,expected",
+    [
+        (
+            # checks fix: regex expected at least one space after `:`
+            "{species:Mouse, functionality:Static, height:95 mm, date: 2012-01-01, name:Male OF1 Mouse, sex:Male, version:1.0, weight:35.5 g}",
+            {
+                "version": "1.0",
+                "weight": "35.5 g",
+                "species": "Mouse",
+                "functionality": "Static",
+            },
+        ),
+        (
+            # Checks spaces before `,` are removed
+            "{date: 2012-01-01, name:  Male OF1 Mouse    , sex:Male}",
+            {
+                "date": datetime.date(2012, 1, 1),
+                "name": "Male OF1 Mouse",
+                "sex": "Male",
+            },
+        ),
+    ],
+)
+def test_validation_of_itis_vip_response_model(
+    faker: Faker, features_str: str, expected: dict[str, Any]
+):
 
     available_download = random_itis_vip_available_download_item(
         identifier=0,
-        features_functionality="Posable",
         fake=faker,
+        Features=features_str,
     )
 
     vip_data = ItisVipData.model_validate(available_download)
 
+    # Checks how features BeforeValidator and parser
+    assert {k: vip_data.features[k] for k in expected} == expected
+
     # Dumped as in the source
     assert vip_data.model_dump(by_alias=True)["Features"] == vip_data.features
 
-    license_resource_data = ItisVipResourceData(
-        category_id="123",
-        category_display="This is a resource",
-        source=vip_data,
+    license_resource_data = ItisVipResourceData.model_validate(
+        {
+            "category_id": "SomeCategoryID",
+            "category_display": "This is a resource",
+            "source": vip_data,
+        }
     )
 
     assert license_resource_data.source.features == vip_data.features