Skip to content

Commit c3e8c94

Browse files
Merge branch 'master' into improve-sql-listing-projects
2 parents 58fb915 + ef99643 commit c3e8c94

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

services/dask-sidecar/src/simcore_service_dask_sidecar/computational_sidecar/docker_utils.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,11 @@ async def _parse_container_log_file( # noqa: PLR0913 # pylint: disable=too-many
247247
)
248248

249249

250+
_MINUTE: Final[int] = 60
251+
_HOUR: Final[int] = 60 * _MINUTE
252+
_AIODOCKER_LOGS_TIMEOUT_S: Final[int] = 1 * _HOUR
253+
254+
250255
async def _parse_container_docker_logs(
251256
*,
252257
container: DockerContainer,
@@ -273,7 +278,11 @@ async def _parse_container_docker_logs(
273278
async for log_line in cast(
274279
AsyncGenerator[str, None],
275280
container.log(
276-
stdout=True, stderr=True, follow=True, timestamps=True
281+
stdout=True,
282+
stderr=True,
283+
follow=True,
284+
timestamps=True,
285+
timeout=_AIODOCKER_LOGS_TIMEOUT_S,
277286
),
278287
):
279288
log_msg_without_timestamp = log_line.split(" ", maxsplit=1)[1]

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,11 @@ async def _copy() -> None:
181181
product_name=product_name,
182182
):
183183
task_progress.update(
184-
message=async_job_composed_result.status.progress.composed_message,
184+
message=(
185+
async_job_composed_result.status.progress.message.description
186+
if async_job_composed_result.status.progress.message
187+
else None
188+
),
185189
percent=TypeAdapter(ProgressPercent).validate_python(
186190
(
187191
starting_value

0 commit comments

Comments
 (0)