DLMS-SPODES 0.87.2__py3-none-any.whl → 0.87.5__py3-none-any.whl

DLMS_SPODES/cosem_interface_classes/cosem_interface_class.py

@@ -330,6 +330,7 @@ class COSEMInterfaceClasses(Protocol):
     __specific_methods: tuple[cdt.CommonDataType, ...] = None
     _cbs_attr_post_init: dict[int, Callable]
     collection: Any | None  # Collection. todo: remove in future
+    hash_: int
 
     def __init__(self, logical_name: cst.LogicalName | bytes | str):
         self.collection = None

DLMS_SPODES/cosem_interface_classes/implementations/data.py

@@ -302,6 +302,15 @@ class KPZAlarm1(DataStatic):
     A_ELEMENTS = DataStatic.get_attr_element(2).get_change(data_type=KPZAlarm1Values),
 
 
+class SPODES3ControlAlarm1Values(cdt.IntegerFlag, cdt.DoubleLongUnsigned):
+    ...
+
+
+class SPODES3ControlAlarm1(DataDynamic):
+    """СТО 34.01-5.1-006-2023v4 Таблица 13.5 Распределение событий отключения реле нагрузки по битам"""
+    A_ELEMENTS = DataNotSpecific.get_attr_element(2).get_change(data_type=SPODES3ControlAlarm1Values),
+
+
 class SPODES3PowerQuality1Event(DataNotSpecific):
     """СТО_34.01-5.1-006-2019v3 E.1 Статус качества сети (журнал качества сети)"""
     A_ELEMENTS = DataNotSpecific.get_attr_element(2).get_change(data_type=SPODES3PowerQuality1EventValues),

DLMS_SPODES/cosem_interface_classes/parameters.py

@@ -14,11 +14,11 @@ class Data(Parameter):
 class ActiveFirmwareIdentifier(Data):
 
     @classmethod
-    def from_b(cls, b: int) -> "ActiveFirmwareIdentifier":
+    def from_b(cls, b: int = 0) -> "ActiveFirmwareIdentifier":
         return cls.parse(f"0.{b}.0.2.0.255")
 
 
-ACTIVE_FIRMWARE_IDENTIFIER_0 = ActiveFirmwareIdentifier.from_b(0)
+ACTIVE_FIRMWARE_IDENTIFIER_0 = ActiveFirmwareIdentifier.from_b()
 
 
 @dataclass(frozen=True)
@@ -28,6 +28,77 @@ class Register(Data):
         return self.get_attr(3)
 
 
+@dataclass(frozen=True)
+class Clock(Parameter):
+    @classmethod
+    def from_be(cls, b: int = 0, e: int = 0) -> "Clock":
+        return cls.parse(f"0.{b}.1.0.{e}.255")
+
+    @property
+    def time(self) -> "Clock":
+        return self.get_attr(2)
+
+    @property
+    def time_zone(self) -> "Clock":
+        return self.get_attr(3)
+
+    @property
+    def status(self) -> "Clock":
+        return self.get_attr(4)
+
+    @property
+    def time_zone(self) -> "Clock":
+        return self.get_attr(3)
+
+    @property
+    def status(self) -> "Clock":
+        return self.get_attr(4)
+
+    @property
+    def daylight_savings_begin(self) -> "Clock":
+        return self.get_attr(5)
+
+    @property
+    def daylight_savings_end(self) -> "Clock":
+        return self.get_attr(6)
+
+    @property
+    def daylight_savings_deviation(self) -> "Clock":
+        return self.get_attr(7)
+
+    @property
+    def daylight_savings_enabled(self) -> "Clock":
+        return self.get_attr(8)
+
+    @property
+    def clock_base(self) -> "Clock":
+        return self.get_attr(9)
+
+    @property
+    def adjust_to_quarter(self) -> "Clock":
+        return self.get_meth(1)
+
+    @property
+    def adjust_to_measuring_period(self) -> "Clock":
+        return self.get_meth(2)
+
+    @property
+    def adjust_to_minute(self) -> "Clock":
+        return self.get_meth(3)
+
+    @property
+    def adjust_to_preset_time(self) -> "Clock":
+        return self.get_meth(4)
+
+    @property
+    def preset_adjusting_time(self) -> "Clock":
+        return self.get_meth(5)
+
+    @property
+    def shift_time(self) -> "Clock":
+        return self.get_meth(6)
+
+
 @dataclass(frozen=True)
 class DisconnectControl(Parameter):
 

