move adapters to schemas

Author: pcrespov

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

@@ -1,6 +1,5 @@
-from ast import TypeVar
 from contextlib import suppress
-from typing import Annotated, Any, Self
+from typing import Annotated, Any, Self, TypeVar
 
 from common_library.basic_types import DEFAULT_FACTORY
 from pydantic import (
@@ -17,11 +16,23 @@
 
 from ..basic_types import IDStr
 from ..emails import LowerCaseEmailStr
-from ..groups import AccessRightsDict, Group, OrganizationCreate, OrganizationUpdate
+from ..groups import (
+    AccessRightsDict,
+    Group,
+    GroupMember,
+    OrganizationCreate,
+    OrganizationUpdate,
+)
 from ..users import UserID
 from ..utils.common_validators import create__check_only_one_is_set__root_validator
 from ._base import InputSchema, OutputSchema
 
+S = TypeVar("S", bound=BaseModel)
+
+
+def _rename_keys(source: dict, name_map: dict[str, str]) -> dict[str, Any]:
+    return {name_map.get(k, k): v for k, v in source.items()}
+
 
 class GroupAccessRights(BaseModel):
     """
@@ -63,16 +74,11 @@ class GroupGet(OutputSchema):
 
     @classmethod
     def from_model(cls, group: Group, access_rights: AccessRightsDict) -> Self:
-        # Fuses both dataset into GroupSet
-        _to = {
-            "name": "label",
-        }
-
+        # Merges both service models into this schema
         return cls.model_validate(
             {
-                **{
-                    _to.get(key, key): value
-                    for key, value in group.model_dump(
+                **_rename_keys(
+                    group.model_dump(
                         include={
                             "gid",
                             "name",
@@ -82,8 +88,11 @@ def from_model(cls, group: Group, access_rights: AccessRightsDict) -> Self:
                         },
                         exclude_unset=True,
                         by_alias=False,
-                    ).items()
-                },
+                    ),
+                    name_map={
+                        "name": "label",
+                    },
+                ),
                 "access_rights": access_rights,
             }
         )
@@ -132,25 +141,15 @@ def _sanitize_legacy_data(cls, v):
         return None
 
 
-Sc = TypeVar("Sc", bound=BaseModel)
-
-
-def _model_dump_with_map(schema: Sc, alias_map: dict[str, str]) -> dict[str, Any]:
-    return {
-        alias_map.get(k, k): v
-        for k, v in schema.model_dump(mode="json", exclude_unset=True).items()
-    }
-
-
 class GroupCreate(InputSchema):
     label: str
     description: str
     thumbnail: AnyUrl | None = None
 
     def to_model(self) -> OrganizationCreate:
-        data = _model_dump_with_map(
-            self,
-            alias_map={"label": "name"},
+        data = _rename_keys(
+            self.model_dump(mode="json", exclude_unset=True),
+            name_map={"label": "name"},
         )
         return OrganizationCreate(**data)
 
@@ -161,9 +160,9 @@ class GroupUpdate(InputSchema):
     thumbnail: AnyUrl | None = None
 
     def to_model(self) -> OrganizationUpdate:
-        data = _model_dump_with_map(
-            self,
-            alias_map={"label": "name"},
+        data = _rename_keys(
+            self.model_dump(mode="json", exclude_unset=True),
+            name_map={"label": "name"},
         )
         return OrganizationUpdate(**data)
 
@@ -217,6 +216,7 @@ class MyGroupsGet(OutputSchema):
 
 
 class GroupUserGet(BaseModel):
+    # OutputSchema
 
     # Identifiers
     id: Annotated[
@@ -265,6 +265,20 @@ class GroupUserGet(BaseModel):
         },
     )
 
+    @classmethod
+    def from_model(cls, user: GroupMember) -> Self:
+        return cls.model_validate(
+            {
+                "id": user.id,
+                "user_name": user.name,
+                "login": user.email,
+                "first_name": user.first_name,
+                "last_name": user.last_name,
+                "gid": user.primary_gid,
+                "access_rights": user.access_rights,
+            }
+        )
+
 
 class GroupUserAdd(InputSchema):
     """

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

@@ -10,6 +10,7 @@
 )
 from models_library.products import ProductName
 from models_library.users import GroupID, UserID
+from pydantic import EmailStr
 
 from ..users.api import get_user
 from . import _groups_db
@@ -181,7 +182,7 @@ async def update_user_in_group(
     user_id: UserID,
     gid: GroupID,
     the_user_id_in_group: UserID,
-    access_rights: dict,
+    access_rights: AccessRightsDict,
 ) -> GroupMember:
     return await _groups_db.update_user_in_group(
         app,
@@ -235,7 +236,7 @@ async def add_user_in_group(
     gid: GroupID,
     *,
     new_user_id: UserID | None = None,
-    new_user_email: str | None = None,
+    new_user_email: EmailStr | None = None,
     access_rights: AccessRightsDict | None = None,
 ) -> None:
     """Adds new_user (either by id or email) in group (with gid) owned by user_id

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

@@ -76,7 +76,11 @@ def _row_to_model(group: Row) -> Group:
 def _to_group_info_tuple(group: Row) -> GroupInfoTuple:
     return (
         _row_to_model(group),
-        AccessRightsDict(**group.access_rights),
+        AccessRightsDict(
+            read=group.access_rights["read"],
+            write=group.access_rights["write"],
+            delete=group.access_rights["delete"],
+        ),
     )
 
 

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

@@ -11,7 +11,6 @@
     GroupUserUpdate,
     MyGroupsGet,
 )
-from models_library.groups import GroupMember
 from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import (
     parse_request_body_as,
@@ -160,21 +159,6 @@ async def delete_group(request: web.Request):
 #
 
 
-def _to_groupuserget_model(user: GroupMember) -> GroupUserGet:
-    # Fuses both dataset into GroupSet
-    return GroupUserGet.model_validate(
-        {
-            "id": user.id,
-            "user_name": user.name,
-            "login": user.email,
-            "first_name": user.first_name,
-            "last_name": user.last_name,
-            "gid": user.primary_gid,
-            "access_rights": user.access_rights,
-        }
-    )
-
-
 @routes.get(f"/{API_VTAG}/groups/{{gid}}/users", name="get_all_group_users")
 @login_required
 @permission_required("groups.*")
@@ -189,7 +173,7 @@ async def get_group_users(request: web.Request):
     )
 
     return envelope_json_response(
-        [_to_groupuserget_model(user) for user in users_in_group]
+        [GroupUserGet.from_model(user) for user in users_in_group]
     )
 
 
@@ -228,7 +212,7 @@ async def get_group_user(request: web.Request):
     user = await _groups_api.get_user_in_group(
         request.app, req_ctx.user_id, path_params.gid, path_params.uid
     )
-    return envelope_json_response(_to_groupuserget_model(user))
+    return envelope_json_response(GroupUserGet.from_model(user))
 
 
 @routes.patch(f"/{API_VTAG}/groups/{{gid}}/users/{{uid}}", name="update_group_user")
@@ -247,7 +231,7 @@ async def update_group_user(request: web.Request):
         the_user_id_in_group=path_params.uid,
         access_rights=update.access_rights.model_dump(),
     )
-    return envelope_json_response(_to_groupuserget_model(user))
+    return envelope_json_response(GroupUserGet.from_model(user))
 
 
 @routes.delete(f"/{API_VTAG}/groups/{{gid}}/users/{{uid}}", name="delete_group_user")