protobin 0.0.24__tar.gz → 0.0.26__tar.gz

{protobin-0.0.24 → protobin-0.0.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: protobin
-Version: 0.0.24
+Version: 0.0.26
 Summary: Python library for encode and decode data in protobin format
 Project-URL: Homepage, https://github.com/drmelectronic/protobin-python
 Project-URL: Bug Tracker, https://github.com/drmelectronic/protobin-python/issues

{protobin-0.0.24 → protobin-0.0.26}/protobin/fields.py

@@ -6,6 +6,7 @@ from typing import Union, List
 from protobin.errors import ParserError, FormatError
 
 
+# removed for python 3.8
 # class FieldEnum(enum.StrEnum):
 #     ARRAY = 'array'
 #     BITS = 'bits'
@@ -24,9 +25,10 @@ from protobin.errors import ParserError, FormatError
 
 
 class FieldBase:
-    bytes: int | None
-    keys: List[str] | None
-    key: str
+    # removed for python 3.8
+    # bytes: int | None
+    # keys: List[str] | None
+    # key: str
     # type: FieldEnum
 
     def __init__(self, k, js):
@@ -231,7 +233,9 @@ class DateField(FieldBase):
     def __repr__(self):
         return f'DateField<key: {self.key}>'
 
-    def to_binary(self, val: datetime.datetime | str):
+    # removed for python 3.8
+    # def to_binary(self, val: datetime.datetime | str):
+    def to_binary(self, val):
         if val is None:
             return bytes([0] * 3)
         elif isinstance(val, str):
@@ -260,7 +264,9 @@ class DateTimeField(FieldBase):
     def __repr__(self):
         return f'DateTimeField<key: {self.key}>'
 
-    def to_binary(self, val: datetime.datetime | str):
+    # removed for python 3.8
+    # def to_binary(self, val: datetime.datetime | str):
+    def to_binary(self, val):
         if val is None:
             return bytes([0] * 6)
         elif not isinstance(val, datetime.datetime):
@@ -420,7 +426,9 @@ class TimeField(FieldBase):
     def __repr__(self):
         return f'TimeField<key: {self.key}, bytes: {self.bytes}>'
 
-    def to_binary(self, val: datetime.datetime | datetime.time | str):
+    # removed for python 3.8
+    # def to_binary(self, val: datetime.datetime | datetime.time | str):
+    def to_binary(self, val):
         if val is None:
             return bytes([0] * 2)
         elif isinstance(val, str):
@@ -455,7 +463,9 @@ class TimestampField(FieldBase):
     def __repr__(self):
         return f'TimestampField<key: {self.key}>'
 
-    def to_binary(self, val: datetime.datetime | str):
+    # removed for python 3.8
+    # def to_binary(self, val: datetime.datetime | str):
+    def to_binary(self, val):
         if val is None:
             return bytes([0] * 8)
         timestamp = val.timestamp() * (10 ** self.decimals)

{protobin-0.0.24 → protobin-0.0.26}/protobin/protocol.py

@@ -42,7 +42,9 @@ class Format:
         if self.header:
             binary += self.header.encode('utf') + b'='
         elif self.codec:
-            binary += self.codec.to_bytes()
+            # added for python 3.8
+            # binary += self.codec.to_bytes()
+            binary += self.codec.to_bytes(1, 'big')
         for f in self.output_fields:
             binary += f.encode(data)
         return binary
@@ -99,7 +101,9 @@ class Protocol:
         return self.formats[self.headers[h.decode('utf')]]
 
     def get_codec(self, h):
-        return self.formats[self.codecs[int.from_bytes(h)]]
+        # added for python 3.8
+        # return self.formats[self.codecs[int.from_bytes(h)]]
+        return self.formats[self.codecs[int.from_bytes(h, 'big')]]
 
     def encode(self, data, format_key):
         if format_key not in self.formats:
@@ -110,21 +114,30 @@ class Protocol:
             binary = len(binary).to_bytes(self.length, 'big', signed=False) + binary + self.get_crc(binary)
         return binary
 
-    def decode(self, binary, codec=None):
-        if codec is None:
-            n = binary.find(b'=')
-            if n == -1:
+    def get_header(self, binary):
+        n = binary.find(b'=')
+        if n == -1:
+            binary = self.check_crc(binary)
+            h = binary[:1]
+            binary = binary[1:]
+            format = self.get_codec(h)
+        else:
+            if n > 4:
                 binary = self.check_crc(binary)
-                h = binary[:1]
-                binary = binary[1:]
-                format = self.get_codec(h)
-            else:
+                n = binary.find(b'=')
                 if n > 4:
-                    binary = self.check_crc(binary)
-                    n = binary.find(b'=')
-                h = binary[0:n]
-                binary = binary[n + 1:]
-                format = self.get_format(h)
+                    h = binary[:1]
+                    binary = binary[1:]
+                    format = self.get_codec(h)
+                    return format, binary
+            h = binary[0:n]
+            binary = binary[n + 1:]
+            format = self.get_format(h)
+        return format, binary
+
+    def decode(self, binary, codec=None):
+        if codec is None:
+            format, binary = self.get_header(binary)
         else:
             format = self.formats[codec]
             if format.crc and self.crc16:

{protobin-0.0.24 → protobin-0.0.26}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "protobin"
-version = "0.0.24"
+version = "0.0.26"
 authors = [
     { name="Daniel Robles", email="drm.electronic@gmail.com" },
 ]

{protobin-0.0.24 → protobin-0.0.26}/tests/codec8.json

@@ -45,9 +45,9 @@
                     "events8b": {"type": "array", "array": {
                         "id": {"type": "id", "bytes": 1},
                         "value": {"type": "unsigned", "bytes": 8}
-                    }},
-                    "#reports": {"type": "unsigned", "bytes": 1}
-                }}
+                    }}
+                }},
+                "#reports": {"type": "unsigned", "bytes": 1}
             }
         },
         "status3": {

{protobin-0.0.24 → protobin-0.0.26}/tests/tests.py

@@ -563,7 +563,6 @@ report:
         header, recv = server.decode(binary)
         self.assertEqual(recv, data)
 
-
     def test_teltonika_position_hex(self):
         hexdata = '000000000000003608010000016B40D8EA30010000000000000000000000000000000105021503010101425E0F01F10000601A014E0000000000000000010000C7CF'
         binary = bytes.fromhex(hexdata)
@@ -571,31 +570,32 @@ report:
         header, recv = client.decode(binary)
         self.assertEqual(recv, {
             'positions': [{
-            'time': datetime.datetime(2019, 6, 10, 5, 4, 46),
-            'priority': 1,
-            'lng': 0.0,
-            'lat': 0.0,
-            'alt': 0,
-            'angle': 0,
-            'satellites': 0,
-            'speed': 0,
-            'event_io': 1,
-            '#events': 5,
-            'events1b': [
-                {'id': 21, 'value': 3},
-                {'id': 1, 'value': 1}
-            ],
-            'events2b': [
-                {'id': 66, 'value': 24079}
-            ],
-            'events4b': [
-                {'id': 241, 'value': 24602}
-            ],
-            'events8b': [
-                {'id': 78, 'value': 0}
+                'time': datetime.datetime(2019, 6, 10, 5, 4, 46),
+                'priority': 1,
+                'lng': 0.0,
+                'lat': 0.0,
+                'alt': 0,
+                'angle': 0,
+                'satellites': 0,
+                'speed': 0,
+                'event_io': 1,
+                '#events': 5,
+                'events1b': [
+                    {'id': 21, 'value': 3},
+                    {'id': 1, 'value': 1}
+                ],
+                'events2b': [
+                    {'id': 66, 'value': 24079}
+                ],
+                'events4b': [
+                    {'id': 241, 'value': 24602}
+                ],
+                'events8b': [
+                    {'id': 78, 'value': 0}
+                ]}
             ],
-            '#reports': 1,
-        }]})
+            '#reports': 1
+        })
 
     def test_login_keyerror(self):
         client = Protocol(file='demo.json', server=False)
