DLMS-SPODES-client 0.19.11__py3-none-any.whl → 0.19.13__py3-none-any.whl

DLMS_SPODES_client/client.py

@@ -14,6 +14,7 @@ import datetime
 import os
 import hashlib
 from Cryptodome.Cipher import AES
+from StructResult import result
 from DLMS_SPODES_communications import Network, Serial, RS485, BLEKPZ, base
 from DLMS_SPODES.cosem_interface_classes import overview
 from DLMS_SPODES.cosem_interface_classes.collection import Collection, InterfaceClass, ic, cdt, ut, Data, AssociationLN

DLMS_SPODES_client/task.py

@@ -50,10 +50,6 @@ class Base[T: result.Result](Protocol):
     """Exchange task for DLMS client"""
     msg: str
 
-    def __post_init__(self) -> None:
-        if self.msg == "":
-            self.msg = self.__class__.__name__
-
     def copy(self) -> Self: ...
 
     @property
@@ -295,11 +291,11 @@ class StrictOK(Base[result.StrictOk], Protocol):
     async def exchange(self, c: Client) -> result.StrictOk | result.Error: ...
 
 
-@dataclass
+@dataclass(frozen=True)
 class ClientBlocking(SimpleCopy, OK):
     """complete by time or abort"""
-    delay: Final[float] = field(default=99999999.0)
-    msg: str = ""
+    delay: float = field(default=99999999.0)
+    msg: str = "client blocking"
 
     async def run(self, c: Client) -> result.Ok | result.Error:
         try:
@@ -316,8 +312,9 @@ class ClientBlocking(SimpleCopy, OK):
 
 
 # todo: make with <data_link>
+@dataclass
 class TestDataLink(SimpleCopy, OK):
-    msg: str = ""
+    msg: str = "test DLink"
 
     async def physical(self, c: Client) -> result.Ok | result.Error:
         if OSI.PHYSICAL not in c.level:
@@ -340,18 +337,18 @@ class TestDataLink(SimpleCopy, OK):
         return result.OK
 
 
-@dataclass
+@dataclass(frozen=True)
 class Dummy(SimpleCopy, OK):
-    msg: str = ""
+    msg: str = "dummy"
 
     async def exchange(self, c: Client) -> result.Ok | result.Error:
         """"""
         return result.OK
 
 
-@dataclass
+@dataclass(frozen=True)
 class HardwareDisconnect(SimpleCopy, OK):
-    msg: str = ""
+    msg: str = "hardware disconnect"
 
     @override
     async def exchange(self, c: Client) -> result.Ok | result.Error:
@@ -362,9 +359,9 @@ class HardwareDisconnect(SimpleCopy, OK):
         return result.OK
 
 
-@dataclass
+@dataclass(frozen=True)
 class HardwareReconnect(SimpleCopy, OK):
-    delay: Final[float] = 0.0
+    delay: float = 0.0
     """delay between disconnect and restore Application"""
     msg: str = "reconnect media without response"
 
@@ -378,13 +375,13 @@ class HardwareReconnect(SimpleCopy, OK):
         return result.OK
 
 
-@dataclass
+@dataclass(frozen=True)
 class Loop(OK):
     task: Base[result.Result]
     func: Callable[[Any], bool]
-    delay: Final[int] = 0.0
-    msg: str = ""
-    attempt_amount: Final[int] = 0
+    delay: int = 0.0
+    msg: str = "loop"
+    attempt_amount: int = 0
     """0 is never end loop"""
 
     def copy(self) -> Self:
@@ -415,7 +412,7 @@ class ConditionalTask[T](Base):
     comp_value: T
     predicate: Callable[[T, T], bool]
     main_task: Base[result.Result]
-    msg: str
+    msg: str = "conditional task"
 
     async def exchange(self, c: Client) -> result.Result:
         res = await self.precondition_task.exchange(c)
@@ -438,7 +435,7 @@ class Scheduler[T: result.Result](Base[T]):
     repetition_delay_min: Final[int] = 1
     repetition_delay_exponent: Final[int] = 100
     repetition_delay_max: Final[int] = 100
