DLMS-SPODES 0.87.0__tar.gz → 0.87.2__tar.gz

{dlms_spodes-0.87.0 → dlms_spodes-0.87.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES
-Version: 0.87.0
+Version: 0.87.2
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/DlmsSPODES-project

{dlms_spodes-0.87.0 → dlms_spodes-0.87.2}/pyproject.toml

@@ -14,7 +14,7 @@ exclude = ["test","KPZ"]
 
 [project]
 name = "DLMS_SPODES"
-version = "0.87.0"
+version = "0.87.2"
 authors = [
     {name="Serj Kotilevski", email="youserj@outlook.com"}
 ]

{dlms_spodes-0.87.0 → dlms_spodes-0.87.2}/src/DLMS_SPODES/config_parser.py

@@ -1,4 +1,3 @@
-import logging
 import os
 import tomllib
 from typing_extensions import deprecated
@@ -6,9 +5,6 @@ from typing_extensions import deprecated
 
 print("Path: ", os.getcwd())
 
-logger = logging.getLogger(__name__)
-logger.level = logging.INFO
-
 
 @deprecated("use settings.settings")
 def get_values(*args: str) -> dict | None:
@@ -20,7 +16,7 @@ def get_values(*args: str) -> dict | None:
             par = par[key]
             continue
         except KeyError as e:
-            logger.info(e.args[0])
+            print(f"error: {e.args[0]}")
             return None
     return par
 
@@ -28,10 +24,9 @@ def get_values(*args: str) -> dict | None:
 if not os.path.isfile(path := ".//config.toml"):
     path = F"{os.path.dirname(__file__)}{path}"
 elif not os.path.isfile(path):
-    logger.warning("NOT FIND CONFIGURATION: <config.toml>")
+    print("NOT FIND CONFIGURATION: <config.toml>")
 with open(path, "rb") as f:
     config = tomllib.load(f)
-    logger.info(F"Find configuration <config.toml> with path: {f}")
     print(F"Find configuration <config.toml> with path: {f}")
 
 _messages = get_values("DLMS", "messages")

{dlms_spodes-0.87.0 → dlms_spodes-0.87.2}/src/DLMS_SPODES/cosem_interface_classes/collection.py

@@ -8,7 +8,6 @@ from dataclasses import dataclass
 from itertools import count, chain
 from functools import reduce, cached_property, lru_cache
 from typing import TypeAlias, Iterator, Type, Self, Callable, Literal, Iterable, Optional, Hashable
-import logging
 from semver import Version as SemVer
 from StructResult import result
 from ..types import common_data_types as cdt, cosem_service_types as cst, useful_types as ut
@@ -275,8 +274,6 @@ _UNDER_OVER_LIMIT_MAGNITUDES = (34, 38)
 _NOT_PROCESSING_OF_MEASUREMENT_VALUES = tuple(set(range(256)).difference((0, 93, 94, 96, 97, 98, 99)))  # BlueBook DLMS UA 1000-1 Ed.14 7.5.2.1 Table 66
 _RU_CHANGE_LIMIT_LEVEL = 134
 
-logger = logging.getLogger(__name__)
-logger.level = logging.INFO
 
 
 @dataclass(frozen=True)
@@ -683,7 +680,7 @@ class Collection:
         """ all DLMS objects container with obis key """
 
     @property
-    def id(self) -> ID | None:
+    def id(self) -> ID:
         return self.__id
 
     def set_id(self, value: ID):
@@ -740,7 +737,7 @@ class Collection:
                             value=value.encoding,
                             data_type=source.get_attr(i).__class__)
                     except exc.EmptyObj as e:
-                        logger.warning(F"can't copy {target} attr={i}, skipped. {e}")
+                        print(F"can't copy {target} attr={i}, skipped. {e}")
 
     def copy(self) -> result.Simple["Collection"]:
         """copy collection with value by Association"""
@@ -898,7 +895,7 @@ class Collection:
                 func_map=func_maps[self.spec_map])(logical_name)
             new_object.collection = self
             self.__objs[o.OBIS(logical_name.contents)] = new_object
-            logger.info(F'Create {new_object}')
+            print(F'Create {new_object}')
             return new_object
         except ValueError as e:
             raise ValueError(F"error getting DLMS object instance with {class_id=} {version=} {logical_name=}: {e}")
@@ -1186,7 +1183,7 @@ class Collection:
                     obj=self.get_object(obj_def.logical_name),
                     par=bytes([int(obj_def.attribute_index)]))
             except ic.EmptyAttribute as e:
