From 09c00735c62332000b96c80733306c5084570165 Mon Sep 17 00:00:00 2001 From: Giancarlo Romeo Date: Mon, 7 Oct 2024 13:39:35 +0200 Subject: [PATCH] point to common library --- .../src/models_library/osparc_variable_identifier.py | 3 ++- .../src/models_library/utils/specs_substitution.py | 3 ++- packages/models-library/tests/test_errors_classes.py | 2 +- .../notifications-library/src/notifications_library/errors.py | 2 +- .../src/servicelib/rabbitmq/rpc_interfaces/catalog/errors.py | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/models-library/src/models_library/osparc_variable_identifier.py b/packages/models-library/src/models_library/osparc_variable_identifier.py index a4b0d4e882b..80a8e6d0fc0 100644 --- a/packages/models-library/src/models_library/osparc_variable_identifier.py +++ b/packages/models-library/src/models_library/osparc_variable_identifier.py @@ -1,8 +1,9 @@ from copy import deepcopy from typing import Any, TypeVar +from common_library.errors_classes import OsparcErrorMixin from models_library.basic_types import ConstrainedStr -from models_library.errors_classes import OsparcErrorMixin + from pydantic import BaseModel from .utils.string_substitution import OSPARC_IDENTIFIER_PREFIX diff --git a/packages/models-library/src/models_library/utils/specs_substitution.py b/packages/models-library/src/models_library/utils/specs_substitution.py index 73260237b22..d8a7e9cf161 100644 --- a/packages/models-library/src/models_library/utils/specs_substitution.py +++ b/packages/models-library/src/models_library/utils/specs_substitution.py @@ -1,6 +1,7 @@ from typing import Any, NamedTuple, TypeAlias, cast -from models_library.errors_classes import OsparcErrorMixin +from common_library.errors_classes import OsparcErrorMixin + from pydantic import StrictBool, StrictFloat, StrictInt from .json_serialization import json_dumps, json_loads diff --git a/packages/models-library/tests/test_errors_classes.py b/packages/models-library/tests/test_errors_classes.py index 754367805e2..ae0ed8c1e3d 100644 --- a/packages/models-library/tests/test_errors_classes.py +++ b/packages/models-library/tests/test_errors_classes.py @@ -9,7 +9,7 @@ from typing import Any import pytest -from models_library.errors_classes import OsparcErrorMixin +from common_library.errors_classes import OsparcErrorMixin def test_get_full_class_name(): diff --git a/packages/notifications-library/src/notifications_library/errors.py b/packages/notifications-library/src/notifications_library/errors.py index 2ffaa461a02..21edbbb0dc7 100644 --- a/packages/notifications-library/src/notifications_library/errors.py +++ b/packages/notifications-library/src/notifications_library/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 NotifierError(OsparcErrorMixin, Exception): diff --git a/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/catalog/errors.py b/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/catalog/errors.py index 65c403853ea..5837beddcae 100644 --- a/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/catalog/errors.py +++ b/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/catalog/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 CatalogApiBaseError(OsparcErrorMixin, Exception):