diff --git a/src/pydase/data_service/data_service.py b/src/pydase/data_service/data_service.py index 2283976..afb3eac 100644 --- a/src/pydase/data_service/data_service.py +++ b/src/pydase/data_service/data_service.py @@ -15,9 +15,9 @@ from pydase.utils.helpers import ( is_property_attribute, ) from pydase.utils.serialization.serializer import ( - SerializedObject, Serializer, ) +from pydase.utils.serialization.types import SerializedObject logger = logging.getLogger(__name__) diff --git a/src/pydase/data_service/data_service_cache.py b/src/pydase/data_service/data_service_cache.py index e32e681..f1d54e8 100644 --- a/src/pydase/data_service/data_service_cache.py +++ b/src/pydase/data_service/data_service_cache.py @@ -2,10 +2,10 @@ import logging from typing import TYPE_CHECKING, Any, cast from pydase.utils.serialization.serializer import ( - SerializedObject, get_nested_dict_by_path, set_nested_value_by_path, ) +from pydase.utils.serialization.types import SerializedObject if TYPE_CHECKING: from pydase import DataService diff --git a/src/pydase/data_service/data_service_observer.py b/src/pydase/data_service/data_service_observer.py index d6c073c..ec686c7 100644 --- a/src/pydase/data_service/data_service_observer.py +++ b/src/pydase/data_service/data_service_observer.py @@ -13,9 +13,9 @@ from pydase.utils.helpers import ( ) from pydase.utils.serialization.serializer import ( SerializationPathError, - SerializedObject, dump, ) +from pydase.utils.serialization.types import SerializedObject logger = logging.getLogger(__name__) diff --git a/src/pydase/data_service/state_manager.py b/src/pydase/data_service/state_manager.py index 5e041ed..b9fa64e 100644 --- a/src/pydase/data_service/state_manager.py +++ b/src/pydase/data_service/state_manager.py @@ -17,11 +17,11 @@ from pydase.utils.helpers import ( from pydase.utils.serialization.deserializer import loads from pydase.utils.serialization.serializer import ( SerializationPathError, - SerializedObject, generate_serialized_data_paths, get_nested_dict_by_path, serialized_dict_is_nested_object, ) +from pydase.utils.serialization.types import SerializedObject if TYPE_CHECKING: from pydase import DataService diff --git a/src/pydase/server/web_server/sio_setup.py b/src/pydase/server/web_server/sio_setup.py index 2342b8e..9d3c127 100644 --- a/src/pydase/server/web_server/sio_setup.py +++ b/src/pydase/server/web_server/sio_setup.py @@ -20,7 +20,7 @@ from pydase.data_service.data_service_observer import DataServiceObserver from pydase.data_service.state_manager import StateManager from pydase.server.web_server.api.v1 import endpoints from pydase.utils.logging import SocketIOHandler -from pydase.utils.serialization.serializer import SerializedObject +from pydase.utils.serialization.types import SerializedObject logger = logging.getLogger(__name__) diff --git a/src/pydase/utils/serialization/serializer.py b/src/pydase/utils/serialization/serializer.py index 99e4419..046c6c5 100644 --- a/src/pydase/utils/serialization/serializer.py +++ b/src/pydase/utils/serialization/serializer.py @@ -20,29 +20,29 @@ from pydase.utils.helpers import ( parse_full_access_path, parse_serialized_key, ) -from pydase.utils.serialization.types import ( - DataServiceTypes, - SerializedBool, - SerializedDataService, - SerializedDatetime, - SerializedDict, - SerializedEnum, - SerializedException, - SerializedFloat, - SerializedInteger, - SerializedList, - SerializedMethod, - SerializedNoneType, - SerializedObject, - SerializedQuantity, - SerializedString, - SignatureDict, -) if TYPE_CHECKING: from collections.abc import Callable from pydase.client.proxy_class import ProxyClass + from pydase.utils.serialization.types import ( + DataServiceTypes, + SerializedBool, + SerializedDataService, + SerializedDatetime, + SerializedDict, + SerializedEnum, + SerializedException, + SerializedFloat, + SerializedInteger, + SerializedList, + SerializedMethod, + SerializedNoneType, + SerializedObject, + SerializedQuantity, + SerializedString, + SignatureDict, + ) logger = logging.getLogger(__name__) diff --git a/tests/utils/serialization/test_serializer.py b/tests/utils/serialization/test_serializer.py index ade88f8..f0d8b53 100644 --- a/tests/utils/serialization/test_serializer.py +++ b/tests/utils/serialization/test_serializer.py @@ -3,15 +3,15 @@ from datetime import datetime from enum import Enum from typing import Any, ClassVar +import pytest + import pydase import pydase.units as u -import pytest from pydase.components.coloured_enum import ColouredEnum from pydase.task.task_status import TaskStatus from pydase.utils.decorators import frontend from pydase.utils.serialization.serializer import ( SerializationPathError, - SerializedObject, add_prefix_to_full_access_path, dump, generate_serialized_data_paths, @@ -21,6 +21,7 @@ from pydase.utils.serialization.serializer import ( serialized_dict_is_nested_object, set_nested_value_by_path, ) +from pydase.utils.serialization.types import SerializedObject class MyEnum(enum.Enum): @@ -252,7 +253,7 @@ def test_methods_with_type_hints() -> None: def method_with_type_hint(some_argument: int) -> None: pass - def method_with_union_type_hint(some_argument: int | float) -> None: + def method_with_union_type_hint(some_argument: int | float) -> None: # noqa: PYI041 pass assert dump(method_without_type_hint) == {