repository module

Author: pcrespov

services/api-server/src/simcore_service_api_server/api/dependencies/authentication.py

@@ -6,8 +6,8 @@
 from models_library.products import ProductName
 from pydantic import BaseModel, PositiveInt
 
-from ...db.repositories.api_keys import ApiKeysRepository, UserAndProductTuple
-from ...db.repositories.users import UsersRepository
+from ...repository.api_keys import ApiKeysRepository, UserAndProductTuple
+from ...repository.users import UsersRepository
 from .database import get_repository
 
 # SEE https://swagger.io/docs/specification/authentication/basic-authentication/

services/api-server/src/simcore_service_api_server/api/dependencies/database.py

@@ -7,7 +7,7 @@
 from sqlalchemy.ext.asyncio import AsyncEngine
 
 from ...clients.postgres import get_engine
-from ...db.repositories import BaseRepository
+from ...repository import BaseRepository
 
 _logger = logging.getLogger(__name__)
 

services/api-server/src/simcore_service_api_server/db/repositories/__init__.py renamed to services/api-server/src/simcore_service_api_server/repository/__init__.py

@@ -5,10 +5,10 @@
 from models_library.products import ProductName
 from pydantic.types import PositiveInt
 from simcore_postgres_database.aiopg_errors import DatabaseError
+from simcore_postgres_database.models.api_keys import api_keys as api_keys_table
 from simcore_postgres_database.utils_repos import pass_or_acquire_connection
 from sqlalchemy.ext.asyncio import AsyncConnection
 
-from .. import tables as tbl
 from ._base import BaseRepository
 
 _logger = logging.getLogger(__name__)
@@ -31,13 +31,15 @@ async def get_user(
     ) -> UserAndProductTuple | None:
 
         stmt = sa.select(
-            tbl.api_keys.c.user_id,
-            tbl.api_keys.c.product_name,
+            api_keys_table.c.user_id,
+            api_keys_table.c.product_name,
         ).where(
-            (tbl.api_keys.c.api_key == api_key)  # NOTE: keep order, api_key is indexed
+            (
+                api_keys_table.c.api_key == api_key
+            )  # NOTE: keep order, api_key is indexed
             & (
-                tbl.api_keys.c.api_secret
-                == sa.func.crypt(api_secret, tbl.api_keys.c.api_secret)
+                api_keys_table.c.api_secret
+                == sa.func.crypt(api_secret, api_keys_table.c.api_secret)
             )
         )
         result: UserAndProductTuple | None = None

services/api-server/src/simcore_service_api_server/db/repositories/_base.py renamed to services/api-server/src/simcore_service_api_server/repository/_base.py

@@ -1,11 +1,12 @@
 import sqlalchemy as sa
+from common_library.users_enums import UserStatus
 from models_library.emails import LowerCaseEmailStr
 from models_library.users import UserID
 from pydantic import TypeAdapter
+from simcore_postgres_database.models.users import users
 from simcore_postgres_database.utils_repos import pass_or_acquire_connection
 from sqlalchemy.ext.asyncio import AsyncConnection
 
-from ..tables import UserStatus, users
 from ._base import BaseRepository
 
 
@@ -17,7 +18,7 @@ async def get_active_user_email(
         user_id: UserID,
     ) -> LowerCaseEmailStr | None:
         async with pass_or_acquire_connection(self.db_engine, connection) as conn:
-            email: str | None = await conn.scalar(
+            email = await conn.scalar(
                 sa.select(users.c.email).where(
                     (users.c.id == user_id) & (users.c.status == UserStatus.ACTIVE)
                 )

services/api-server/src/simcore_service_api_server/db/repositories/api_keys.py renamed to services/api-server/src/simcore_service_api_server/repository/api_keys.py

@@ -50,7 +50,7 @@
 from simcore_service_api_server.api.dependencies.rabbitmq import get_rabbitmq_rpc_client
 from simcore_service_api_server.core.application import init_app
 from simcore_service_api_server.core.settings import ApplicationSettings
-from simcore_service_api_server.db.repositories.api_keys import UserAndProductTuple
+from simcore_service_api_server.repository.api_keys import UserAndProductTuple
 from simcore_service_api_server.services_http.solver_job_outputs import ResultsTypes
 
 
@@ -176,12 +176,12 @@ def auth(
 
     # NOTE: here, instead of using the database, we patch repositories interface
     mocker.patch(
-        "simcore_service_api_server.db.repositories.api_keys.ApiKeysRepository.get_user",
+        "simcore_service_api_server.repository.api_keys.ApiKeysRepository.get_user",
         autospec=True,
         return_value=UserAndProductTuple(user_id=user_id, product_name="osparc"),
     )
     mocker.patch(
-        "simcore_service_api_server.db.repositories.users.UsersRepository.get_active_user_email",
+        "simcore_service_api_server.repository.users.UsersRepository.get_active_user_email",
         autospec=True,
         return_value=user_email,
     )