@@ -612,7 +612,7 @@ report:
         self.assertEqual(data, recv)
 
     def test_crc(self):
-        data = {'positions': [{'time': datetime.datetime(2024, 10, 19, 9, 37, 57, 555000), 'priority': 1, 'lng': -77.0155334, 'lat': -12.0613651, 'alt': 0, 'angle': 0, 'satellites': 3, 'speed': 105, 'event_io': 0, '#events': 0, 'events1b': [], 'events2b': [], 'events4b': [], 'events8b': [], '#reports': 1}]}
+        data = {'positions': [{'time': datetime.datetime(2024, 10, 19, 9, 37, 57, 555000), 'priority': 1, 'lng': -77.0155334, 'lat': -12.0613651, 'alt': 0, 'angle': 0, 'satellites': 3, 'speed': 105, 'event_io': 0, '#events': 0, 'events1b': [], 'events2b': [], 'events4b': [], 'events8b': []}], '#reports': 1}
         client = Protocol(file='codec8.json')
         binary = client.encode(data, 'report')
         self.assertEqual(b'\x00\x00\x00\x00\x00\x00\x00!\x08\x01\x00\x00\x01\x92\xa56\xaf\xb3\x01\xd2\x18\\\xba\xf8\xcf\x94\xed\x00\x00\x00\x00\x03\x00i\x00\x00\x00\x00\x00\x00\x01\x00\x00\xa3\xe4', binary)
