Skip to content

Commit ded5d00

Browse files
author
Andrei Neagu
committed
fixed missing field
1 parent e2b7e6f commit ded5d00

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

services/web/server/src/simcore_service_webserver/socketio/models.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from abc import abstractmethod
22
from typing import Literal, Self
33

4+
from models_library.osparc_jobs import OsparcJobId
45
from models_library.progress_bar import ProgressReport
56
from models_library.projects import ProjectID
67
from models_library.projects_nodes_io import NodeID
@@ -48,6 +49,10 @@ class _WebSocketProgressMixin(BaseModel):
4849
progress_report: ProgressReport
4950

5051

52+
class _WebSocketOsparcJobIdMixin(BaseModel):
53+
osparc_job_id: OsparcJobId
54+
55+
5156
class WebSocketProjectProgress(
5257
_WebSocketUserMixin,
5358
_WebSocketProjectMixin,
@@ -101,6 +106,7 @@ def to_socket_dict(self) -> SocketMessageDict:
101106
class WebSocketWorkerJobProgress(
102107
_WebSocketUserMixin,
103108
_WebSocketProgressMixin,
109+
_WebSocketOsparcJobIdMixin,
104110
WebSocketMessageBase,
105111
):
106112
event_type: Literal["workerJobProgress"] = "workerJobProgress"
@@ -109,6 +115,7 @@ class WebSocketWorkerJobProgress(
109115
def from_rabbit_message(cls, message: ProgressRabbitMessageWorkerJob) -> Self:
110116
return cls.model_construct(
111117
user_id=message.user_id,
118+
osparc_job_id=message.osparc_job_id,
112119
progress_type=message.progress_type,
113120
progress_report=message.report,
114121
)

services/web/server/tests/unit/isolated/notifications/test_rabbitmq_consumers.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,14 @@
8181
user_id=123,
8282
progress_type=ProgressType.WORKER_JOB_EXPORTING,
8383
report=ProgressReport(actual_value=0.4, total=1),
84+
osparc_job_id="id",
8485
).model_dump_json(),
8586
SocketMessageDict(
8687
event_type=WebSocketNodeProgress.get_event_type(),
8788
data={
8889
"user_id": 123,
8990
"progress_type": ProgressType.WORKER_JOB_EXPORTING.value,
91+
"osparc_job_id": "id",
9092
"progress_report": {
9193
"actual_value": 0.4,
9294
"attempt": 0,

0 commit comments

Comments
 (0)