add api_base_url

Author: giancarloromeo

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

@@ -35,7 +35,7 @@
 from ...security.api import check_user_permission
 from ...security.decorators import permission_required
 from ...users.api import get_user_fullname
-from ...utils_aiohttp import envelope_json_response
+from ...utils_aiohttp import envelope_json_response, get_api_base_url
 from .. import _crud_api_create, _crud_api_read, _projects_service
 from .._permalink_service import update_or_pop_permalink_in_project
 from ..models import ProjectDict
@@ -116,6 +116,7 @@ async def create_project(request: web.Request):
         copy_data=query_params.copy_data,
         user_id=req_ctx.user_id,
         product_name=req_ctx.product_name,
+        product_api_base_url=get_api_base_url(request),
         simcore_user_agent=header_params.simcore_user_agent,
         predefined_project=predefined_project,
         parent_project_uuid=header_params.parent_project_uuid,
@@ -452,6 +453,7 @@ async def clone_project(request: web.Request):
         copy_data=True,
         user_id=req_ctx.user_id,
         product_name=req_ctx.product_name,
+        product_api_base_url=get_api_base_url(request),
         simcore_user_agent=request.headers.get(
             X_SIMCORE_USER_AGENT, UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE
         ),

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

@@ -258,6 +258,7 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
     copy_data: bool,
     user_id: UserID,
     product_name: str,
+    product_api_base_url: str,
     predefined_project: ProjectDict | None,
     simcore_user_agent: str,
     parent_project_uuid: ProjectID | None,