-                logger.error(F"Can't fill Scaler and Unit for {get_name(obj_def.logical_name)}: {e}")
+                print(F"Can't fill Scaler and Unit for {get_name(obj_def.logical_name)}: {e}")
             finally:
                 res.append(s_u)
         return res
@@ -1495,7 +1492,7 @@ class Collection:
                                     continue
                                 indexes.append(-i)
                             except exc.ITEApplication as e:
-                                logger.error(F"skip {i}... methods for {obj}: {e}")
+                                print(F"skip {i}... methods for {obj}: {e}")
                                 break
                     if len(indexes) != 0:
                         objects[obj] = indexes
@@ -2090,7 +2087,7 @@ class Template:
                 obj_col = col.get_object(ln)
             except exc.NoObject as e:
                 ret.append(e)
-                logger.warning(F"<add_collection> skip obj{self}: {e}")
+                print(F"<add_collection> skip obj{self}: {e}")
                 continue
             for i in indexes:
                 if (attr := obj.get_attr(i)) is not None:

{dlms_spodes-0.87.0 → dlms_spodes-0.87.2}/src/DLMS_SPODES/cosem_interface_classes/parameter.py

@@ -1,8 +1,8 @@
 from typing_extensions import deprecated
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 import numpy as np
 from struct import Struct, pack, unpack_from
-from typing import Optional, cast, Iterator
+from typing import Optional, cast, Iterator, Self
 import re
 from functools import cached_property
 from .. import exceptions as exc
@@ -44,7 +44,7 @@ class Parameter:
         return self._value
 
     @classmethod
-    def parse(cls, value: str) -> "Parameter":
+    def parse(cls, value: str) -> Self:
         """create from string. Only LN, attr/meth type ddd.ddd.ddd.ddd.ddd.ddd:aaa, ex.: 0.0.1.0.0.255 """
         if (res := _pattern.fullmatch(value)) is None:
             raise ValueError(F"in {cls.__name__}.parse got wrong :{value:}")
@@ -64,7 +64,7 @@ class Parameter:
     def logical_name(self) -> "Parameter":
         return self.get_attr(2)
 
-    def __eq__(self, other) -> bool:
+    def __eq__(self, other: object) -> bool:
         if isinstance(other, Parameter):
             return cast("bool", self._value==other._value)
         return NotImplemented
@@ -115,12 +115,12 @@ class Parameter:
         """attribute or method index"""
         return self._value[7]
 
-    def get_attr(self, i: int) -> "Parameter":
+    def get_attr(self, i: int) -> Self:
         """get attribute"""
         val = Index.pack(0, i)
         return self.__class__(self._value[:6] + val)
 
-    def get_meth(self, i: int) -> "Parameter":
+    def get_meth(self, i: int) -> Self:
         """get method"""
         val = Index.pack(1, i)
         return self.__class__(self._value[:6] + val)
@@ -130,9 +130,9 @@ class Parameter:
         if len(self._value) == 6:
             tmp = self._value + val
         else:
-            tmp = bytearray(self._value)
-            tmp[6:8] = val
-            tmp = bytes(tmp)
+            tmp_ = bytearray(self._value)
+            tmp_[6:8] = val
+            tmp = bytes(tmp_)
         return self.__class__(tmp)
 
     def append_validate(self) -> None:
@@ -180,10 +180,12 @@ class Parameter:
     def piece(self) -> Optional[int]:
         if self.has_piece():
             return self._value[-1]
+        return None
 
     def clear_piece(self) -> "Parameter":
         if self.has_piece():
             return self.__class__(self._value[:-1])
+        return self
 
     def elements(self, start: int = 0) -> Iterator[int]:
         """return: index elements nested in attribute, started with"""
