relative imports

Andrei Neagu · Andrei Neagu · commit b7acc6cf7b04 · 2025-07-30T14:53:11.000+02:00
diff --git a/packages/service-library/src/servicelib/aiohttp/db_asyncpg_engine.py b/packages/service-library/src/servicelib/aiohttp/db_asyncpg_engine.py
@@ -8,7 +8,6 @@
 from typing import Final
 
 from aiohttp import web
-from servicelib.logging_utils import log_context
 from settings_library.postgres import PostgresSettings
 from simcore_postgres_database.utils_aiosqlalchemy import (  # type: ignore[import-not-found] # this on is unclear
     get_pg_engine_stateinfo,
diff --git a/packages/service-library/src/servicelib/aiohttp/long_running_tasks/_routes.py b/packages/service-library/src/servicelib/aiohttp/long_running_tasks/_routes.py
@@ -2,8 +2,8 @@
 
 from aiohttp import web
 from pydantic import BaseModel
-from servicelib.aiohttp import status
 
+from ...aiohttp import status
 from ...long_running_tasks import lrt_api
 from ...long_running_tasks.models import TaskGet, TaskId
 from ..requests_validation import parse_request_path_parameters_as
diff --git a/packages/service-library/src/servicelib/aiohttp/observer.py b/packages/service-library/src/servicelib/aiohttp/observer.py
@@ -8,8 +8,8 @@
 from collections.abc import Callable
 
 from aiohttp import web
-from servicelib.aiohttp.application_setup import ensure_single_setup
 
+from ..aiohttp.application_setup import ensure_single_setup
 from ..utils import logged_gather
 
 log = logging.getLogger(__name__)
diff --git a/packages/service-library/src/servicelib/aiohttp/rest_middlewares.py b/packages/service-library/src/servicelib/aiohttp/rest_middlewares.py
@@ -16,13 +16,12 @@
 from common_library.user_messages import user_message
 from models_library.basic_types import IDStr
 from models_library.rest_error import ErrorGet, ErrorItemType, LogMessageType
-from servicelib.rest_constants import RESPONSE_MODEL_POLICY
-from servicelib.status_codes_utils import is_5xx_server_error
 
 from ..logging_errors import create_troubleshootting_log_kwargs
 from ..mimetype_constants import MIMETYPE_APPLICATION_JSON
+from ..rest_constants import RESPONSE_MODEL_POLICY
 from ..rest_responses import is_enveloped_from_text
-from ..status_codes_utils import get_code_description
+from ..status_codes_utils import get_code_description, is_5xx_server_error
 from . import status
 from .rest_responses import (
     create_data_response,
diff --git a/packages/service-library/src/servicelib/aiohttp/tracing.py b/packages/service-library/src/servicelib/aiohttp/tracing.py
@@ -17,11 +17,12 @@
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import SpanProcessor, TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
-from servicelib.logging_utils import log_context
-from servicelib.tracing import get_trace_id_header
 from settings_library.tracing import TracingSettings
 from yarl import URL
 
+from ..logging_utils import log_context
+from ..tracing import get_trace_id_header
+
 _logger = logging.getLogger(__name__)
 try:
     from opentelemetry.instrumentation.botocore import (  # type: ignore[import-not-found]
diff --git a/packages/service-library/src/servicelib/archiving_utils/_interface_7zip.py b/packages/service-library/src/servicelib/archiving_utils/_interface_7zip.py
@@ -11,10 +11,10 @@
 
 import tqdm
 from pydantic import NonNegativeInt
-from servicelib.logging_utils import log_catch
 from tqdm.contrib.logging import tqdm_logging_redirect
 
 from ..file_utils import shutil_move
+from ..logging_utils import log_catch
 from ..progress_bar import ProgressBarData
 from ._errors import (
     CouldNotFindValueError,
diff --git a/packages/service-library/src/servicelib/background_task_utils.py b/packages/service-library/src/servicelib/background_task_utils.py
@@ -3,11 +3,10 @@
 from collections.abc import Callable, Coroutine
 from typing import Any, ParamSpec, TypeVar
 
-from servicelib.exception_utils import suppress_exceptions
-from servicelib.redis._errors import CouldNotAcquireLockError
-
 from .background_task import periodic
+from .exception_utils import suppress_exceptions
 from .redis import RedisClientSDK, exclusive
+from .redis._errors import CouldNotAcquireLockError
 
 P = ParamSpec("P")
 R = TypeVar("R")
diff --git a/packages/service-library/src/servicelib/celery/app_server.py b/packages/service-library/src/servicelib/celery/app_server.py
@@ -4,7 +4,7 @@
 from asyncio import AbstractEventLoop
 from typing import Generic, TypeVar
 
-from servicelib.celery.task_manager import TaskManager
+from ..celery.task_manager import TaskManager
 
 T = TypeVar("T")
 
diff --git a/packages/service-library/src/servicelib/deferred_tasks/_deferred_manager.py b/packages/service-library/src/servicelib/deferred_tasks/_deferred_manager.py
@@ -16,10 +16,10 @@
     RabbitRouter,
 )
 from pydantic import NonNegativeInt
-from servicelib.logging_utils import log_catch, log_context
-from servicelib.redis import RedisClientSDK
 from settings_library.rabbit import RabbitSettings
 
+from ..logging_utils import log_catch, log_context
+from ..redis import RedisClientSDK
 from ._base_deferred_handler import (
     BaseDeferredHandler,
     DeferredContext,
diff --git a/packages/service-library/src/servicelib/exception_utils.py b/packages/service-library/src/servicelib/exception_utils.py
@@ -6,7 +6,8 @@
 from typing import Any, Final, ParamSpec, TypeVar
 
 from pydantic import BaseModel, Field, NonNegativeFloat, PrivateAttr
-from servicelib.logging_errors import create_troubleshootting_log_kwargs
+
+from .logging_errors import create_troubleshootting_log_kwargs
 
 _logger = logging.getLogger(__name__)
 
diff --git a/packages/service-library/src/servicelib/fastapi/http_client_thin.py b/packages/service-library/src/servicelib/fastapi/http_client_thin.py
@@ -8,7 +8,6 @@
 from common_library.errors_classes import OsparcErrorMixin
 from httpx import AsyncClient, ConnectError, HTTPError, PoolTimeout, Response
 from httpx._types import TimeoutTypes, URLTypes
-from servicelib.fastapi.tracing import setup_httpx_client_tracing
 from settings_library.tracing import TracingSettings
 from tenacity import RetryCallState
 from tenacity.asyncio import AsyncRetrying
@@ -18,6 +17,7 @@
 from tenacity.wait import wait_exponential
 
 from .http_client import BaseHTTPApi
+from .tracing import setup_httpx_client_tracing
 
 _logger = logging.getLogger(__name__)
 
@@ -128,7 +128,7 @@ def retry_on_errors(
     """
 
     def decorator(
-        request_func: Callable[..., Awaitable[Response]]
+        request_func: Callable[..., Awaitable[Response]],
     ) -> Callable[..., Awaitable[Response]]:
         assert asyncio.iscoroutinefunction(request_func)
 
@@ -178,7 +178,7 @@ def expect_status(
     """
 
     def decorator(
-        request_func: Callable[..., Awaitable[Response]]
+        request_func: Callable[..., Awaitable[Response]],
     ) -> Callable[..., Awaitable[Response]]:
         assert asyncio.iscoroutinefunction(request_func)
 
diff --git a/packages/service-library/src/servicelib/fastapi/long_running_tasks/_context_manager.py b/packages/service-library/src/servicelib/fastapi/long_running_tasks/_context_manager.py
@@ -5,8 +5,8 @@
 from typing import Any, Final
 
 from pydantic import PositiveFloat
-from servicelib.logging_errors import create_troubleshootting_log_message
 
+from ...logging_errors import create_troubleshootting_log_message
 from ...long_running_tasks.errors import TaskClientTimeoutError, TaskExceptionError
 from ...long_running_tasks.models import (
     ProgressCallback,
diff --git a/packages/service-library/src/servicelib/fastapi/monitoring.py b/packages/service-library/src/servicelib/fastapi/monitoring.py
@@ -13,19 +13,19 @@
     CONTENT_TYPE_LATEST,
     generate_latest,
 )
-from servicelib.prometheus_metrics import (
-    PrometheusMetrics,
-    get_prometheus_metrics,
-    record_request_metrics,
-    record_response_metrics,
-)
 from starlette.middleware.base import BaseHTTPMiddleware, RequestResponseEndpoint
 from starlette.types import ASGIApp
 
 from ..common_headers import (
     UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE,
     X_SIMCORE_USER_AGENT,
 )
+from ..prometheus_metrics import (
+    PrometheusMetrics,
+    get_prometheus_metrics,
+    record_request_metrics,
+    record_response_metrics,
+)
 
 _logger = logging.getLogger(__name__)
 _PROMETHEUS_METRICS = "prometheus_metrics"
diff --git a/packages/service-library/src/servicelib/fastapi/profiler.py b/packages/service-library/src/servicelib/fastapi/profiler.py
@@ -1,11 +1,11 @@
 from typing import Any, Final
 
 from fastapi import FastAPI
-from servicelib.aiohttp import status
-from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 from starlette.requests import Request
 from starlette.types import ASGIApp, Receive, Scope, Send
 
+from ..aiohttp import status
+from ..mimetype_constants import MIMETYPE_APPLICATION_JSON
 from ..utils_profiling_middleware import (
     _is_profiling,
     _profiler,
diff --git a/packages/service-library/src/servicelib/fastapi/tracing.py b/packages/service-library/src/servicelib/fastapi/tracing.py
@@ -15,12 +15,13 @@
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import SpanProcessor, TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
-from servicelib.logging_utils import log_context
-from servicelib.tracing import get_trace_id_header
 from settings_library.tracing import TracingSettings
 from starlette.middleware.base import BaseHTTPMiddleware
 from yarl import URL
 
+from ..logging_utils import log_context
+from ..tracing import get_trace_id_header
+
 _logger = logging.getLogger(__name__)
 
 try:
diff --git a/packages/service-library/src/servicelib/long_running_tasks/_store/redis.py b/packages/service-library/src/servicelib/long_running_tasks/_store/redis.py
@@ -12,8 +12,8 @@
 
 _logger = logging.getLogger(__name__)
 
-STORE_TYPE_TASK_DATA: Final[str] = "TD"
-STORE_TYPE_CANCELLED_TASKS: Final[str] = "CT"
+_STORE_TYPE_TASK_DATA: Final[str] = "TD"
+_STORE_TYPE_CANCELLED_TASKS: Final[str] = "CT"
 
 
 class RedisStore(BaseStore):
@@ -35,52 +35,52 @@ async def shutdown(self) -> None:
             await self._client.shutdown()
 
     @property
-    def redis(self) -> aioredis.Redis:
+    def _redis(self) -> aioredis.Redis:
         assert self._client  # nosec
         return self._client.redis
 
     def _get_redis_hash_key(self, store_type: str) -> str:
-        return f"{self.namespace}::{store_type}"
+        return f"{self.namespace}:{store_type}"
 
     def _get_key(self, store_type: str, name: str) -> str:
-        return f"{self.namespace}::{store_type}::{name}"
+        return f"{self.namespace}:{store_type}:{name}"
 
     async def get_task_data(self, task_id: TaskId) -> TaskData | None:
-        result: Any | None = await self.redis.hget(
-            self._get_redis_hash_key(STORE_TYPE_TASK_DATA), task_id
+        result: Any | None = await self._redis.hget(
+            self._get_redis_hash_key(_STORE_TYPE_TASK_DATA), task_id
         )  # type: ignore[misc]
         return TypeAdapter(TaskData).validate_json(result) if result else None
 
     async def set_task_data(self, task_id: TaskId, value: TaskData) -> None:
         _logger.debug(
             "Setting task data for task_id=%s with data value=%s", task_id, value
         )
-        await self.redis.hset(
-            self._get_redis_hash_key(STORE_TYPE_TASK_DATA),
+        await self._redis.hset(
+            self._get_redis_hash_key(_STORE_TYPE_TASK_DATA),
             task_id,
             value.model_dump_json(),
         )  # type: ignore[misc]
 
     async def list_tasks_data(self) -> list[TaskData]:
-        result: list[Any] = await self.redis.hvals(
-            self._get_redis_hash_key(STORE_TYPE_TASK_DATA)
+        result: list[Any] = await self._redis.hvals(
+            self._get_redis_hash_key(_STORE_TYPE_TASK_DATA)
         )  # type: ignore[misc]
         return [TypeAdapter(TaskData).validate_json(item) for item in result]
 
     async def delete_task_data(self, task_id: TaskId) -> None:
-        await self.redis.hdel(self._get_redis_hash_key(STORE_TYPE_TASK_DATA), task_id)  # type: ignore[misc]
+        await self._redis.hdel(self._get_redis_hash_key(_STORE_TYPE_TASK_DATA), task_id)  # type: ignore[misc]
 
     async def set_as_cancelled(
         self, task_id: TaskId, with_task_context: TaskContext
     ) -> None:
-        await self.redis.hset(
-            self._get_redis_hash_key(STORE_TYPE_CANCELLED_TASKS),
+        await self._redis.hset(
+            self._get_redis_hash_key(_STORE_TYPE_CANCELLED_TASKS),
             task_id,
             json_dumps(with_task_context),
         )  # type: ignore[misc]
 
     async def get_cancelled(self) -> dict[TaskId, TaskContext]:
-        result: dict[str, str | None] = await self.redis.hgetall(
-            self._get_redis_hash_key(STORE_TYPE_CANCELLED_TASKS)
+        result: dict[str, str | None] = await self._redis.hgetall(
+            self._get_redis_hash_key(_STORE_TYPE_CANCELLED_TASKS)
         )  # type: ignore[misc]
         return {task_id: json_loads(context) for task_id, context in result.items()}
diff --git a/packages/service-library/src/servicelib/long_running_tasks/lrt_api.py b/packages/service-library/src/servicelib/long_running_tasks/lrt_api.py
@@ -2,8 +2,8 @@
 from typing import Any
 
 from common_library.error_codes import create_error_code
-from servicelib.logging_errors import create_troubleshootting_log_kwargs
 
+from ..logging_errors import create_troubleshootting_log_kwargs
 from .errors import TaskNotCompletedError, TaskNotFoundError
 from .models import TaskBase, TaskContext, TaskId, TaskStatus
 from .task import RegisteredTaskName, TasksManager
diff --git a/packages/service-library/src/servicelib/long_running_tasks/task.py b/packages/service-library/src/servicelib/long_running_tasks/task.py
@@ -12,10 +12,10 @@
 from common_library.async_tools import cancel_wait_task
 from models_library.api_schemas_long_running_tasks.base import TaskProgress
 from pydantic import PositiveFloat
-from servicelib.background_task import create_periodic_task
-from servicelib.logging_utils import log_catch
 from settings_library.redis import RedisDatabase, RedisSettings
 
+from ..background_task import create_periodic_task
+from ..logging_utils import log_catch
 from ..redis import RedisClientSDK, exclusive
 from ._redis_serialization import object_to_string, string_to_object
 from ._store.base import BaseStore
diff --git a/packages/service-library/src/servicelib/rabbitmq/_client_base.py b/packages/service-library/src/servicelib/rabbitmq/_client_base.py
@@ -6,9 +6,10 @@
 
 import aio_pika
 import aiormq
-from servicelib.logging_utils import log_catch
 from settings_library.rabbit import RabbitSettings
 
+from ..logging_utils import log_catch
+
 _DEFAULT_RABBITMQ_SERVER_HEARTBEAT_S: Final[int] = 60
 
 _logger = logging.getLogger(__name__)
diff --git a/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/agent/containers.py b/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/agent/containers.py
@@ -6,8 +6,9 @@
 from models_library.projects_nodes_io import NodeID
 from models_library.rabbitmq_basic_types import RPCMethodName, RPCNamespace
 from pydantic import NonNegativeInt, TypeAdapter
-from servicelib.logging_utils import log_decorator
-from servicelib.rabbitmq import RabbitMQRPCClient
+
+from ....logging_utils import log_decorator
+from ....rabbitmq import RabbitMQRPCClient
 
 _logger = logging.getLogger(__name__)
 
diff --git a/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/agent/volumes.py b/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/agent/volumes.py
@@ -6,8 +6,9 @@
 from models_library.projects_nodes_io import NodeID
 from models_library.rabbitmq_basic_types import RPCMethodName, RPCNamespace
 from pydantic import NonNegativeInt, TypeAdapter
-from servicelib.logging_utils import log_decorator
-from servicelib.rabbitmq import RabbitMQRPCClient
+
+from ....logging_utils import log_decorator
+from ....rabbitmq import RabbitMQRPCClient
 
 _logger = logging.getLogger(__name__)
 
diff --git a/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/dynamic_scheduler/services.py b/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/dynamic_scheduler/services.py
@@ -18,8 +18,9 @@
 from models_library.services_types import ServicePortKey
 from models_library.users import UserID
 from pydantic import NonNegativeInt, TypeAdapter
-from servicelib.logging_utils import log_decorator
-from servicelib.rabbitmq import RabbitMQRPCClient
+
+from ....logging_utils import log_decorator
+from ....rabbitmq import RabbitMQRPCClient
 
 _logger = logging.getLogger(__name__)
 
diff --git a/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/auth/api_keys.py b/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/auth/api_keys.py
@@ -6,8 +6,9 @@
 from models_library.rpc.webserver.auth.api_keys import ApiKeyCreate, ApiKeyGet
 from models_library.users import UserID
 from pydantic import TypeAdapter
-from servicelib.logging_utils import log_decorator
-from servicelib.rabbitmq import RabbitMQRPCClient
+
+from .....logging_utils import log_decorator
+from .....rabbitmq import RabbitMQRPCClient
 
 _logger = logging.getLogger(__name__)
 
diff --git a/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/licenses/licensed_items.py b/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/licenses/licensed_items.py
@@ -15,8 +15,9 @@
 from models_library.users import UserID
 from models_library.wallets import WalletID
 from pydantic import TypeAdapter
-from servicelib.logging_utils import log_decorator
-from servicelib.rabbitmq import RabbitMQRPCClient
+
+from .....logging_utils import log_decorator
+from .....rabbitmq import RabbitMQRPCClient
 
 _logger = logging.getLogger(__name__)
 
diff --git a/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/projects.py b/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/projects.py
