Replace SimpleNamespaces with dataclasses. Add base class _Typing in labeler.py to convert dictionaries to dataclasses. Remove SimpleNamespace references.

This commit is contained in:
Davide Casale
2023-01-16 16:30:06 +01:00
parent 903f68c6e3
commit 0bb9f65a19
3 changed files with 66 additions and 36 deletions

View File

@@ -1,12 +1,13 @@
from typing import List, Dict, Union, Optional, Any, TypedDict, Generic, TypeVar, cast
from types import SimpleNamespace
from dataclasses import dataclass
from .labeler import _Serializer
from .labeler import _Typing, _Serializer
T = TypeVar("T")
class Notification(SimpleNamespace, Generic[T]):
@dataclass
class Notification(_Typing, Generic[T]):
MTS: int
TYPE: str
MESSAGE_ID: Optional[int]
@@ -24,7 +25,7 @@ class _Notification(_Serializer, Generic[T]):
self.serializer, self.iterate = serializer, iterate
def parse(self, *values: Any, skip: Optional[List[str]] = None) -> Notification[T]:
notification = cast(Notification[T], SimpleNamespace(**dict(self._serialize(*values))))
notification = cast(Notification[T], _Typing(**dict(self._serialize(*values))))
if isinstance(self.serializer, _Serializer):
NOTIFY_INFO = cast(List[Any], notification.NOTIFY_INFO)
@@ -33,7 +34,7 @@ class _Notification(_Serializer, Generic[T]):
if len(NOTIFY_INFO) == 1 and isinstance(NOTIFY_INFO[0], list):
NOTIFY_INFO = NOTIFY_INFO[0]
notification.NOTIFY_INFO = cast(T, SimpleNamespace(**dict(self.serializer._serialize(*NOTIFY_INFO, skip=skip))))
else: notification.NOTIFY_INFO = cast(T, [ SimpleNamespace(**dict(self.serializer._serialize(*data, skip=skip))) for data in NOTIFY_INFO ])
notification.NOTIFY_INFO = cast(T, _Typing(**dict(self.serializer._serialize(*NOTIFY_INFO, skip=skip))))
else: notification.NOTIFY_INFO = cast(T, [ _Typing(**dict(self.serializer._serialize(*data, skip=skip))) for data in NOTIFY_INFO ])
return notification