fixed imports

sanderegg · sanderegg · commit 06b48a736ac0 · 2025-01-08T09:39:58.000+01:00
diff --git a/services/autoscaling/src/simcore_service_autoscaling/modules/auto_scaling_task.py b/services/autoscaling/src/simcore_service_autoscaling/modules/auto_scaling_task.py
@@ -4,7 +4,7 @@
 
 from fastapi import FastAPI
 from servicelib.background_task import start_periodic_task, stop_periodic_task
-from servicelib.redis_utils import exclusive
+from servicelib.redis import exclusive
 
 from ..core.settings import ApplicationSettings
 from ..utils.redis import create_lock_key_and_value
diff --git a/services/autoscaling/src/simcore_service_autoscaling/modules/buffer_machines_pool_task.py b/services/autoscaling/src/simcore_service_autoscaling/modules/buffer_machines_pool_task.py
@@ -4,7 +4,7 @@
 
 from fastapi import FastAPI
 from servicelib.background_task import start_periodic_task, stop_periodic_task
-from servicelib.redis_utils import exclusive
+from servicelib.redis import exclusive
 
 from ..core.settings import ApplicationSettings
 from ..utils.redis import create_lock_key_and_value
diff --git a/services/clusters-keeper/src/simcore_service_clusters_keeper/modules/clusters_management_task.py b/services/clusters-keeper/src/simcore_service_clusters_keeper/modules/clusters_management_task.py
@@ -4,7 +4,7 @@
 
 from fastapi import FastAPI
 from servicelib.background_task import start_periodic_task, stop_periodic_task
-from servicelib.redis_utils import exclusive
+from servicelib.redis import exclusive
 
 from .._meta import APP_NAME
 from ..core.settings import ApplicationSettings
diff --git a/services/director-v2/src/simcore_service_director_v2/modules/comp_scheduler/_manager.py b/services/director-v2/src/simcore_service_director_v2/modules/comp_scheduler/_manager.py
@@ -9,8 +9,7 @@
 from servicelib.background_task import start_periodic_task, stop_periodic_task
 from servicelib.exception_utils import silence_exceptions
 from servicelib.logging_utils import log_context
-from servicelib.redis import CouldNotAcquireLockError
-from servicelib.redis_utils import exclusive
+from servicelib.redis import CouldNotAcquireLockError, exclusive
 from servicelib.utils import limited_gather
 
 from ...models.comp_runs import RunMetadataDict
diff --git a/services/director-v2/src/simcore_service_director_v2/modules/comp_scheduler/_worker.py b/services/director-v2/src/simcore_service_director_v2/modules/comp_scheduler/_worker.py
@@ -8,8 +8,7 @@
 from models_library.projects import ProjectID
 from models_library.users import UserID
 from servicelib.logging_utils import log_context
-from servicelib.redis import CouldNotAcquireLockError
-from servicelib.redis_utils import exclusive
+from servicelib.redis import CouldNotAcquireLockError, exclusive
 
 from ...core.settings import get_application_settings
 from ...models.comp_runs import Iteration
@@ -50,7 +49,6 @@ async def _exclusively_schedule_pipeline(
 
 
 async def _handle_apply_distributed_schedule(app: FastAPI, data: bytes) -> bool:
-
     with log_context(_logger, logging.DEBUG, msg="handling scheduling"):
         to_schedule_pipeline = SchedulePipelineRabbitMessage.model_validate_json(data)
         with contextlib.suppress(CouldNotAcquireLockError):
diff --git a/services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/scheduler/_core/_scheduler.py b/services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/scheduler/_core/_scheduler.py
@@ -48,8 +48,7 @@
 )
 from servicelib.fastapi.long_running_tasks.client import ProgressCallback
 from servicelib.fastapi.long_running_tasks.server import TaskProgress
-from servicelib.redis import RedisClientsManager
-from servicelib.redis_utils import exclusive
+from servicelib.redis import RedisClientsManager, exclusive
 from settings_library.redis import RedisDatabase
 
 from .....core.dynamic_services_settings.scheduler import (
@@ -158,7 +157,7 @@ async def shutdown(self) -> None:
                     "Following observation tasks completed with an unexpected error:%s",
                     f"{bad_results}",
                 )
