protobin 0.0.49__tar.gz → 0.1.0__tar.gz

{protobin-0.0.49 → protobin-0.1.0}/PKG-INFO

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

@@ -243,7 +243,7 @@ class CharField(FieldBase):
 
     def to_binary(self, val):
         if val is None:
-            val = ''
+            val = '\x00' * self.bytes
         encoded = val[:self.bytes].encode('utf')
         if self.bytes == 1 and len(encoded) > 1:
             raise ValueError(f'{self} of one byte is possible to encode a utf-8 character')
@@ -506,9 +506,10 @@ class TimestampField(FieldBase):
         super().__init__(k, js)
         self.bytes = js.get('bytes', 6)
         if self.bytes == 6:
-            self.decimals = 3
+            self.decimals = js.get('decimals', 3)
         elif self.bytes == 8:
-            self.decimals = 6
+            self.decimals = js.get('decimals', 6)
+
         else:
             raise ValueError(f'Error in field TimestampField<{self.key}>, bytes must be 6 or 8 but "{self.bytes}" is received')
 

{protobin-0.0.49 → protobin-0.1.0}/protobin/protocol.py

@@ -74,6 +74,7 @@ class Protocol:
         self.server = server
         self.headers = {}
         self.codecs = {}
+        self.file = file
         if file:
             with open(file, 'r') as f:
                 if 'json' in file:
@@ -85,6 +86,9 @@ class Protocol:
         else:
             self.load_format(js)
 
+    def __str__(self):
+        return self.file
+
     def load_format(self, js):
         if 'crc' in js:
             self.config_crc(js['crc'])
@@ -128,7 +132,7 @@ class Protocol:
         n = binary.find(b'=')
         if n == -1:
             # posiciones sin =, calcular la longitud de la trama con sus primero bytes
-            binary = self.check_crc(binary)
+            # binary = self.check_crc(binary)
             h = binary[:1]
             binary = binary[1:]
             format = self.get_codec(h)
@@ -140,7 +144,7 @@ class Protocol:
                 #     binary = binary[4:]
                 # else:
                 #     # codec8
-                binary = self.check_crc(binary)
+                # binary = self.check_crc(binary)
                 n = binary.find(b'=')
                 if n > 4 or n == -1:
                     # si el igual está adelante no es parte del comando

{protobin-0.0.49 → protobin-0.1.0}/pyproject.toml

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

{protobin-0.0.49 → protobin-0.1.0}/tests/codec8.json

