libasterix 0.36.1__tar.gz → 0.36.3__tar.gz

{libasterix-0.36.1 → libasterix-0.36.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libasterix
-Version: 0.36.1
+Version: 0.36.3
 Summary: Asterix data processing library
 Author-email: Zoran Bošnjak <zoran.bosnjak@via.si>
 License-Expression: MIT

{libasterix-0.36.1 → libasterix-0.36.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "libasterix"
-version = "0.36.1"
+version = "0.36.3"
 authors = [
   { name="Zoran Bošnjak", email="zoran.bosnjak@via.si" },
 ]

{libasterix-0.36.1 → libasterix-0.36.3}/src/asterix/base.py

@@ -2,7 +2,7 @@
 """
 
 import copy
-from itertools import chain, dropwhile
+from itertools import chain, dropwhile, repeat
 from dataclasses import dataclass
 from binascii import hexlify, unhexlify
 from typing import *
@@ -576,7 +576,9 @@ class Spare(ItemBase):
         return cls._parse(bs)
 
     @classmethod
-    def create(cls, arg: int) -> 'Spare':
+    def create(cls, arg: Union['Spare', int]) -> 'Spare':
+        if isinstance(arg, Spare):
+            return arg
         bs = Bits.from_uinteger(arg, cls.cv_bit_offset8, cls.cv_bit_size)
         return cls(bs)
 
@@ -1019,6 +1021,15 @@ class Fspec:
         (a, b) = s.split_at(n * 8)
         return (cls(a), b)
 
+    @classmethod
+    def iter_complete(cls, flags: Any, items: List[Any]) \
+            -> Iterator[Tuple[bool, Any]]:
+        """Make sure to visit all FSPEC bits, even after the last defined
+        item. This is important, to let the caller check all FSPEC bits."""
+
+        for (a, b) in zip(flags, chain(items, repeat(None))):
+            yield (a, b)
+
     def __iter__(self) -> Iterator[bool]:
         n = 0
         for flag in self.bs:
@@ -1087,7 +1098,7 @@ class Compound(Variation):
             return result
         fspec, remaining = result
         items = {}
-        for (flag, nsp) in zip(fspec, cls.cv_items_list):
+        for (flag, nsp) in Fspec.iter_complete(fspec, cls.cv_items_list):
             if not flag:
                 continue
             if nsp is None:
@@ -1287,7 +1298,7 @@ class Record:
         fspec, remaining = result
         items1: Dict[str, NonSpare] = {}
         items2: List[Optional[List[Tuple[str, NonSpare]]]] = []
-        for (flag, i) in zip(fspec, cls.cv_items_list):
+        for (flag, i) in Fspec.iter_complete(fspec, cls.cv_items_list):
             if not flag:
                 continue
             if issubclass(i, UapItemSpare):
@@ -1336,7 +1347,7 @@ class Record:
                 break
             elif issubclass(i, UapItem):
                 nsp = i.cv_non_spare
-                result2 = nsp.parse(remaining)  # type: ignore
+                result2 = nsp.parse(remaining)
                 if isinstance(result2, ValueError):
                     if pm == ParsingMode.StrictParsing:
                         return result2
@@ -1587,7 +1598,7 @@ class Expansion:
         else:
             raise Exception('Unexpected cv_type', a)
         items = {}
-        for (flag, nsp) in zip(flags, cls.cv_items_list):
+        for (flag, nsp) in Fspec.iter_complete(flags, cls.cv_items_list):
             if not flag:
                 continue
             if nsp is None:

{libasterix-0.36.1 → libasterix-0.36.3}/src/libasterix.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libasterix
-Version: 0.36.1
+Version: 0.36.3
 Summary: Asterix data processing library
 Author-email: Zoran Bošnjak <zoran.bosnjak@via.si>
 License-Expression: MIT

{libasterix-0.36.1 → libasterix-0.36.3}/tests/test_asterix.py

@@ -7,6 +7,7 @@ from typing import *
 import pytest
 
 from . generated import *
+from . import sample_records
 
 
 def test_create() -> None:
@@ -574,6 +575,16 @@ def test_compound0() -> None:
     assert isinstance(result, ValueError)
 
 
+def test_compound_fspec_error() -> None:
+    T = Cat_000_1_0.cv_record.spec('092')
+    # error: fspec bit is set between 'I1' and 'I2'
+    result1 = T.parse(Bits.from_bytes(unhexlify('c01122')))
+    assert isinstance(result1, ValueError)
+    # error: fspec bit is set after 'I2'
+    result2 = T.parse(Bits.from_bytes(unhexlify('a21122')))
+    assert isinstance(result2, ValueError)
+
+
 def test_compound1() -> None:
     T = Cat_000_1_0.cv_record.spec('093')
     with pytest.raises(ValueError):
@@ -1163,6 +1174,33 @@ def test_empty() -> None:
     rec2 = Cat_000_1_0.cv_record.create({})
     assert rec2.is_empty()
 
+
+def _test_roundtrip(num_records: int) -> None:
+    """For each specification and edition, create a few records,
+    encode, decode, expect the same result."""
+
+    def check(Spec: AstCat, r: Record) -> None:
+        records = list([r] * num_records)
+        bs = b''.join([r.unparse().to_bytes() for r in records])
+        if m_name is None:
+            result = Spec.cv_uap.parse(Bits.from_bytes(bs))  # type: ignore
+        else:
+            result = Spec.cv_uap.parse(  # type: ignore
+                m_name, Bits.from_bytes(bs))
+        assert not isinstance(result, ValueError)
+        bs2 = b''.join([r.unparse().to_bytes() for r in result])
+        assert bs2 == bs
+
+    for lst in manifest['CATS'].values():  # type: ignore
+        for Spec in lst:
+            for (m_name, r1, r2) in sample_records(Spec):
+                check(Spec, r1)
+                check(Spec, r2)
+
+
+def test_roundtrip() -> None:
+    _test_roundtrip(5)
+
 # python specific tests