protobin 0.0.39__tar.gz → 0.0.41__tar.gz

{protobin-0.0.39 → protobin-0.0.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: protobin
-Version: 0.0.39
+Version: 0.0.41
 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.39 → protobin-0.0.41}/protobin/fields.py

@@ -299,7 +299,7 @@ class FlagsField(FieldBase):
     def __init__(self, k, js):
         super().__init__(k, js)
         self.keys = self.key.split(',')
-        self.length = len(self.key)
+        self.length = len(self.keys)
         self.bytes = math.ceil(self.length / 8)
 
     def __repr__(self):
@@ -463,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):
@@ -475,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.39 → protobin-0.0.41}/pyproject.toml

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

{protobin-0.0.39 → protobin-0.0.41}/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.39 → protobin-0.0.41}/tests/teltonika.json

@@ -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.39 → protobin-0.0.41}/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,7 @@ 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)
@@ -735,3 +771,43 @@ report:
         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')
+
+    def test_history_geofence_ms(self):
+        codec = {
+            "formats":{
+                "history_geofence_ms": {
+                    "header": "$",
+                    "fields": {
+                        "items": {
+                            "type": "array",
+                            "array": {
+                                "id": {"bytes": 2, "type": "unsigned"},
+                                "orden" : {"bytes": 1, "type": "unsigned"},
+                                "longitud": {"bytes": 4, "type": "float", "decimals": 6},
+                                "latitud": {"bytes": 4, "type": "float", "decimals": 6},
+                                "radio": {"bytes": 2, "type": "unsigned"},
+                                "ruta": {"bytes": 1, "type": "unsigned"},
+                                "lado,control,datear,activo": {"type": "flags"},
+                                "nombre": {"bytes": 15, "type": "char"},
+                                "timestamp":{"bytes": 6, "decimals": 3, "type": "timestamp"},
+                                "type": {"bytes": 1, "type": "char"}
+                            }
+                        },
+                        "next": {"bytes": 1, "type": "char"}
+                    }
+                }
+            }
+        }
+        data = {'items': [{'id': 2, 'lado': False, 'ruta': 2, 'audio': 'HU', 'orden': 8, 'radio': 70, 'activo': True, 'datear': True, 'nombre': 'FINAL', 'control': True, 'latitud': -12.0627343, 'retorno': True, 'sagrado': False, 'longitud': -77.0153672, 'terminal': True, 'timestamp': datetime.datetime(2020, 7, 27, 14, 12, 14, 486000), 'refrecuenciar': False, 'type': '+', 'tabla': 'G'}, {'id': 5, 'lado': False, 'ruta': 2, 'audio': 'UN', 'orden': 2, 'radio': 70, 'activo': True, 'datear': True, 'nombre': 'UNIVERITARIA', 'control': True, 'latitud': -12.0500755, 'retorno': False, 'sagrado': False, 'longitud': -77.0772618, 'terminal': False, 'timestamp': datetime.datetime(2020, 7, 27, 14, 12, 14, 518000), 'refrecuenciar': False, 'type': '+', 'tabla': 'G'}, {'id': 6, 'lado': False, 'ruta': 2, 'audio': 'CA', 'orden': 3, 'radio': 70, 'activo': True, 'datear': True, 'nombre': 'CARCAMO', 'control': True, 'latitud': -12.0472635, 'retorno': False, 'sagrado': False, 'longitud': -77.0508689, 'terminal': False, 'timestamp': datetime.datetime(2020, 7, 27, 14, 12, 14, 528000), 'refrecuenciar': False, 'type': '+', 'tabla': 'G'}, {'id': 7, 'lado': False, 'ruta': 2, 'audio': '2 ', 'orden': 4, 'radio': 70, 'activo': True, 'datear': True, 'nombre': '2 DE MAYO', 'control': True, 'latitud': -12.0465238, 'retorno': False, 'sagrado': False, 'longitud': -77.043466, 'terminal': False, 'timestamp': datetime.datetime(2020, 7, 27, 14, 12, 14, 536000), 'refrecuenciar': False, 'type': '+', 'tabla': 'G'}, {'id': 8, 'lado': False, 'ruta': 2, 'audio': 'PL', 'orden': 5, 'radio': 70, 'activo': True, 'datear': True, 'nombre': 'PLAZA SAN MARTIN', 'control': True, 'latitud': -12.0511405, 'retorno': False, 'sagrado': False, 'longitud': -77.0355159, 'terminal': False, 'timestamp': datetime.datetime(2020, 7, 27, 14, 12, 14, 544000), 'refrecuenciar': False, 'type': '+', 'tabla': 'G'}, {'id': 13, 'lado': True, 'ruta': 2, 'audio': 'AB', 'orden': 4, 'radio': 70, 'activo': True, 'datear': True, 'nombre': 'ABANCAY', 'control': True, 'latitud': -12.0547289, 'retorno': False, 'sagrado': False, 'longitud': -77.0298779, 'terminal': False, 'timestamp': datetime.datetime(2020, 7, 27, 14, 12, 14, 585000), 'refrecuenciar': False, 'type': '+', 'tabla': 'G'}, {'id': 14, 'lado': True, 'ruta': 2, 'audio': 'PL', 'orden': 5, 'radio': 70, 'activo': True, 'datear': True, 'nombre': 'PLAZA SAN MARTIN', 'control': True, 'latitud': -12.0520219, 'retorno': False, 'sagrado': False, 'longitud': -77.0339656, 'terminal': False, 'timestamp': datetime.datetime(2020, 7, 27, 14, 12, 14, 593000), 'refrecuenciar': False, 'type': '+', 'tabla': 'G'}, {'id': 15, 'lado': True, 'ruta': 2, 'audio': '2 ', 'orden': 6, 'radio': 70, 'activo': True, 'datear': True, 'nombre': '2 DE MAYO', 'control': True, 'latitud': -12.0467074, 'retorno': False, 'sagrado': False, 'longitud': -77.0421463, 'terminal': False, 'timestamp': datetime.datetime(2020, 7, 27, 14, 12, 14, 601000), 'refrecuenciar': False, 'type': '+', 'tabla': 'G'}, {'id': 17, 'lado': True, 'ruta': 2, 'audio': 'TE', 'orden': 9, 'radio': 70, 'activo': True, 'datear': True, 'nombre': 'TERMINAL', 'control': True, 'latitud': -12.0492046, 'retorno': False, 'sagrado': False, 'longitud': -77.088908, 'terminal': True, 'timestamp': datetime.datetime(2020, 7, 27, 14, 12, 14, 618000), 'refrecuenciar': False, 'type': '+', 'tabla': 'G'}], 'next': 'P'}
+        client = Protocol(js=codec, server=None)
+        binary = client.encode(data, 'history_geofence_ms')
+        rasp = b'$=\t\x00\x02\x08\xfbh\xd6\xb9\xffG\xef\xf2\x00F\x02\x07FINAL          \x01s\x91\xb0\x90\x96+\x00\x05\x02\xfbg\xe4\xf2\xffH!d\x00F\x02\x07UNIVERITARIA   \x01s\x91\xb0\x90\xb6+\x00\x06\x03\xfbhL\x0b\xffH,`\x00F\x02\x07CARCAMO        \x01s\x91\xb0\x90\xc0+\x00\x07\x04\xfbhh\xf6\xffH/D\x00F\x02\x072 DE MAYO      \x01s\x91\xb0\x90\xc8+\x00\x08\x05\xfbh\x88\x04\xffH\x1d<\x00F\x02\x07PLAZA SAN MARTI\x01s\x91\xb0\x90\xd0+\x00\r\x04\xfbh\x9e\n\xffH\x0f7\x00F\x02\x0fABANCAY        \x01s\x91\xb0\x90\xf9+\x00\x0e\x05\xfbh\x8e\x12\xffH\x19\xca\x00F\x02\x0fPLAZA SAN MARTI\x01s\x91\xb0\x91\x01+\x00\x0f\x06\xfbhn\x1e\xffH.\x8d\x00F\x02\x0f2 DE MAYO      \x01s\x91\xb0\x91\t+\x00\x11\t\xfbg\xb7t\xffH$\xcb\x00F\x02\x0fTERMINAL       \x01s\x91\xb0\x91\x1a+P'
+        self.assertEqual(binary, rasp)
+        h, recv = client.decode(binary)
+        print(recv)