✨ Refactor imports: update repository paths for consistency and add error handling setup

Author: pcrespov

services/catalog/src/simcore_service_catalog/api/_dependencies/database.py

@@ -6,7 +6,7 @@
 from fastapi.requests import Request
 from sqlalchemy.ext.asyncio import AsyncEngine
 
-from ...db.repositories._base import BaseRepository
+from ...repository._base import BaseRepository
 
 _logger = logging.getLogger(__name__)
 

services/catalog/src/simcore_service_catalog/api/_dependencies/services.py

@@ -13,8 +13,8 @@
 from servicelib.fastapi.dependencies import get_app
 
 from ...core.settings import ApplicationSettings
-from ...db.repositories.groups import GroupsRepository
-from ...db.repositories.services import ServicesRepository
+from ...repository.groups import GroupsRepository
+from ...repository.services import ServicesRepository
 from ...service import manifest
 from ...service.director import DirectorApi
 from .database import get_repository

services/catalog/src/simcore_service_catalog/api/_dependencies/user_groups.py

@@ -4,7 +4,7 @@
 from models_library.groups import GroupAtDB
 from models_library.users import UserID
 
-from ...db.repositories.groups import GroupsRepository
+from ...repository.groups import GroupsRepository
 from .database import get_repository
 
 

services/catalog/src/simcore_service_catalog/api/rest/__init__.py

@@ -1,12 +1,10 @@
 from fastapi import FastAPI
-from servicelib.fastapi.http_error import set_app_default_http_error_handlers
 
+from .errors import setup_rest_api_error_handlers
 from .routes import setup_rest_api_routes
 
 
 def initialize_rest_api(app: FastAPI):
 
     setup_rest_api_routes(app)
-
-    # defaults error handling
-    set_app_default_http_error_handlers(app)
+    setup_rest_api_error_handlers(app)

services/catalog/src/simcore_service_catalog/api/rest/_services.py

@@ -20,9 +20,9 @@
     LIST_SERVICES_CACHING_TTL,
     RESPONSE_MODEL_POLICY,
 )
-from ...db.repositories.groups import GroupsRepository
-from ...db.repositories.services import ServicesRepository
 from ...models.services_db import ServiceAccessRightsAtDB, ServiceMetaDataDBGet
+from ...repository.groups import GroupsRepository
+from ...repository.services import ServicesRepository
 from ...service.director import DirectorApi
 from .._dependencies.database import get_repository
 from .._dependencies.director import get_director_api

services/catalog/src/simcore_service_catalog/api/rest/_services_access_rights.py

@@ -8,8 +8,8 @@
 from models_library.services import ServiceKey, ServiceVersion
 
 from ..._constants import RESPONSE_MODEL_POLICY
-from ...db.repositories.services import ServicesRepository
 from ...models.services_db import ServiceAccessRightsAtDB
+from ...repository.services import ServicesRepository
 from .._dependencies.database import get_repository
 from .._dependencies.services import AccessInfo, check_service_read_access
 

services/catalog/src/simcore_service_catalog/api/rest/_services_resources.py

@@ -23,7 +23,7 @@
 from pydantic import TypeAdapter
 
 from ..._constants import RESPONSE_MODEL_POLICY, SIMCORE_SERVICE_SETTINGS_LABELS
-from ...db.repositories.services import ServicesRepository
+from ...repository.services import ServicesRepository
 from ...service.director import DirectorApi
 from ...service.function_services import is_function_service
 from ...utils.service_resources import (

services/catalog/src/simcore_service_catalog/api/rest/_services_specifications.py

@@ -10,8 +10,8 @@
 from models_library.users import UserID
 
 from ..._constants import RESPONSE_MODEL_POLICY
-from ...db.repositories.groups import GroupsRepository
-from ...db.repositories.services import ServicesRepository
+from ...repository.groups import GroupsRepository
+from ...repository.services import ServicesRepository
 from ...service.function_services import is_function_service
 from .._dependencies.database import get_repository
 from .._dependencies.services import get_default_service_specifications

services/catalog/src/simcore_service_catalog/api/rest/errors.py

@@ -0,0 +1,6 @@
+from fastapi import FastAPI
+from servicelib.fastapi.http_error import set_app_default_http_error_handlers
+
+
+def setup_rest_api_error_handlers(app: FastAPI):
+    set_app_default_http_error_handlers(app)

services/catalog/src/simcore_service_catalog/api/rpc/_services.py

@@ -23,9 +23,9 @@
     CatalogForbiddenError,
     CatalogItemNotFoundError,
 )
-from simcore_service_catalog.db.repositories.groups import GroupsRepository
+from simcore_service_catalog.repository.groups import GroupsRepository
 
-from ...db.repositories.services import ServicesRepository
+from ...repository.services import ServicesRepository
 from ...service import services_api
 from .._dependencies.director import get_director_api