DLMS-SPODES-client 0.19.25__py3-none-any.whl → 0.19.28__py3-none-any.whl

DLMS_SPODES_client/client.py

@@ -338,7 +338,7 @@ class Client:
         # TODO: make return pdu
         if reply.command is None:
             if reply.data.size - reply.data.position == 0:
-                return result.Error(ValueError("Invalid PDU"), "getpdu")
+                return result.Error.from_e(ValueError("Invalid PDU"), "getpdu")
             index = reply.data.position
             reply.command = XDLMSAPDU(reply.data.getUInt8())
             match reply.command:
@@ -444,7 +444,7 @@ class Client:
                         case pdu.ActionResponse.NORMAL:
                             reply.error = pdu.ActionResult(reply.data.getUInt8())
                             if reply.error != 0:
-                                return result.Error(exc.ResultError(reply.error), "get pdu")
+                                return result.Error.from_e(exc.ResultError(reply.error), "get pdu")
                             if reply.data.position < reply.data.size:
                                 ret = reply.data.getUInt8()
                                 if ret == 0:
@@ -780,7 +780,10 @@ class Client:
                     return result.Error.from_e(exc.NoObject(), "read data block")
                 case _:
                     return result.Error.from_e(GXDLMSException(reply.error), "read data block")
-            if self.received_frames[-1].control.is_info() or self.received_frames[-1].control == frame.Control.UI_PF:
+            if (
+                self.received_frames[-1].control.is_info() 
+                or self.received_frames[-1].control == frame.Control.UI_PF
+            ):
                 if self.received_frames[-1].is_segmentation:
                     """pass handle frame. wait all information"""
                 else:

DLMS_SPODES_client/services.py

@@ -11,19 +11,19 @@ _h: dict[str, [str]] = dict(settings.from_csv.header_names)
 class IpAddress:
     __value: list[int]
 
-    def __init__(self, value: str = '127.0.0.1'):
+    def __init__(self, value: str = "127.0.0.1"):
         self.__value = list()
-        for el1 in value.split('.'):
+        for el1 in value.split("."):
             if el1.isdigit():
                 el = int(el1)
                 if 0 <= el <= 255:
                     self.__value.append(el)
                 else:
-                    raise ValueError(F'Wrong digit in value: {el}, must be 0..255')
+                    raise ValueError(F"Wrong digit in value: {el}, must be 0..255")
             else:
-                raise ValueError(F'Value is not digit: {el1}')
+                raise ValueError(F"Value is not digit: {el1}")
         if len(self.__value) != 4:
-            raise ValueError(F'Length of Ip address {value} must be 4, got {len(self.__value)}')
+            raise ValueError(F"Length of Ip address {value} must be 4, got {len(self.__value)}")
 
     @classmethod
     def is_valid(cls, value: str) -> bool:
@@ -34,64 +34,57 @@ class IpAddress:
             return False
 
     def __str__(self):
-        return '.'.join(map(str, self.__value))
+        return ".".join(map(str, self.__value))
 
 
 def get_client_from_csv(
         file_name: str,
-        id_factory: IDFactory = None,
+        id_factory: IDFactory,
         universal: bool = False
 ) -> list[Client]:
     """file in utf-8 format"""
     da: str
-    with open(file_name, 'r', encoding="utf-8-sig") as csv_file:
-        sniffer = csv.Sniffer()
-        dialect = sniffer.sniff(csv_file.readline(1024))
+    with open(file_name, "r", encoding="utf-8-sig") as csv_file:
+        dialect = csv.Sniffer().sniff(csv_file.readline(1024))
         csv_file.seek(0)
         reader = csv.reader(csv_file, dialect=dialect)
         first_row: list[str] = next(reader)
         if any(map(IpAddress.is_valid, first_row)):  # search ip_address in first row
-            # header is absence
-            raise ValueError('Не найден заголовок таблицы')
-        else:  # header is exist
-            # search column by name
-            column_name_count = count()
-            field_names: list[str] = list()
-            for index, cell in enumerate(first_row):
-                for column in _h:
-                    if any(map(cell.lower().startswith, _h[column])):
-                        field_names.append(_h[column][0])
-                        break
-                else:
-                    field_names.append(F'unknown{next(column_name_count)}')
-            if all(map(lambda name: name in field_names, ('ip',))):
-                csv_file.seek(0)
-                reader = csv.DictReader(csv_file, fieldnames=field_names, dialect=dialect)
-                next(reader)
-                res: list[Client] = list()
-                for i in reader:
-                    if IpAddress.is_valid(i['ip']):
-                        res.append(c := Client(
-                            media=Network(
-                                host=i.get("ip", "127.0.0.1"),
-                                port="8888"
-                            ),
-                            id_=id_factory.create() if id_factory else None,
-                            universal=universal
-                        ))
-                        c.com_profile.parameters.inactivity_time_out = int(i.get("timeout", 120))  # todo: work only for HDLC, make better
-                        c.secret = bytes(i.get('secret', '0000000000000000'), 'utf-8')
-                        if m_id := i.get('m_id'):
-                            c.m_id.set(m_id)
-                        if port := i.get('port'):
-                            c.media.port = port
-                        if sap := i.get('sap'):
-                            c.SAP.set(sap)
-                        if (
-                            (da := i.get('da'))
-                            and da.isdigit()
-                        ):
-                            c.com_profile.parameters.device_address = int(da)
-                        if name := i.get("name"):
-                            c.name = name
-                return res
+            raise ValueError("Table header not found")
+        # header is exist search column by name
+        field_names: list[str] = []
+        for index, cell in enumerate(first_row):
+            for column in _h:
+                if any(map(cell.lower().startswith, _h[column])):
+                    field_names.append(_h[column][0])
+                    break
+            else:
+                field_names.append(F"unknown{index}")
+        if all(map(lambda name: name in field_names, ("ip",))):
+            csv_file.seek(0)
+            reader = csv.DictReader(csv_file, fieldnames=field_names, dialect=dialect)
+            next(reader)  # skeep header
+            res: list[Client] = []
+            for i in reader:
+                if IpAddress.is_valid(i["ip"]):
+                    res.append(c := Client(
+                        media=Network(
+                            host=i.get("ip") or "127.0.0.1",
+                            port=i.get("port") or "8888",
+                            to_recv=float(i.get("timeout") or 120.0)
+                        ),
+                        SAP=int(i.get("sap") or 0x30),
+                        secret=bytes(i.get("secret", "0000000000000000"), "utf-8"),
+                        m_id=int(i.get("m_id") or 2),
+                        id_=id_factory.create(),
+                        universal=universal
+                    ))
+                    if (
+                        (da := i.get("da"))
+                        and da.isdigit()
+                    ):
+                        c.com_profile.parameters.device_address = int(da)
+                    if name := i.get("name"):
+                        c.name = name
+            return res
+        raise ValueError("not find at least one client")

