tsrkit-types 0.1.3__py3-none-any.whl → 0.1.5__py3-none-any.whl

tsrkit_types/__init__.py

@@ -35,7 +35,7 @@ from .sequences import (
 from .dictionary import Dictionary
 
 # Bytes types
-from .bytes import Bytes, ByteArray16, ByteArray32, ByteArray64, ByteArray128, ByteArray256, ByteArray512, ByteArray1024
+from .bytes import Bytes, Bytes16, Bytes32, Bytes64, Bytes128, Bytes256, Bytes512, Bytes1024
 from .bytearray import ByteArray
 
 # Bit types
@@ -76,7 +76,7 @@ __all__ = [
     "Dictionary",
     
     # Bytes types
-    "Bytes", "ByteArray16", "ByteArray32", "ByteArray64", "ByteArray128", "ByteArray256", "ByteArray512", "ByteArray1024",
+    "Bytes", "Bytes16", "Bytes32", "Bytes64", "Bytes128", "Bytes256", "Bytes512", "Bytes1024",
     "ByteArray",
     
     # Bit types

tsrkit_types/bytes.py

@@ -61,10 +61,10 @@ class Bytes(bytes, Codable, BytesMixin, metaclass=BytesCheckMeta):
     # ---------------------------------------------------------------------------- #
     # JSON methods inherited from BytesMixin
         
-ByteArray16 = Bytes[16]
-ByteArray32 = Bytes[32]
-ByteArray64 = Bytes[64]
-ByteArray128 = Bytes[128]
-ByteArray256 = Bytes[256]
-ByteArray512 = Bytes[512]
-ByteArray1024 = Bytes[1024]
+Bytes16 = Bytes[16]
+Bytes32 = Bytes[32]
+Bytes64 = Bytes[64]
+Bytes128 = Bytes[128]
+Bytes256 = Bytes[256]
+Bytes512 = Bytes[512]
+Bytes1024 = Bytes[1024]

tsrkit_types/choice.py

@@ -68,6 +68,9 @@ class Choice(Codable):
     def unwrap(self) -> Any:
         return self._value
 
+    def get_key(self):
+        return self._choice_key
+
     def __repr__(self) -> str:
         return f"{self.__class__.__name__}({self._value!r})"
 
@@ -129,4 +132,4 @@ class Choice(Codable):
         tag, tag_size = Uint.decode_from(buffer, offset)
         value, val_size = cls._opt_types[tag][1].decode_from(buffer, offset+tag_size)
 
-        return cls(value), tag_size+val_size
+        return cls(value), tag_size+val_size

tsrkit_types/integers.py

@@ -11,7 +11,7 @@ class IntCheckMeta(abc.ABCMeta):
         return isinstance(instance, int) and getattr(instance, "byte_size", 0) == cls.byte_size
 
 
-class Uint(int, Codable, metaclass=IntCheckMeta):
+class Int(int, Codable, metaclass=IntCheckMeta):
     """
     Unsigned integer type.
     
@@ -52,23 +52,42 @@ class Uint(int, Codable, metaclass=IntCheckMeta):
     # If the byte_size is set, the integer is fixed size.
     # Otherwise, the integer is General Integer (supports up to 2**64 - 1)
     byte_size: int = 0
-
-    def __class_getitem__(cls, size: int):
-        return type(f"U{size}" if size else "Int", (cls,), {"byte_size": size // 8})
+    signed = False
+    _bound = 0
+
+    def __class_getitem__(cls, data: int | tuple):
+        """
+        Args:
+            data: either byte_size or (byte_size, signed)
+        """
+        if data == None:
+            size, signed = 0, False
+        # If we have a single value arg - wither byte_size or signed
+        elif not isinstance(data, tuple):
+            if isinstance(data, int):
+                size, signed = data, False
+            else: 
+                size, signed = 0, bool(data)
+        else:
+            size, signed = data
+        return type(f"U{size}" if size else "Int", (cls,), {
+            "byte_size": size // 8, 
+            "signed": signed, 
+            "_bound": 1 << size if size > 0 else 1 << 64
+        })
 
     def __new__(cls, value: Any):
         value = int(value)
         if cls.byte_size > 0:
-            bits = 8 * cls.byte_size
-            min_v = 0
-            max_v = (1 << bits) - 1
-            if not (min_v <= value <= max_v):
-                raise ValueError(f"Fixed Int: {cls.__name__} out of range: {value!r} "
-                                f"not in [{min_v}, {max_v}]")
+            max_v = cls._bound // 2 if cls.signed else cls._bound 
+            min_v = -1 * cls._bound // 2 if cls.signed else 0
         else:
-            if not 0 <= value < 2 ** 64:
-                raise ValueError(f"General Int: Value must be between 0 and 2**64 - 1, got {value}")
-
+            min_v = -1 * cls._bound // 2 if cls.signed else 0
+            max_v = cls._bound // 2 if cls.signed else cls._bound - 1  
+        
+        if not (min_v <= value <= max_v):
+                raise ValueError(f"Int: {cls.__name__} out of range: {value!r} "
+                                f"not in [{min_v}, {max_v}]")
         return super().__new__(cls, value)
 
     def __repr__(self):
@@ -105,11 +124,11 @@ class Uint(int, Codable, metaclass=IntCheckMeta):
     # ---------------------------------------------------------------------------- #
     #                                  JSON Serde                                  #
     # ---------------------------------------------------------------------------- #
-    def to_json(self) -> str:
+    def to_json(self) -> int:
         return int(self)
     
     @classmethod
-    def from_json(cls, json_str: str) -> "Uint":
+    def from_json(cls, json_str: str) -> "Int":
         return cls(int(json_str))
 
     # ---------------------------------------------------------------------------- #
@@ -118,20 +137,24 @@ class Uint(int, Codable, metaclass=IntCheckMeta):
     @staticmethod
     def l(x):
         return math.floor(Decimal(x).ln() / (Decimal(7) * Decimal(2).ln()))
-
+    
+    def to_unsigned(self) -> "Int":
+        if not self.signed: return self
+        return int(self) + (self._bound // 2)
 
     def encode_size(self) -> int:
         if self.byte_size > 0:
             return self.byte_size 
         else:
-            if self < 2**7:
+            value = self.to_unsigned()
+            if value < 2**7:
                 return 1
-            elif self < 2 ** (7 * 9):
+            elif value < 2 ** (7 * 9):
                 return 1 + self.l(self)
-            elif self < 2**64:
+            elif value < 2**64:
                 return 9
             else:
-                raise ValueError("Value too large for encoding. General Uint support up to 2**64 - 1")
+                raise ValueError("Value too large for encoding. General Int support up to 2**64 - 1")
 
     def encode_into(self, buffer: bytearray, offset: int = 0) -> int:
         if self.byte_size > 0:
@@ -214,7 +237,8 @@ class Uint(int, Codable, metaclass=IntCheckMeta):
             return cls(int("".join(str(int(b)) for b in reversed(bits)), 2))
 
 
+Uint = Int
 U8 = Uint[8]
 U16 = Uint[16]
 U32 = Uint[32]
-U64 = Uint[64]
+U64 = Uint[64]

tsrkit_types/null.py

@@ -1,7 +1,7 @@
 from typing import Optional, Tuple, Union
+from tsrkit_types.itf.codable import Codable
 
-
-class NullType:
+class NullType(Codable):
     def __repr__(self):
         return "Null"
 
@@ -40,4 +40,4 @@ class NullType:
     
     
     
-Null = NullType()
+Null = NullType()

{tsrkit_types-0.1.3.dist-info → tsrkit_types-0.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tsrkit-types
-Version: 0.1.3
+Version: 0.1.5
 Summary: Performant Python Typings library for type-safe binary serialization, JSON encoding, and data validation with zero dependencies
 Author-email: chainscore-labs <hello@chainscore.finance>, prasad-kumkar <prasad@chainscore.finance>
 License-Expression: MIT

{tsrkit_types-0.1.3.dist-info → tsrkit_types-0.1.5.dist-info}/RECORD

@@ -1,21 +1,21 @@
-tsrkit_types/__init__.py,sha256=dPiakZ3q_YZLcj3nW5CLjI8CA9rE8umqtv2camWl3Cs,1956
+tsrkit_types/__init__.py,sha256=PlhqxNwjXaJU5vTIqJdLvC5BBfExLAoKQ57peNG2Opc,1900
 tsrkit_types/bits.py,sha256=33WLfuUYdzGscoc-E3InTYdbJRIDeixoe_pG0XAv71c,4213
 tsrkit_types/bool.py,sha256=Veu6KLIeiRFnIW1sbawJ0haF0veyaL-As5mBiypq-uE,1280
 tsrkit_types/bytearray.py,sha256=DaMnACq-7pzEW-pRO2f_IAny_8ldhSt3G5D24Soywk4,1662
-tsrkit_types/bytes.py,sha256=ayuD8AUTbZ4LFnceG8TBzAGAYXGht0pYQcmX-7ZtwyI,2762
+tsrkit_types/bytes.py,sha256=V_sFmpOsftGb3IPXqExOlDHbt4CpJWM6md-kQ3_CEmg,2734
 tsrkit_types/bytes_common.py,sha256=b1Zqh_NhkCX718QaZC52J3nEzKAi1Fe8E0nefWVwwmo,2301
-tsrkit_types/choice.py,sha256=zNLvB1jSZERot6Qo9cxxkPcY84DAJss8o0ULyp9D--4,5196
+tsrkit_types/choice.py,sha256=OVHxIr2PcnaTpo5sAMjipCArc5oATNsyYkqZNRqU7bA,5253
 tsrkit_types/dictionary.py,sha256=GcUvaHC1VOEc3OzUVAH0id--ncLqTJ6ZRz-lucMNRdY,5618
 tsrkit_types/enum.py,sha256=3MyLW15_ToQQdctJjcMY8Xb3OsS_Ad997OOEo8FjVeA,4256
-tsrkit_types/integers.py,sha256=w8WCbzzQP0YX3ky4iP-fbNeOBHsIydsU0Tady8iGQPQ,8026
-tsrkit_types/null.py,sha256=OwHVhWLdazaFLXXR8iHPaHe67NPmYHDCavBxUfcZ53s,1318
+tsrkit_types/integers.py,sha256=_JkceknSupr42TaLEm8W31MsxLitoncJyartSI_FeiU,8840
+tsrkit_types/null.py,sha256=vzobz4-xJrUeky8pzbg-Qmz4N6b7GsCNf8TafbstlgY,1372
 tsrkit_types/option.py,sha256=xwtaAFN20GjaGqzYZAAo1fZqqUZnCYHdy2bjshhY620,1631
 tsrkit_types/sequences.py,sha256=KOT5-4mia5Lc0CMjIF7Yqe34Sei92ZQ2s6GaP13soUg,8090
 tsrkit_types/string.py,sha256=8rvg0BwvyhQnbMW3qornmBFTQHeTQFUfwD7OC0eVgcY,2575
 tsrkit_types/struct.py,sha256=GoXWFc1OqO9CXnxFS7Xkms7J-rtZe8h32LkAIBlzdSM,3497
 tsrkit_types/itf/codable.py,sha256=agx8YSVWGBeEiLrU9eqh3ZoeTgpJsmmIlW622xIKqPI,2810
-tsrkit_types-0.1.3.dist-info/licenses/LICENSE,sha256=TwnDvVCPwHadHWLUuY1sPx03XNw1jzh_ZmoDBNai9Uc,1072
-tsrkit_types-0.1.3.dist-info/METADATA,sha256=W_kNQJPjZnMV4wh3tqG7ggWcec8tL1d6gLWx2K4jvVM,22755
-tsrkit_types-0.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tsrkit_types-0.1.3.dist-info/top_level.txt,sha256=pnVhnUsnZ_A0FIj1zHwDw3suMGrfMJwusp-4GPVY1CM,13
-tsrkit_types-0.1.3.dist-info/RECORD,,
+tsrkit_types-0.1.5.dist-info/licenses/LICENSE,sha256=TwnDvVCPwHadHWLUuY1sPx03XNw1jzh_ZmoDBNai9Uc,1072
+tsrkit_types-0.1.5.dist-info/METADATA,sha256=-chUqeENY3cHR3cBh6R-di6VT2ijAQ35Qh0nzjS3P68,22755
+tsrkit_types-0.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tsrkit_types-0.1.5.dist-info/top_level.txt,sha256=pnVhnUsnZ_A0FIj1zHwDw3suMGrfMJwusp-4GPVY1CM,13
+tsrkit_types-0.1.5.dist-info/RECORD,,