-    msg: str = ""
+    msg: str = "sheduler"
 
     def copy(self) -> "Scheduler[T]":
         return Scheduler(
@@ -496,8 +493,8 @@ class Subtasks[U: Base[result.Result]](Protocol):
 class List[T: result.Result, U: Base[result.Result]](Subtasks[U], _List[T]):
     """for exchange task sequence"""
     __is_exchange: bool
-    msg: str
     err_ignore: bool
+    msg: str
     __current: Base[T]
 
     def __init__(self, *tasks: Base[T], msg: str = "", err_ignore: bool = True):
@@ -550,7 +547,7 @@ class Sequence[*Ts](Subtasks[Base[result.Result]], _Sequence[*Ts]):
     __current: "Base[result.Result] | Sequence[*Ts]"
     tasks: tuple[Base[result.Result], ...]
 
-    def __init__(self, *tasks: Base[result.Result], msg: str = "", err_ignore: bool = False):
+    def __init__(self, *tasks: Base[result.Result], msg: str = "sequence", err_ignore: bool = False):
         self.tasks = tasks
         self.__current = self
         self.msg = self.__class__.__name__ if msg == "" else msg
@@ -574,20 +571,21 @@ class Sequence[*Ts](Subtasks[Base[result.Result]], _Sequence[*Ts]):
         for t in self.tasks:
             self.__current = t
             try:
-                if (
-                    isinstance(res_one := await t.exchange(c), result.Error)
-                    and not self.err_ignore
-                ):
-                    return res_one
+                if isinstance(res_one := await t.exchange(c), result.Error):
+                    if self.err_ignore:
+                        res_one = res_one.with_msg(self.msg)
+                    else:
+                        return res_one
                 res = res.add(res_one)
             except exc.ResultError as e:  # todo: make without except
-                res.add(result.Error.from_e(e).with_msg(t.msg))
+                res = res.add(result.Error.from_e(e).with_msg(self.msg))
         return cast("result.Sequence[*Ts]", res)
 
 
+@dataclass(frozen=True)
 class SetLocalTime(SimpleCopy, OK):
     """without decide time transfer"""
-    msg: str
+    msg: str = "set local time"
 
     async def exchange(self, c: Client) -> result.Ok | result.Error:
         clock_obj: Clock = c.objects.get_object("0.0.1.0.0.255")
@@ -607,17 +605,17 @@ class SetLocalTime(SimpleCopy, OK):
         return result.OK
 
 
+@dataclass(frozen=True)
 class GetFirmwareVersion(SimpleCopy, CDT):
-    """get firmware version by Client.id"""
-    msg: str
+    msg: str = "get firmware version"
 
     async def exchange(self, c: Client) -> result.SimpleOrError[cdt.CommonDataType]:
         return await Par2Data(Parameter(c.objects.id.f_ver.par[:6]).get_attr(c.objects.id.f_ver.par[6])).exchange(c)
 
 
+@dataclass(frozen=True)
 class FindFirmwareVersion(SimpleCopy, Simple[collection.ParameterValue]):
-    """try find COSEM server version, return: instance(B group), CDT"""
-    msg: str
+    msg: str = "try find COSEM server version, return: instance(B group), CDT"
 
     async def exchange(self, c: Client) -> result.SimpleOrError[collection.ParameterValue]:
         err = result.ErrorAccumulator()
@@ -640,8 +638,8 @@ class FindFirmwareVersion(SimpleCopy, Simple[collection.ParameterValue]):
         raise RuntimeError(f"empty {err}")
 
 
+@dataclass(frozen=True)
 class FindFirmwareId(SimpleCopy, Simple[collection.ParameterValue]):
-    """try find COSEM server identifier, return: FirmwareID"""
     msg: str = "find firmaware Identifier"
 
     async def exchange(self, c: Client) -> result.SimpleOrError[collection.ParameterValue]:
@@ -665,10 +663,9 @@ class FindFirmwareId(SimpleCopy, Simple[collection.ParameterValue]):
         raise RuntimeError(f"empty {err}")
 
 
-@dataclass
+@dataclass(frozen=True)
 class KeepAlive(SimpleCopy, OK):
-    """use read LDN.ln"""
-    msg: str = "keep alive"
+    msg: str = "keep alive(read LND.ln)"
 
     async def exchange(self, c: Client) -> result.Ok | result.Error:
         if isinstance(res := await Par2Data(dlms_par.LDN.value).exchange(c), result.Error):
@@ -701,7 +698,7 @@ class GetLDN(SimpleCopy, CDT[octet_string.LDN]):
 @dataclass
 class MatchLDN(OK):
     universal: bool = field(default=False)
-    msg: str = ""
+    msg: str = "matching LDN"
 
     async def exchange(self, c: Client) -> result.Ok | result.Error:
         if isinstance((res := await GetLDN().exchange(c)), result.Error):
@@ -949,7 +946,7 @@ class MapTypeCreator:
 @dataclass
 class InitType(SimpleCopy, Simple[collection.Collection]):
     adapter: Adapter
-    msg: str = ""
+    msg: str = "initiate type"
 
     async def exchange(self, c: Client) -> result.SimpleOrError[collection.Collection]:
         if isinstance((res := await Sequence(
@@ -996,7 +993,7 @@ get_adapter(gag)  # Dummy Adapter
 class ReadAttribute(SimpleCopy, CDT):
     ln: collection.LNContaining
     index: int
-    msg: str = ""
+    msg: str = "read LN attribute"
 
     async def exchange(self, c: Client) -> result.Simple[cdt.CommonDataType]:
         obj = c.objects.get_object(self.ln)
@@ -1007,7 +1004,7 @@ class ReadAttribute(SimpleCopy, CDT):
 class ReadObjAttr(SimpleCopy, CDT):
     obj: collection.InterfaceClass
     index: int
-    msg: str = ""
+    msg: str = "read object attribute"
 
     async def exchange(self, c: Client) -> result.SimpleOrError[cdt.CommonDataType]:
         # TODO: check is_readable?
@@ -1029,7 +1026,7 @@ class ReadObjAttr(SimpleCopy, CDT):
             return result.Error.from_e(e)
 
 
-@dataclass
+@dataclass(frozen=True)
 class Par2Data[T: cdt.CommonDataType](SimpleCopy, CDT[T]):
     """get CommonDataType by Parameter"""
     par: Parameter
@@ -1060,13 +1057,13 @@ def is_empty(value: cdt.CommonDataType | None) -> bool:
     return True if value is None else False
 
 
-@dataclass
+@dataclass(frozen=True)
 class ReadAttributeIf(SimpleCopy, Base):
     """read if func with arg as value is True"""
     ln: collection.LNContaining
     index: int
     func: AttrValueComp
-    msg: str
+    msg: str = "read attribute with condition"
 
     async def exchange(self, c: Client) -> result.Simple[cdt.CommonDataType]:
         # TODO: check is_readable
@@ -1079,7 +1076,7 @@ class ReadAttributeIf(SimpleCopy, Base):
             return result.OK
 
 
-@dataclass
+@dataclass(frozen=True)
 class ReadEmptyAttribute(SimpleCopy, Base):
     ln: collection.LNContaining
     index: int
@@ -1094,7 +1091,7 @@ class ReadEmptyAttribute(SimpleCopy, Base):
         ).exchange(c)
 
 
-@dataclass
+@dataclass(frozen=True)
 class ReadWritableAttributes(SimpleCopy, Base):
     ln: collection.LNContaining
     indexes: tuple[int, ...]
@@ -1120,7 +1117,7 @@ class ReadWritableAttributes(SimpleCopy, Base):
 
 
 # copy past from ReadWritableAttributes
-@dataclass
+@dataclass(frozen=True)
 class ActualizeAttributes(SimpleCopy, OK):
     ln: collection.LNContaining
     indexes: tuple[int, ...]
@@ -1146,7 +1143,7 @@ class ActualizeAttributes(SimpleCopy, OK):
         return result.OK
 
 
-@dataclass
+@dataclass(frozen=True)
 class ReadAttributes(SimpleCopy, _List[cdt.CommonDataType]):
     ln: collection.LNContaining
     indexes: tuple[int, ...]
@@ -1321,7 +1318,7 @@ class Execute2(SimpleCopy, OK):
     """execute method"""
     par: Parameter
     data: cdt.CommonDataType
-    msg: str = ""
+    msg: str = "Execute method"
 
     async def exchange(self, c: Client) -> result.Ok | result.Error:
         if isinstance(res := c.objects.par2obj(self.par), result.Error):
@@ -1365,7 +1362,7 @@ class ImageTransfer(SimpleCopy, StrictOK):
     n_t_b: int = field(init=False, default=0)
     """not transferred block"""
     n_blocks: int = field(init=False)
-    msg: str = ""
+    msg: str = "image transfer"
 
     def __post_init__(self) -> None:
         self.ITI = ImageTransferInitiate((
@@ -1566,7 +1563,7 @@ class ActivateImage(SimpleCopy, OK):
 
 class TestAll(Base):
     """read all attributes with check access"""  # todo: add Write with access
-    msg: str = ""
+    msg: str = "test all"
 
     async def exchange(self, c: Client):
         # todo: refactoring with <append_err>
@@ -1619,7 +1616,7 @@ class TestAll(Base):
 @dataclass
 class ApplyTemplate(Base):
     template: collection.Template
-    msg: str = ""
+    msg: str = "apply template"
 
     async def exchange(self, c: Client) -> result.Result:
         # todo: search col
@@ -1649,7 +1646,7 @@ class ApplyTemplate(Base):
 @dataclass
 class ReadTemplate(OK):
     template: collection.Template
-    msg: str = ""
+    msg: str = "read template"
 
     async def exchange(self, c: Client) -> result.Ok | result.Error:
         # todo: copypast from <ApplyTemplate>
@@ -1680,7 +1677,7 @@ class ReadTemplate(OK):
 class AccessValidate(Base[result.Ok | result.Simple[list[Parameter]]]):
     """check all access rights for current SAP"""
     with_correct: bool = False
-    msg: str = ""
+    msg: str = "all access validate"
 
     # todo: make with result.Error
     async def exchange(self, c: Client) -> result.Ok | result.Simple[list[Parameter]] | result.Error:
@@ -1746,7 +1743,7 @@ class WriteList(SimpleCopy, _List[result.Ok]):
     par_datas: tuple[tuple[Parameter, cdt.CommonDataType], ...]
     err_ignore: bool
 
-    def __init__(self, *par_datas: tuple[Parameter, cdt.CommonDataType], err_ignore: bool = False, msg: str = "") -> None:
+    def __init__(self, *par_datas: tuple[Parameter, cdt.CommonDataType], err_ignore: bool = False, msg: str = "write list") -> None:
         self.par_datas = par_datas
         self.err_ignore = err_ignore
         self.msg = msg
@@ -1768,12 +1765,12 @@ class WriteTranscript(SimpleCopy, OK):
     """write by ParValues[Transcript]"""
     par: Parameter
     value: cdt.Transcript
-    msg: str = ""
+    msg: str = "write with transcript"
 
     async def exchange(self, c: Client) -> result.Ok | result.Error:
         if isinstance((res := await Par2Data[cdt.CommonDataType](self.par).exchange(c)), result.Error):
             return res
-        if isinstance(data, cdt.Digital):
+        if isinstance(res.value, cdt.Digital):
             s_u = c.objects.par2su(self.par)
             if isinstance(s_u, cdt.ScalUnitType):
                 if not isinstance(self.value, str):
@@ -1794,7 +1791,7 @@ class WriteTranscripts(SimpleCopy, _List[result.Ok]):
     par_values: tuple[tuple[Parameter, cdt.Transcript], ...]
     err_ignore: bool
 
-    def __init__(self, *par_values: tuple[Parameter, cdt.Transcript], err_ignore: bool = False, msg: str =""):
+    def __init__(self, *par_values: tuple[Parameter, cdt.Transcript], err_ignore: bool = False, msg: str ="write transcripts"):
         self.par_values = par_values
         self.err_ignore = err_ignore
         self.msg = msg

{dlms_spodes_client-0.19.11.dist-info → dlms_spodes_client-0.19.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES_client
-Version: 0.19.11
+Version: 0.19.13
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/SPODESclient_prj
@@ -15,7 +15,7 @@ Requires-Dist: pycryptodomex>=3.22.0
 Requires-Dist: semver>=3.0
 Requires-Dist: StructResult<0.10,>=0.9.2
 Requires-Dist: DLMS-SPODES-communications<1.5,>=1.4.9
-Requires-Dist: DLMS_SPODES<0.88,>=0.87.6
+Requires-Dist: DLMS_SPODES<0.88,>=0.87.7
 Requires-Dist: DLMSadapter<0.8,>=0.7.5
 Requires-Dist: DLMSCommunicationProfile<0.2,>=0.1.11
 Requires-Dist: numpy>=2.3.2

{dlms_spodes_client-0.19.11.dist-info → dlms_spodes_client-0.19.13.dist-info}/RECORD

@@ -1,12 +1,12 @@
 DLMS_SPODES_client/FCS16.py,sha256=RhoN4fX7eesKWfWCkRT_uWNfiQHqFd3T6lRwxfamUqw,2697
 DLMS_SPODES_client/__init__.py,sha256=6wphXvqkodng7h4nKNmkfldbaxf--IDVGfT0yNbas-o,449
-DLMS_SPODES_client/client.py,sha256=Dqe2gMTp4x_sAurInpOujFNBxrSRi35HfHgW6oS6148,112189
+DLMS_SPODES_client/client.py,sha256=WuWg9OW3uRMQ4EtcWPEqUuG9QQLjNyL-JR2gZSTUifo,112222
 DLMS_SPODES_client/logger.py,sha256=zAbihLloMU99w8Sw3djQ0cwItzyGq0Fz8DI9_suazv4,1913
 DLMS_SPODES_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DLMS_SPODES_client/services.py,sha256=xM_-h322V1bGBcw9cJh7XOSUMTL3_E-GX89-z3YwIYw,3909
 DLMS_SPODES_client/session.py,sha256=1sa4wJny2xwDqL3DXpfYTS7mZcabVdC5fW1H60VB5QA,12681
 DLMS_SPODES_client/settings.py,sha256=6mitGe9UYeEgL61sf933MJ-S5N-ReoxvXqiI3agBGYE,1623
-DLMS_SPODES_client/task.py,sha256=MSXIMnvAhO4GPBhB9eh12AIWINYxdM9VhASg3Mpmy9s,76093
+DLMS_SPODES_client/task.py,sha256=xgiEk7Fu3pp24rgVcRQ_R2asK9rZwA0KhtZXfvZYi6Q,76509
 DLMS_SPODES_client/gurux_common/enums/TraceLevel.py,sha256=Ne0Rn3c9ACqQjmde_ksbiQxIUv6nXsPQRnhkGwIv3QI,521
 DLMS_SPODES_client/gurux_common/enums/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DLMS_SPODES_client/gurux_dlms/AesGcmParameter.py,sha256=HJt0uvxtkqKEkvfiqXTMNsiayN15AgPJa9_iMSSFZsQ,1429
@@ -54,8 +54,8 @@ DLMS_SPODES_client/gurux_dlms/enums/Task.py,sha256=chuOL6-IMxBvABUZtoFcaYaQQB4GZ
 DLMS_SPODES_client/gurux_dlms/enums/VdeStateError.py,sha256=qT87LMbIYEs3TYPIp3N-dR2Tcg9KhKyiELwhVl5U-tw,233
 DLMS_SPODES_client/gurux_dlms/enums/__init__.py,sha256=F_sgGwNmmdpbKvP1klJQUNiLXxU2BtZ-LgEI9e6xP8g,1314
 DLMS_SPODES_client/gurux_dlms/internal/_GXCommon.py,sha256=7D9EYcfiZxwbk8sfpHv7s2nYqrbmGf-Tbwv2T-gqmgk,53226
-dlms_spodes_client-0.19.11.dist-info/METADATA,sha256=WNXbO-vb3vSfL9nYm9kEFyTr1xPWa8aTVfNkAe25s6I,986
-dlms_spodes_client-0.19.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dlms_spodes_client-0.19.11.dist-info/entry_points.txt,sha256=Z6UTeQjjCf2k1Y3Bjs0s7yr-UYSWb-TvJMuG2K2MApw,70
-dlms_spodes_client-0.19.11.dist-info/top_level.txt,sha256=rh_3Uig5bc6J_lKni01btol7dX_IgIJulNtGjGehmBE,19
-dlms_spodes_client-0.19.11.dist-info/RECORD,,
+dlms_spodes_client-0.19.13.dist-info/METADATA,sha256=T6U2znlwbvDl53LDxlksEmmOXJKGett3mwG5QeR08UI,986
+dlms_spodes_client-0.19.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dlms_spodes_client-0.19.13.dist-info/entry_points.txt,sha256=Z6UTeQjjCf2k1Y3Bjs0s7yr-UYSWb-TvJMuG2K2MApw,70
+dlms_spodes_client-0.19.13.dist-info/top_level.txt,sha256=rh_3Uig5bc6J_lKni01btol7dX_IgIJulNtGjGehmBE,19
+dlms_spodes_client-0.19.13.dist-info/RECORD,,