DLMS_SPODES/cosem_interface_classes/reports.py

@@ -1,72 +1,70 @@
-from typing import Any
-from .collection import ic, cdt
+from typing import Any, Iterable
+from StructResult import result
+from . import cosem_interface_class as ic
+from ..types import cdt
+from .parameter import Parameter
 from ..cosem_interface_classes import collection
 from ..config_parser import get_values
+from ..settings import settings
 
 
-def get_obj_report(
+def from_obj(
+        col: collection.Collection,
         obj: ic.COSEMInterfaceClasses,
-        attr_index_par: tuple[int | Any, ...]) -> str:
-    struct_report: dict | None = get_values("DLMS", "report", "struct")
-    ret = str()
-    ret += F"[{collection.get_name(obj.logical_name)}]\n"
+        attr_index_par: tuple[int, ...]
+) -> result.SimpleOrError[str]:
+    if not hasattr(from_obj, "struct_pattern"):
+        from_obj.struct_pattern = dict(settings.report.struct)
+    ret: str = F"[{collection.get_name(obj.logical_name)}]\n"
     for i in attr_index_par:
-        if isinstance(i, int):
-            pass
-        else:
-            i, par = i[0], i[1:]
-        value = obj.get_attr(i)
-        if isinstance(value, cdt.SimpleDataType):
-            match obj, i:
-                case collection.impl.data.DLMSDeviceIDObject(), 2: value = value.to_str()
-                case _: pass
-            if isinstance(value, cdt.OctetString):
-                pass
-            if hasattr(value, "report"):
-                value = value.report
-            ret += F"  {obj.get_attr_element(i)}: {value}\n"
-        elif isinstance(value, cdt.ComplexDataType):
+        par = Parameter(obj.logical_name.contents).set_i(i)
+        if isinstance(res_data := col.par2data(par), result.Error):
+            return res_data
+        a_data = res_data.value
+        if isinstance(a_data, cdt.SimpleDataType):
+            rep = col.par2rep(par, a_data)
+            ret += F"  {obj.get_attr_element(i)}: {rep.msg}{f" {rep.unit}" if rep.unit else ""}\n"
+        elif isinstance(a_data, cdt.ComplexDataType):
             ret += F"  [{obj.get_attr_element(i)}]\n"
-            stack: list = [("", iter(value))]
+            stack: list[tuple[Any, Any]] = [("", iter(a_data))]
             while stack:
                 name, value_it = stack[-1]
-                indent = F"{' '*(len(stack) + 1)}"
-                value = next(value_it, None)
-                if value:
+                indent = F"{' ' * (len(stack) + 1)}"
+                data = next(value_it, None)
+                if data:
                     if not isinstance(name, str):
-                        name = next(name).NAME
-                    if isinstance(value, cdt.Array):
+                        name = str(next(name))
+                    if isinstance(data, cdt.Array):
                         ret += F"{indent}[{name}]\n"
-                        stack.append(("*", iter(value)))
-                    elif isinstance(value, cdt.Structure):
-                        if struct_report and (pattern := struct_report.get(value.__class__.__name__)):
+                        stack.append(("*", iter(data)))
+                    elif isinstance(data, cdt.Structure):
+                        if (pattern := from_obj.struct_pattern.get(data.__class__.__name__)):
                             val = list(pattern)
                             val.reverse()
-                            result = str()
+                            result_ = str()
                             while val:
-                                i = val.pop()
-                                match i:
+                                match val.pop():
                                     case "%":
-                                        par = val.pop()
+                                        par_ = val.pop()
                                         index = int(val.pop() + val.pop())
-                                        match par:
+                                        match par_:
                                             case "n":
-                                                result += value.ELEMENTS[index].NAME
+                                                result_ += str(data.ELEMENTS[index])
                                             case "v":
-                                                result += str(value[index])
+                                                result_ += str(data[index])
                                             case err:
                                                 raise ValueError(F"unknown macros &{err}{index}")
                                     case symbol:
