fix import

Author: sanderegg

services/payments/src/simcore_service_payments/api/rpc/_payments.py

@@ -16,7 +16,8 @@
 from models_library.users import UserID
 from models_library.wallets import WalletID
 from pydantic import EmailStr, HttpUrl
-from servicelib.logging_utils import get_log_record_extra, log_context
+from servicelib.logging_base import get_log_record_extra
+from servicelib.logging_utils import log_context
 from servicelib.rabbitmq import RPCRouter
 
 from ...db.payments_transactions_repo import PaymentsTransactionsRepo
@@ -80,7 +81,6 @@ async def cancel_payment(
     user_id: UserID,
     wallet_id: WalletID,
 ) -> None:
-
     with log_context(
         _logger,
         logging.INFO,

services/web/server/src/simcore_service_webserver/garbage_collector/_tasks_users.py

@@ -10,7 +10,8 @@
 from aiohttp import web
 from models_library.users import UserID
 from servicelib.background_task_utils import exclusive_periodic
-from servicelib.logging_utils import get_log_record_extra, log_context
+from servicelib.logging_base import get_log_record_extra
+from servicelib.logging_utils import log_context
 
 from ..login import login_service
 from ..redis import get_redis_lock_manager_client_sdk
@@ -44,7 +45,6 @@ async def notify_user_logout_all_sessions(
 
 
 async def _update_expired_users(app: web.Application):
-
     if updated := await users_service.update_expired_users(app):
         # expired users might be cached in the auth. If so, any request
         # with this user-id will get thru producing unexpected side-effects
@@ -68,7 +68,6 @@ async def _update_expired_users(app: web.Application):
 
 
 def create_background_task_for_trial_accounts(wait_s: float) -> CleanupContextFunc:
-
     async def _cleanup_ctx_fun(app: web.Application) -> AsyncIterator[None]:
         interval = timedelta(seconds=wait_s)
 

services/web/server/src/simcore_service_webserver/login/_controller/rest/auth.py

@@ -7,7 +7,8 @@
 from pydantic import TypeAdapter
 from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import parse_request_body_as
-from servicelib.logging_utils import get_log_record_extra, log_context
+from servicelib.logging_base import get_log_record_extra
+from servicelib.logging_utils import log_context
 from servicelib.request_keys import RQT_USERID_KEY
 from simcore_postgres_database.models.users import UserRole
 

services/web/server/src/simcore_service_webserver/login/_security_service.py

@@ -3,7 +3,8 @@
 import logging
 
 from aiohttp import web
-from servicelib.logging_utils import get_log_record_extra, log_context
+from servicelib.logging_base import get_log_record_extra
+from servicelib.logging_utils import log_context
 
 from ..security import security_web
 from ..web_utils import flash_response

services/web/server/src/simcore_service_webserver/login_accounts/_controller_rest.py

@@ -13,7 +13,8 @@
     handle_validation_as_http_error,
     parse_request_body_as,
 )
-from servicelib.logging_utils import get_log_record_extra, log_context
+from servicelib.logging_base import get_log_record_extra
+from servicelib.logging_utils import log_context
 from servicelib.utils import fire_and_forget_task
 
 from .._meta import API_VTAG

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

@@ -41,7 +41,8 @@
 from pydantic import TypeAdapter
 from pydantic.types import PositiveInt
 from servicelib.aiohttp.application_keys import APP_AIOPG_ENGINE_KEY
-from servicelib.logging_utils import get_log_record_extra, log_context
+from servicelib.logging_base import get_log_record_extra
+from servicelib.logging_utils import log_context
 from simcore_postgres_database.aiopg_errors import UniqueViolation
 from simcore_postgres_database.models.groups import user_to_groups
 from simcore_postgres_database.models.project_to_groups import project_to_groups

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

@@ -84,7 +84,8 @@
     X_FORWARDED_PROTO,
     X_SIMCORE_USER_AGENT,
 )
-from servicelib.logging_utils import get_log_record_extra, log_context
+from servicelib.logging_base import get_log_record_extra
+from servicelib.logging_utils import log_context
 from servicelib.rabbitmq import RemoteMethodNotRegisteredError, RPCServerError
 from servicelib.rabbitmq.rpc_interfaces.catalog import services as catalog_rpc
 from servicelib.rabbitmq.rpc_interfaces.clusters_keeper.ec2_instances import (

services/web/server/src/simcore_service_webserver/resource_manager/user_sessions.py

@@ -7,7 +7,8 @@
 
 from aiohttp import web
 from models_library.users import UserID
-from servicelib.logging_utils import get_log_record_extra, log_context
+from servicelib.logging_base import get_log_record_extra
+from servicelib.logging_utils import log_context
 
 from .models import ResourcesDict, UserSession
 from .registry import (

services/web/server/src/simcore_service_webserver/socketio/_handlers.py

@@ -15,8 +15,9 @@
 from models_library.users import UserID
 from pydantic import TypeAdapter
 from servicelib.aiohttp.observer import emit
+from servicelib.logging_base import get_log_record_extra
 from servicelib.logging_errors import create_troubleshootting_log_kwargs
-from servicelib.logging_utils import get_log_record_extra, log_context
+from servicelib.logging_utils import log_context
 from servicelib.request_keys import RQT_USERID_KEY
 
 from ..groups.api import list_user_groups_ids_with_read_access

services/web/server/src/simcore_service_webserver/socketio/_observer.py

@@ -9,7 +9,7 @@
 from aiohttp import web
 from servicelib.aiohttp.application_keys import APP_FIRE_AND_FORGET_TASKS_KEY
 from servicelib.aiohttp.observer import register_observer, setup_observer_registry
-from servicelib.logging_utils import get_log_record_extra
+from servicelib.logging_base import get_log_record_extra
 from servicelib.utils import fire_and_forget_task, logged_gather
 from socketio import AsyncServer  # type: ignore[import-untyped]