DLMS-SPODES-client 0.19.4__tar.gz → 0.19.6__tar.gz

{dlms_spodes_client-0.19.4/src/DLMS_SPODES_client.egg-info → dlms_spodes_client-0.19.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES_client
-Version: 0.19.4
+Version: 0.19.6
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/SPODESclient_prj
@@ -13,7 +13,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: pydantic>=2.11
 Requires-Dist: pycryptodomex>=3.22.0
 Requires-Dist: semver>=3.0
-Requires-Dist: StructResult<0.9,>=0.8.10
+Requires-Dist: StructResult<0.10,>=0.9.1
 Requires-Dist: DLMS-SPODES-communications<1.5,>=1.4.9
 Requires-Dist: DLMS_SPODES<0.88,>=0.87.6
 Requires-Dist: DLMSadapter<0.8,>=0.7.5

{dlms_spodes_client-0.19.4 → dlms_spodes_client-0.19.6}/pyproject.toml

@@ -15,7 +15,7 @@ exclude = ["Types"]
 
 [project]
 name = "DLMS_SPODES_client"
-version = "0.19.4"
+version = "0.19.6"
 requires-python = ">= 3.12"
 authors = [
     {name="Serj Kotilevski", email="youserj@outlook.com"}
@@ -24,7 +24,7 @@ dependencies = [
     "pydantic>=2.11",
     "pycryptodomex >= 3.22.0",
     "semver >= 3.0",
-    "StructResult >= 0.8.10, <0.9",
+    "StructResult >= 0.9.1, <0.10",
     "DLMS-SPODES-communications >= 1.4.9, <1.5",
     "DLMS_SPODES >= 0.87.6, < 0.88",
     "DLMSadapter >= 0.7.5, < 0.8",

{dlms_spodes_client-0.19.4 → dlms_spodes_client-0.19.6}/src/DLMS_SPODES_client/client.py

@@ -970,7 +970,7 @@ class Client:
     def set_params(self, field: str, value: str):
         self.__dict__[field] = eval(value)
 
-    async def close(self):
+    async def close(self) -> None:
         """close , media is open"""
         self.log(logL.DEB, "close")
         if self.level > OSI.DATA_LINK:

{dlms_spodes_client-0.19.4 → dlms_spodes_client-0.19.6}/src/DLMS_SPODES_client/task.py

@@ -5,7 +5,7 @@ import re
 from typing_extensions import deprecated
 import hashlib
 from dataclasses import dataclass, field
-from typing import Callable, Any, Optional, Protocol, cast, override, Self, Final
+from typing import Callable, Any, Optional, Protocol, cast, override, Self, Final, Iterable, TypeVarTuple
 from itertools import count
 import datetime
 import time
@@ -35,7 +35,8 @@ from DLMS_SPODES.firmwares import get_firmware
 from DLMS_SPODES.cosem_interface_classes.image_transfer import image_transfer_status as i_t_status
 from DLMSAdapter.main import AdapterException, Adapter, gag
 from DLMSCommunicationProfile.osi import OSI
-from .client import Client, logL, Security, Data, mechanism_id, AcseServiceUser, State
+from .logger import LogLevel as logL
+from .client import Client, Security, Data, mechanism_id, AcseServiceUser, State
 
 
 firm_id_pat = re.compile(b".*(?P<fid>PWRM_M2M_[^_]{1,10}_[^_]{1,10}).+")
@@ -56,7 +57,7 @@ class Base[T: result.Result](Protocol):
     def copy(self) -> Self: ...
 
     @property
-    def current(self) -> 'Base[T]':
+    def current(self) -> 'Base[T] | Self':
         return self
 
     async def run(self, c: Client) -> T | result.Error:
@@ -137,14 +138,14 @@ class Base[T: result.Result](Protocol):
         # todo: make tile
         return await self.application(c)
 
-    async def AA(self, c: Client):
+    async def AA(self, c: Client) -> None:
         """Application Associate"""
         if c.invocationCounter and c.settings.cipher is not None and c.settings.cipher.security != Security.NONE:
             # create IC object. TODO: remove it after close connection, maybe???
             c.settings.proposedConformance |= Conformance.GENERAL_PROTECTION
 
             # my block
-            IC: Data = c._objects.add_if_missing(ut.CosemClassId(1),
+            IC: Data = c.objects.add_if_missing(ut.CosemClassId(1),
                                                  logical_name=cst.LogicalName(bytearray((0, c.get_channel_index(), 43, 1,
                                                                                         c.current_association.security_setup_reference.e, 255))),
                                                  version=cdt.Unsigned(0))
@@ -268,12 +269,18 @@ class CDT[T: cdt.CommonDataType](Simple[T], Protocol):
     async def exchange(self, c: Client) -> result.SimpleOrError[T]: ...
 
 
-class List[T](Base[result.List[T]], Protocol):
+class _List[T](Base[result.List[T]], Protocol):
     """With List result"""
     @override
     async def exchange(self, c: Client) -> result.List[T] | result.Error: ...
 
 
+class _Sequence[*Ts](Base[result.Sequence[*Ts]], Protocol):
+    """With List result"""
+    @override
+    async def exchange(self, c: Client) -> result.Sequence[*Ts] | result.Error: ...
+
+
 class OK(Base[result.Ok], Protocol):
     """Always result OK"""
 
@@ -289,12 +296,12 @@ class StrictOK(Base[result.StrictOk], Protocol):
 
 
 @dataclass
-class ClientBlocking(SimpleCopy, Base):
+class ClientBlocking(SimpleCopy, OK):
     """complete by time or abort"""
     delay: Final[float] = field(default=99999999.0)
     msg: str = ""
 
-    async def run(self, c: Client) -> result.Ok:
+    async def run(self, c: Client) -> result.Ok | result.Error:
         try:
             c.level = OSI.APPLICATION
             c.log(logL.WARN, F"blocked for {self.delay} second")
@@ -302,8 +309,9 @@ class ClientBlocking(SimpleCopy, Base):
             return result.OK
         finally:
             c.level = OSI.NONE
+        return result.OK
 
-    async def exchange(self, c: Client) -> result.Result:
+    async def exchange(self, c: Client) -> result.Ok | result.Error:
         raise RuntimeError(f"not support for {self.__class__.__name__}")
 
 
@@ -432,7 +440,7 @@ class Scheduler[T: result.Result](Base[T]):
     repetition_delay_max: Final[int] = 100
     msg: str = ""
 
-    def copy(self) -> Self:
+    def copy(self) -> "Scheduler[T]":
         return Scheduler(
             task=self.task.copy(),
             execution_datetime=self.execution_datetime,
@@ -479,37 +487,37 @@ class Scheduler[T: result.Result](Base[T]):
 @dataclass
 class Subtasks[U: Base[result.Result]](Protocol):
     """for register longer other tasks into task"""
-    tasks: list[U]
+    tasks: Iterable[U]
 
     @property
     def current(self) -> U | Self: ...
 
 
-class Sequence[T: result.Result, U: Base[result.Result]](Subtasks[U], List[T]):
+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
     __current: Base[T]
 
-    def __init__(self, *tasks: Base[T], msg: str = None, err_ignore: bool = True):
+    def __init__(self, *tasks: Base[T], msg: str = "", err_ignore: bool = True):
         self.tasks = list(tasks)
         self.__current = self
         self.__is_exchange = False
-        self.msg = self.msg = self.__class__.__name__ if msg == "" else msg
+        self.msg = self.__class__.__name__ if msg == "" else msg
         self.err_ignore = err_ignore
 
     def copy(self) -> Self:
         if all((isinstance(t, SimpleCopy) for t in self.tasks)):
             return self
-        return Sequence(
+        return List(
             *(t.copy() for t in self.tasks),
             msg=self.msg,
             err_ignore=self.err_ignore
         )
 
     @property
-    def current(self) -> 'Base[T]':
+    def current(self) -> 'Base[T] | Self':
         return self.__current
 
     def append(self, task: Base[T]):
@@ -535,6 +543,48 @@ class Sequence[T: result.Result, U: Base[result.Result]](Subtasks[U], List[T]):
         return res
 
 
+class Sequence[*Ts](Subtasks[Base[result.Result]], _Sequence[*Ts]):
+    """for exchange task sequence"""
+    msg: str
+    err_ignore: bool
+    __current: "Base[result.Result] | Sequence[*Ts]"
+    tasks: tuple[Base[result.Result], ...]
+
+    def __init__(self, *tasks: Base[result.Result], msg: str = "", err_ignore: bool = False):
+        self.tasks = tasks
+        self.__current = self
+        self.msg = self.__class__.__name__ if msg == "" else msg
+        self.err_ignore = err_ignore
+
+    def copy(self) -> "Sequence[*Ts]":
+        if all((isinstance(t, SimpleCopy) for t in self.tasks)):
+            return self
+        return Sequence(
+            *(t.copy() for t in self.tasks),
+            msg=self.msg,
+            err_ignore=self.err_ignore
+        )
+
+    @property
+    def current(self) -> Base[result.Result] | Self:
+        return self.__current
+
+    async def exchange(self, c: Client) -> result.Sequence[*Ts] | result.Error:
+        res = result.Sequence()
+        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
+                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))
+        return cast("result.Sequence[*Ts]", res)
+
+
 class SetLocalTime(SimpleCopy, OK):
     """without decide time transfer"""
     msg: str
@@ -907,7 +957,6 @@ class InitType(SimpleCopy, Simple[collection.Collection]):
             FindFirmwareId(),
             FindFirmwareVersion(),
             msg="get collection.ID",
-            err_ignore=False
         ).exchange(c)), result.Error):
             return res.with_msg("init type")
         ldn, f_id, f_ver = res.value
@@ -996,7 +1045,7 @@ class Par2Data[T: cdt.CommonDataType](SimpleCopy, CDT):
         return res
 
 
-class ReadSequence(Sequence):
+class ReadSequence(List):
     tasks: list[ReadAttribute]
 
     def __post_init__(self):
@@ -1098,7 +1147,7 @@ class ActualizeAttributes(SimpleCopy, OK):
 
 
 @dataclass
-class ReadAttributes(SimpleCopy, List[cdt.CommonDataType]):
+class ReadAttributes(SimpleCopy, _List[cdt.CommonDataType]):
     ln: collection.LNContaining
     indexes: tuple[int, ...]
     msg: str = ""
@@ -1645,7 +1694,7 @@ class AccessValidate(Base[result.Ok | result.Simple[list[Parameter]]]):
 
 
 @dataclass
-class WriteParDatas(SimpleCopy, List[result.Ok]):
+class WriteParDatas(SimpleCopy, _List[result.Ok]):
     """write by ParData list"""
     par_datas: list[ParData]
     msg: str = ""
@@ -1664,34 +1713,39 @@ class WriteParDatas(SimpleCopy, List[result.Ok]):
 @dataclass
 class WriteParTranscript(SimpleCopy, OK):
     """write by ParValues[Transcript]"""
-    par_value: ParValues[cdt.Transcript]
+    par: Parameter
+    value: cdt.Transcript
     msg: str = ""
 
     async def exchange(self, c: Client) -> result.Ok | result.Error:
-        par, value = self.par_value
-        if isinstance((res := await Par2Data(par).exchange(c)), result.Error):
+        if isinstance((res := await Par2Data(self.par).exchange(c)), result.Error):
             return res
         data = copy(res.value)
         if isinstance(data, cdt.Digital):
-            s_u = c.objects.par2su(par)
+            s_u = c.objects.par2su(self.par)
             if isinstance(s_u, cdt.ScalUnitType):
-                value = int(float(value) * 10 ** -int(s_u.scaler))
-        data.set(value)
+                value = int(float(self.value) * 10 ** -int(s_u.scaler))
+        data.set(self.value)
         return await WriteAttribute(
-            ln=self.par_value.par.obis,
-            index=self.par_value.par.i,
+            ln=self.par.obis,
+            index=self.par.i,
             value=data.encoding
         ).exchange(c)
 
 
+Ts = TypeVarTuple("Ts")
+
+
 @dataclass
-class WriteParTranscripts(SimpleCopy, Base):
+class WriteParTranscripts(SimpleCopy, Sequence[*Ts]):
     """write by ParValues[Transcript] list"""
-    par_values: Final[list[ParValues[cdt.Transcript]]]
+    par_values: list[ParValues[cdt.Transcript]]
     msg: str = ""
 
-    async def exchange(self, c: Client) -> result.List:
-        res = result.List()
+    async def exchange(self, c: Client) -> result.Sequence[*Ts] | result.Error:
+        res = result.Sequence()
         for par_value in self.par_values:
-            WriteParTranscript(par_value)
+            if isinstance(res_one := await WriteParTranscript(*par_value).exchange(c), result.Error):
+                return res_one
+            res = res.add(res_one)
         return res

{dlms_spodes_client-0.19.4 → dlms_spodes_client-0.19.6/src/DLMS_SPODES_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES_client
-Version: 0.19.4
+Version: 0.19.6
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/SPODESclient_prj
@@ -13,7 +13,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: pydantic>=2.11
 Requires-Dist: pycryptodomex>=3.22.0
 Requires-Dist: semver>=3.0
-Requires-Dist: StructResult<0.9,>=0.8.10
+Requires-Dist: StructResult<0.10,>=0.9.1
 Requires-Dist: DLMS-SPODES-communications<1.5,>=1.4.9
 Requires-Dist: DLMS_SPODES<0.88,>=0.87.6
 Requires-Dist: DLMSadapter<0.8,>=0.7.5

{dlms_spodes_client-0.19.4 → dlms_spodes_client-0.19.6}/src/DLMS_SPODES_client.egg-info/requires.txt

@@ -1,7 +1,7 @@
 pydantic>=2.11
 pycryptodomex>=3.22.0
 semver>=3.0
-StructResult<0.9,>=0.8.10
+StructResult<0.10,>=0.9.1
 DLMS-SPODES-communications<1.5,>=1.4.9
 DLMS_SPODES<0.88,>=0.87.6
 DLMSadapter<0.8,>=0.7.5