DLMS-SPODES-client 0.19.27__tar.gz → 0.19.29__tar.gz

dlms_spodes_client-0.19.29/.vscode/launch.json

@@ -0,0 +1,24 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug test_SetBits",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "-m",
+            "args": [
+                "unittest",
+                "test.test_Client.TestType.test_Session",
+                "-v"
+            ],
+            "console": "integratedTerminal",
+            "justMyCode": false,
+            "env": {
+                "PYTHONPATH": "${workspaceFolder}"
+            }
+        },
+    ]
+}

{dlms_spodes_client-0.19.27 → dlms_spodes_client-0.19.29}/PKG-INFO

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

{dlms_spodes_client-0.19.27 → dlms_spodes_client-0.19.29}/pyproject.toml

@@ -15,7 +15,7 @@ exclude = ["Types"]
 
 [project]
 name = "DLMS_SPODES_client"
-version = "0.19.27"
+version = "0.19.29"
 requires-python = ">= 3.12"
 authors = [
     {name="Serj Kotilevski", email="youserj@outlook.com"}

dlms_spodes_client-0.19.29/src/DLMS_SPODES_client/services.py

@@ -0,0 +1,90 @@
+from .client import Client, Network, IDFactory, c_pf
+import csv
+from itertools import count
+from .settings import settings
+
+
+_h: dict[str, [str]] = dict(settings.from_csv.header_names)
+"""header names"""
+
+
+class IpAddress:
+    __value: list[int]
+
+    def __init__(self, value: str = "127.0.0.1"):
+        self.__value = list()
+        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")
+            else:
+                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)}")
+
+    @classmethod
+    def is_valid(cls, value: str) -> bool:
+        try:
+            cls(value)
+            return True
+        except ValueError:
+            return False
+
+    def __str__(self):
+        return ".".join(map(str, self.__value))
+
+
+def get_client_from_csv(
+        file_name: str,
+        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:
+        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
+            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-0.19.27 → dlms_spodes_client-0.19.29}/src/DLMS_SPODES_client/task.py

@@ -1240,6 +1240,43 @@ class Write2(SimpleCopy, OK):
         return result.OK
 
 
+@dataclass(frozen=True)
+class SetBits(SimpleCopy, OK):
+    """set bits by pattern"""
+    par: Parameter
+    pattern: dict[int, int]
+    msg: str = "set bits"
+
+    async def exchange(self, c: Client) -> result.Ok | result.Error:
+        if isinstance(res_obj := c.objects.par2obj(self.par), result.Error):
+            return res_obj
+        if isinstance(res_read := await Par2Data[cdt.Digital | cdt.BitString](self.par.attr).exchange(c), result.Error):
+            return res_read
+        data = res_read.value
+        for el in self.par.elements():
+            data = data[el]
+        if isinstance(data, cdt.Digital):
+            data_int = int(data)
+            for pos, val in self.pattern.items():
+                data_int = (data_int | (1 << pos)) if val else (data_int & ~(1 << pos))
+            data.set(data_int)
+        elif isinstance(data, cdt.BitString):
+            for pos, val in self.pattern.items():
+                try:
+                    data[pos] = val
+                except IndexError as e:
+                    return result.Error.from_e(ValueError(f"can't set bit {pos} in {self.par}"))
+        else:
+            return result.Error.from_e(TypeError(f"{self.par} not available SetBits"))
+        c.get_set_request_normal(
+            obj=res_obj.value,
+            attr_index=self.par.i,
+            value=res_read.value.encoding)
+        if isinstance(res_pdu := await c.read_data_block(), result.Error):
+            return res_pdu
+        return result.OK
+
+
 @dataclass
 @deprecated("use <WriteTranscript>")
 class WriteParValue(SimpleCopy, OK):

{dlms_spodes_client-0.19.27 → dlms_spodes_client-0.19.29}/src/DLMS_SPODES_client.egg-info/PKG-INFO

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

{dlms_spodes_client-0.19.27 → dlms_spodes_client-0.19.29}/src/DLMS_SPODES_client.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@
 README.md
 pyproject.toml
 .github/workflows/publish.yaml
+.vscode/launch.json
 src/DLMS_SPODES_client/FCS16.py
 src/DLMS_SPODES_client/__init__.py
 src/DLMS_SPODES_client/client.py
@@ -64,6 +65,7 @@ src/DLMS_SPODES_client/gurux_dlms/enums/Task.py
 src/DLMS_SPODES_client/gurux_dlms/enums/VdeStateError.py
 src/DLMS_SPODES_client/gurux_dlms/enums/__init__.py
 src/DLMS_SPODES_client/gurux_dlms/internal/_GXCommon.py
+test/__init__.py
 test/client_log.txt
 test/config.toml
 test/name2.csv

{dlms_spodes_client-0.19.27 → dlms_spodes_client-0.19.29}/test/test_Client.py

@@ -20,8 +20,8 @@ from src.DLMS_SPODES_client import task
 task.get_adapter(adapter := xml50)
 
 
-port1 = "COM6"
-port2 = "COM5"
+port1 = "COM5"
+port2 = "COM6"
 # mac = "A0:6C:65:53:7D:86"
 mac = "5C:53:10:5A:E2:4B"
 
@@ -132,6 +132,16 @@ class TestType(unittest.TestCase):
         ))
         print(sess)
 
+    def test_SetBits(self):
+        self.start_coro(sess := Session(
+            c=c_Serial_HIGH,
+            tsk=task.SetBits(
+                par=Parameter.parse("0.0.96.3.20.255:3").append(0),
+                pattern={1: 1, 0: 0}
+            )
+        ))
+        print(sess)
+
     def test_WriteTime(self):
         self.start_coro(sess := Session(
             c=c_Serial_HIGH,

dlms_spodes_client-0.19.27/src/DLMS_SPODES_client/services.py

@@ -1,97 +0,0 @@
-from .client import Client, Network, IDFactory, c_pf
-import csv
-from itertools import count
-from .settings import settings
-
-
-_h: dict[str, [str]] = dict(settings.from_csv.header_names)
-"""header names"""
-
-
-class IpAddress:
-    __value: list[int]
-
-    def __init__(self, value: str = '127.0.0.1'):
-        self.__value = list()
-        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')
-            else:
-                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)}')
-
-    @classmethod
-    def is_valid(cls, value: str) -> bool:
-        try:
-            cls(value)
-            return True
-        except ValueError:
-            return False
-
-    def __str__(self):
-        return '.'.join(map(str, self.__value))
-
-
-def get_client_from_csv(
-        file_name: str,
-        id_factory: IDFactory = None,
-        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))
-        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