ITQC/pydase
24
0
Fork 0
mirror of https://github.com/tiqi-group/pydase.git synced 2025-04-21 16:50:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

moves check for load_state decorator to load_state method in StateManager

Browse Source
This commit is contained in:
Mose Müller 2023-11-09 17:32:30 +01:00
parent 4a45d0d438
commit f5e6dca16a
1 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/pydase/data_service/state_manager.py
View File

@ -148,7 +148,10 @@ class StateManager:
value, value_type = nested_json_dict["value"], nested_json_dict["type"] value, value_type = nested_json_dict["value"], nested_json_dict["type"]
class_attr_value_type = nested_class_dict.get("type", None) class_attr_value_type = nested_class_dict.get("type", None)
if class_attr_value_type == value_type: if (
class_attr_value_type == value_type
and self.__is_loadable_state_attribute(path)
):
self.set_service_attribute_value_by_path(path, value) self.set_service_attribute_value_by_path(path, value)
else: else:
logger.info( logger.info(
@ -231,7 +234,6 @@ class StateManager:
# Traverse the object according to the path parts # Traverse the object according to the path parts
target_obj = get_object_attr_from_path_list(self.service, parent_path_list) target_obj = get_object_attr_from_path_list(self.service, parent_path_list)
if self.__attr_value_should_change(target_obj, attr_name):
if attr_cache_type in ("ColouredEnum", "Enum"): if attr_cache_type in ("ColouredEnum", "Enum"):
enum_attr = get_object_attr_from_path_list(target_obj, [attr_name]) enum_attr = get_object_attr_from_path_list(target_obj, [attr_name])
setattr(target_obj, attr_name, enum_attr.__class__[value]) setattr(target_obj, attr_name, enum_attr.__class__[value])
@ -241,11 +243,27 @@ class StateManager:
else: else:
setattr(target_obj, attr_name, value) setattr(target_obj, attr_name, value)
def __attr_value_should_change(self, parent_object: Any, attr_name: str) -> bool: def __is_loadable_state_attribute(self, property_path: str) -> bool:
# If the attribute is a property, change it using the setter without getting """Checks if an attribute defined by a dot-separated path should be loaded from
# the property value (would otherwise be bad for expensive getter methods) storage.
For properties, it verifies the presence of the '@load_state' decorator. Regular
attributes default to being loadable.
"""
parent_object = get_object_attr_from_path_list(
self.service, property_path.split(".")[:-1]
)
attr_name = property_path.split(".")[-1]
prop = getattr(type(parent_object), attr_name, None) prop = getattr(type(parent_object), attr_name, None)
if isinstance(prop, property): if isinstance(prop, property):
return has_load_state_decorator(prop) has_decorator = has_load_state_decorator(prop)
if not has_decorator:
logger.debug(
f"Property {attr_name!r} has no '@load_state' decorator. "
"Ignoring value from JSON file..."
)
return has_decorator
return True return True