protobin 0.0.38__tar.gz → 0.0.40__tar.gz

{protobin-0.0.38 → protobin-0.0.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: protobin
-Version: 0.0.38
+Version: 0.0.40
 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.38 → protobin-0.0.40}/protobin/errors.py

@@ -21,7 +21,7 @@ class InputError(BaseError):
     pass
 
 
-class ParserError(BaseError):
+class DecodeError(BaseError):
     pass
 
 

{protobin-0.0.38 → protobin-0.0.40}/protobin/fields.py

@@ -3,7 +3,7 @@ import datetime
 import math
 from typing import Union, List
 
-from protobin.errors import ParserError, FormatError
+from protobin.errors import DecodeError, FormatError
 
 
 # removed for python 3.8
@@ -50,7 +50,7 @@ class FieldBase:
     def ensure_length(self, binary):
         if self.bytes:
             if len(binary) < self.bytes:
-                raise ParserError(f'Binary has not enough data for {self}')
+                raise DecodeError(f'Binary has not enough data for {self}')
 
     def from_binary(self, binary):
         raise NotImplementedError()
@@ -398,7 +398,10 @@ class StringField(FieldBase):
         return f'StringField<key: {self.key}, bytes: {self.bytes}>'
 
     def from_binary(self, binary):
-        return binary.decode('utf')
+        try:
+            return binary.decode('utf')
+        except UnicodeEncodeError:
+            raise DecodeError(f"Can't decode string: {binary}")
 
     def split(self, binary):
         if self.bytes:
@@ -460,7 +463,7 @@ class TimestampField(FieldBase):
 
     def __init__(self, k, js):
         super().__init__(k, js)
-        self.bytes = 8
+        self.bytes = js.get('bytes', 6)
         self.decimals = js.get('decimals', 6)
 
     def __repr__(self):
@@ -472,7 +475,7 @@ class TimestampField(FieldBase):
         if val is None:
             return bytes([0] * 8)
         timestamp = val.timestamp() * (10 ** self.decimals)
-        return int(timestamp).to_bytes(8, 'big', signed=False)
+        return int(timestamp).to_bytes(self.bytes, 'big', signed=False)
 
     def from_binary(self, binary):
         d = int.from_bytes(binary, 'big')

{protobin-0.0.38 → protobin-0.0.40}/pyproject.toml

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

{protobin-0.0.38 → protobin-0.0.40}/tests/codec8.json

@@ -14,7 +14,7 @@
             "crc_size": 2,
             "header": "P",
             "fields": {
-                "bus_number": {"type": "string"},
+                "padron": {"type": "string"},
                 "company": {"type": "string"},
                 "route": {"type": "string"}
             }

{protobin-0.0.38 → protobin-0.0.40}/tests/demo.json

@@ -64,6 +64,16 @@
                 "id": {"type": "string"},
                 "value": {"type": "string"}
             }
+        },
+        "timestamp": {
+            "header": "#T",
+            "server": {
+                "faltantes": {"bytes": 4, "type": "unsigned"},
+                "tabla": {"bytes": 1, "type": "char"}
+            },
+            "client": {
+                "timestamp":{"bytes": 6, "decimals": 3, "type": "timestamp"}
+            }
         }
     }
 }

{protobin-0.0.38 → protobin-0.0.40}/tests/teltonika.json

@@ -14,7 +14,7 @@
             "crc_size": 2,
             "header": "P",
             "fields": {
-                "bus_number": {"type": "string"},
+                "padron": {"type": "string"},
                 "company": {"type": "string"},
                 "route": {"type": "string"}
             }
@@ -139,6 +139,14 @@
                 "datero_dif_5": {"type": "unsigned", "bytes": 1}
             }
         },
