all servers are setup

Author: pcrespov

services/web/server/src/simcore_service_webserver/api_keys/_controller/rpc.py

@@ -1,13 +1,12 @@
 from datetime import timedelta
 
 from aiohttp import web
-from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
 from models_library.products import ProductName
 from models_library.rpc.webserver.auth.api_keys import ApiKeyGet
 from models_library.users import UserID
 from servicelib.rabbitmq import RPCRouter
 
-from ...rabbitmq import get_rabbitmq_rpc_server
+from ...rabbitmq import create_register_rpc_routes_on_startup
 from .. import _service
 from ..errors import ApiKeyNotFoundError
 from ..models import ApiKey
@@ -68,6 +67,4 @@ async def delete_api_key_by_key(
     )
 
 
-async def register_rpc_routes_on_startup(app: web.Application):
-    rpc_server = get_rabbitmq_rpc_server(app)
-    await rpc_server.register_router(router, WEBSERVER_RPC_NAMESPACE, app)
+register_rpc_routes_on_startup = create_register_rpc_routes_on_startup(router)

services/web/server/src/simcore_service_webserver/licenses/_rpc.py

@@ -1,5 +1,4 @@
 from aiohttp import web
-from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
 from models_library.api_schemas_webserver.licensed_items import (
     LicensedItemRpcGet,
     LicensedItemRpcGetPage,
@@ -27,7 +26,7 @@
     NotEnoughAvailableSeatsError,
 )
 
-from ..rabbitmq import get_rabbitmq_rpc_server
+from ..rabbitmq import create_register_rpc_routes_on_startup
 from . import _licensed_items_checkouts_service, _licensed_items_service
 
 router = RPCRouter()
@@ -161,6 +160,4 @@ async def release_licensed_item_for_wallet(
     )
 
 
-async def register_rpc_routes_on_startup(app: web.Application):
-    rpc_server = get_rabbitmq_rpc_server(app)
-    await rpc_server.register_router(router, WEBSERVER_RPC_NAMESPACE, app)
+register_rpc_routes_on_startup = create_register_rpc_routes_on_startup(router)

services/web/server/src/simcore_service_webserver/payments/_rpc_invoice.py

@@ -1,7 +1,6 @@
 from decimal import Decimal
 
 from aiohttp import web
-from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
 from models_library.emails import LowerCaseEmailStr
 from models_library.payments import InvoiceDataGet, UserInvoiceAddress
 from models_library.products import ProductName
@@ -10,7 +9,7 @@
 
 from ..products import products_service
 from ..products.models import CreditResult
-from ..rabbitmq import get_rabbitmq_rpc_server
+from ..rabbitmq import create_register_rpc_routes_on_startup
 from ..users.api import get_user_display_and_id_names, get_user_invoice_address
 
 router = RPCRouter()
@@ -45,6 +44,4 @@ async def get_invoice_data(
     )
 
 
-async def register_rpc_routes_on_startup(app: web.Application):
-    rpc_server = get_rabbitmq_rpc_server(app)
-    await rpc_server.register_router(router, WEBSERVER_RPC_NAMESPACE, app)
+register_rpc_routes_on_startup = create_register_rpc_routes_on_startup(router)

services/web/server/src/simcore_service_webserver/products/_controller/rpc.py

@@ -1,13 +1,12 @@
 from decimal import Decimal
 
 from aiohttp import web
-from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
 from models_library.api_schemas_webserver.products import CreditResultRpcGet
 from models_library.products import ProductName
 from servicelib.rabbitmq import RPCRouter
 
 from ...constants import APP_SETTINGS_KEY
-from ...rabbitmq import get_rabbitmq_rpc_server, setup_rabbitmq
+from ...rabbitmq import create_register_rpc_routes_on_startup, setup_rabbitmq
 from .. import _service
 from .._models import CreditResult
 
@@ -27,9 +26,7 @@ async def get_credit_amount(
     return CreditResultRpcGet.model_validate(credit_result, from_attributes=True)
 
 
-async def _register_rpc_routes_on_startup(app: web.Application):
-    rpc_server = get_rabbitmq_rpc_server(app)
-    await rpc_server.register_router(router, WEBSERVER_RPC_NAMESPACE, app)
+_register_rpc_routes_on_startup = create_register_rpc_routes_on_startup(router)
 
 
 def setup_rpc(app: web.Application):