-                                        result += symbol
-                            ret += F"{indent}{result}\n"
+                                        result_ += symbol
+                            ret += F"{indent}{result_}\n"
                         else:
-                            if name == "":
+                            if name=="":
                                 ret += "\n"
                             else:
                                 ret += F"{indent}[{name}]\n"
-                            stack.append((iter(value.ELEMENTS), iter(value)))
+                            stack.append((iter(data.ELEMENTS), iter(data)))
                     else:
-                        ret += F"{indent}{name}: {value}\n"
+                        ret += F"{indent}{name}: {data}\n"
                 else:
                     stack.pop()
-    return ret
+    return result.Simple(ret)

DLMS_SPODES/pardata.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from .cosem_interface_classes import Parameter
+from .cosem_interface_classes.parameter import Parameter
 from typing import Optional, Iterator
 from .types import cdt
 
@@ -9,14 +9,6 @@ class ParValues[T]:
     par:  Parameter
     data: T
 
-    def __getitem__(self, item):
-        if item == 0:
-            return self.par
-        elif item == 1:
-            return self.data
-        else:
-            raise StopIteration
-
     def __iter__(self) -> Iterator[Parameter | T]:
         yield self.par
         yield self.data

{dlms_spodes-0.87.2.dist-info → dlms_spodes-0.87.5.dist-info}/METADATA

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

{dlms_spodes-0.87.2.dist-info → dlms_spodes-0.87.5.dist-info}/RECORD

@@ -6,7 +6,7 @@ DLMS_SPODES/enums.py,sha256=13BE0owOyJBNlOI4NY1d-kpqVoHF7JPR9brkPKHLERE,17789
 DLMS_SPODES/exceptions.py,sha256=UBZRQlQIRi1CzRxWTeqX5PVNuFS770f77BAizQ99IDU,3006
 DLMS_SPODES/firmwares.py,sha256=lFRnxtq4joYhpZPxHD8Pv30-GvgcEfZCDZUYo_pIeQU,3850
 DLMS_SPODES/literals.py,sha256=5u6hreLSXgmN7Z_5pXchyBKsuPYJ5deqxKHqewQEFoI,1632
-DLMS_SPODES/pardata.py,sha256=yktr4g59FITC_L1kRbQuwp0PMQvGdMwXqWxpXcCDpQU,700
+DLMS_SPODES/pardata.py,sha256=_VluNrP4R7PLVXa9xmqD7fiqEXQqyVXp48NieTct5jY,519
 DLMS_SPODES/pdu_enums.py,sha256=5xiV-tZTPXOcHT8XQcHWrwAMKTOmCH09Sk4iL1N7I3c,2276
 DLMS_SPODES/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DLMS_SPODES/relation_to_OBIS.py,sha256=KcSMIQ_5amjeT0Lya3HbYoaDdz_BjZC2JLVhl2nffwo,32761
@@ -25,8 +25,8 @@ DLMS_SPODES/cosem_interface_classes/activity_calendar.py,sha256=VWSiKn2LNBA1VLAA
 DLMS_SPODES/cosem_interface_classes/arbitrator.py,sha256=S9TguoMG6O5DpMBp6mpcJpw6PHanvh4SEAN3M_v6qts,3240
 DLMS_SPODES/cosem_interface_classes/attr_indexes.py,sha256=aUSnT-dKoBsDbwLhlgtLIHGRl7PZrT-ld2ThCEUjUeA,328
 DLMS_SPODES/cosem_interface_classes/clock.py,sha256=9OJwRGrbFPws_VZPayHv-hzFJegIcjgoJoenIqofd5w,4525
