From 9851ccfcdff012dbfeb7d89308e1e050231897c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mose=20M=C3=BCller?= Date: Wed, 27 Mar 2024 16:30:15 +0100 Subject: [PATCH] moves serializer file into serialization module --- src/pydase/client/client.py | 2 +- src/pydase/client/proxy_class_factory.py | 6 +++++- src/pydase/data_service/data_service.py | 2 +- src/pydase/data_service/data_service_cache.py | 2 +- src/pydase/data_service/data_service_observer.py | 2 +- src/pydase/data_service/state_manager.py | 2 +- src/pydase/server/web_server/sio_setup.py | 2 +- src/pydase/server/web_server/web_server.py | 2 +- src/pydase/utils/{ => serialization}/serializer.py | 0 9 files changed, 12 insertions(+), 8 deletions(-) rename src/pydase/utils/{ => serialization}/serializer.py (100%) diff --git a/src/pydase/client/client.py b/src/pydase/client/client.py index 420fa3d..98bfb56 100644 --- a/src/pydase/client/client.py +++ b/src/pydase/client/client.py @@ -6,7 +6,7 @@ import socketio # type: ignore from pydase.client.proxy_class_factory import ProxyClassFactory from pydase.utils.serialization.deserializer import loads -from pydase.utils.serializer import SerializedObject +from pydase.utils.serialization.serializer import SerializedObject if TYPE_CHECKING: from pydase.client.proxy_class_factory import ProxyClass diff --git a/src/pydase/client/proxy_class_factory.py b/src/pydase/client/proxy_class_factory.py index 597adef..7d0e0ad 100644 --- a/src/pydase/client/proxy_class_factory.py +++ b/src/pydase/client/proxy_class_factory.py @@ -6,7 +6,11 @@ import socketio # type: ignore import pydase from pydase.utils.serialization.deserializer import Deserializer, loads -from pydase.utils.serializer import SerializedMethod, SerializedObject, dump +from pydase.utils.serialization.serializer import ( + SerializedMethod, + SerializedObject, + dump, +) if TYPE_CHECKING: from collections.abc import Callable diff --git a/src/pydase/data_service/data_service.py b/src/pydase/data_service/data_service.py index fa885b3..eae41a1 100644 --- a/src/pydase/data_service/data_service.py +++ b/src/pydase/data_service/data_service.py @@ -14,7 +14,7 @@ from pydase.utils.helpers import ( get_class_and_instance_attributes, is_property_attribute, ) -from pydase.utils.serializer import ( +from pydase.utils.serialization.serializer import ( SerializedObject, Serializer, ) diff --git a/src/pydase/data_service/data_service_cache.py b/src/pydase/data_service/data_service_cache.py index 91fa6a0..756ef9e 100644 --- a/src/pydase/data_service/data_service_cache.py +++ b/src/pydase/data_service/data_service_cache.py @@ -1,7 +1,7 @@ import logging from typing import TYPE_CHECKING, Any, cast -from pydase.utils.serializer import ( +from pydase.utils.serialization.serializer import ( SerializationPathError, SerializationValueError, SerializedObject, diff --git a/src/pydase/data_service/data_service_observer.py b/src/pydase/data_service/data_service_observer.py index 8d2e673..a526486 100644 --- a/src/pydase/data_service/data_service_observer.py +++ b/src/pydase/data_service/data_service_observer.py @@ -9,7 +9,7 @@ from pydase.observer_pattern.observer.property_observer import ( PropertyObserver, ) from pydase.utils.helpers import get_object_attr_from_path_list -from pydase.utils.serializer import SerializedObject, dump +from pydase.utils.serialization.serializer import SerializedObject, dump logger = logging.getLogger(__name__) diff --git a/src/pydase/data_service/state_manager.py b/src/pydase/data_service/state_manager.py index 878ef1a..84af429 100644 --- a/src/pydase/data_service/state_manager.py +++ b/src/pydase/data_service/state_manager.py @@ -12,7 +12,7 @@ from pydase.utils.helpers import ( is_property_attribute, parse_list_attr_and_index, ) -from pydase.utils.serializer import ( +from pydase.utils.serialization.serializer import ( SerializedObject, dump, generate_serialized_data_paths, diff --git a/src/pydase/server/web_server/sio_setup.py b/src/pydase/server/web_server/sio_setup.py index b5ff4f2..6900e7f 100644 --- a/src/pydase/server/web_server/sio_setup.py +++ b/src/pydase/server/web_server/sio_setup.py @@ -10,7 +10,7 @@ from pydase.data_service.state_manager import StateManager from pydase.utils.helpers import get_object_attr_from_path_list from pydase.utils.logging import SocketIOHandler from pydase.utils.serialization.deserializer import Deserializer, loads -from pydase.utils.serializer import SerializedObject, dump +from pydase.utils.serialization.serializer import SerializedObject, dump logger = logging.getLogger(__name__) diff --git a/src/pydase/server/web_server/web_server.py b/src/pydase/server/web_server/web_server.py index 4f59c6a..fac97bc 100644 --- a/src/pydase/server/web_server/web_server.py +++ b/src/pydase/server/web_server/web_server.py @@ -16,7 +16,7 @@ from pydase.data_service.data_service_observer import DataServiceObserver from pydase.server.web_server.sio_setup import ( setup_sio_server, ) -from pydase.utils.serializer import generate_serialized_data_paths +from pydase.utils.serialization.serializer import generate_serialized_data_paths from pydase.version import __version__ logger = logging.getLogger(__name__) diff --git a/src/pydase/utils/serializer.py b/src/pydase/utils/serialization/serializer.py similarity index 100% rename from src/pydase/utils/serializer.py rename to src/pydase/utils/serialization/serializer.py