some rename

Author: pcrespov

api/specs/web-server/_users.py

@@ -8,13 +8,13 @@
 
 from fastapi import APIRouter, Depends, status
 from models_library.api_schemas_webserver.users import (
+    MyPermissionGet,
     MyProfileGet,
     MyProfilePatch,
-    PermissionGet,
-    ThirdPartyToken,
-    TokenCreate,
+    MyTokenCreate,
     UserGet,
     UsersSearchQueryParams,
+    UserThirdPartyToken,
 )
 from models_library.api_schemas_webserver.users_preferences import PatchRequestBody
 from models_library.generics import Envelope
@@ -73,24 +73,24 @@ async def set_frontend_preference(
 
 @router.get(
     "/me/tokens",
-    response_model=Envelope[list[ThirdPartyToken]],
+    response_model=Envelope[list[UserThirdPartyToken]],
 )
 async def list_tokens():
     ...
 
 
 @router.post(
     "/me/tokens",
-    response_model=Envelope[ThirdPartyToken],
+    response_model=Envelope[UserThirdPartyToken],
     status_code=status.HTTP_201_CREATED,
 )
-async def create_token(_token: TokenCreate):
+async def create_token(_token: MyTokenCreate):
     ...
 
 
 @router.get(
     "/me/tokens/{service}",
-    response_model=Envelope[ThirdPartyToken],
+    response_model=Envelope[UserThirdPartyToken],
 )
 async def get_token(_params: Annotated[_TokenPathParams, Depends()]):
     ...
@@ -133,7 +133,7 @@ async def mark_notification_as_read(
 
 @router.get(
     "/me/permissions",
-    response_model=Envelope[list[PermissionGet]],
+    response_model=Envelope[list[MyPermissionGet]],
 )
 async def list_user_permissions():
     ...

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

@@ -20,7 +20,7 @@
 #
 # THIRD-PARTY TOKENS
 #
-class ThirdPartyToken(BaseModel):
+class UserThirdPartyToken(BaseModel):
     """
     Tokens used to access third-party services connected to osparc (e.g. pennsieve, scicrunch, etc)
     """
@@ -42,19 +42,19 @@ class ThirdPartyToken(BaseModel):
     )
 
 
-class TokenCreate(ThirdPartyToken):
+class MyTokenCreate(UserThirdPartyToken):
     ...
 
 
 #
 # PERMISSIONS
 #
-class Permission(BaseModel):
+class UserPermission(BaseModel):
     name: str
     allowed: bool
 
 
-class PermissionGet(Permission, OutputSchema):
+class MyPermissionGet(UserPermission, OutputSchema):
     ...
 
 

services/web/server/src/simcore_service_webserver/users/_notifications_handlers.py

@@ -3,7 +3,7 @@
 
 import redis.asyncio as aioredis
 from aiohttp import web
-from models_library.api_schemas_webserver.users import Permission, PermissionGet
+from models_library.api_schemas_webserver.users import MyPermissionGet, UserPermission
 from pydantic import BaseModel
 from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import (
@@ -125,12 +125,12 @@ async def mark_notification_as_read(request: web.Request) -> web.Response:
 @permission_required("user.permissions.read")
 async def list_user_permissions(request: web.Request) -> web.Response:
     req_ctx = UsersRequestContext.model_validate(request)
-    list_permissions: list[Permission] = await _users_service.list_user_permissions(
+    list_permissions: list[UserPermission] = await _users_service.list_user_permissions(
         request.app, user_id=req_ctx.user_id, product_name=req_ctx.product_name
     )
     return envelope_json_response(
         [
-            PermissionGet.model_construct(
+            MyPermissionGet.model_construct(
                 _fields_set=p.model_fields_set, **p.model_dump()
             )
             for p in list_permissions

services/web/server/src/simcore_service_webserver/users/_tokens.py

@@ -4,7 +4,10 @@
 """
 import sqlalchemy as sa
 from aiohttp import web
-from models_library.api_schemas_webserver.users import ThirdPartyToken, TokenCreate
+from models_library.api_schemas_webserver.users import (
+    MyTokenCreate,
+    UserThirdPartyToken,
+)
 from models_library.users import UserID
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from sqlalchemy import and_, literal_column
@@ -15,8 +18,8 @@
 
 
 async def create_token(
-    app: web.Application, user_id: UserID, token: TokenCreate
-) -> ThirdPartyToken:
+    app: web.Application, user_id: UserID, token: MyTokenCreate
+) -> UserThirdPartyToken:
     async with get_database_engine(app).acquire() as conn:
         await conn.execute(
             tokens.insert().values(
@@ -28,33 +31,35 @@ async def create_token(
         return token
 
 
-async def list_tokens(app: web.Application, user_id: UserID) -> list[ThirdPartyToken]:
-    user_tokens: list[ThirdPartyToken] = []
+async def list_tokens(
+    app: web.Application, user_id: UserID
+) -> list[UserThirdPartyToken]:
+    user_tokens: list[UserThirdPartyToken] = []
     async with get_database_engine(app).acquire() as conn:
         async for row in conn.execute(
             sa.select(tokens.c.token_data).where(tokens.c.user_id == user_id)
         ):
-            user_tokens.append(ThirdPartyToken.model_construct(**row["token_data"]))
+            user_tokens.append(UserThirdPartyToken.model_construct(**row["token_data"]))
         return user_tokens
 
 
 async def get_token(
     app: web.Application, user_id: UserID, service_id: str
-) -> ThirdPartyToken:
+) -> UserThirdPartyToken:
     async with get_database_engine(app).acquire() as conn:
         result = await conn.execute(
             sa.select(tokens.c.token_data).where(
                 and_(tokens.c.user_id == user_id, tokens.c.token_service == service_id)
             )
         )
         if row := await result.first():
-            return ThirdPartyToken.model_construct(**row["token_data"])
+            return UserThirdPartyToken.model_construct(**row["token_data"])
         raise TokenNotFoundError(service_id=service_id)
 
 
 async def update_token(
     app: web.Application, user_id: UserID, service_id: str, token_data: dict[str, str]
-) -> ThirdPartyToken:
+) -> UserThirdPartyToken:
     async with get_database_engine(app).acquire() as conn:
         result = await conn.execute(
             sa.select(tokens.c.token_data, tokens.c.token_id).where(
@@ -78,7 +83,7 @@ async def update_token(
         assert resp.rowcount == 1  # nosec
         updated_token = await resp.fetchone()
         assert updated_token  # nosec
-        return ThirdPartyToken.model_construct(**updated_token["token_data"])
+        return UserThirdPartyToken.model_construct(**updated_token["token_data"])
 
 
 async def delete_token(app: web.Application, user_id: UserID, service_id: str) -> None:

services/web/server/src/simcore_service_webserver/users/_tokens_handlers.py

@@ -2,7 +2,7 @@
 import logging
 
 from aiohttp import web
-from models_library.api_schemas_webserver.users import TokenCreate
+from models_library.api_schemas_webserver.users import MyTokenCreate
 from pydantic import BaseModel
 from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import (
@@ -55,7 +55,7 @@ async def list_tokens(request: web.Request) -> web.Response:
 @permission_required("user.tokens.*")
 async def create_token(request: web.Request) -> web.Response:
     req_ctx = UsersRequestContext.model_validate(request)
-    token_create = await parse_request_body_as(TokenCreate, request)
+    token_create = await parse_request_body_as(MyTokenCreate, request)
     await _tokens.create_token(request.app, req_ctx.user_id, token_create)
     return envelope_json_response(token_create, web.HTTPCreated)
 

services/web/server/src/simcore_service_webserver/users/_users_repository.py

@@ -2,7 +2,7 @@
 
 import sqlalchemy as sa
 from aiohttp import web
-from models_library.api_schemas_webserver.users import Permission
+from models_library.api_schemas_webserver.users import UserPermission
 from models_library.users import GroupID, UserBillingDetails, UserID
 from simcore_postgres_database.models.groups import groups, user_to_groups
 from simcore_postgres_database.models.products import products
@@ -73,8 +73,8 @@ async def list_user_permissions(
     *,
     user_id: UserID,
     product_name: str,
-) -> list[Permission]:
-    override_services_specifications = Permission(
+) -> list[UserPermission]:
+    override_services_specifications = UserPermission(
         name="override_services_specifications",
         allowed=False,
     )

services/web/server/src/simcore_service_webserver/users/_users_service.py

@@ -2,7 +2,7 @@
 
 import pycountry
 from aiohttp import web
-from models_library.api_schemas_webserver.users import Permission, UserGet
+from models_library.api_schemas_webserver.users import UserGet, UserPermission
 from models_library.emails import LowerCaseEmailStr
 from models_library.payments import UserInvoiceAddress
 from models_library.products import ProductName
@@ -24,8 +24,8 @@ async def list_user_permissions(
     *,
     user_id: UserID,
     product_name: ProductName,
-) -> list[Permission]:
-    permissions: list[Permission] = await _users_repository.list_user_permissions(
+) -> list[UserPermission]:
+    permissions: list[UserPermission] = await _users_repository.list_user_permissions(
         app, user_id=user_id, product_name=product_name
     )
     return permissions