@@ -411,7 +412,11 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
 
         # This is a new project and every new graph needs to be reflected in the pipeline tables
         await director_v2_service.create_or_update_pipeline(
-            request.app, user_id, new_project["uuid"], product_name
+            request.app,
+            user_id,
+            new_project["uuid"],
+            product_name,
+            product_api_base_url,
         )
         # get the latest state of the project (lastChangeDate for instance)
         new_project, _ = await _projects_repository.get_project_dict_and_type(

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

@@ -869,7 +869,11 @@ async def add_project_node(
     # also ensure the project is updated by director-v2 since services
     # are due to access comp_tasks at some point see [https://github.com/ITISFoundation/osparc-simcore/issues/3216]
     await director_v2_service.create_or_update_pipeline(
-        request.app, user_id, project["uuid"], product_name
+        request.app,
+        user_id,
+        project["uuid"],
+        product_name,
+        product_api_base_url,
     )
     await dynamic_scheduler_service.update_projects_networks(
         request.app, project_id=ProjectID(project["uuid"])
@@ -952,6 +956,7 @@ async def delete_project_node(
     user_id: UserID,
     node_uuid: NodeIDStr,
     product_name: ProductName,
+    product_api_base_url: str,
 ) -> None:
     log.debug(
         "deleting node %s in project %s for user %s", node_uuid, project_uuid, user_id
@@ -997,7 +1002,7 @@ async def delete_project_node(
     # also ensure the project is updated by director-v2 since services
     product_name = products_web.get_product_name(request)
     await director_v2_service.create_or_update_pipeline(
-        request.app, user_id, project_uuid, product_name
+        request.app, user_id, project_uuid, product_name, product_api_base_url
     )
     await dynamic_scheduler_service.update_projects_networks(
         request.app, project_id=project_uuid
@@ -1069,6 +1074,7 @@ async def patch_project_node(
     app: web.Application,
     *,
     product_name: ProductName,
+    product_api_base_url: str,
     user_id: UserID,
     project_id: ProjectID,
     node_id: NodeID,
@@ -1127,7 +1133,11 @@ async def patch_project_node(
 
     # 4. Make calls to director-v2 to keep data in sync (ex. comp_tasks DB table)
     await director_v2_service.create_or_update_pipeline(
-        app, user_id, project_id, product_name=product_name
+        app,
+        user_id,
+        project_id,
+        product_name=product_name,
+        product_api_base_url=product_api_base_url,
     )
     if _node_patch_exclude_unset.get("label"):
         await dynamic_scheduler_service.update_projects_networks(

services/web/server/src/simcore_service_webserver/studies_dispatcher/_projects.py

@@ -183,7 +183,12 @@ def _create_project_with_filepicker_and_service(
 
 
 async def _add_new_project(
-    app: web.Application, project: Project, user: UserInfo, *, product_name: str
+    app: web.Application,
+    project: Project,
+    user: UserInfo,
+    *,
+    product_name: str,
+    product_api_base_url: str,
 ):
     # TODO: move this to projects_api
     # TODO: this piece was taken from the end of projects.projects_handlers.create_projects
@@ -212,7 +217,9 @@ async def _add_new_project(
     #
     # TODO: Ensure this user has access to these services!
     #
-    await create_or_update_pipeline(app, user.id, project.uuid, product_name)
+    await create_or_update_pipeline(
+        app, user.id, project.uuid, product_name, product_api_base_url
+    )
 
 
 async def _project_exists(
@@ -245,6 +252,7 @@ async def get_or_create_project_with_file_and_service(
     download_link: HttpUrl,
     *,
     product_name: str,
+    product_api_base_url: str,
 ) -> ProjectNodePair:
     #
     # Generate one project per user + download_link + viewer
@@ -292,7 +300,13 @@ async def get_or_create_project_with_file_and_service(
             viewer,
         )
 
-        await _add_new_project(app, project, user, product_name=product_name)
+        await _add_new_project(
+            app,
+            project,
+            user,
+            product_name=product_name,
+            product_api_base_url=product_api_base_url,
+        )
 
     return ProjectNodePair(project_uid=project_uid, node_uid=service_id)
 
@@ -304,6 +318,7 @@ async def get_or_create_project_with_service(
     service_info: ServiceInfo,
     *,
     product_name: str,
+    product_api_base_url: str,
 ) -> ProjectNodePair:
     project_uid: ProjectID = compose_uuid_from(user.id, service_info.footprint)
     _, service_id = _generate_nodeids(project_uid)
@@ -322,7 +337,13 @@ async def get_or_create_project_with_service(
             owner=user,
             service_info=service_info,
         )
-        await _add_new_project(app, project, user, product_name=product_name)
+        await _add_new_project(
+            app,
+            project,
+            user,
+            product_name=product_name,
+            product_api_base_url=product_api_base_url,
+        )
 
     return ProjectNodePair(project_uid=project_uid, node_uid=service_id)
 
@@ -335,6 +356,7 @@ async def get_or_create_project_with_file(
     *,
     project_thumbnail: HttpUrl,
     product_name: str,
+    product_api_base_url: str,
 ) -> ProjectNodePair:
     project_uid: ProjectID = compose_uuid_from(user.id, file_params.footprint)
     file_picker_id, _ = _generate_nodeids(project_uid)
@@ -364,6 +386,12 @@ async def get_or_create_project_with_file(
             },
         )
 
-        await _add_new_project(app, project, user, product_name=product_name)
+        await _add_new_project(
+            app,
+            project,
+            user,
+            product_name=product_name,
+            product_api_base_url=product_api_base_url,
+        )
 
     return ProjectNodePair(project_uid=project_uid, node_uid=file_picker_id)

services/web/server/src/simcore_service_webserver/studies_dispatcher/_redirects_handlers.py

@@ -19,7 +19,7 @@
 from ..dynamic_scheduler import api as dynamic_scheduler_service
 from ..products import products_web
 from ..utils import compose_support_error_msg
-from ..utils_aiohttp import create_redirect_to_page_response
+from ..utils_aiohttp import create_redirect_to_page_response, get_api_base_url
 from ._catalog import ValidService, validate_requested_service
 from ._constants import MSG_UNEXPECTED_DISPATCH_ERROR
 from ._core import validate_requested_file, validate_requested_viewer
@@ -249,6 +249,7 @@ async def get_redirection_to_viewer(request: web.Request):
             viewer,
             file_params.download_link,
             product_name=products_web.get_product_name(request),
+            product_api_base_url=get_api_base_url(request),
         )
         await dynamic_scheduler_service.update_projects_networks(
             request.app, project_id=project_id
@@ -280,6 +281,7 @@ async def get_redirection_to_viewer(request: web.Request):
             user,
             service_info=_create_service_info_from(valid_service),
             product_name=products_web.get_product_name(request),
+            product_api_base_url=get_api_base_url(request),
         )
         await dynamic_scheduler_service.update_projects_networks(
             request.app, project_id=project_id