protobin 0.0.20__tar.gz → 0.0.22__tar.gz

{protobin-0.0.20 → protobin-0.0.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: protobin
-Version: 0.0.20
+Version: 0.0.22
 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
@@ -31,7 +31,7 @@ License: MIT License
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.9
+Requires-Python: >=3.8
 Requires-Dist: crcmod==1.7
 Requires-Dist: pyyaml~=6.0
 Description-Content-Type: text/markdown

{protobin-0.0.20 → protobin-0.0.22}/protobin/protocol.py

@@ -16,6 +16,7 @@ class Format:
         self.input_fields = []
         self.output_fields = []
         self.header = format.get('header')
+        self.codec = format.get('codec')
         self.crc = format.get('crc', True)
         if server is None:
             input_mode = 'fields'
@@ -31,12 +32,17 @@ class Format:
             self.output_fields.append(FIELD_MAP[f['type']](k, f))
 
     def __repr__(self):
-        return f'Format: {self.name} <{self.header}>'
+        if self.header:
+            return f'Format: {self.name} <{self.header}>'
+        elif self.codec:
+            return f'Format: {self.name} <{self.codec}>'
 
     def encode(self, data):
         binary = b''
         if self.header:
             binary += self.header.encode('utf') + b'='
+        elif self.codec:
+            binary += self.codec.to_bytes()
         for f in self.output_fields:
             binary += f.encode(data)
         return binary
@@ -61,6 +67,7 @@ class Protocol:
     def __init__(self, server: bool = None, file=None, js=None):
         self.server = server
         self.headers = {}
+        self.codecs = {}
         if file:
             with open(file, 'r') as f:
                 if 'json' in file:
@@ -85,10 +92,15 @@ class Protocol:
             self.formats[name] = Format(name=name, format=format, server=self.server)
             if 'header' in format:
                self.headers[format['header']] = name
+            if 'codec' in format:
+               self.codecs[format['codec']] = name
 
     def get_format(self, h):
         return self.formats[self.headers[h.decode('utf')]]
 
+    def get_codec(self, h):
+        return self.formats[self.codecs[int.from_bytes(h)]]
+
     def encode(self, data, format_key):
         if format_key not in self.formats:
             raise InputError(f'{format_key} is not available format, these are the all availables formats {self.formats.keys()}')
@@ -101,12 +113,18 @@ class Protocol:
     def decode(self, binary, codec=None):
         if codec is None:
             n = binary.find(b'=')
-            if n > 4:
+            if n == -1:
                 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)
+            else:
+                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)
         else:
             format = self.formats[codec]
             if format.crc and self.crc16:

{protobin-0.0.20 → protobin-0.0.22}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "protobin"
-version = "0.0.20"
+version = "0.0.22"
 authors = [
     { name="Daniel Robles", email="drm.electronic@gmail.com" },
 ]
@@ -15,7 +15,7 @@ dependencies = [
 description = "Python library for encode and decode data in protobin format"
 readme = "README.md"
 license = { file="LICENSE.txt" }
-requires-python = ">=3.9"
+requires-python = ">=3.8"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",

{protobin-0.0.20 → protobin-0.0.22}/tests/codec8.json

@@ -16,8 +16,8 @@
             }
         },
         "report": {
+            "codec": 8,
             "fields": {
-                "codec": {"type":  "unsigned", "bytes": 1},
                 "positions": {"type": "array", "array": {
                     "time": {"type": "timestamp", "decimals": 3},
                     "priority": {"type": "unsigned", "bytes": 1},

{protobin-0.0.20 → protobin-0.0.22}/tests/demo.json

@@ -60,15 +60,9 @@
                 }
             },
             "server": {
-                "comando": {
-                    "type": "char"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "value": {
-                    "type": "string"
-                }
+                "comando": {"type": "char"},
+                "id": {"type": "string"},
+                "value": {"type": "string"}
             }
         }
     }

{protobin-0.0.20 → protobin-0.0.22}/tests/tests.py

@@ -568,9 +568,8 @@ report:
         hexdata = '000000000000003608010000016B40D8EA30010000000000000000000000000000000105021503010101425E0F01F10000601A014E0000000000000000010000C7CF'
         binary = bytes.fromhex(hexdata)
         client = Protocol(file='codec8.json', server=None)
-        recv = client.decode(binary, 'report')
+        header, recv = client.decode(binary)
         self.assertEqual(recv, {
-            'codec': 8,
             'positions': [{
             'time': datetime.datetime(2019, 6, 10, 5, 4, 46),
             'priority': 1,
@@ -613,11 +612,11 @@ report:
         self.assertEqual(data, recv)
 
     def test_crc(self):
-        data = {'codec': 8, '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)
-        recv = client.decode(binary, 'report')
+        header, recv = client.decode(binary)
         self.assertEqual(data, recv)
 
     def test_status_crc(self):