DLMS_SPODES_client/task.py

@@ -104,7 +104,7 @@ class Base[T: result.Result](Protocol):
             return res_terminate
         return ret
 
-    async def DL_connect(self, c: Client) -> None:
+    async def DL_connect(self, c: Client) -> result.Ok | result.Error:
         """Data link Layer connect"""
         c.send_frames.clear()
         # calculate addresses  todo: move to c.com_profile(HDLC)
@@ -128,10 +128,12 @@ class Base[T: result.Result](Protocol):
         if isinstance(res_pdu := await c.read_data_block(), result.Error):
             return res_pdu
         c.level |= OSI.DATA_LINK
+        return result.OK
 
     async def data_link(self, c: Client) -> T | result.Error:
         if OSI.DATA_LINK not in c.level:
-            await self.DL_connect(c)
+            if isinstance(res_conn := await self.DL_connect(c), result.Error):
+                return res_conn
         # todo: make tile
         return await self.application(c)
 
@@ -212,7 +214,11 @@ class Base[T: result.Result](Protocol):
         if isinstance(res_pdu := await c.read_data_block(), result.Error):
             return res_pdu
         # await c.read_attr(ut.CosemAttributeDescriptor((collection.ClassID.ASSOCIATION_LN, ut.CosemObjectInstanceId("0.0.40.0.0.255"), ut.CosemObjectAttributeId(6)))) # for test only
-        match c.parseAareResponse(res_pdu.value):
+        try:
+            parse = c.parseAareResponse(res_pdu.value)
+        except IndexError as e:
+            print(e)
+        match parse:
             case AcseServiceUser.NULL:
                 c.log(logL.INFO, "Authentication success")
                 c.level |= OSI.APPLICATION

{dlms_spodes_client-0.19.25.dist-info → dlms_spodes_client-0.19.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES_client
-Version: 0.19.25
+Version: 0.19.28
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/SPODESclient_prj

{dlms_spodes_client-0.19.25.dist-info → dlms_spodes_client-0.19.28.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=pRkFriDGu2DKZQDDNWmNaYXTRvPeWWIcITjfHwYx3CE,112082
+DLMS_SPODES_client/client.py,sha256=HnsbECdBGzrlyT0RzNGweIBms5LKRNP4uUMSmaMEPIA,112148
 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/services.py,sha256=g2Rv2j7mlIcNpnqxRZrKgSpy7k6pnaJHAkZ3JJUhK3s,3418
 DLMS_SPODES_client/session.py,sha256=nPzXujpmGSTFFvhyZRjgH_RLX1DS9moRddUEZuf-QEE,12760
 DLMS_SPODES_client/settings.py,sha256=6mitGe9UYeEgL61sf933MJ-S5N-ReoxvXqiI3agBGYE,1623
-DLMS_SPODES_client/task.py,sha256=wW6sjKKR31dc1FNKFptGTcob3mBRAVaOVa1h6tUWp10,78083
+DLMS_SPODES_client/task.py,sha256=hylTkESBK3J8xVksmLGGhdGiI0tYNnkqShThZioaGN0,78300
 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.25.dist-info/METADATA,sha256=bn_R-U_lc1TyTuOOGkNrUZFYRc6oDiEcYF7IZgISCl0,1062
-dlms_spodes_client-0.19.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dlms_spodes_client-0.19.25.dist-info/entry_points.txt,sha256=Z6UTeQjjCf2k1Y3Bjs0s7yr-UYSWb-TvJMuG2K2MApw,70
-dlms_spodes_client-0.19.25.dist-info/top_level.txt,sha256=rh_3Uig5bc6J_lKni01btol7dX_IgIJulNtGjGehmBE,19
-dlms_spodes_client-0.19.25.dist-info/RECORD,,
+dlms_spodes_client-0.19.28.dist-info/METADATA,sha256=l2Fgx6uY4RUQlFP0zdS6UfHJFc_6sfFbdRJCama8LHQ,1062
+dlms_spodes_client-0.19.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dlms_spodes_client-0.19.28.dist-info/entry_points.txt,sha256=Z6UTeQjjCf2k1Y3Bjs0s7yr-UYSWb-TvJMuG2K2MApw,70
+dlms_spodes_client-0.19.28.dist-info/top_level.txt,sha256=rh_3Uig5bc6J_lKni01btol7dX_IgIJulNtGjGehmBE,19
+dlms_spodes_client-0.19.28.dist-info/RECORD,,