-DLMS_SPODES/cosem_interface_classes/collection.py,sha256=3ivTtIv2dCanGsXqBbvcuoNqRm211S523DeZvN9dwuU,96317
-DLMS_SPODES/cosem_interface_classes/cosem_interface_class.py,sha256=SIME0IC1XyX9RSsfxt0cbghN7rCyWzjqCbesQEpTCM8,23347
+DLMS_SPODES/cosem_interface_classes/collection.py,sha256=4zafwek9zuWPLlpOZqZ0-uC7z2X-IhsVC5kCUaxhEmY,98545
+DLMS_SPODES/cosem_interface_classes/cosem_interface_class.py,sha256=pY3UoW7XVV2TJ5cjphKsQZnngA8Q9S6TsjjZnMDLKb4,23363
 DLMS_SPODES/cosem_interface_classes/data.py,sha256=YSjA3Y0M5NMcfYzWPEuZw6ojIqr2UghgW_ck8dXySMU,809
 DLMS_SPODES/cosem_interface_classes/disconnect_control.py,sha256=CIx7I4QRpPxAC5iYxpbhCIuv6U2P3s6ELam8eD-kD5w,2926
 DLMS_SPODES/cosem_interface_classes/extended_register.py,sha256=xULCS11YVWjFMoaRUrm4whvH39Gx0Cu6breUos_oLCs,1153
@@ -38,10 +38,10 @@ DLMS_SPODES/cosem_interface_classes/ln_pattern.py,sha256=IPluhyGWJQLBEUjOjdfEMct
 DLMS_SPODES/cosem_interface_classes/obis.py,sha256=yEwYm5CshJx8X8uSy3QH8XIbdVPg8Tt6zPUjFgkAB0M,575
 DLMS_SPODES/cosem_interface_classes/overview.py,sha256=0eko1CW0eH397J5kM20G7RSQUzCGV6lGCMPbLsKPEqQ,7146
 DLMS_SPODES/cosem_interface_classes/parameter.py,sha256=esTD-1VzvX0rnazsHSVIR8mLuVxpdqwdjzppxj5Zz7s,18961
-DLMS_SPODES/cosem_interface_classes/parameters.py,sha256=mrLO0eIi_0Q5Wyug_3pAX2ucZUNyxTuV_5QPbuETbFI,2678
+DLMS_SPODES/cosem_interface_classes/parameters.py,sha256=VZDBm9H25VIGxUGGJ-OcVu0pAO8VJhFF2XdZTQMnmoM,4354
 DLMS_SPODES/cosem_interface_classes/register.py,sha256=Cfikftpo1Nzg_B2drOmJDwoGkbS2wXlqQpxVgXL1w2U,1886
 DLMS_SPODES/cosem_interface_classes/register_monitor.py,sha256=fNM-JrjHxQB8b5DgUOtDcnkO_hxu5bFICiuKEoZa37g,1792
-DLMS_SPODES/cosem_interface_classes/reports.py,sha256=9kOt9Ztyp5D59j3k3x5URy7WD1qlFNMa8xFlMu7nUmA,3320
+DLMS_SPODES/cosem_interface_classes/reports.py,sha256=zsWmKGqdP6uiZrH8hR5aqHJPMsyHwyrSCRf6khhFoSg,3365
 DLMS_SPODES/cosem_interface_classes/schedule.py,sha256=IT9sVrkOCdWV4uuTt8Kbu5bL6jchiVTgUqA15x1fq5s,8041
 DLMS_SPODES/cosem_interface_classes/script_table.py,sha256=aPDXwjCkrvT-yGkCOOZXWjiOZViRy6N-Tb_Gl1aTIik,3455
 DLMS_SPODES/cosem_interface_classes/single_action_schedule.py,sha256=UGRO-x2q1du3CupfB4KQtUyyUAcbJGqph_apIe0QfFY,1708
@@ -72,7 +72,7 @@ DLMS_SPODES/cosem_interface_classes/image_transfer/image_transfer_status.py,sha2
 DLMS_SPODES/cosem_interface_classes/image_transfer/ver0.py,sha256=rnHj2XnK1Zr4CvPG_MrPSoBBcdh883rwqdIus1RxKMw,5371
 DLMS_SPODES/cosem_interface_classes/implementations/__init__.py,sha256=z4OfnPPyYr6f94rj-PU3---Wk05ddduf9MkmWxhczXA,77
 DLMS_SPODES/cosem_interface_classes/implementations/arbitrator.py,sha256=cMhYLi9ZFqfJ0yxjONHq9JZZJ3QuzrF0jtPjk4nf0eo,573
