tests passing

Author: pcrespov

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

@@ -63,9 +63,26 @@ class GroupGet(OutputSchema):
     @classmethod
     def from_model(cls, group: Group, access_rights: AccessRightsDict) -> Self:
         # Fuses both dataset into GroupSet
+        _to = {
+            "name": "label",
+        }
+
         return cls.model_validate(
             {
-                **group.model_dump(),
+                **{
+                    _to.get(key, key): value
+                    for key, value in group.model_dump(
+                        include={
+                            "gid",
+                            "name",
+                            "description",
+                            "thumbnail",
+                            "inclusion_rules",
+                        },
+                        exclude_unset=True,
+                        by_alias=False,
+                    ).items()
+                },
                 "access_rights": access_rights,
             }
         )

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

@@ -1,9 +1,10 @@
 import enum
-from typing import Annotated, Final, NamedTuple, TypeAlias, TypedDict
+from typing import Annotated, Final, NamedTuple, TypeAlias
 
 from common_library.basic_types import DEFAULT_FACTORY
 from pydantic import BaseModel, ConfigDict, EmailStr, Field, field_validator
 from pydantic.types import PositiveInt
+from typing_extensions import TypedDict
 
 from .basic_types import IDStr
 from .users import GroupID, UserID
@@ -42,6 +43,8 @@ class Group(BaseModel):
         create_enums_pre_validator(GroupTypeInModel)
     )
 
+    model_config = ConfigDict(populate_by_name=True)
+
 
 class AccessRightsDict(TypedDict):
     read: bool

services/web/server/src/simcore_service_webserver/groups/_groups_db.py

@@ -75,11 +75,7 @@ def _row_to_model(group: Row) -> Group:
 def _to_group_info_tuple(group: Row) -> GroupInfoTuple:
     return (
         _row_to_model(group),
-        AccessRightsDict(
-            read=group.access_rights.read,
-            write=group.access_rights.read,
-            delete=group.access_rights.delete,
-        ),
+        AccessRightsDict(**group.access_rights),
     )
 
 
@@ -353,15 +349,15 @@ async def delete_user_group(
     users.c.id,
     users.c.name,
     sa.case(
-        [(users.c.privacy_hide_email == sa.true(), None)],
+        (users.c.privacy_hide_email.is_(True), None),
         else_=users.c.email,
     ).label("email"),
     sa.case(
-        [(users.c.privacy_hide_fullname == sa.true(), None)],
+        (users.c.privacy_hide_fullname.is_(True), None),
         else_=users.c.first_name,
     ).label("first_name"),
     sa.case(
-        [(users.c.privacy_hide_fullname == sa.true(), None)],
+        (users.c.privacy_hide_fullname.is_(True), None),
         else_=users.c.last_name,
     ).label("last_name"),
     users.c.primary_gid,