replace exceptions

Author: pcrespov

services/payments/src/simcore_service_payments/db/payments_methods_repo.py

@@ -1,6 +1,5 @@
 import datetime
 
-import simcore_postgres_database.aiopg_errors as db_errors
 import sqlalchemy as sa
 from arrow import utcnow
 from models_library.api_schemas_payments.errors import (
@@ -16,6 +15,7 @@
     InitPromptAckFlowState,
     payments_methods,
 )
+from sqlalchemy.exc import IntegrityError
 
 from ..models.db import PaymentsMethodsDB
 from .base import BaseRepository
@@ -42,7 +42,7 @@ async def insert_init_payment_method(
                 )
                 return payment_method_id
 
-        except db_errors.UniqueViolation as err:
+        except IntegrityError as err:
             raise PaymentMethodUniqueViolationError(
                 payment_method_id=payment_method_id
             ) from err

services/payments/src/simcore_service_payments/db/payments_transactions_repo.py

@@ -13,11 +13,11 @@
 from models_library.users import UserID
 from models_library.wallets import WalletID
 from pydantic import HttpUrl, PositiveInt, TypeAdapter
-from simcore_postgres_database import aiopg_errors as pg_errors
 from simcore_postgres_database.models.payments_transactions import (
     PaymentTransactionState,
     payments_transactions,
 )
+from sqlalchemy.exc import IntegrityError
 
 from ..models.db import PaymentsTransactionsDB
 from .base import BaseRepository
@@ -58,7 +58,7 @@ async def insert_init_payment_transaction(
                     )
                 )
                 return payment_id
-        except pg_errors.UniqueViolation as exc:
+        except IntegrityError as exc:
             raise PaymentAlreadyExistsError(payment_id=f"{payment_id}") from exc
 
     async def update_ack_payment_transaction(

services/web/server/src/simcore_service_webserver/garbage_collector/_core_utils.py

@@ -5,7 +5,8 @@
 from models_library.groups import Group, GroupID, GroupType
 from models_library.projects import ProjectID
 from models_library.users import UserID
-from simcore_postgres_database.aiopg_errors import DatabaseError
+from simcore_postgres_database.aiopg_errors import DatabaseError as AiopgDatabaseError
+from sqlalchemy.exc import DatabaseError
 
 from ..groups.api import get_group_by_gid
 from ..projects._projects_repository_legacy import (
@@ -187,8 +188,8 @@ async def replace_current_owner(
         )
 
     except (
+        AiopgDatabaseError,
         DatabaseError,
-        asyncpg.exceptions.PostgresError,
         ProjectNotFoundError,
         UserNotFoundError,
     ):

services/web/server/src/simcore_service_webserver/security/_authz_policy.py

@@ -15,8 +15,7 @@
 from models_library.products import ProductName
 from models_library.users import UserID
 from servicelib.aiohttp.db_asyncpg_engine import get_async_engine
-from simcore_postgres_database.aiopg_errors import DatabaseError as AiopgDatabaseError
-from sqlalchemy.exc import DatabaseError as SQLAlchemyDatabaseError
+from sqlalchemy.exc import DatabaseError
 
 from . import _authz_repository
 from ._authz_access_model import (
@@ -48,7 +47,7 @@
 def _handle_exceptions_as_503():
     try:
         yield
-    except (AiopgDatabaseError, SQLAlchemyDatabaseError) as err:
+    except DatabaseError as err:
         _logger.exception(
             **create_troubleshooting_log_kwargs(
                 "Auth unavailable due to database error",