move

Author: giancarloromeo

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/products.py

@@ -12,15 +12,15 @@
 
 
 @log_decorator(_logger, level=logging.DEBUG)
-async def get_product_base_url(
+async def get_product_api_base_url(
     rpc_client: RabbitMQRPCClient,
     *,
     product_name: ProductName,
 ) -> str:
 
     resp = await rpc_client.request(
         WEBSERVER_RPC_NAMESPACE,
-        TypeAdapter(RPCMethodName).validate_python("get_product_base_url"),
+        TypeAdapter(RPCMethodName).validate_python("get_product_api_base_url"),
         product_name=product_name,
     )
     assert resp  # nosec

services/director-v2/src/simcore_service_director_v2/modules/osparc_variables/substitutions.py

@@ -4,7 +4,6 @@
 import logging
 from copy import deepcopy
 from typing import Any, Final, TypeVar
-from urllib.parse import urlparse, urlunparse
 
 from fastapi import FastAPI
 from models_library.osparc_variable_identifier import (
@@ -24,7 +23,9 @@
 from pydantic import BaseModel
 from servicelib.fastapi.app_state import SingletonInAppStateMixin
 from servicelib.logging_utils import log_context
-from servicelib.rabbitmq.rpc_interfaces.webserver.products import get_product_base_url
+from servicelib.rabbitmq.rpc_interfaces.webserver.products import (
+    get_product_api_base_url,
+)
 
 from ...modules.rabbitmq import get_rabbitmq_rpc_client
 from ...utils.db import get_repository
@@ -42,16 +43,6 @@
 TBaseModel = TypeVar("TBaseModel", bound=BaseModel)
 
 
-def _make_api_server_base_url(base_url: str):
-    parsed = urlparse(base_url)
-    hostname = parsed.hostname or ""
-
-    if not hostname.startswith("api."):
-        hostname = f"api.{hostname}"
-
-    return urlunparse((parsed.scheme, hostname, "", "", "", ""))
-
-
 async def substitute_vendor_secrets_in_model(
     app: FastAPI,
     model: TBaseModel,
@@ -217,11 +208,9 @@ async def resolve_and_substitute_session_variables_in_model(
                 node_id=node_id,
                 run_id=service_run_id,
                 wallet_id=wallet_id,
-                api_server_base_url=_make_api_server_base_url(
-                    await get_product_base_url(
-                        get_rabbitmq_rpc_client(app),
-                        product_name=product_name,
-                    ),
+                api_server_base_url=await get_product_api_base_url(
+                    get_rabbitmq_rpc_client(app),
+                    product_name=product_name,
                 ),
             ),
         )
@@ -267,11 +256,9 @@ async def resolve_and_substitute_session_variables_in_specs(
                     node_id=node_id,
                     run_id=service_run_id,
                     wallet_id=wallet_id,
-                    api_server_base_url=_make_api_server_base_url(
-                        await get_product_base_url(
-                            get_rabbitmq_rpc_client(app),
-                            product_name=product_name,
-                        ),
+                    api_server_base_url=await get_product_api_base_url(
+                        get_rabbitmq_rpc_client(app),
+                        product_name=product_name,
                     ),
                 ),
             )

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

@@ -30,12 +30,12 @@ async def get_credit_amount(
 
 
 @router.expose()
-async def get_product_base_url(
+async def get_product_api_base_url(
     app: web.Application,
     *,
     product_name: ProductName,
 ) -> str:
-    return await _service.get_product_base_url(app, product_name=product_name)
+    return await _service.get_product_api_base_url(app, product_name=product_name)
 
 
 async def _register_rpc_routes_on_startup(app: web.Application):

services/web/server/src/simcore_service_webserver/products/_service.py

@@ -1,5 +1,6 @@
 from decimal import Decimal
 from typing import Any
+from urllib.parse import urlparse, urlunparse
 
 from aiohttp import web
 from models_library.groups import GroupID
@@ -22,6 +23,16 @@
 from .models import Product
 
 
+def _make_api_server_base_url(base_url: str):
+    parsed = urlparse(base_url)
+    hostname = parsed.hostname or ""
+
+    if not hostname.startswith("api."):
+        hostname = f"api.{hostname}"
+
+    return urlunparse((parsed.scheme, hostname, "", "", "", ""))
+
+
 async def load_products(app: web.Application) -> list[Product]:
     repo = ProductRepository.create_from_app(app)
     try:
@@ -137,12 +148,13 @@ async def get_template_content(app: web.Application, *, template_name: str):
     return content
 
 
-async def get_product_base_url(app: web.Application, *, product_name) -> str:
+async def get_product_api_base_url(app: web.Application, *, product_name) -> str:
     repo = ProductRepository.create_from_app(app)
     base_url = await repo.get_product_base_url(product_name)
     if not base_url:
         raise ProductBaseUrlNotFoundError(product_name=product_name)
-    return base_url
+
+    return _make_api_server_base_url(base_url)
 
 
 async def auto_create_products_groups(