protobin 0.0.41__tar.gz → 0.0.43__tar.gz

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

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

@@ -106,7 +106,7 @@ class ArrayField(FieldBase):
 
     def to_binary(self, val):
         if not isinstance(val, (list, tuple)):
-            raise ValueError(f'Error in field "{self.key}", a array is expected but "{val}" is received, {type(val)}')
+            raise ValueError(f'Error in field ArrayField<{self.key}>, a array is expected but "{val}" is received, {type(val)}')
         binary = b''
         length = len(val)
         binary += length.to_bytes(1, 'big')
@@ -135,7 +135,7 @@ class BitsField(FieldBase):
         self.bytes = math.ceil(self.length / 8)
 
     def __repr__(self):
-        return f'BitsFIeld<key: {self.key}, length: {self.length}, bytes: {self.bytes}>'
+        return f'BitsField<key: {self.key}, length: {self.length}, bytes: {self.bytes}>'
 
     def decode(self, binary):
         self.ensure_length(binary)
@@ -215,7 +215,14 @@ class CharField(FieldBase):
     def to_binary(self, val):
         if val is None:
             return bytes([0])
-        return (val + ' '*self.bytes)[:self.bytes].encode('utf')
+        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')
+        i = 0
+        while len(encoded) > self.bytes:
+            i += 1
+            encoded = val[:self.bytes - i].encode('utf')
+        return (encoded + b' ' * self.bytes)[:self.bytes]
 
     def from_binary(self, binary):
         val = int.from_bytes(binary[:self.bytes], 'big', signed=False)
@@ -270,7 +277,7 @@ class DateTimeField(FieldBase):
         if val is None:
             return bytes([0] * 6)
         elif not isinstance(val, datetime.datetime):