-        except asyncio.TimeoutError:
+        except TimeoutError:
             logger.exception(
                 "Timed-out waiting for %s to complete. Action: Check why this is blocking",
                 f"{running_tasks=}",
diff --git a/services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/status_monitor/_monitor.py b/services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/status_monitor/_monitor.py
@@ -8,7 +8,7 @@
 from models_library.projects_nodes_io import NodeID
 from pydantic import NonNegativeFloat, NonNegativeInt
 from servicelib.background_task import stop_periodic_task
-from servicelib.redis_utils import start_exclusive_periodic_task
+from servicelib.redis import start_exclusive_periodic_task
 from servicelib.utils import limited_gather
 from settings_library.redis import RedisDatabase
 
@@ -34,7 +34,6 @@ async def _start_get_status_deferred(
 
 
 def _can_be_removed(model: TrackedServiceModel) -> bool:
-
     # requested **as** `STOPPED`
     # service **reports** `IDLE`
     if (
diff --git a/services/efs-guardian/src/simcore_service_efs_guardian/services/background_tasks_setup.py b/services/efs-guardian/src/simcore_service_efs_guardian/services/background_tasks_setup.py
@@ -7,7 +7,7 @@
 from fastapi import FastAPI
 from servicelib.background_task import stop_periodic_task
 from servicelib.logging_utils import log_catch, log_context
-from servicelib.redis_utils import start_exclusive_periodic_task
+from servicelib.redis import start_exclusive_periodic_task
 
 from .background_tasks import removal_policy_task
 from .modules.redis import get_redis_lock_client
@@ -33,9 +33,10 @@ class EfsGuardianBackgroundTask(TypedDict):
 
 def _on_app_startup(app: FastAPI) -> Callable[[], Awaitable[None]]:
     async def _startup() -> None:
-        with log_context(
-            _logger, logging.INFO, msg="Efs Guardian startup.."
-        ), log_catch(_logger, reraise=False):
+        with (
+            log_context(_logger, logging.INFO, msg="Efs Guardian startup.."),
+            log_catch(_logger, reraise=False),
+        ):
             app.state.efs_guardian_background_tasks = []
 
             # Setup periodic tasks
@@ -57,9 +58,10 @@ def _on_app_shutdown(
     _app: FastAPI,
 ) -> Callable[[], Awaitable[None]]:
     async def _stop() -> None:
-        with log_context(
-            _logger, logging.INFO, msg="Efs Guardian shutdown.."
-        ), log_catch(_logger, reraise=False):
+        with (
+            log_context(_logger, logging.INFO, msg="Efs Guardian shutdown.."),
+            log_catch(_logger, reraise=False),
+        ):
             assert _app  # nosec
             if _app.state.efs_guardian_background_tasks:
                 await asyncio.gather(
diff --git a/services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/background_task_periodic_heartbeat_check_setup.py b/services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/background_task_periodic_heartbeat_check_setup.py
@@ -5,7 +5,7 @@
 from fastapi import FastAPI
 from servicelib.background_task import stop_periodic_task
 from servicelib.logging_utils import log_catch, log_context
-from servicelib.redis_utils import start_exclusive_periodic_task
+from servicelib.redis import start_exclusive_periodic_task
 
 from ..core.settings import ApplicationSettings
 from .background_task_periodic_heartbeat_check import (
@@ -26,11 +26,14 @@ class RutBackgroundTask(TypedDict):
 
 def _on_app_startup(app: FastAPI) -> Callable[[], Awaitable[None]]:
     async def _startup() -> None:
-        with log_context(
-            _logger,
-            logging.INFO,
-            msg="RUT background task Periodic check of running services startup..",
-        ), log_catch(_logger, reraise=False):
+        with (
+            log_context(
+                _logger,
+                logging.INFO,
+                msg="RUT background task Periodic check of running services startup..",
+            ),
+            log_catch(_logger, reraise=False),
+        ):
             app_settings: ApplicationSettings = app.state.settings
 
             app.state.rut_background_task__periodic_check_of_running_services = None
@@ -55,11 +58,14 @@ def _on_app_shutdown(
     _app: FastAPI,
 ) -> Callable[[], Awaitable[None]]:
     async def _stop() -> None:
-        with log_context(
-            _logger,
-            logging.INFO,
-            msg="RUT background tasks Periodic check of running services shutdown..",
-        ), log_catch(_logger, reraise=False):
+        with (
+            log_context(
+                _logger,
+                logging.INFO,
+                msg="RUT background tasks Periodic check of running services shutdown..",
+            ),
+            log_catch(_logger, reraise=False),
+        ):
             assert _app  # nosec
             if _app.state.rut_background_task__periodic_check_of_running_services:
                 await stop_periodic_task(
diff --git a/services/storage/src/simcore_service_storage/dsm_cleaner.py b/services/storage/src/simcore_service_storage/dsm_cleaner.py
@@ -1,4 +1,4 @@
-""" backround task that cleans the DSM pending/expired uploads
+"""backround task that cleans the DSM pending/expired uploads
 
 # Rationale:
  - for each upload an entry is created in the file_meta_data table in the database
@@ -26,7 +26,7 @@
 from aiohttp import web
 from servicelib.background_task import stop_periodic_task
 from servicelib.logging_utils import log_catch, log_context
-from servicelib.redis_utils import start_exclusive_periodic_task
+from servicelib.redis import start_exclusive_periodic_task
 
 from .constants import APP_CONFIG_KEY, APP_DSM_KEY
 from .dsm_factory import DataManagerProvider
@@ -57,8 +57,9 @@ async def dsm_cleaner_task(app: web.Application) -> None:
 
 def setup_dsm_cleaner(app: web.Application):
     async def _setup(app: web.Application):
-        with log_context(_logger, logging.INFO, msg="setup dsm cleaner"), log_catch(
-            _logger, reraise=False
+        with (
+            log_context(_logger, logging.INFO, msg="setup dsm cleaner"),
+            log_catch(_logger, reraise=False),
         ):
             cfg: Settings = app[APP_CONFIG_KEY]
             assert cfg.STORAGE_CLEANER_INTERVAL_S  # nosec
diff --git a/services/web/server/src/simcore_service_webserver/resource_manager/registry.py b/services/web/server/src/simcore_service_webserver/resource_manager/registry.py
@@ -1,14 +1,14 @@
-""" Wrapper around a Redis-backed registry for storing resources in a hash (https://redis.io/topics/data-types).
+"""Wrapper around a Redis-backed registry for storing resources in a hash (https://redis.io/topics/data-types).
 
-    Redis stores key/values.
+Redis stores key/values.
 
-    key hashes are generated from a dictionary (e.g. {"user_id":"a_user_id, "some_other_id":123} will
-    create a hash named "user_id=a_user_id:some_other_id=123:resources")
-    resources are tuples (resource_name, resource_value) that are stored with a key as Redis fields.
-    A same key can have a lot of fields provided they have a different name.
+key hashes are generated from a dictionary (e.g. {"user_id":"a_user_id, "some_other_id":123} will
+create a hash named "user_id=a_user_id:some_other_id=123:resources")
+resources are tuples (resource_name, resource_value) that are stored with a key as Redis fields.
+A same key can have a lot of fields provided they have a different name.
 
-    A key can be set as "alive". This creates a secondary key (e.g. "user_id=a_user_id:some_other_id=123:alive").
-    This key can have a timeout value. When the key times out then the key disappears from Redis automatically.
+A key can be set as "alive". This creates a secondary key (e.g. "user_id=a_user_id:some_other_id=123:alive").
+This key can have a timeout value. When the key times out then the key disappears from Redis automatically.
 
 
 """
@@ -18,7 +18,7 @@
 import redis.asyncio as aioredis
 from aiohttp import web
 from models_library.basic_types import UUIDStr
-from servicelib.redis_utils import handle_redis_returns_union_types
+from servicelib.redis import handle_redis_returns_union_types
 from typing_extensions import (  # https://docs.pydantic.dev/latest/api/standard_library_types/#typeddict
     TypedDict,
 )
diff --git a/services/web/server/src/simcore_service_webserver/users/_notifications_rest.py b/services/web/server/src/simcore_service_webserver/users/_notifications_rest.py
@@ -11,7 +11,7 @@
     parse_request_body_as,
     parse_request_path_parameters_as,
 )
-from servicelib.redis_utils import handle_redis_returns_union_types
+from servicelib.redis import handle_redis_returns_union_types
 
 from .._meta import API_VTAG
 from ..login.decorators import login_required