@@ -216,12 +218,12 @@ class Parameter:
         return max(0, (len(self._value) - 8) // 2)
 
     def set(self,
-            a: int = None,
-            b: int = None,
-            c: int = None,
-            d: int = None,
-            e: int = None,
-            f: int = None
+            a: Optional[int] = None,
+            b: Optional[int] = None,
+            c: Optional[int] = None,
+            d: Optional[int] = None,
+            e: Optional[int] = None,
+            f: Optional[int] = None
             ) -> "Parameter":
         val = bytearray(self._value)
         if a is not None:
@@ -238,12 +240,12 @@ class Parameter:
             val[5] = f
         return self.__class__(bytes(val))
 
-    def __contains__(self, item: "Parameter"):
+    def __contains__(self, item: "Parameter") -> bool:
         return item._value in self._value
 
-    def __getitem__(self, item) -> Optional[int]:
+    def __getitem__(self, item: int) -> Optional[int]:
         if self.n_elements > 0:
-            return unpack_from(">H", self._value, item * 2 + 8)[0]
+            return cast(int, unpack_from(">H", self._value, item * 2 + 8)[0])
         else:
             return None
 
@@ -296,12 +298,12 @@ class ParPattern:
     positions: tuple[int, ...]
     "7 elements , -1 is SKIP, last element is attribute index if positive and method index else negative"
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         if 6 > len(self.positions) > 7:
             raise ValueError(f"positions must have exactly 6 elements, got {len(self.positions)}")
 
     @classmethod
-    def parse(cls, pattern: str) -> 'LNPattern':
+    def parse(cls, pattern: str) -> "ParPattern":
         """Парсинг строк вида:
         - "a.0.(1,2,3).(0-64).0.f" (6 элементов)
         - "a.0.1.0.0.f:2" (6 элементов + индекс через :)
@@ -379,7 +381,7 @@ class ParPattern:
     @staticmethod
     def _parse_group(group_str: str) -> set[int]:
         """Парсинг групп вида '1,2,3' или '10-20'"""
-        elements = set()
+        elements: set[int] = set()
         for item in group_str.split(','):
             item = item.strip()
             if '-' in item:
@@ -392,7 +394,7 @@ class ParPattern:
     # @functools.cache
     def __hash__(self) -> int:
         print("hash")
-        hash_parts = []
+        hash_parts: list[Optional[bytes]] = []
         for pos in self.positions:
             if pos == -1:
                 hash_parts.append(None)
@@ -475,9 +477,9 @@ class ParPattern:
 class PatternMatcher:
     """Класс для быстрого сопоставления Parameter с ParPattern"""
     patterns: dict['ParPattern', str]
-    _masks: list[tuple[tuple[np.ndarray, ...], str]] = None
+    _masks: list[tuple[tuple[np.ndarray, ...], str]] = field(init=False)
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         # Предварительная обработка шаблонов
         masks = []
         for pattern, value in self.patterns.items():

dlms_spodes-0.87.2/src/DLMS_SPODES/cosem_interface_classes/parameters.py

@@ -0,0 +1,108 @@
+from dataclasses import dataclass
+from functools import cached_property
+from typing import Self
+from .parameter import Parameter
+
+
+@dataclass(frozen=True)
+class Data(Parameter):
+    @property
+    def value(self) -> Parameter:
+        return self.get_attr(2)
+
+
+class ActiveFirmwareIdentifier(Data):
+
+    @classmethod
+    def from_b(cls, b: int) -> "ActiveFirmwareIdentifier":
+        return cls.parse(f"0.{b}.0.2.0.255")
+
+
+ACTIVE_FIRMWARE_IDENTIFIER_0 = ActiveFirmwareIdentifier.from_b(0)
+
+
+@dataclass(frozen=True)
+class Register(Data):
+    @property
+    def scaler_unit(self) -> Parameter:
+        return self.get_attr(3)
+
+
+@dataclass(frozen=True)
+class DisconnectControl(Parameter):
+
+    @classmethod
+    def from_b(cls, b: int) -> "DisconnectControl":
+        return cls.parse(f"0.{b}.96.3.10.255")
+
+    @property
+    def output_state(self) -> "DisconnectControl":
+        return self.get_attr(2)
+
+    @property
+    def control_state(self) -> "DisconnectControl":
+        return self.get_attr(3)
+
+    @property
+    def control_mode(self) -> "DisconnectControl":
+        return self.get_attr(4)
+
+    @property
+    def remote_disconnect(self) -> "DisconnectControl":
+        return self.get_meth(1)
+
+    @property
+    def remote_reconnect(self) -> "DisconnectControl":
+        return self.get_meth(2)
+
+
+DISCONNECT_CONTROL_0 = DisconnectControl.from_b(0)
+
+
+@dataclass(frozen=True)
+class ImageTransfer(Parameter):
+    @classmethod
+    def from_e(cls, e: int = 0) -> "ImageTransfer":
+        return cls.parse(f"0.0.44.0.{e}.255")
+
+    @property
+    def image_block_size(self) -> "ImageTransfer":
+        return self.get_attr(2)
+
+    @property
+    def image_transferred_blocks_status(self) -> "ImageTransfer":
+        return self.get_attr(3)
+
+    @property
+    def image_first_not_transferred_block_number(self) -> "ImageTransfer":
+        return self.get_attr(4)
+
+    @property
+    def image_transfer_enabled(self) -> "ImageTransfer":
+        return self.get_attr(5)
+
+    @property
+    def image_transfer_status(self) -> "ImageTransfer":
+        return self.get_attr(6)
+
+    @property
+    def image_to_activate_info(self) -> "ImageTransfer":
+        return self.get_attr(7)
+
+    @property
+    def image_transfer_initiate(self) -> "ImageTransfer":
+        return self.get_meth(1)
+
+    @property
+    def image_block_transfer(self) -> "ImageTransfer":
+        return self.get_meth(2)
+
+    @property
+    def image_verify(self) -> "ImageTransfer":
+        return self.get_meth(3)
+
+    @property
+    def image_activate(self) -> "ImageTransfer":
+        return self.get_meth(4)
+
+

{dlms_spodes-0.87.0 → dlms_spodes-0.87.2}/src/DLMS_SPODES/hdlc/frame.py

@@ -4,10 +4,6 @@ from struct import unpack, pack
 from functools import cached_property
 from typing import Deque
 from enum import IntFlag
-import logging
-
-logger = logging.getLogger(__name__)
-logger.level = logging.INFO
 
 _FLAG: int = 0x7e
 
@@ -750,13 +746,13 @@ class Frame:
             try:
                 return cls(value)
             except ValueError as e:
-                logger.info(F'Wrong Frame: {e.args[0]}')
+                print(F'Wrong Frame: {e.args[0]}')
                 return None
             except NotEnoughDataError as e:
-                logger.info(F'Frame Error: {e.args[0]}')
+                print(F'Frame Error: {e.args[0]}')
                 return None
             except FormatDataError as e:
-                logger.info(F'Frame Error: {e.args[0]}')
+                print(F'Frame Error: {e.args[0]}')
                 value.pop(0)
                 return None
 
@@ -819,7 +815,7 @@ class Frame:
                 info: bytearray = bytearray(frame.info)
                 break
             else:
-                logger.warning(F'Frame {frame} not handled and deleted')
+                print(F'Frame {frame} not handled and deleted')
         else:
             raise ValueError('Not found information Frame')
         while frame.is_segmentation:
@@ -831,7 +827,7 @@ class Frame:
                     info.extend(next_frame.info)
                     frame = next_frame
                 else:
-                    logger.warning(F'Frame {frame} not handled and deleted')
+                    print(F'Frame {frame} not handled and deleted')
         return info
 
 

{dlms_spodes-0.87.0 → dlms_spodes-0.87.2}/src/DLMS_SPODES/types/implementations/integers.py

@@ -1,6 +1,11 @@
 """all realisation cdt.Integer subclasses"""
 from ...types import common_data_types as cdt
+from typing_extensions import deprecated
 
 
+@deprecated("use INTEGER_0")
 class Only0(cdt.Integer, value=0):
     """ Limited Integer only 0 """
+
+
+INTEGER_0 = cdt.Integer(0)

{dlms_spodes-0.87.0 → dlms_spodes-0.87.2}/src/DLMS_SPODES.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES
-Version: 0.87.0
+Version: 0.87.2
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/DlmsSPODES-project

dlms_spodes-0.87.0/src/DLMS_SPODES/cosem_interface_classes/parameters.py

@@ -1,41 +0,0 @@
-from dataclasses import dataclass
-from functools import cached_property
-from typing import Self
-from .parameter import Parameter
-
-
-@dataclass(frozen=True)
-class Data(Parameter):
-    @property
-    def value(self) -> Parameter:
-        return self.get_attr(2)
-
-
-@dataclass(frozen=True)
-class Register(Data):
-    @property
-    def scaler_unit(self) -> Parameter:
-        return self.get_attr(3)
-
-
-@dataclass(frozen=True)
-class DisconnectControl(Parameter):
-
-    @classmethod
-    def from_b(cls, b: int) -> "DisconnectControl":
-        return cls.parse(f"0.{b}.96.3.10.255")
-
-    @property
-    def output_state(self) -> "DisconnectControl":
-        return self.get_attr(2)
-
-    @property
-    def control_state(self) -> "DisconnectControl":
-        return self.get_attr(3)
-
-    @property
-    def control_mode(self) -> "DisconnectControl":
-        return self.get_attr(4)
-
-
-DISCONNECT_CONTROL_0 = DisconnectControl.from_b(0)