@mguidon request: speag phantoms

Author: pcrespov

.env-devel

@@ -135,8 +135,10 @@ FUNCTION_SERVICES_AUTHORS='{"UN": {"name": "Unknown", "email": "[email protected]
 
 WEBSERVER_LICENSES={}
 LICENSES_ITIS_VIP_SYNCER_ENABLED=false
-LICENSES_ITIS_VIP_API_URL=https://some-api/{category}
+LICENSES_ITIS_VIP_API_URL=https://replace-with-itis-api/{category}
 LICENSES_ITIS_VIP_CATEGORIES='{"HumanWholeBody": "Humans", "HumanBodyRegion": "Humans (Region)", "AnimalWholeBody": "Animal"}'
+LICENSES_SPEAG_PHANTOMS_API_URL=https://replace-with-speag-api/{category}
+LICENSES_SPEAG_PHANTOMS_CATEGORIES='{"ComputationalPhantom": "Phantom of the Opera"}'
 
 # Can use 'docker run -it itisfoundation/invitations:latest simcore-service-invitations generate-dotenv --auto-password'
 INVITATIONS_DEFAULT_PRODUCT=osparc

services/docker-compose.yml

@@ -708,6 +708,9 @@ services:
       LICENSES_ITIS_VIP_SYNCER_ENABLED : ${LICENSES_ITIS_VIP_SYNCER_ENABLED}
       LICENSES_ITIS_VIP_API_URL: ${LICENSES_ITIS_VIP_API_URL}
       LICENSES_ITIS_VIP_CATEGORIES: ${LICENSES_ITIS_VIP_CATEGORIES}
+      LICENSES_SPEAG_PHANTOMS_API_URL: ${LICENSES_SPEAG_PHANTOMS_API_URL}
+      LICENSES_SPEAG_PHANTOMS_CATEGORIES: ${LICENSES_SPEAG_PHANTOMS_CATEGORIES}
+
 
       WEBSERVER_LOGIN: ${WEBSERVER_LOGIN}
       LOGIN_ACCOUNT_DELETION_RETENTION_DAYS: ${LOGIN_ACCOUNT_DELETION_RETENTION_DAYS}

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

@@ -13,6 +13,19 @@ def _validate_url_contains_category(url: str) -> str:
     return url
 
 
+def _to_categories(
+    api_url: str, category_map: dict[CategoryID, CategoryDisplay]
+) -> list[CategoryTuple]:
+    return [
+        CategoryTuple(
+            url=HttpUrl(api_url.format(category=category_id)),
+            id=category_id,
+            display=category_display,
+        )
+        for category_id, category_display in category_map.items()
+    ]
+
+
 class ItisVipSettings(BaseCustomSettings):
     LICENSES_ITIS_VIP_API_URL: Annotated[
         str, AfterValidator(_validate_url_contains_category)
@@ -26,13 +39,20 @@ def get_urls(self) -> list[HttpUrl]:
         ]
 
     def to_categories(self) -> list[CategoryTuple]:
-        return [
-            CategoryTuple(
-                url=HttpUrl(
-                    self.LICENSES_ITIS_VIP_API_URL.format(category=category_id)
-                ),
-                id=category_id,
-                display=category_display,
-            )
-            for category_id, category_display in self.LICENSES_ITIS_VIP_CATEGORIES.items()
-        ]
+        return _to_categories(
+            self.LICENSES_ITIS_VIP_API_URL,
+            self.LICENSES_ITIS_VIP_CATEGORIES,
+        )
+
+
+class SpeagPhantomsSettings(BaseCustomSettings):
+    LICENSES_SPEAG_PHANTOMS_API_URL: Annotated[
+        str, AfterValidator(_validate_url_contains_category)
+    ]
+    LICENSES_SPEAG_PHANTOMS_CATEGORIES: dict[CategoryID, CategoryDisplay]
+
+    def to_categories(self) -> list[CategoryTuple]:
+        return _to_categories(
+            self.LICENSES_SPEAG_PHANTOMS_API_URL,
+            self.LICENSES_SPEAG_PHANTOMS_CATEGORIES,
+        )

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

@@ -6,15 +6,15 @@
 from servicelib.aiohttp.application_keys import APP_SETTINGS_KEY
 from settings_library.base import BaseCustomSettings
 
-from ._itis_vip_settings import ItisVipSettings
+from ._itis_vip_settings import ItisVipSettings, SpeagPhantomsSettings
 
 
 class LicensesSettings(BaseCustomSettings):
     # ITIS - VIP
     LICENSES_ITIS_VIP: Annotated[
         ItisVipSettings | None,
         Field(
-            description="Settings for VIP license models",
+            description="Settings for VIP licensed models",
             json_schema_extra={"auto_default_from_env": True},
         ),
     ]
@@ -23,6 +23,15 @@ class LicensesSettings(BaseCustomSettings):
         days=1
     )
 
+    # SPEAG - PHANTOMS
+    LICENSES_SPEAG_PHANTOMS: Annotated[
+        SpeagPhantomsSettings | None,
+        Field(
+            description="Settings for SPEAG licensed phantoms",
+            json_schema_extra={"auto_default_from_env": True},
+        ),
+    ]
+
     # other licensed resources come here ...