removed some constants

Author: Andrei Neagu

packages/service-library/src/servicelib/aiohttp/long_running_tasks/client.py

@@ -1,9 +1,11 @@
 import asyncio
 import logging
 from collections.abc import AsyncGenerator
-from typing import Any
+from datetime import timedelta
+from typing import Any, Final
 
 from aiohttp import ClientConnectionError, ClientSession
+from pydantic import PositiveFloat
 from tenacity import TryAgain, retry
 from tenacity.asyncio import AsyncRetrying
 from tenacity.before_sleep import before_sleep_log
@@ -12,7 +14,7 @@
 from tenacity.wait import wait_random_exponential
 from yarl import URL
 
-from ...long_running_tasks.constants import DEFAULT_POLL_INTERVAL_S, HOUR
+from ...long_running_tasks.constants import DEFAULT_POLL_INTERVAL_S
 from ...long_running_tasks.models import (
     LRTask,
     RequestBody,
@@ -26,6 +28,7 @@
 
 _logger = logging.getLogger(__name__)
 
+_DEFAULT_CLIENT_TIMEOUT_S: Final[PositiveFloat] = timedelta(hours=1).total_seconds()
 
 _DEFAULT_AIOHTTP_RETRY_POLICY: dict[str, Any] = {
     "retry": retry_if_exception_type(ClientConnectionError),
@@ -49,7 +52,7 @@ async def _wait_for_completion(
     session: ClientSession,
     task_id: TaskId,
     status_url: URL,
-    client_timeout: int,
+    client_timeout: PositiveFloat,
 ) -> AsyncGenerator[TaskProgress, None]:
     try:
         async for attempt in AsyncRetrying(
@@ -98,7 +101,7 @@ async def long_running_task_request(
     session: ClientSession,
     url: URL,
     json: RequestBody | None = None,
-    client_timeout: int = 1 * HOUR,
+    client_timeout: PositiveFloat = _DEFAULT_CLIENT_TIMEOUT_S,
 ) -> AsyncGenerator[LRTask, None]:
     """Will use the passed `ClientSession` to call an oSparc long
     running task `url` passing `json` as request body.

packages/service-library/src/servicelib/long_running_tasks/constants.py

@@ -1,8 +1,6 @@
 from datetime import timedelta
 from typing import Final
 
-MINUTE: Final[int] = 60  # in secs
-HOUR: Final[int] = 60 * MINUTE  # in secs
 DEFAULT_POLL_INTERVAL_S: Final[float] = 1
 
 DEFAULT_STALE_TASK_CHECK_INTERVAL: Final[timedelta] = timedelta(minutes=1)