Skip to content

Commit 3f6bf87

Browse files
fix timedelta
1 parent 250a9c0 commit 3f6bf87

File tree

3 files changed

+10
-8
lines changed
  • packages/service-library/src/servicelib/fastapi/long_running_tasks
  • services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/api_client

3 files changed

+10
-8
lines changed

packages/service-library/src/servicelib/fastapi/long_running_tasks/_context_manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ async def _wait_task_completion() -> None:
118118
logger.debug("%s, %s", f"{task_id=}", f"{result=}")
119119

120120
yield result
121-
except asyncio.TimeoutError as e:
121+
except TimeoutError as e:
122122
await client.cancel_and_delete_task(task_id)
123123
raise TaskClientTimeoutError(
124124
task_id=task_id,

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/api_client/_public.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ async def restore_service_state(self, dynamic_sidecar_endpoint: AnyHttpUrl) -> i
358358
result: Any | None = await self._await_for_result(
359359
task_id,
360360
dynamic_sidecar_endpoint,
361-
self._dynamic_services_scheduler_settings.DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT,
361+
self._dynamic_services_scheduler_settings.DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT.total_seconds(),
362362
_debug_progress_callback,
363363
)
364364
assert isinstance(result, int) # nosec
@@ -392,7 +392,7 @@ async def save_service_state(
392392
result: Any | None = await self._await_for_result(
393393
task_id,
394394
dynamic_sidecar_endpoint,
395-
self._dynamic_services_scheduler_settings.DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT,
395+
self._dynamic_services_scheduler_settings.DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT.total_seconds(),
396396
progress_callback,
397397
)
398398
assert isinstance(result, int) # nosec
@@ -411,7 +411,7 @@ async def pull_service_input_ports(
411411
transferred_bytes = await self._await_for_result(
412412
task_id,
413413
dynamic_sidecar_endpoint,
414-
self._dynamic_services_scheduler_settings.DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT,
414+
self._dynamic_services_scheduler_settings.DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT.total_seconds(),
415415
_debug_progress_callback,
416416
)
417417
return transferred_bytes or 0
@@ -429,7 +429,7 @@ async def pull_service_output_ports(
429429
result: Any | None = await self._await_for_result(
430430
task_id,
431431
dynamic_sidecar_endpoint,
432-
self._dynamic_services_scheduler_settings.DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT,
432+
self._dynamic_services_scheduler_settings.DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT.total_seconds(),
433433
_debug_progress_callback,
434434
)
435435
assert isinstance(result, int) # nosec
@@ -448,7 +448,7 @@ async def push_service_output_ports(
448448
await self._await_for_result(
449449
task_id,
450450
dynamic_sidecar_endpoint,
451-
self._dynamic_services_scheduler_settings.DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT,
451+
self._dynamic_services_scheduler_settings.DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT.total_seconds(),
452452
progress_callback,
453453
)
454454

@@ -495,7 +495,9 @@ async def get_service_activity(
495495
dynamic_sidecar_endpoint
496496
)
497497
decoded_response = response.json()
498-
return ActivityInfo.model_validate(decoded_response) if decoded_response else None
498+
return (
499+
ActivityInfo.model_validate(decoded_response) if decoded_response else None
500+
)
499501

500502
async def free_reserved_disk_space(
501503
self, dynamic_sidecar_endpoint: AnyHttpUrl

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/api_client/_thin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def __init__(self, app: FastAPI):
3535
# timeouts
3636
self._health_request_timeout = Timeout(1.0, connect=1.0)
3737
self._save_restore_timeout = Timeout(
38-
scheduler_settings.DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT,
38+
scheduler_settings.DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT.total_seconds(),
3939
connect=scheduler_settings.DYNAMIC_SIDECAR_API_CONNECT_TIMEOUT,
4040
)
4141
self._restart_containers_timeout = Timeout(

0 commit comments

Comments
 (0)