@@ -23,7 +23,7 @@
             "codec": 8,
             "fields": {
                 "positions": {"type": "array", "array": {
-                    "time": {"type": "timestamp", "decimals": 3},
+                    "time": {"type": "timestamp", "decimals": 3, "bytes": 8},
                     "priority": {"type": "unsigned", "bytes": 1},
                     "lng": {"type": "float", "bytes": 4, "decimals":  7},
                     "lat": {"type": "float", "bytes": 4, "decimals":  7},

{protobin-0.0.49 → protobin-0.1.0}/tests/tests.py

@@ -277,7 +277,7 @@ class BasicTest(unittest.TestCase):
         data = {'test': None}
         binary = self.protocol.encode(data, 'char')
         h, recv = self.protocol.decode(binary)
-        self.assertEqual({'test': ' '}, recv)
+        self.assertEqual({'test': None}, recv)
 
     def test_char_utf(self):
         data = {'test': 'ñ'}
@@ -457,10 +457,11 @@ class BasicTest(unittest.TestCase):
         self.assertEqual(data, recv)
 
     def test_timestamp(self):
-        data = {'test': datetime.datetime(2024, 9, 13, 15, 23, 51, 265981)}
+        data = {'test': datetime.datetime(2025, 9, 2, 12, 9, 50, 732000)}
         binary = self.protocol.encode(data, 'timestamp')
         print(binary)
         h, recv = self.protocol.decode(binary)
+        print('recv', recv)
         self.assertEqual(data, recv)
 
     def test_timestamp6(self):
@@ -477,12 +478,14 @@ class BasicTest(unittest.TestCase):
         self.assertEqual(data, recv)
 
     def test_timestamp_default(self):
-        data = {'test': datetime.datetime.now()}
+        data = {'test': datetime.datetime(2025, 9, 2, 12, 9, 50, 732000)}
+        # data = {'test': datetime.datetime.now()}
         print(data)
         binary = self.protocol.encode(data, 'timestamp_default')
-        print(binary)
+        print('mio', binary)
+        binary = b'\x54\x44\x3d\x01\x99\x0A\x55\x5D\x8C'
         h, recv = self.protocol.decode(binary)
-        print(recv)
+        print('edu', recv)
         self.assertEqual(data['test'].replace(microsecond=(data['test'].microsecond // 1000) * 1000), recv['test'])
 
 class AdvancedTest(unittest.TestCase):
@@ -753,7 +756,7 @@ report:
                 }
         client = Protocol(file='demo.json', server=False)
         binary = client.encode(data, 'report')
-        binary2 = b'PV=\x01\x18\x10$\x15W8\xfbh\xd6\x13\xffG\xf5Ki\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00'
+        binary2 = b'PV=\x01\x18\x10$\x15W8\xfbh\xd6\x13\xffG\xf5Ki\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\xa2\x00'
         self.assertEqual(binary, binary2)
         server = Protocol(file='demo.json', server=True)
         header, recv = server.decode(binary)
@@ -1018,7 +1021,7 @@ report:
         data = {'id': 52723, 'ruta': 1, 'lado': True, 'inicio': datetime.datetime(2025, 7, 22, 16, 40), 'estado': 'R', 'frecuencia': 6, 'conductor': 36, 'geocerca': 14, 'marcados': [True, True, True, True, True, True, True, True, True, True, True, True, True, True, False, False, False, False], 'controles': [{'geocerca': 3, 'tiempo': 0, 'volada': -10}, {'geocerca': 11, 'tiempo': 3, 'volada': -11}, {'geocerca': 28, 'tiempo': 3, 'volada': -4}, {'geocerca': 29, 'tiempo': 6, 'volada': -2}, {'geocerca': 43, 'tiempo': 0, 'volada': -2}, {'geocerca': 30, 'tiempo': 3, 'volada': 2}, {'geocerca': 12, 'tiempo': 3, 'volada': 2}, {'geocerca': 31, 'tiempo': 8, 'volada': 2}, {'geocerca': 32, 'tiempo': 2, 'volada': 3}, {'geocerca': 13, 'tiempo': 2, 'volada': 3}, {'geocerca': 33, 'tiempo': 2, 'volada': 6}, {'geocerca': 34, 'tiempo': 6, 'volada': 4}, {'geocerca': 35, 'tiempo': 4, 'volada': 4}, {'geocerca': 14, 'tiempo': 6, 'volada': 3}, {'geocerca': 36, 'tiempo': 11, 'volada': 0}, {'geocerca': 37, 'tiempo': 11, 'volada': 0}, {'geocerca': 38, 'tiempo': 11, 'volada': 0}, {'geocerca': 4, 'tiempo': 11, 'volada': 0}]}
         binary = server.encode(data, 'salida')
         print(binary)
-        self.assertEqual(b'S=\x00\x00\xcd\xf3\x01\x01"\x07%\x16@\x00R\x06\x00\x00\x00$\x00\x0e\x12\xff\xfc\x00\x12\x00\x03\x00\x00\xff\xf6\x00\x0b\x00\x03\xff\xf5\x00\x1c\x00\x03\xff\xfc\x00\x1d\x00\x06\xff\xfe\x00+\x00\x00\xff\xfe\x00\x1e\x00\x03\x00\x02\x00\x0c\x00\x03\x00\x02\x00\x1f\x00\x08\x00\x02\x00 \x00\x02\x00\x03\x00\r\x00\x02\x00\x03\x00!\x00\x02\x00\x06\x00"\x00\x06\x00\x04\x00#\x00\x04\x00\x04\x00\x0e\x00\x06\x00\x03\x00$\x00\x0b\x00\x00\x00%\x00\x0b\x00\x00\x00&\x00\x0b\x00\x00\x00\x04\x00\x0b\x00\x00', binary)
+        self.assertEqual(b'S=\x00\x00\xcd\xf3\x01\x01"\x07%\x16@\x00R\x06\x00\x00\x00$\x00\x0e\x12\xff\xfc\x00\x12\x00\x03\x00\x00\xff\xf6\x00\x0b\x00\x03\xff\xf5\x00\x1c\x00\x03\xff\xfc\x00\x1d\x00\x06\xff\xfe\x00+\x00\x00\xff\xfe\x00\x1e\x00\x03\x00\x02\x00\x0c\x00\x03\x00\x02\x00\x1f\x00\x08\x00\x02\x00 \x00\x02\x00\x03\x00\r\x00\x02\x00\x03\x00!\x00\x02\x00\x06\x00"\x00\x06\x00\x04\x00#\x00\x04\x00\x04\x00\x0e\x00\x06\x00\x03\x00$\x00\x0b\x00\x00\x00%\x00\x0b\x00\x00\x00&\x00\x0b\x00\x00\x00\x04\x00\x0b\x00\x00\x9e\xce', binary)
         h, recv = client.decode(binary)
         print(recv)
         self.assertEqual(h, 'salida')