-DLMS_SPODES/cosem_interface_classes/implementations/data.py,sha256=zyhnnJ-9erdj2rZ28ZjtP7rHH704yuUkqdvJAafvaQs,18598
+DLMS_SPODES/cosem_interface_classes/implementations/data.py,sha256=PCa_exj-y0WFt5gVTZQvIpI1wNTqTFc6ZoUSmLKz1Ys,19001
 DLMS_SPODES/cosem_interface_classes/implementations/profile_generic.py,sha256=oibO3EV9fRHxxaBdMQqz436GrMMqo1BlT6lgVtzUKU0,4318
 DLMS_SPODES/cosem_interface_classes/modem_configuration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DLMS_SPODES/cosem_interface_classes/modem_configuration/ver0.py,sha256=nFU3Y0fFhsOKfSl21TmA1CaWJo-N9Iqm7XlcGuSSjoQ,3071
@@ -96,7 +96,6 @@ DLMS_SPODES/hdlc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 DLMS_SPODES/hdlc/frame.py,sha256=ar5DvkPK5tUGSZcQYCpeku1Ansx7QecugvmcV-xekqI,34784
 DLMS_SPODES/hdlc/sub_layer.py,sha256=zTxe5ddTt8tliFSY145HhluLwIh57gvOG19Mc8-vnEM,2147
 DLMS_SPODES/obis/__init__.py,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-DLMS_SPODES/obis/abstract_objects.py,sha256=0ZoJKRQ_7FoChC2rNSgNV573hso8JYZQKdLF3Wgaoqw,443
 DLMS_SPODES/obis/media_id.py,sha256=GRiwHPe9-3iCg4u_J6qf2rMc3Wjw0aJHKiSnBtNYD3o,22339
 DLMS_SPODES/types/__init__.py,sha256=UFiP4suA72o_kvaqUnHLGK-cedDXLl8kVHYsjXHYUDw,116
 DLMS_SPODES/types/choices.py,sha256=z7IasrlRaagOYNfRvgbpojDxf1jgYUc9cz59PH2PMi0,6350
@@ -112,7 +111,7 @@ DLMS_SPODES/types/implementations/integers.py,sha256=Asy4X260t1Fzw_V5iw0uiDOxtfB
 DLMS_SPODES/types/implementations/long_unsigneds.py,sha256=SxmFvD2moQ03p-KZSBYK1Rv7bQSaywlHVXBfkTZG1OQ,8761
 DLMS_SPODES/types/implementations/octet_string.py,sha256=Jo_sfWcsfstiP4O6mXfBOOQlksx1c2qJMI-vbAOV-yM,294
 DLMS_SPODES/types/implementations/structs.py,sha256=GMOo6Jy8jA9d6KTLs0D-j5t0oSRvxUIwtBr_4UePwbA,2059
-dlms_spodes-0.87.2.dist-info/METADATA,sha256=u0_IQbaywetOsTcXCN1Yckn9qduLGkK__ANW4LAH1Uk,1027
-dlms_spodes-0.87.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dlms_spodes-0.87.2.dist-info/top_level.txt,sha256=k26SRuRdwBZrSM3NgNZECAUNIDZREbJuLCnPbWtTNak,12
-dlms_spodes-0.87.2.dist-info/RECORD,,
+dlms_spodes-0.87.5.dist-info/METADATA,sha256=dqBhrE-dP748FIQpNtLEBN5seqiaVed7N6t-x44BfVU,1027
+dlms_spodes-0.87.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dlms_spodes-0.87.5.dist-info/top_level.txt,sha256=k26SRuRdwBZrSM3NgNZECAUNIDZREbJuLCnPbWtTNak,12
+dlms_spodes-0.87.5.dist-info/RECORD,,

DLMS_SPODES/obis/abstract_objects.py

@@ -1,17 +0,0 @@
-"""DLMS UA 1000-1 Ed. 14. 7.4 Abstract objects (Value group A = 0)"""
-from struct import pack_into
-from ..types import cst
-
-
-_buf = bytearray(6)
-
-
-def BILLING_PERIOD_COUNTER(b: int = 0, f: int = 255):
-    return cst.LogicalName(bytes((0, b, 0, 1, 0, f)))
-
-
-def SPODES3_DISPLAY_MODE():
-    return cst.LogicalName(pack_into(">6B", _buf, 0, 0, 96, 4, 1, 255))
-
-
-LDN = cst.LogicalName(pack_into(">6B", _buf, 0, 0, 42, 0, 0, 255))