@@ -635,3 +635,10 @@ report:
         data = {'positions': 1}
         binary = protocol.encode(data, 'report_ack')
         self.assertEqual(binary, b'\x00\x00\x00\x01')
+
+    def test_decode_codec8(self):
+        # binary = b'\xfe\x0f350424068858891\x00\x00\x01\x06CBF541\x04\x00\x02R\x00\x00\x00\x00\x01\x00\x00\x1e\n\x04\x00)\x11$\x100\x00R\xff\x00\x00\x00\x02'
+        binary = b'\x00\x00\x00\x00\x00\x00\x01\x11\x08\t\x00\x00\x01\x93x\xd74\xf0\x00\xd2\x15\x19\xe6\xf8\xc6\xe8\x9e\x00Z\x01b\x0e\x00\r\x00\x00\x00\x00\x00\x00\x00\x00\x01\x93x\xd7_\xe8\x00\xd2\x15\x1b#\xf8\xc6\xfau\x00W\x00\x06\x0f\x00\x0e\x00\x00\x00\x00\x00\x00\x00\x00\x01\x93x\xd7\x86\xf8\x00\xd2\x15\x19\xf7\xf8\xc7\x0c~\x00S\x01e\x10\x00\x14\x00\x00\x00\x00\x00\x00\x00\x00\x01\x93x\xd7\xd5\x18\x00\xd2\x15\x19\xf7\xf8\xc7\x14=\x00U\x00\x02\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x93x\xd8#8\x00\xd2\x15\x19\xf7\xf8\xc7\x14=\x00U\x00\x02\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x93x\xd8qX\x00\xd2\x15\x19\xf7\xf8\xc7\x14=\x00U\x00\x02\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x93x\xd8\xb3\xc0\x00\xd2\x15\x1bU\xf8\xc7%\xe2\x00R\x01g\x10\x00\x19\x00\x00\x00\x00\x00\x00\x00\x00\x01\x93x\xd8\xcf\x18\x00\xd2\x15\x1a\xe0\xf8\xc79\x8b\x00T\x01g\x0f\x00\x17\x00\x00\x00\x00\x00\x00\x00\x00\x01\x93x\xd8\xeeX\x00\xd2\x15\x1al\xf8\xc7K\x1f\x00Y\x00\x01\x0e\x00\x17\x00\x00\x00\x00\x00\x00\t\x00\x00\x13x'
+        client = Protocol(file='codec8.json')
+        header, recv = client.decode(binary)
+        print(header, recv)