Skip to content

Commit ee801c5

Browse files
committed
added product_name
1 parent 96c954d commit ee801c5

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ async def open_project(request: web.Request) -> web.Response:
165165
user_id=req_ctx.user_id,
166166
project=project,
167167
app=request.app,
168+
product_name=req_ctx.product_name,
168169
)
169170
await _projects_service.notify_project_state_update(request.app, project)
170171

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,7 @@ async def create_project( # pylint: disable=too-many-arguments,too-many-branche
433433
user_id=user_id,
434434
project=new_project,
435435
app=request.app,
436+
product_name=product_name,
436437
)
437438
await progress.update()
438439

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
from aiohttp import web
1212
from models_library.folders import FolderID, FolderQuery, FolderScope
13+
from models_library.products import ProductName
1314
from models_library.projects import ProjectTemplateType
1415
from models_library.rest_ordering import OrderBy
1516
from models_library.users import UserID
@@ -51,6 +52,7 @@ async def _aggregate_data_to_projects_from_other_sources(
5152
*,
5253
db_projects: list[ProjectDict],
5354
user_id: UserID,
55+
product_name: ProductName,
5456
) -> list[ProjectDict]:
5557
"""
5658
Aggregates data to each project from other sources, first as a batch-update and then as a parallel-update.
@@ -73,9 +75,7 @@ async def _aggregate_data_to_projects_from_other_sources(
7375
# udpating `project.state`
7476
update_state_per_project = [
7577
_projects_service.add_project_states_for_user(
76-
user_id=user_id,
77-
project=prj,
78-
app=app,
78+
user_id=user_id, project=prj, app=app, product_name=product_name
7979
)
8080
for prj in db_projects
8181
]
@@ -188,7 +188,7 @@ async def list_projects( # pylint: disable=too-many-arguments
188188
)
189189

190190
final_projects = await _aggregate_data_to_projects_from_other_sources(
191-
app, db_projects=api_projects, user_id=user_id
191+
app, db_projects=api_projects, user_id=user_id, product_name=product_name
192192
)
193193

194194
return final_projects, total_number_projects
@@ -235,7 +235,7 @@ async def list_projects_full_depth( # pylint: disable=too-many-arguments
235235
)
236236

237237
final_projects = await _aggregate_data_to_projects_from_other_sources(
238-
app, db_projects=api_projects, user_id=user_id
238+
app, db_projects=api_projects, user_id=user_id, product_name=product_name
239239
)
240240

241241
return final_projects, total_number_projects

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ async def get_project_for_user(
281281
user_id=user_id,
282282
project=project,
283283
app=app,
284+
product_name=product_name,
284285
)
285286

286287
# adds `trashed_by_primary_gid`
@@ -1265,7 +1266,7 @@ async def patch_project_node(
12651266
)
12661267

12671268
updated_project = await add_project_states_for_user(
1268-
user_id=user_id, project=updated_project, app=app
1269+
user_id=user_id, project=updated_project, app=app, product_name=product_name
12691270
)
12701271
# 5. if inputs/outputs have been changed all depending nodes shall be notified
12711272
if {"inputs", "outputs"} & _node_patch_exclude_unset.keys():
@@ -1335,7 +1336,7 @@ async def update_project_node_outputs(
13351336
pformat(changed_entries),
13361337
)
13371338
updated_project = await add_project_states_for_user(
1338-
user_id=user_id, project=updated_project, app=app
1339+
user_id=user_id, project=updated_project, app=app, product_name=product_name
13391340
)
13401341

13411342
# changed entries come in the form of {node_uuid: {outputs: {changed_key1: value1, changed_key2: value2}}}
@@ -1910,6 +1911,7 @@ async def add_project_states_for_user(
19101911
user_id: int,
19111912
project: ProjectDict,
19121913
app: web.Application,
1914+
product_name: ProductName,
19131915
) -> ProjectDict:
19141916
_logger.debug(
19151917
"adding project states for %s with project %s",
@@ -1945,6 +1947,7 @@ async def add_project_states_for_user(
19451947
user_id=user_id,
19461948
project_uuid=project["uuid"],
19471949
node_id=NodeID(node_uuid),
1950+
product_name=product_name,
19481951
)
19491952
if NodeID(node_uuid) in computational_node_states:
19501953
node_state = computational_node_states[NodeID(node_uuid)].model_copy(

0 commit comments

Comments
 (0)