COSEMpdu 0.3.2__tar.gz → 0.3.4__tar.gz

{cosempdu-0.3.2/src/COSEMpdu.egg-info → cosempdu-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: COSEMpdu
-Version: 0.3.2
+Version: 0.3.4
 Summary: cosem-pdu
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/COSEMpdu_project

{cosempdu-0.3.2 → cosempdu-0.3.4}/pyproject.toml

@@ -9,7 +9,7 @@ package-dir = {"" = "src"}
 
 [project]
 name = "COSEMpdu"
-version = "0.3.2"
+version = "0.3.4"
 authors = [
     {name="Serj Kotilevski", email="youserj@outlook.com"}
 ]

{cosempdu-0.3.2 → cosempdu-0.3.4}/src/COSEMpdu/axdr.py

@@ -17,13 +17,12 @@ Standards:
 - X.680: ASN.1 notation
 - X.690: BER encoding (reference for comparison)
 """
-
-from typing import ClassVar, Self, Optional, cast, TypeAlias, Annotated, Protocol, Any, override
+from typing import ClassVar, Self, Optional, cast, TypeAlias, Annotated, Protocol, Any, override, runtime_checkable
 from StructResult.result import ValueOrError, Error
 from COSEMpdu import x690
 from .x680.tagged_type import TaggingMode
 from .x680.constrained_type import ValueRange, SizeConstraint
-from .x680.type import OptionalNamedType, DefaultNamedType, NamedType, INTEGER, SEQUENCE_OF, CHOICE, OCTET_STRING
+from .x680.type import OptionalNamedType, DefaultNamedType, NamedType, INTEGER, SEQUENCE_OF, CHOICE
 from . import x680
 from .byte_buffer import ByteBuffer, put_chain
 
@@ -480,7 +479,7 @@ class Utf8String(Type, x680.VisibleString):  # todo: copypast VisibleString
 # =============================================================================
 # CHOICE Type (IEC 61334-6 §6.6)
 # =============================================================================
-
+@runtime_checkable
 class ChoiceType(Type, x680.ChoiceType[Type], Protocol):
     """
     CHOICE with A-XDR encoding/decoding (IEC 61334-6 §6.6)

{cosempdu-0.3.2 → cosempdu-0.3.4}/src/COSEMpdu/data.py

@@ -262,6 +262,10 @@ class Structure(ImplicitTaggedType[SequenceOfData[ImplicitTaggedType[Any]]]):
     tag = 2
     components: ClassVar[Optional[tuple[NamedType[Type], ...]]] = None  # 4.1.5 Common data types Table 2
 
+    @classmethod
+    def default(cls) -> Self:
+        return cls(SequenceOfData([component.type_.default() for component in cls.components]))
+
     @property
     def get_el0(self):
         return self.value[0]
@@ -354,6 +358,9 @@ class DigitalMixin[T: Unsigned8 | Unsigned16 | Unsigned32 | Unsigned64 | Integer
     def __int__(self) -> int:
         return self.value.value.value
 
+    def normalize(self) -> INTEGER:
+        return self.value.normalize()
+
 
 class Boolean(ImplicitTaggedType[BooleanType]):
     """[3] IMPLICIT BOOLEAN"""
@@ -379,6 +386,9 @@ class OctetString(ImplicitTaggedType[OctetStringType]):
     """[9] IMPLICIT OCTET STRING"""
     tag = 9
 
+    def normalize(self) -> OCTET_STRING:
+        return super().normalize()
+
 
 class VisibleString(ImplicitTaggedType[axdr.VisibleString]):
     """[10] IMPLICIT VisibleString"""
@@ -494,10 +504,26 @@ class EnumMixin:
 
     def __str__(self) -> str:
         value = self.normalize()
-        add: str = ""
-        if value in self.enumeration_item:
-            add = f"{self.enumeration_item[value]}"
-        return f"({value}){add}"
+        return f"({value}){self.enumeration_item.get(value, "")}"
+
+
+class BitMixin:
+    enumeration_item: ClassVar[dict[int, str]]
+    value: Unsigned8
+
+    def normalize(self) -> INTEGER:
+        return self.value.normalize()
+
+    def __str__(self) -> str:
+        value = self.normalize()
+        values: list[str] = []
+        for (k, v) in self.enumeration_item.items():
+            if k & value:
+                values.append(v)
+        return f"({value}){" | ".join(values)}"
+
+    def __contains__(self, item: INTEGER) -> bool:
+        return bool(item & self.normalize())
 
 
 class Enum(EnumMixin, ImplicitTaggedType[Unsigned8]):

{cosempdu-0.3.2 → cosempdu-0.3.4}/src/COSEMpdu/user_information.py

@@ -1,9 +1,10 @@
-from typing import Optional, Self, ClassVar
+from typing import Optional, Self, ClassVar, Literal
 from .x680 import tag, TaggingMode
 from .x680.type import (
     OptionalNamedType,
     DefaultNamedType,
-    NamedType
+    NamedType,
+    INTEGER
 )
 from .x680.bit_string import NamedBitList, NamedBit
 from .x680.constrained_type import SizeConstraint
@@ -13,8 +14,7 @@ from . import axdr
 from .useful_types import Integer8, Unsigned16, Unsigned8, ObjectName
 
 
-class Conformance_(ber.ConstrainedType[ber.BitStringType]):
-    """Conformance"""
+class BitStringConformance(ber.BitStringType):
     named_bits: ClassVar[Optional[NamedBitList]] = NamedBitList((
         NamedBit("reserved-zero", 0),
         NamedBit("general-protection", 1),
@@ -41,8 +41,40 @@ class Conformance_(ber.ConstrainedType[ber.BitStringType]):
         NamedBit("event-notification", 22),
         NamedBit("action", 23),
     ))
+
+
+class Conformance_(ber.ConstrainedType[BitStringConformance]):
+    """Conformance"""
     constraint_spec = SizeConstraint(24)
-    value: ber.BitStringType
+    value: BitStringConformance
+
+
+NamedBitLiteral = Literal[
+    "reserved-zero",
+    "general-protection",
+    "general-block-transfer",
+    "read",
+    "write",
+    "unconfirmed-write",
+    "delta-value-encoding",
+    "reserved-seven",
+    "attribute0-supported-with-set",
+    "priority-mgmt-supported",
+    "attribute0-supported-with-get",
+    "block-transfer-with-get-or-read",
+    "block-transfer-with-set-or-write",
+    "block-transfer-with-action",
+    "multiple-references",
+    "information-report",
+    "data-notification",
+    "access",
+    "parameterized-access",
+    "get",
+    "set",
+    "selective-access",
+    "event-notification",
+    "action"
+]
 
 
 class Conformance(ber.TaggedType[Conformance_]):
@@ -53,6 +85,9 @@ class Conformance(ber.TaggedType[Conformance_]):
     mode = TaggingMode.IMPLICIT
     value: Conformance_
 
+    def __getitem__(self, key: NamedBitLiteral) -> INTEGER:
+        return self.value.value[key]
+
 
 LN_REFERENCE = ObjectName(axdr.IntegerType(0x0007))
 SN_REFERENCE = ObjectName(axdr.IntegerType(-1536))  # 0xFA00

{cosempdu-0.3.2 → cosempdu-0.3.4}/src/COSEMpdu/x680/bit_string.py

@@ -77,6 +77,8 @@ class BitStringType(Simple[BIT_STRING], BuiltinType):
     @classmethod
     def default(cls) -> Self:
         """Default value: all bits 0"""
+        if cls.named_bits:
+            return cls((0,) * len(cls.named_bits.bits))
         return cls(())
 
     @classmethod

{cosempdu-0.3.2 → cosempdu-0.3.4}/src/COSEMpdu/x680/constrained_type.py

@@ -1,6 +1,5 @@
 from dataclasses import dataclass
 from typing import ClassVar, Optional, Protocol, Any, Self, get_type_hints, override
-from StructResult.result import ValueOrError
 from .type import Type, TYPE_VALUE, OCTET_STRING
 from .integer_type import IntegerType
 from .bit_string import BitStringType
@@ -157,8 +156,8 @@ class ConstrainedType[T: Type](Type, Protocol):
     def parse(cls, value: Any) -> Self:
         return cls(cls.get_type().parse(value))
 
-    # def normalize(self) -> TYPE_VALUE:
-    #     return self.value.normalize()
+    def normalize(self) -> TYPE_VALUE:
+        return self.value.normalize()
 
     @classmethod
     def default(cls) -> Self:

{cosempdu-0.3.2 → cosempdu-0.3.4}/src/COSEMpdu/x680/enumerated_type.py

@@ -83,6 +83,11 @@ class EnumeratedType(Simple[INTEGER], BuiltinType):
     named_members: ClassVar[Optional[EnumerationList]] = None
     value: INTEGER
 
+    def __init_subclass__(cls) -> None:
+        if cls.named_members:
+            for member in cls.named_members:
+                setattr(cls, member.identifier, member.value)
+
     @classmethod
     def default(cls) -> Self:
         """Default value: first member in the list."""

{cosempdu-0.3.2 → cosempdu-0.3.4/src/COSEMpdu.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: COSEMpdu
-Version: 0.3.2
+Version: 0.3.4
 Summary: cosem-pdu
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/COSEMpdu_project