fix tests

Author: giancarloromeo

services/web/server/src/simcore_service_webserver/director_v2/_client.py

@@ -16,6 +16,7 @@
 )
 from models_library.projects import ProjectID
 from models_library.users import UserID
+from pydantic import AnyHttpUrl, TypeAdapter
 
 from ._client_base import request_director_v2
 from .settings import DirectorV2Settings, get_client_session, get_plugin_settings
@@ -62,7 +63,12 @@ async def get_computation(
         return DirectorV2ComputationGet.model_validate(computation_task_out)
 
     async def start_computation(
-        self, project_id: ProjectID, user_id: UserID, product_name: str, **options
+        self,
+        project_id: ProjectID,
+        user_id: UserID,
+        product_name: str,
+        product_api_base_url: str,
+        **options,
     ) -> str:
         computation_task_out = await request_director_v2(
             self._app,
@@ -73,6 +79,9 @@ async def start_computation(
                 user_id=user_id,
                 project_id=project_id,
                 product_name=product_name,
+                product_api_base_url=TypeAdapter(AnyHttpUrl).validate_python(
+                    product_api_base_url
+                ),
                 **options,
             ).model_dump(mode="json", exclude_unset=True),
         )

services/web/server/src/simcore_service_webserver/director_v2/_controller/rest.py

@@ -26,7 +26,7 @@
 from ...models import RequestContext
 from ...products import products_web
 from ...security.decorators import permission_required
-from ...utils_aiohttp import envelope_json_response
+from ...utils_aiohttp import envelope_json_response, get_api_base_url
 from .. import _director_v2_service
 from .._client import DirectorV2RestClient
 from .._director_v2_abc_service import get_project_run_policy
@@ -111,7 +111,11 @@ async def start_computation(request: web.Request) -> web.Response:
     _started_pipelines_ids = await asyncio.gather(
         *[
             computations.start_computation(
-                pid, req_ctx.user_id, req_ctx.product_name, **options
+                pid,
+                req_ctx.user_id,
+                req_ctx.product_name,
+                get_api_base_url(request),
+                **options,
             )
             for pid in running_project_ids
         ]

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

@@ -62,7 +62,7 @@
 from ...login.decorators import login_required
 from ...security.decorators import permission_required
 from ...users.api import get_user_id_from_gid, get_user_role
-from ...utils_aiohttp import envelope_json_response
+from ...utils_aiohttp import envelope_json_response, get_api_base_url
 from .. import _access_rights_service as access_rights_service
 from .. import _nodes_service, _projects_service, nodes_utils
 from .._nodes_service import NodeScreenshot, get_node_screenshots
@@ -278,6 +278,7 @@ async def start_node(request: web.Request) -> web.Response:
     await _projects_service.start_project_node(
         request,
         product_name=req_ctx.product_name,
+        product_api_base_url=get_api_base_url(request),
         user_id=req_ctx.user_id,
         project_id=path_params.project_id,
         node_id=path_params.node_id,

services/web/server/src/simcore_service_webserver/projects/_projects_service.py

@@ -596,6 +596,7 @@ async def _start_dynamic_service(  # noqa: C901
     service_key: ServiceKey,
     service_version: ServiceVersion,
     product_name: str,
+    product_api_base_url: str,
     user_id: UserID,
     project_uuid: ProjectID,
     node_uuid: NodeID,
@@ -767,6 +768,7 @@ async def _() -> None:
             app=request.app,
             dynamic_service_start=DynamicServiceStart(
                 product_name=product_name,
+                product_api_base_url=product_api_base_url,
                 can_save=save_state,
                 project_id=project_uuid,
                 user_id=user_id,
@@ -869,7 +871,8 @@ async def add_project_node(
 
 async def start_project_node(
     request: web.Request,
-    product_name: str,
+    product_name: ProductName,
+    product_api_base_url: str,
     user_id: UserID,
     project_id: ProjectID,
     node_id: NodeID,

services/web/server/src/simcore_service_webserver/utils_aiohttp.py

@@ -7,6 +7,7 @@
 from aiohttp.web_exceptions import HTTPError, HTTPException
 from aiohttp.web_routedef import RouteDef, RouteTableDef
 from common_library.json_serialization import json_dumps
+from common_library.network import is_ip_address
 from models_library.generics import Envelope
 from pydantic import BaseModel, Field
 from servicelib.common_headers import X_FORWARDED_PROTO
@@ -151,3 +152,16 @@ def iter_originating_hosts(request: web.Request) -> Iterator[str]:
         host = request.host.partition(":")[0]
         if host not in seen:
             yield host
+
+
+def get_api_base_url(request: web.Request) -> str | None:
+    originating_host = next(iter_originating_hosts(request), None)
+    if not originating_host:
+        return None
+
+    api_host = (
+        f"api.{originating_host}"
+        if not is_ip_address(originating_host)
+        else originating_host
+    )
+    return f"{request.url.with_host(api_host).with_port(None).with_path('')}"