-            raise ValueError(f'Error in field "{self.key}", a datetime is expected but "{val}" is received')
+            raise ValueError(f'Error in field DateTimeField<{self.key}>, a datetime is expected but "{val}" is received')
         elif isinstance(val, str):
             val = datetime.datetime.strptime(val, '%Y-%m-%d %H:%M:%S').date()
         return bytes([
@@ -326,7 +333,7 @@ class FlagsField(FieldBase):
         for k in self.keys:
             val = data.get(k)
             if val is None:
-                raise ValueError(f'Error in field "{self.key}", a boolean is expected but "None" is received')
+                raise ValueError(f'Error in field FlagsField<{self.key}>, a boolean is expected but "None" is received')
             bits += '1' if data[k] else '0'
         return int(bits, 2).to_bytes(self.bytes, 'big', signed=False)
 
@@ -335,9 +342,11 @@ class FloatField(FieldBase):
 
     def __init__(self, k, js):
         super().__init__(k, js)
-        self.decimals = js['decimals']
+        self.decimals = js.get('decimals', None)
         if self.bytes == None:
-            raise ValueError(f'FloatField {self.key} needs to have bytes declared')
+            raise ValueError(f'FloatField<{self.key}> needs to have bytes declared')
+        if self.decimals == None:
+            raise ValueError(f'FloatField<{self.key}> needs to have decimals declared')
 
     def __repr__(self):
         return f'FloatField<key: {self.key}, bytes: {self.bytes}, decimals: {self.decimals}>'
@@ -361,7 +370,7 @@ class IdField(FieldBase):
         max_value = 256 ** self.bytes - 1
         val = min(val, max_value)
         if val < 0:
-            raise ValueError('Negative values not allowed')
+            raise ValueError('IdField<{self.key}> does not allow negative values')
         return int(val).to_bytes(self.bytes, 'big', signed=False)
 
     def from_binary(self, binary):
@@ -401,7 +410,7 @@ class StringField(FieldBase):
         try:
             return binary.decode('utf')
         except UnicodeEncodeError:
-            raise DecodeError(f"Can't decode string: {binary}")
+            raise DecodeError(f"{self}: Can't decode string: {binary}")
 
     def split(self, binary):
         if self.bytes:
@@ -441,10 +450,10 @@ class TimeField(FieldBase):
                 else:
                     val = datetime.datetime.strptime(val, '%H:%M').time()
             except:
-                raise ValueError(f'Error in field "{self.key}", a datetime or time is expected but "{val}" is received')
+                raise ValueError(f'Error in field TimeField<{self.key}>, a datetime or time is expected but "{val}" is received')
 
         elif not isinstance(val, datetime.datetime) and not isinstance(val, datetime.time):
-            raise ValueError(f'Error in field "{self.key}", a datetime or time is expected but "{val}" is received')
+            raise ValueError(f'Error in field TimeField<{self.key}>, a datetime or time is expected but "{val}" is received')
 
         return bytes([
             self.to_nible(val.hour),
@@ -495,11 +504,11 @@ class UnsignedField(FieldBase):
 
     def to_binary(self, val):
         if val is None:
-            raise ValueError(f'Error in field "{self.key}", None is not allowed')
+            raise ValueError(f'Error in field UnsignedField<{self.key}>, None is not allowed')
         max_value = 256 ** self.bytes - 1
         val = min(val, max_value)
         if val < 0:
-            raise ValueError(f'Error in field "{self.key}", positive integers expected but "{val}" is received')
+            raise ValueError(f'Error in field UnsignedField<{self.key}>, positive integers expected but "{val}" is received')
         return int(val).to_bytes(self.bytes, 'big', signed=False)
 
     def from_binary(self, binary):

{protobin-0.0.41 → protobin-0.0.43}/protobin/singleton.py

@@ -13,6 +13,5 @@ class ProtobinLoader(object):
     def get(self, path, server):
         key = f'{path}|{server}'
         if key not in self.protocols:
-            print('load protocol', path, server)
             self.protocols[key] = Protocol(file=path, server=server)
         return self.protocols[key]

{protobin-0.0.41 → protobin-0.0.43}/pyproject.toml

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

{protobin-0.0.41 → protobin-0.0.43}/tests/tests.py

@@ -112,7 +112,7 @@ class BasicTest(unittest.TestCase):
             },
             'float': {
                 "header": "f",
-                "fields": {'test': {'bytes': 4, 'decimals': 6, 'type': 'float'}}
+                "fields": {'test': {'bytes': 4, 'type': 'float', 'decimals': 6}}
             },
             'id': {
                 "header": "i",
@@ -202,6 +202,13 @@ class BasicTest(unittest.TestCase):
         h, recv = self.protocol.decode(binary)
         self.assertEqual(data, recv)
 
+    def test_char_utf(self):
+        data = {'test': 'ñ'}
+        binary = self.protocol.encode(data, 'char')
+        print('binary', binary)
+        h, recv = self.protocol.decode(binary)
+        self.assertEqual(data, recv)
+
     def test_char2(self):
         data = {'test': 'FA', 'prueba': 'DO'}
         binary = self.protocol.encode(data, 'char2')
@@ -215,6 +222,30 @@ class BasicTest(unittest.TestCase):
         self.assertEqual(data_corregida, recv)
         print(recv)
 
+    def test_char2_utf(self):
+        data = {'test': 'FA', 'prueba': 'ÑA'}
+        binary = self.protocol.encode(data, 'char2')
+        h, recv = self.protocol.decode(binary)
+        data['prueba'] = 'Ñ'
+        self.assertEqual(data, recv)
+        data = {'test': '', 'prueba': 'SÍ'}
+        binary = self.protocol.encode(data, 'char2')
+        print(binary)
+        h, recv = self.protocol.decode(binary)
+        data['prueba'] ='S '
+        data['test'] ='  '
+        self.assertEqual(data, recv)
+        print(recv)
+        data = {'test': 'ÉL', 'prueba': 'NO'}
+        binary = self.protocol.encode(data, 'char2')
+        print(binary)
+        h, recv = self.protocol.decode(binary)
+        data['test'] ='É'
+        self.assertEqual(data, recv)
+        print(recv)
+
+
+
     def test_date(self):
         data = {'test': datetime.date(2024, 9, 13)}
         binary = self.protocol.encode(data, 'date')
@@ -273,6 +304,10 @@ class BasicTest(unittest.TestCase):
     def test_float(self):
         data = {'test': -11.659812}
         binary = self.protocol.encode(data, 'float')
+        h, recv = self.protocol.decode(binary)
+        self.assertEqual(data, recv)
+        data = {'test': 0}
+        binary = self.protocol.encode(data, 'float')
         print(binary)
         h, recv = self.protocol.decode(binary)
         self.assertEqual(data, recv)
@@ -340,6 +375,11 @@ class BasicTest(unittest.TestCase):
         binary = self.protocol.encode(data, 'string')
         h, recv = self.protocol.decode(binary)
         self.assertEqual(data, recv)
+        data = {'test': 'ñandú'}
+        binary = self.protocol.encode(data, 'string')
+        h, recv = self.protocol.decode(binary)
+        print('binary', binary)
+        self.assertEqual(data, recv)
 
     def test_timestamp(self):
         data = {'test': datetime.datetime(2024, 9, 13, 15, 23, 51, 265981)}
@@ -810,4 +850,4 @@ report:
         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)
+        print(recv)