extra missing

Author: pcrespov

services/web/server/src/simcore_service_webserver/tags/_rest.py

@@ -148,7 +148,7 @@ async def list_tag_groups(request: web.Request):
         caller_user_id=req_ctx.user_id,
         tag_id=path_params.tag_id,
     )
-    return envelope_json_response([TagGroupGet.from_model(md) for md in got])
+    return envelope_json_response([TagGroupGet.from_domain_model(md) for md in got])
 
 
 @routes.post(f"/{VTAG}/tags/{{tag_id}}/groups/{{group_id}}", name="create_tag_group")
@@ -165,11 +165,11 @@ async def create_tag_group(request: web.Request):
         caller_user_id=req_ctx.user_id,
         tag_id=path_params.tag_id,
         group_id=path_params.group_id,
-        access_rights=body_params.to_model(),
+        access_rights=body_params.to_domain_model(),
     )
 
     return envelope_json_response(
-        TagGroupGet.from_model(got), status_cls=web.HTTPCreated
+        TagGroupGet.from_domain_model(got), status_cls=web.HTTPCreated
     )
 
 
@@ -187,10 +187,10 @@ async def replace_tag_group(request: web.Request):
         caller_user_id=req_ctx.user_id,
         tag_id=path_params.tag_id,
         group_id=path_params.group_id,
-        access_rights=body_params.to_model(),
+        access_rights=body_params.to_domain_model(),
     )
 
-    return envelope_json_response(TagGroupGet.from_model(got))
+    return envelope_json_response(TagGroupGet.from_domain_model(got))
 
 
 @routes.delete(f"/{VTAG}/tags/{{tag_id}}/groups/{{group_id}}", name="delete_tag_group")

services/web/server/src/simcore_service_webserver/tags/_service.py

@@ -35,7 +35,7 @@ async def create_tag(
         delete=True,
         **new_tag.model_dump(exclude_unset=True),
     )
-    return TagGet.from_model(tag)
+    return TagGet.from_domain_model(tag)
 
 
 async def list_tags(
@@ -45,7 +45,7 @@ async def list_tags(
     engine: AsyncEngine = get_async_engine(app)
     repo = TagsRepo(engine)
     tags = await repo.list_all(user_id=user_id)
-    return [TagGet.from_model(t) for t in tags]
+    return [TagGet.from_domain_model(t) for t in tags]
 
 
 async def update_tag(
@@ -59,7 +59,7 @@ async def update_tag(
         tag_id=tag_id,
         **tag_updates.model_dump(exclude_unset=True),
     )
-    return TagGet.from_model(tag)
+    return TagGet.from_domain_model(tag)
 
 
 async def delete_tag(app: web.Application, user_id: UserID, tag_id: IdInt):

services/web/server/src/simcore_service_webserver/tags/schemas.py

@@ -55,7 +55,7 @@ class TagGet(OutputSchema):
     access_rights: TagAccessRights = Field(..., alias="accessRights")
 
     @classmethod
-    def from_model(cls, tag: TagDict) -> Self:
+    def from_domain_model(cls, tag: TagDict) -> Self:
         # NOTE: cls(access_rights=tag, **tag) would also work because of Config
         return cls(
             id=tag["id"],
@@ -84,7 +84,7 @@ class TagGroupCreate(InputSchema):
     write: bool
     delete: bool
 
-    def to_model(self) -> AccessRightsDict:
+    def to_domain_model(self) -> AccessRightsDict:
         data = self.model_dump()
         return AccessRightsDict(
             read=data["read"],
@@ -101,7 +101,7 @@ class TagGroupGet(OutputSchema):
     delete: bool
 
     @classmethod
-    def from_model(cls, data: TagAccessRightsDict) -> Self:
+    def from_domain_model(cls, data: TagAccessRightsDict) -> Self:
         return cls(
             gid=data["group_id"],
             read=data["read"],