rename

Author: pcrespov

packages/service-library/src/servicelib/fastapi/app_state.py

@@ -5,7 +5,7 @@
 _logger = logging.getLogger(__name__)
 
 
-class AppStateMixin:
+class SingletonInAppStateMixin:
     """
     Mixin to get, set and delete an instance of 'self' from/to app.state
     """

packages/service-library/tests/fastapi/test_http_client.py

@@ -13,12 +13,12 @@
 from asgi_lifespan import LifespanManager
 from fastapi import FastAPI, status
 from models_library.healthchecks import IsResponsive
-from servicelib.fastapi.app_state import AppStateMixin
+from servicelib.fastapi.app_state import SingletonInAppStateMixin
 from servicelib.fastapi.http_client import BaseHttpApi
 
 
 def test_using_app_state_mixin():
-    class SomeData(AppStateMixin):
+    class SomeData(SingletonInAppStateMixin):
         app_state_name: str = "my_data"
         frozen: bool = True
 
@@ -71,7 +71,7 @@ def mock_server_api(base_url: str) -> Iterator[respx.MockRouter]:
 
 
 async def test_base_http_api(mock_server_api: respx.MockRouter, base_url: str):
-    class MyClientApi(BaseHttpApi, AppStateMixin):
+    class MyClientApi(BaseHttpApi, SingletonInAppStateMixin):
         app_state_name: str = "my_client_api"
 
     new_app = FastAPI()

services/payments/src/simcore_service_payments/api/rest/_dependencies.py

@@ -4,7 +4,7 @@
 
 from fastapi import Depends, FastAPI, Request
 from fastapi.security import OAuth2PasswordBearer
-from servicelib.fastapi.app_state import AppStateMixin
+from servicelib.fastapi.app_state import SingletonInAppStateMixin
 from servicelib.fastapi.dependencies import get_app, get_reverse_url_mapper
 from sqlalchemy.ext.asyncio import AsyncEngine
 
@@ -44,7 +44,9 @@ def get_rut_api(request: Request) -> ResourceUsageTrackerApi:
     )
 
 
-def get_from_app_state(app_state_mixin_subclass: type[AppStateMixin]) -> Callable:
+def get_from_app_state(
+    app_state_mixin_subclass: type[SingletonInAppStateMixin],
+) -> Callable:
     """Generic getter of app.state objects"""
 
     def _(app: Annotated[FastAPI, Depends(get_app)]):

services/payments/src/simcore_service_payments/services/notifier.py

@@ -13,15 +13,15 @@
     PaymentTransaction,
 )
 from models_library.users import UserID
-from servicelib.fastapi.app_state import AppStateMixin
+from servicelib.fastapi.app_state import SingletonInAppStateMixin
 
 from ..db.payment_users_repo import PaymentsUsersRepo
 from .postgres import get_engine
 
 _logger = logging.getLogger(__name__)
 
 
-class Notifier(AppStateMixin):
+class Notifier(SingletonInAppStateMixin):
     app_state_name: str = "notifier"
 
     def __init__(

services/payments/src/simcore_service_payments/services/payments_gateway.py

@@ -18,7 +18,9 @@
 from models_library.api_schemas_webserver.wallets import PaymentID, PaymentMethodID
 from pydantic import ValidationError, parse_raw_as
 from pydantic.errors import PydanticErrorMixin
-from servicelib.fastapi.http_client import AppStateMixin, BaseHttpApi, to_curl_command
+from servicelib.fastapi.app_state import SingletonInAppStateMixin
+from servicelib.fastapi.http_client import BaseHttpApi
+from servicelib.fastapi.httpx_utils import to_curl_command
 from simcore_service_payments.models.schemas.acknowledgements import (
     AckPaymentWithPaymentMethod,
 )
@@ -105,7 +107,7 @@ def auth_flow(self, request):
         yield request
 
 
-class PaymentsGatewayApi(BaseHttpApi, AppStateMixin):
+class PaymentsGatewayApi(BaseHttpApi, SingletonInAppStateMixin):
     app_state_name: str = "payment_gateway_api"
 
     #

services/payments/src/simcore_service_payments/services/resource_usage_tracker.py

@@ -19,15 +19,15 @@
 from models_library.resource_tracker import CreditTransactionId
 from models_library.users import UserID
 from models_library.wallets import WalletID
-from servicelib.fastapi.app_state import AppStateMixin
+from servicelib.fastapi.app_state import SingletonInAppStateMixin
 from servicelib.fastapi.http_client import BaseHttpApi
 
 from ..core.settings import ApplicationSettings
 
 _logger = logging.getLogger(__name__)
 
 
-class ResourceUsageTrackerApi(BaseHttpApi, AppStateMixin):
+class ResourceUsageTrackerApi(BaseHttpApi, SingletonInAppStateMixin):
     app_state_name: str = "source_usage_tracker_api"
 
     async def create_credit_transaction(