+        "message": {
+            "crc": false,
+            "crc_size": 2,
+            "header": "M",
+            "fields": {
+                "text": {"type": "string"}
+            }
+        },
         "command": {
             "codec": 12,
             "fields": {

{protobin-0.0.38 → protobin-0.0.40}/tests/tests.py

@@ -134,6 +134,10 @@ class BasicTest(unittest.TestCase):
                 "header": "TS",
                 "fields": {'test': {'bytes': 8, 'type': 'timestamp'}}
             },
+            'timestamp6': {
+                "header": "T6",
+                "fields": {'test': {'bytes': 6, "decimals": 3, 'type': 'timestamp'}}
+            },
             'unsigned': {
                 "header": "u",
                 "fields": {'test': {'bytes': 3, 'type': 'unsigned'}}
@@ -290,6 +294,31 @@ class BasicTest(unittest.TestCase):
         with self.assertRaises(ValueError) as er:
             self.protocol.encode(data, 'unsigned')
 
+        protocol = Protocol(js={'formats': {
+            'unsigned': {
+                "header": "u",
+                "fields": {
+                    "geofence": {"bytes": 2, "type": "unsigned"},
+                    "orden": {"bytes": 1, "type": "unsigned"},
+                    "delta": {"bytes": 1, "type": "unsigned"},
+                    "origin": {"bytes": 2, "type": "unsigned"},
+                    "id": {"bytes": 0, "type": "string"}
+                }
+            }
+        }})
+        data = {
+            "id": "11",
+            "orden": 0,
+            "origin": 57,
+            "delta": 5,
+            "geofence": 200
+        }
+        binary = protocol.encode(data, 'unsigned')
+        print(binary)
+        h, recv = protocol.decode(binary)
+        print(recv)
+        self.assertEqual(data, recv)
+
     def test_id(self):
         data = {'test': 254}
         binary = self.protocol.encode(data, 'id')
@@ -318,6 +347,13 @@ class BasicTest(unittest.TestCase):
         h, recv = self.protocol.decode(binary)
         self.assertEqual(data, recv)
 
+    def test_timestamp6(self):
+        data = {'test': datetime.datetime(2025, 1, 24, 9, 18, 24, 896000)}
+        binary = self.protocol.encode(data, 'timestamp6')
+        print(binary)
+        h, recv = self.protocol.decode(binary)
+        self.assertEqual(data, recv)
+
     def test_timestamp_null(self):
         data = {'test': None}
         binary = self.protocol.encode(data, 'timestamp')
@@ -635,7 +671,7 @@ report:
         data = {'status': 'E', 'direction': 'A', 'next_next_control': '', 'next_next_time': '     ', 'next_control': '', 'next_time': '     ', 'previous_control': '', 'delay': 0, 'front_control': '', 'back_control': '', 'back_back_control': '', 'datero_bus_-1': 0, 'datero_dif_-1': 0, 'datero_bus_0': 0, 'datero_dif_0': 0, 'datero_bus_1': 0, 'datero_dif_1': 0, 'datero_bus_2': 0, 'datero_dif_2': 0, 'datero_bus_3': 256, 'datero_dif_3': 0, 'datero_bus_4': 0, 'datero_dif_4': 0, 'datero_bus_5': 0, 'datero_dif_5': 0}
         client = Protocol(file='codec8.json')
         binary = client.encode(data, 'status3')
-        self.assertEqual(b's=EA\x00     \x00     \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xb6\xd6', binary)
+        self.assertEqual(b's=EA\x00     \x00     \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\xb6\xd6', binary)
         header, recv = client.decode(binary)
         self.assertEqual(data, recv)
 
@@ -723,7 +759,21 @@ report:
 
     def test_teltonika_login(self):
         client = Protocol(file='codec8.json', server=None)
-        data = {'bus_number': '110', 'company': 'roma', 'route': 'IO37'}
+        data = {'padron': '110', 'company': 'roma', 'route': 'IO37'}
         binary = client.encode(data, 'login_status')
         print(binary)
         self.assertEqual(b'P=\x03110\x04roma\x04IO37\x19\x8f', binary)
+
+    def test_teltonika_login_urbanito(self):
+        client = Protocol(file='codec8.json', server=None)
+        data = {'company': 'urbanito', 'route': '9802'}
+        binary = client.encode(data, 'login_status')
+        print(binary)
+        self.assertEqual(b'P=\x00\x08urbanito\x049802+\xbf', binary)
+
+    def test_message_teltonika(self):
+        data = {'text': 'prueba de mensaje'}
+        client = Protocol(file='teltonika.json', server=None)
+        binary = client.encode(data, 'message')
+        print(binary)
+        self.assertEqual(binary, b'M=\x11prueba de mensaje48')