Skip to content

Commit 1aa57ed

Browse files
fix tests
1 parent 8fe7c52 commit 1aa57ed

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ async def create_node(request: web.Request) -> web.Response:
121121
project_data,
122122
req_ctx.user_id,
123123
req_ctx.product_name,
124+
get_api_base_url(request),
124125
body.service_key,
125126
body.service_version,
126127
body.service_id,

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from ...products.models import Product
2828
from ...security.decorators import permission_required
2929
from ...users import api
30-
from ...utils_aiohttp import envelope_json_response
30+
from ...utils_aiohttp import envelope_json_response, get_api_base_url
3131
from .. import _projects_service, projects_wallets_service
3232
from ..exceptions import ProjectStartsTooManyDynamicNodesError
3333
from ._rest_exceptions import handle_plugin_requests_exceptions
@@ -118,7 +118,11 @@ async def open_project(request: web.Request) -> web.Response:
118118
# services in the project is highter than the maximum allowed per project
119119
# the project shall still open though.
120120
await _projects_service.run_project_dynamic_services(
121-
request, project, req_ctx.user_id, req_ctx.product_name
121+
request,
122+
project,
123+
req_ctx.user_id,
124+
req_ctx.product_name,
125+
get_api_base_url(request),
122126
)
123127

124128
# and let's update the project last change timestamp

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -797,6 +797,7 @@ async def add_project_node(
797797
project: dict[str, Any],
798798
user_id: UserID,
799799
product_name: str,
800+
product_api_base_url: str,
800801
service_key: ServiceKey,
801802
service_version: ServiceVersion,
802803
service_id: str | None,
@@ -861,6 +862,7 @@ async def add_project_node(
861862
service_key=service_key,
862863
service_version=service_version,
863864
product_name=product_name,
865+
product_api_base_url=product_api_base_url,
864866
user_id=user_id,
865867
project_uuid=ProjectID(project["uuid"]),
866868
node_uuid=node_uuid,
@@ -888,6 +890,7 @@ async def start_project_node(
888890
service_key=node_details.key,
889891
service_version=node_details.version,
890892
product_name=product_name,
893+
product_api_base_url=product_api_base_url,
891894
user_id=user_id,
892895
project_uuid=project_id,
893896
node_uuid=node_id,
@@ -1185,7 +1188,9 @@ async def update_project_node_outputs(
11851188
# changed entries come in the form of {node_uuid: {outputs: {changed_key1: value1, changed_key2: value2}}}
11861189
# we do want only the key names
11871190
changed_keys = (
1188-
changed_entries.get(NodeIDStr(f"{node_id}"), {}).get("outputs", {}).keys()
1191+
changed_entries.get(TypeAdapter(NodeIDStr).validate_python(f"{node_id}"), {})
1192+
.get("outputs", {})
1193+
.keys()
11891194
)
11901195
return updated_project, changed_keys
11911196

@@ -1737,6 +1742,7 @@ async def run_project_dynamic_services(
17371742
project: dict,
17381743
user_id: UserID,
17391744
product_name: str,
1745+
product_api_base_url: str,
17401746
) -> None:
17411747
# first get the services if they already exist
17421748
project_settings: ProjectsSettings = get_plugin_settings(request.app)
@@ -1785,6 +1791,7 @@ async def run_project_dynamic_services(
17851791
service_key=services_to_start_uuids[service_uuid]["key"],
17861792
service_version=services_to_start_uuids[service_uuid]["version"],
17871793
product_name=product_name,
1794+
product_api_base_url=product_api_base_url,
17881795
user_id=user_id,
17891796
project_uuid=project["uuid"],
17901797
node_uuid=NodeID(service_uuid),

0 commit comments

Comments
 (0)