🐛 getters for user_role and email fixed

packages/postgres-database/src/simcore_postgres_database/utils_users.py

@@ -2,6 +2,8 @@
     i.e. models.users main table and all its relations
 """
 
+from typing import Any
+
 import sqlalchemy as sa
 from aiopg.sa.connection import SAConnection
 
@@ -18,17 +20,17 @@ class UserNotFoundInRepoError(BaseUserRepoError):
 
 class UsersRepo:
     @staticmethod
-    async def get_role(conn: SAConnection, user_id: int) -> UserRole:
+    async def get_role(conn: SAConnection, user_id: int) -> Any:
         if value := await conn.scalar(
             sa.select(users.c.role).where(users.c.id == user_id)
         ):
             return UserRole(value)
-        raise UserNotFoundInRepoError()
+        raise UserNotFoundInRepoError
 
     @staticmethod
-    async def get_email(conn: SAConnection, user_id: int) -> str:
+    async def get_email(conn: SAConnection, user_id: int) -> Any:
         if value := await conn.scalar(
             sa.select(users.c.email).where(users.c.id == user_id)
         ):
-            return f"{value}"
-        raise UserNotFoundInRepoError()
+            return value
+        raise UserNotFoundInRepoError

services/director-v2/src/simcore_service_director_v2/modules/db/repositories/services_environments.py

@@ -4,6 +4,7 @@
 from models_library.services import ServiceKey, ServiceVersion
 from models_library.users import UserID
 from pydantic import EmailStr, parse_obj_as
+from simcore_postgres_database.models.users import UserRole
 from simcore_postgres_database.utils_services_environments import (
     VENDOR_SECRET_PREFIX,
     VendorSecret,
@@ -46,11 +47,12 @@ async def get_vendor_secrets(
     def is_vendor_secret_identifier(cls, identifier: str) -> bool:
         return identifier.startswith(VENDOR_SECRET_PREFIX)
 
-    async def get_user_role(self, user_id: UserID):
+    async def get_user_role(self, user_id: UserID) -> UserRole:
         async with self.db_engine.acquire() as conn:
-            return UsersRepo().get_role(conn, user_id=user_id)
+            user_role = await UsersRepo().get_role(conn, user_id=user_id)
+            return UserRole(user_role)
 
     async def get_user_email(self, user_id: UserID) -> EmailStr:
         async with self.db_engine.acquire() as conn:
-            email = UsersRepo().get_email(conn, user_id=user_id)
+            email = await UsersRepo().get_email(conn, user_id=user_id)
             return parse_obj_as(EmailStr, email)

services/director-v2/src/simcore_service_director_v2/modules/db/repositories/users.py

@@ -1,11 +1,12 @@
 from models_library.users import UserID
+from pydantic import EmailStr, parse_obj_as
 from simcore_postgres_database.utils_users import UsersRepo
 
 from ._base import BaseRepository
 
 
 class UsersRepository(BaseRepository):
-    async def get_user_email(self, user_id: UserID) -> str:
+    async def get_user_email(self, user_id: UserID) -> EmailStr:
         async with self.db_engine.acquire() as conn:
-            email: str = await UsersRepo.get_email(conn, user_id)
-            return email
+            email = await UsersRepo.get_email(conn, user_id)
+            return parse_obj_as(EmailStr, email)

services/director-v2/src/simcore_service_director_v2/modules/osparc_variables_substitutions.py

@@ -17,8 +17,9 @@
 from models_library.services import ServiceKey, ServiceVersion
 from models_library.users import UserID
 from models_library.utils.specs_substitution import SpecsSubstitutionsResolver
-from pydantic import BaseModel, EmailStr
+from pydantic import BaseModel
 from servicelib.logging_utils import log_context
+from simcore_postgres_database.models.users import UserRole
 
 from ..utils.db import get_repository
 from ..utils.osparc_variables import (
@@ -252,14 +253,15 @@ def _setup_lifespan_osparc_variables_table(app: FastAPI):
     )
 
 
-async def _request_user_email(app: FastAPI, user_id: UserID) -> EmailStr:
+async def _request_user_email(app: FastAPI, user_id: UserID) -> str:
     repo = get_repository(app, ServicesEnvironmentsRepository)
     return await repo.get_user_email(user_id=user_id)
 
 
-async def _request_user_role(app: FastAPI, user_id: UserID):
+async def _request_user_role(app: FastAPI, user_id: UserID) -> str:
     repo = get_repository(app, ServicesEnvironmentsRepository)
-    return await repo.get_user_role(user_id=user_id)
+    user_role: UserRole = await repo.get_user_role(user_id=user_id)
+    return f"{user_role.value}"
 
 
 def _setup_session_osparc_variables(app: FastAPI):
@@ -271,7 +273,6 @@ def _setup_session_osparc_variables(app: FastAPI):
         ("OSPARC_VARIABLE_PRODUCT_NAME", "product_name"),
         ("OSPARC_VARIABLE_STUDY_UUID", "project_id"),
         ("OSPARC_VARIABLE_NODE_ID", "node_id"),
-        # ANE -> PC: why not register the user_id as well at this point?
     ]:
         table.register_from_context(name, context_name)