continue fixing

Author: giancarloromeo

packages/models-library/src/models_library/api_schemas_webserver/groups.py

@@ -1,6 +1,7 @@
 from contextlib import suppress
 
 from pydantic import (
+    AnyHttpUrl,
     AnyUrl,
     BaseModel,
     ConfigDict,
@@ -90,7 +91,7 @@ def _sanitize_legacy_data(cls, v):
         if v:
             # Enforces null if thumbnail is not valid URL or empty
             with suppress(ValidationError):
-                return TypeAdapter(AnyUrl).validate_python(v)
+                return TypeAdapter(AnyHttpUrl).validate_python(v)
         return None
 
 

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

@@ -2,7 +2,7 @@
 from typing import Final, Literal
 
 from aiohttp import web
-from pydantic import BaseModel, field_validator
+from pydantic import BaseModel, ValidationInfo, field_validator
 from pydantic.fields import Field
 from pydantic.types import PositiveFloat, PositiveInt, SecretStr
 from settings_library.base import BaseCustomSettings
@@ -56,17 +56,17 @@ class LoginSettings(BaseCustomSettings):
 
     @field_validator("LOGIN_2FA_REQUIRED")
     @classmethod
-    def login_2fa_needs_email_registration(cls, v, values):
+    def _login_2fa_needs_email_registration(cls, v, info: ValidationInfo):
         # NOTE: this constraint ensures that a phone is registered in current workflow
-        if v and not values.get("LOGIN_REGISTRATION_CONFIRMATION_REQUIRED", False):
+        if v and not info.data.get("LOGIN_REGISTRATION_CONFIRMATION_REQUIRED", False):
             msg = "Cannot enable 2FA w/o email confirmation"
             raise ValueError(msg)
         return v
 
     @field_validator("LOGIN_2FA_REQUIRED")
     @classmethod
-    def login_2fa_needs_sms_service(cls, v, values):
-        if v and values.get("LOGIN_TWILIO") is None:
+    def _login_2fa_needs_sms_service(cls, v, info: ValidationInfo):
+        if v and info.data.get("LOGIN_TWILIO") is None:
             msg = "Cannot enable 2FA w/o twilio settings which is used to send SMS"
             raise ValueError(msg)
         return v

services/web/server/src/simcore_service_webserver/products/_model.py

@@ -267,7 +267,7 @@ def get_template_name_for(self, filename: str) -> str | None:
         """Checks for field marked with 'x_template_name' that fits the argument"""
         template_name = filename.removesuffix(".jinja2")
         for name, field in self.model_fields.items():
-            if field.json_schema_extra.get("x_template_name") == template_name:
+            if field.json_schema_extra and field.json_schema_extra.get("x_template_name") == template_name:
                 template_name_attribute: str = getattr(self, name)
                 return template_name_attribute
         return None