♻️Use correct import (#6597)

sanderegg · web-flow · commit cd6f5455ab1d · 2024-10-24T14:28:11.000+02:00
diff --git a/packages/common-library/tests/test_error_codes.py b/packages/common-library/tests/test_error_codes.py
@@ -6,7 +6,7 @@
 import logging
 
 import pytest
-from models_library.error_codes import create_error_code, parse_error_code
+from common_library.error_codes import create_error_code, parse_error_code
 
 logger = logging.getLogger(__name__)
 
diff --git a/packages/models-library/src/models_library/error_codes.py b/packages/models-library/src/models_library/error_codes.py
diff --git a/packages/service-library/src/servicelib/aiohttp/rest_middlewares.py b/packages/service-library/src/servicelib/aiohttp/rest_middlewares.py
@@ -12,7 +12,7 @@
 from aiohttp import web
 from aiohttp.web_request import Request
 from aiohttp.web_response import StreamResponse
-from models_library.error_codes import create_error_code
+from common_library.error_codes import create_error_code
 from models_library.utils.json_serialization import json_dumps
 
 from ..logging_errors import create_troubleshotting_log_kwargs
diff --git a/packages/service-library/src/servicelib/logging_errors.py b/packages/service-library/src/servicelib/logging_errors.py
@@ -2,8 +2,8 @@
 from pprint import pformat
 from typing import Any, TypedDict
 
-from models_library.error_codes import ErrorCodeStr
-from models_library.errors_classes import OsparcErrorMixin
+from common_library.error_codes import ErrorCodeStr
+from common_library.errors_classes import OsparcErrorMixin
 
 from .logging_utils import LogExtra, get_log_record_extra
 
diff --git a/packages/service-library/tests/aiohttp/test_rest_middlewares.py b/packages/service-library/tests/aiohttp/test_rest_middlewares.py
@@ -13,7 +13,7 @@
 import pytest
 from aiohttp import web
 from aiohttp.test_utils import TestClient
-from models_library.error_codes import parse_error_code
+from common_library.error_codes import parse_error_code
 from models_library.utils.json_serialization import json_dumps
 from servicelib.aiohttp import status
 from servicelib.aiohttp.rest_middlewares import (
@@ -99,7 +99,7 @@ async def raise_exception(cls, request: web.Request):
             case NotImplementedError.__name__:
                 raise NotImplementedError
             case asyncio.TimeoutError.__name__:
-                raise asyncio.TimeoutError
+                raise TimeoutError
             case web.HTTPOk.__name__:
                 raise web.HTTPOk  # 2XX
             case web.HTTPUnauthorized.__name__:
diff --git a/packages/service-library/tests/test_logging_errors.py b/packages/service-library/tests/test_logging_errors.py
@@ -3,8 +3,8 @@
 import logging
 
 import pytest
-from models_library.error_codes import create_error_code
-from models_library.errors_classes import OsparcErrorMixin
+from common_library.error_codes import create_error_code
+from common_library.errors_classes import OsparcErrorMixin
 from servicelib.logging_errors import (
     create_troubleshotting_log_kwargs,
     create_troubleshotting_log_message,
diff --git a/services/api-server/src/simcore_service_api_server/exceptions/_base.py b/services/api-server/src/simcore_service_api_server/exceptions/_base.py
@@ -1,6 +1,6 @@
 from typing import Any
 
-from models_library.errors_classes import OsparcErrorMixin
+from common_library.errors_classes import OsparcErrorMixin
 
 
 class ApiServerBaseError(OsparcErrorMixin, Exception):
diff --git a/services/api-server/src/simcore_service_api_server/exceptions/handlers/_handlers_factory.py b/services/api-server/src/simcore_service_api_server/exceptions/handlers/_handlers_factory.py
@@ -1,8 +1,8 @@
 import logging
 
+from common_library.error_codes import create_error_code
 from fastapi.requests import Request
 from fastapi.responses import JSONResponse
-from models_library.error_codes import create_error_code
 from servicelib.logging_errors import create_troubleshotting_log_kwargs
 
 from ._utils import ExceptionHandler, create_error_json_response
diff --git a/services/api-server/src/simcore_service_api_server/services/log_streaming.py b/services/api-server/src/simcore_service_api_server/services/log_streaming.py
@@ -4,7 +4,7 @@
 from collections.abc import AsyncIterable
 from typing import Final
 
-from models_library.error_codes import create_error_code
+from common_library.error_codes import create_error_code
 from models_library.rabbitmq_messages import LoggerRabbitMessage
 from models_library.users import UserID
 from pydantic import NonNegativeInt
@@ -123,7 +123,7 @@ async def log_generator(self) -> AsyncIterable[str]:
                         self._queue.get(), timeout=self._log_check_timeout
                     )
                     yield log.json() + _NEW_LINE
-                except asyncio.TimeoutError:
+                except TimeoutError:
                     done = await self._project_done()
 
         except BaseBackEndError as exc:
diff --git a/services/catalog/src/simcore_service_catalog/exceptions/errors.py b/services/catalog/src/simcore_service_catalog/exceptions/errors.py
@@ -1,6 +1,6 @@
 from typing import Any
 
-from models_library.errors_classes import OsparcErrorMixin
+from common_library.errors_classes import OsparcErrorMixin
 
 
 class CatalogBaseError(OsparcErrorMixin, Exception):
diff --git a/services/director-v2/src/simcore_service_director_v2/models/dynamic_services_scheduler.py b/services/director-v2/src/simcore_service_director_v2/models/dynamic_services_scheduler.py
@@ -10,13 +10,13 @@
 from uuid import UUID
 
 import arrow
+from common_library.error_codes import ErrorCodeStr
 from models_library.api_schemas_directorv2.dynamic_services import DynamicServiceCreate
 from models_library.api_schemas_directorv2.dynamic_services_service import (
     CommonServiceDetails,
 )
 from models_library.basic_types import PortInt
 from models_library.callbacks_mapping import CallbacksMapping
-from models_library.error_codes import ErrorCodeStr
 from models_library.generated_models.docker_rest_api import ContainerState, Status2
 from models_library.projects_nodes_io import NodeID
 from models_library.resource_tracker import HardwareInfo, PricingInfo
@@ -116,7 +116,7 @@ def __eq__(self, other: object) -> bool:
     @classmethod
     def create_as_initially_ok(cls) -> "Status":
         # the service is initially ok when started
-        initial_state: "Status" = cls(current=DynamicSidecarStatus.OK, info="")
+        initial_state: Status = cls(current=DynamicSidecarStatus.OK, info="")
         return initial_state
 
 
diff --git a/services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/scheduler/_core/_observer.py b/services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/scheduler/_core/_observer.py
@@ -5,8 +5,8 @@
 from copy import deepcopy
 from math import floor
 
+from common_library.error_codes import create_error_code
 from fastapi import FastAPI
-from models_library.error_codes import create_error_code
 from servicelib.logging_errors import create_troubleshotting_log_kwargs
 
 from .....core.dynamic_services_settings.scheduler import (
diff --git a/services/web/server/src/simcore_service_webserver/errors.py b/services/web/server/src/simcore_service_webserver/errors.py
@@ -1,6 +1,6 @@
 from typing import Any
 
-from models_library.errors_classes import OsparcErrorMixin
+from common_library.errors_classes import OsparcErrorMixin
 
 
 class WebServerBaseError(OsparcErrorMixin, Exception):
diff --git a/services/web/server/src/simcore_service_webserver/login/_registration.py b/services/web/server/src/simcore_service_webserver/login/_registration.py
@@ -10,9 +10,9 @@
 from datetime import datetime
 
 from aiohttp import web
+from common_library.error_codes import create_error_code
 from models_library.basic_types import IdInt
 from models_library.emails import LowerCaseEmailStr
-from models_library.error_codes import create_error_code
 from models_library.products import ProductName
 from pydantic import (
     BaseModel,
diff --git a/services/web/server/src/simcore_service_webserver/login/handlers_confirmation.py b/services/web/server/src/simcore_service_webserver/login/handlers_confirmation.py
@@ -4,8 +4,8 @@
 
 from aiohttp import web
 from aiohttp.web import RouteTableDef
+from common_library.error_codes import create_error_code
 from models_library.emails import LowerCaseEmailStr
-from models_library.error_codes import create_error_code
 from models_library.products import ProductName
 from pydantic import (
     BaseModel,
diff --git a/services/web/server/src/simcore_service_webserver/login/handlers_registration.py b/services/web/server/src/simcore_service_webserver/login/handlers_registration.py
@@ -4,8 +4,8 @@
 
 from aiohttp import web
 from aiohttp.web import RouteTableDef
+from common_library.error_codes import create_error_code
 from models_library.emails import LowerCaseEmailStr
-from models_library.error_codes import create_error_code
 from pydantic import BaseModel, Field, PositiveInt, SecretStr, validator
 from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import parse_request_body_as
diff --git a/services/web/server/src/simcore_service_webserver/studies_dispatcher/_redirects_handlers.py b/services/web/server/src/simcore_service_webserver/studies_dispatcher/_redirects_handlers.py
@@ -8,7 +8,7 @@
 from typing import TypeAlias
 
 from aiohttp import web
-from models_library.error_codes import create_error_code
+from common_library.error_codes import create_error_code
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
 from models_library.services import ServiceKey, ServiceVersion
diff --git a/services/web/server/src/simcore_service_webserver/studies_dispatcher/_studies_access.py b/services/web/server/src/simcore_service_webserver/studies_dispatcher/_studies_access.py
@@ -20,7 +20,7 @@
 
 from aiohttp import web
 from aiohttp_session import get_session
-from models_library.error_codes import create_error_code
+from common_library.error_codes import create_error_code
 from models_library.projects import ProjectID
 from servicelib.aiohttp import status
 from servicelib.aiohttp.typing_extension import Handler
diff --git a/services/web/server/src/simcore_service_webserver/utils.py b/services/web/server/src/simcore_service_webserver/utils.py
@@ -1,6 +1,7 @@
 """
     General utilities and helper functions
 """
+
 import asyncio
 import hashlib
 import logging
@@ -13,8 +14,8 @@
 from typing import Any, TypedDict, cast
 
 import orjson
+from common_library.error_codes import ErrorCodeStr
 from models_library.basic_types import SHA1Str
-from models_library.error_codes import ErrorCodeStr
 
 _CURRENT_DIR = (
     Path(sys.argv[0] if __name__ == "__main__" else __file__).resolve().parent
@@ -80,7 +81,6 @@ def now_str() -> str:
 
 
 def to_datetime(snapshot: str) -> datetime:
-    #
     return datetime.strptime(snapshot, DATETIME_FORMAT)
 
 
diff --git a/services/web/server/src/simcore_service_webserver/wallets/_handlers.py b/services/web/server/src/simcore_service_webserver/wallets/_handlers.py
@@ -2,13 +2,13 @@
 import logging
 
 from aiohttp import web
+from common_library.error_codes import create_error_code
 from models_library.api_schemas_webserver.wallets import (
     CreateWalletBodyParams,
     PutWalletBodyParams,
     WalletGet,
     WalletGetWithAvailableCredits,
 )
-from models_library.error_codes import create_error_code
 from models_library.users import UserID
 from models_library.wallets import WalletID
 from pydantic import Field
