webserver client side

Author: pcrespov

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

@@ -1,12 +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 ...application_settings import get_application_settings
 from ...rabbitmq import get_rabbitmq_rpc_server
 from .. import _service
 from ..errors import ApiKeyNotFoundError
@@ -70,5 +70,9 @@ async def delete_api_key_by_key(
 
 async def register_rpc_routes_on_startup(app: web.Application):
     rpc_server = get_rabbitmq_rpc_server(app)
-    # FIXME: should depend on the webserver instance!
-    await rpc_server.register_router(router, WEBSERVER_RPC_NAMESPACE, app)
+    settings = get_application_settings(app)
+    if not settings.WEBSERVER_RPC_NAMESPACE:
+        msg = "RPC namespace is not configured"
+        raise ValueError(msg)
+
+    await rpc_server.register_router(router, settings.WEBSERVER_RPC_NAMESPACE, app)

services/web/server/src/simcore_service_webserver/functions/_controller/_functions_rpc.py

@@ -1,7 +1,6 @@
 from typing import Literal
 
 from aiohttp import web
-from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
 from models_library.functions import (
     Function,
     FunctionAccessRights,
@@ -53,6 +52,7 @@
 from models_library.users import UserID
 from servicelib.rabbitmq import RPCRouter
 
+from ...application_settings import get_application_settings
 from ...rabbitmq import get_rabbitmq_rpc_server
 from .. import _functions_repository, _functions_service
 
@@ -605,8 +605,12 @@ async def get_functions_user_api_access_rights(
 
 async def register_rpc_routes_on_startup(app: web.Application):
     rpc_server = get_rabbitmq_rpc_server(app)
-    # FIXME: should depend on the webserver instance!
-    await rpc_server.register_router(router, WEBSERVER_RPC_NAMESPACE, app)
+    settings = get_application_settings(app)
+    if not settings.WEBSERVER_RPC_NAMESPACE:
+        msg = "RPC namespace is not configured"
+        raise ValueError(msg)
+
+    await rpc_server.register_router(router, settings.WEBSERVER_RPC_NAMESPACE, app)
 
 
 @router.expose(reraise_if_error_type=())

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,6 +26,7 @@
     NotEnoughAvailableSeatsError,
 )
 
+from ..application_settings import get_application_settings
 from ..rabbitmq import get_rabbitmq_rpc_server
 from . import _licensed_items_checkouts_service, _licensed_items_service
 
@@ -163,5 +163,9 @@ async def release_licensed_item_for_wallet(
 
 async def register_rpc_routes_on_startup(app: web.Application):
     rpc_server = get_rabbitmq_rpc_server(app)
-    # FIXME: should depend on the webserver instance!
-    await rpc_server.register_router(router, WEBSERVER_RPC_NAMESPACE, app)
+    settings = get_application_settings(app)
+    if not settings.WEBSERVER_RPC_NAMESPACE:
+        msg = "RPC namespace is not configured"
+        raise ValueError(msg)
+
+    await rpc_server.register_router(router, settings.WEBSERVER_RPC_NAMESPACE, app)

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

@@ -1,13 +1,13 @@
 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
 from models_library.users import UserID
 from servicelib.rabbitmq import RPCRouter
 
+from ..application_settings import get_application_settings
 from ..products import products_service
 from ..products.models import CreditResult
 from ..rabbitmq import get_rabbitmq_rpc_server
@@ -49,5 +49,9 @@ async def get_invoice_data(
 
 async def register_rpc_routes_on_startup(app: web.Application):
     rpc_server = get_rabbitmq_rpc_server(app)
-    # FIXME: should depend on the webserver instance!
-    await rpc_server.register_router(router, WEBSERVER_RPC_NAMESPACE, app)
+    settings = get_application_settings(app)
+    if not settings.WEBSERVER_RPC_NAMESPACE:
+        msg = "RPC namespace is not configured"
+        raise ValueError(msg)
+
+    await rpc_server.register_router(router, settings.WEBSERVER_RPC_NAMESPACE, app)

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

@@ -1,12 +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 ...application_keys import APP_SETTINGS_APPKEY
+from ...application_settings import get_application_settings
 from ...rabbitmq import get_rabbitmq_rpc_server, setup_rabbitmq
 from .. import _service
 from .._models import CreditResult
@@ -29,8 +29,12 @@ async def get_credit_amount(
 
 async def _register_rpc_routes_on_startup(app: web.Application):
     rpc_server = get_rabbitmq_rpc_server(app)
-    # FIXME: should depend on the webserver instance!
-    await rpc_server.register_router(router, WEBSERVER_RPC_NAMESPACE, app)
+    settings = get_application_settings(app)
+    if not settings.WEBSERVER_RPC_NAMESPACE:
+        msg = "RPC namespace is not configured"
+        raise ValueError(msg)
+
+    await rpc_server.register_router(router, settings.WEBSERVER_RPC_NAMESPACE, app)
 
 
 def setup_rpc(app: web.Application):

services/web/server/src/simcore_service_webserver/projects/_controller/projects_rpc.py

@@ -1,5 +1,4 @@
 from aiohttp import web
-from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
 from models_library.products import ProductName
 from models_library.projects import ProjectID
 from models_library.rest_pagination import PageLimitInt, PageOffsetInt
@@ -15,7 +14,9 @@
     ProjectForbiddenRpcError,
     ProjectNotFoundRpcError,
 )
+from simcore_service_storage.core.settings import get_application_settings
 
+from ...application_settings import get_application_settings
 from ...rabbitmq import get_rabbitmq_rpc_server
 from .. import _jobs_service
 from ..exceptions import ProjectInvalidRightsError, ProjectNotFoundError
@@ -159,5 +160,9 @@ async def get_project_marked_as_job(
 
 async def register_rpc_routes_on_startup(app: web.Application):
     rpc_server = get_rabbitmq_rpc_server(app)
-    # FIXME: should depend on the webserver instance!
-    await rpc_server.register_router(router, WEBSERVER_RPC_NAMESPACE, app)
+    settings = get_application_settings(app)
+    if not settings.WEBSERVER_RPC_NAMESPACE:
+        msg = "RPC namespace is not configured"
+        raise ValueError(msg)
+
+    await rpc_server.register_router(router, settings.WEBSERVER_RPC_NAMESPACE, app)