fix imports

Author: sanderegg

packages/pytest-simcore/src/pytest_simcore/helpers/assert_checks.py

@@ -1,12 +1,11 @@
-""" Extends assertions for testing
+"""Extends assertions for testing"""
 
-"""
 from http import HTTPStatus
 from pprint import pformat
 
 from aiohttp import ClientResponse
 from servicelib.aiohttp import status
-from servicelib.aiohttp.rest_responses import unwrap_envelope
+from servicelib.rest_responses import unwrap_envelope
 from servicelib.status_codes_utils import get_code_display_name, is_error
 
 

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

@@ -4,7 +4,6 @@
 from typing import Any, Final, TypeAlias
 
 from aiohttp import ClientConnectionError, ClientSession
-from servicelib.aiohttp import status
 from tenacity import TryAgain, retry
 from tenacity.asyncio import AsyncRetrying
 from tenacity.retry import retry_if_exception_type
@@ -13,6 +12,7 @@
 from yarl import URL
 
 from ...rest_responses import unwrap_envelope
+from .. import status
 from .server import TaskGet, TaskId, TaskProgress, TaskStatus
 
 RequestBody: TypeAlias = Any

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

@@ -3,15 +3,14 @@
 """
 
 import asyncio
-from collections.abc import AsyncGenerator
+from collections.abc import AsyncGenerator, Coroutine
 from dataclasses import dataclass
-from typing import Any, Coroutine, Final, TypeAlias
+from typing import Any, Final, TypeAlias
 
 import httpx
 from fastapi import status
 from models_library.api_schemas_long_running_tasks.base import TaskProgress
 from models_library.api_schemas_long_running_tasks.tasks import TaskGet, TaskStatus
-from servicelib.rest_responses import unwrap_envelope_if_required
 from tenacity import (
     AsyncRetrying,
     TryAgain,
@@ -30,6 +29,7 @@
     ProgressPercent,
 )
 from ...long_running_tasks._task import TaskId, TaskResult
+from ...rest_responses import unwrap_envelope_if_required
 from ._client import DEFAULT_HTTP_REQUESTS_TIMEOUT, Client, setup
 from ._context_manager import periodic_task_result
 

services/web/server/tests/unit/with_dbs/03/login/test_login_change_password.py

@@ -8,7 +8,7 @@
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.webserver_login import LoggedUser
 from servicelib.aiohttp import status
-from servicelib.aiohttp.rest_responses import unwrap_envelope
+from servicelib.rest_responses import unwrap_envelope
 from simcore_service_webserver.login._constants import (
     MSG_LOGGED_IN,
     MSG_PASSWORD_CHANGED,

services/web/server/tests/unit/with_dbs/03/login/test_login_registration.py

@@ -16,7 +16,7 @@
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
 from pytest_simcore.helpers.webserver_login import NewInvitation, NewUser, parse_link
 from servicelib.aiohttp import status
-from servicelib.aiohttp.rest_responses import unwrap_envelope
+from servicelib.rest_responses import unwrap_envelope
 from simcore_service_webserver.db.models import UserStatus
 from simcore_service_webserver.groups.api import auto_add_user_to_product_group
 from simcore_service_webserver.login._confirmation import _url_for_confirmation

services/web/server/tests/unit/with_dbs/04/studies_dispatcher/test_studies_dispatcher_studies_access.py

@@ -28,11 +28,13 @@
 from servicelib.aiohttp import status
 from servicelib.aiohttp.long_running_tasks.client import LRTask
 from servicelib.aiohttp.long_running_tasks.server import TaskProgress
-from servicelib.aiohttp.rest_responses import unwrap_envelope
 from servicelib.common_headers import UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE
+from servicelib.rest_responses import unwrap_envelope
 from settings_library.utils_session import DEFAULT_SESSION_COOKIE_NAME
 from simcore_service_webserver.projects.models import ProjectDict
-from simcore_service_webserver.projects.projects_service import submit_delete_project_task
+from simcore_service_webserver.projects.projects_service import (
+    submit_delete_project_task,
+)
 from simcore_service_webserver.users.api import (
     delete_user_without_projects,
     get_user_role,