split models

Author: pcrespov

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

@@ -0,0 +1,34 @@
+import re
+from typing import Annotated, Any, Literal
+
+from pydantic import BaseModel, BeforeValidator, Field, HttpUrl
+
+
+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
+    pattern = r"(\w+): ([^,]+)"
+    matches = re.findall(pattern, descriptor.strip("{}"))
+    return dict(matches)
+
+
+class AvailableDownload(BaseModel):
+    id: Annotated[int, Field(alias="ID")]
+    description: Annotated[str, Field(alias="Description")]
+    thumbnail: Annotated[str, Field(alias="Thumbnail")]
+    features: Annotated[
+        dict[str, Any],
+        BeforeValidator(_feature_descriptor_to_dict),
+        Field(alias="Features"),
+    ]
+    doi: Annotated[str, Field(alias="DOI")]
+    license_key: Annotated[str | None, Field(alias="LicenseKey")]
+    license_version: Annotated[str | None, Field(alias="LicenseVersion")]
+    protection: Annotated[Literal["Code", "PayPal"], Field(alias="Protection")]
+    available_from_url: Annotated[HttpUrl | None, Field(alias="AvailableFromURL")]
+
+
+class ResponseData(BaseModel):
+    msg: int | None = None  # still not used
+    available_downloads: Annotated[
+        list[AvailableDownload], Field(alias="availableDownloads")
+    ]

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

@@ -1,47 +1,7 @@
-import re
-from typing import Annotated, Any, Literal
-
 import httpx
-from pydantic import BaseModel, BeforeValidator, Field, HttpUrl
-
-#
-#  MODELS
-#
-
-
-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
-    pattern = r"(\w+): ([^,]+)"
-    matches = re.findall(pattern, descriptor.strip("{}"))
-    return dict(matches)
-
-
-class AvailableDownload(BaseModel):
-    id: Annotated[int, Field(alias="ID")]
-    description: Annotated[str, Field(alias="Description")]
-    thumbnail: Annotated[str, Field(alias="Thumbnail")]
-    features: Annotated[
-        dict[str, Any],
-        BeforeValidator(_feature_descriptor_to_dict),
-        Field(alias="Features"),
-    ]
-    doi: Annotated[str, Field(alias="DOI")]
-    license_key: Annotated[str | None, Field(alias="LicenseKey")]
-    license_version: Annotated[str | None, Field(alias="LicenseVersion")]
-    protection: Annotated[Literal["Code", "PayPal"], Field(alias="Protection")]
-    available_from_url: Annotated[HttpUrl | None, Field(alias="AvailableFromURL")]
-
-
-class ResponseData(BaseModel):
-    msg: int | None = None  # still not used
-    available_downloads: Annotated[
-        list[AvailableDownload], Field(alias="availableDownloads")
-    ]
-
+from pydantic import HttpUrl
 
-#
-# API
-#
+from ._itis_vip_models import AvailableDownload, ResponseData
 
 
 async def get_category_items(