typeid-python 0.2.2__py3-none-any.whl → 0.3.0__py3-none-any.whl

typeid/typeid.py

@@ -1,7 +1,7 @@
+import warnings
 from typing import Optional
-from uuid import UUID
 
-from uuid6 import uuid7
+import uuid6
 
 from typeid import base32
 from typeid.errors import InvalidTypeIDStringException
@@ -10,7 +10,7 @@ from typeid.validation import validate_prefix, validate_suffix
 
 class TypeID:
     def __init__(self, prefix: Optional[str] = None, suffix: Optional[str] = None) -> None:
-        suffix = _convert_uuid_to_b32(uuid7()) if not suffix else suffix
+        suffix = _convert_uuid_to_b32(uuid6.uuid7()) if not suffix else suffix
         validate_suffix(suffix=suffix)
         if prefix:
             validate_prefix(prefix=prefix)
@@ -24,9 +24,9 @@ class TypeID:
         return cls(suffix=suffix, prefix=prefix)
 
     @classmethod
-    def from_uuid(cls, suffix: UUID, prefix: Optional[str] = None):
+    def from_uuid(cls, suffix: uuid6.UUID, prefix: Optional[str] = None):
         suffix_str = _convert_uuid_to_b32(suffix)
-        return TypeID(suffix=suffix_str, prefix=prefix)
+        return cls(suffix=suffix_str, prefix=prefix)
 
     @property
     def suffix(self) -> str:
@@ -37,7 +37,7 @@ class TypeID:
         return self._prefix
 
     @property
-    def uuid(self) -> UUID:
+    def uuid(self) -> uuid6.UUID:
         return _convert_b32_to_uuid(self.suffix)
 
     def __str__(self) -> str:
@@ -47,28 +47,40 @@ class TypeID:
         value += self.suffix
         return value
 
+    def __repr__(self):
+        return "%s(%r)" % (self.__class__.__name__, str(self))
+
     def __eq__(self, value: object) -> bool:
         if not isinstance(value, TypeID):
             return False
         return value.prefix == self.prefix and value.suffix == self.suffix
 
+    def __gt__(self, other):
+        if isinstance(other, TypeID):
+            return str(self) > str(other)
+        return NotImplemented
+
+    def __ge__(self, other):
+        if isinstance(other, TypeID):
+            return str(self) >= str(other)
+        return NotImplemented
+
     def __hash__(self) -> int:
         return hash((self.prefix, self.suffix))
 
 
 def from_string(string: str) -> TypeID:
-    """Consider TypeID.from_string instead."""
+    warnings.warn("Consider TypeID.from_string instead.", DeprecationWarning)
     return TypeID.from_string(string=string)
 
 
-def from_uuid(suffix: UUID, prefix: Optional[str] = None) -> TypeID:
-    """Consider TypeID.from_uuid instead."""
+def from_uuid(suffix: uuid6.UUID, prefix: Optional[str] = None) -> TypeID:
+    warnings.warn("Consider TypeID.from_uuid instead.", DeprecationWarning)
     return TypeID.from_uuid(suffix=suffix, prefix=prefix)
 
 
 def get_prefix_and_suffix(string: str) -> tuple:
     parts = string.split("_")
-    suffix = None
     prefix = None
     if len(parts) == 1:
         suffix = parts[0]
@@ -81,9 +93,11 @@ def get_prefix_and_suffix(string: str) -> tuple:
     return prefix, suffix
 
 
-def _convert_uuid_to_b32(uuid_instance: UUID) -> str:
+def _convert_uuid_to_b32(uuid_instance: uuid6.UUID) -> str:
     return base32.encode(list(uuid_instance.bytes))
 
 
-def _convert_b32_to_uuid(b32: str) -> UUID:
-    return UUID(bytes=bytes(base32.decode(b32)))
+def _convert_b32_to_uuid(b32: str) -> uuid6.UUID:
+    uuid_bytes = bytes(base32.decode(b32))
+    uuid_int = int.from_bytes(uuid_bytes, byteorder="big")
+    return uuid6.UUID(int=uuid_int, version=7)

typeid/validation.py

@@ -1,10 +1,13 @@
+import re
+
 from typeid import base32
-from typeid.constants import PREFIX_MAX_LEN, SUFFIX_LEN
+from typeid.constants import SUFFIX_LEN
 from typeid.errors import PrefixValidationException, SuffixValidationException
 
 
 def validate_prefix(prefix: str) -> None:
-    if not prefix.islower() or not prefix.isascii() or len(prefix) > PREFIX_MAX_LEN or not prefix.isalpha():
+    # See https://github.com/jetify-com/typeid/tree/main/spec
+    if not re.match("^([a-z]([a-z_]{0,61}[a-z])?)?$", prefix):
         raise PrefixValidationException(f"Invalid prefix: {prefix}.")
 
 

{typeid_python-0.2.2.dist-info → typeid_python-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: typeid-python
-Version: 0.2.2
+Version: 0.3.0
 Summary: Python implementation of TypeIDs: type-safe, K-sortable, and globally unique identifiers inspired by Stripe IDs
 Home-page: https://github.com/akhundMurad/typeid-python
 License: MIT
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: cli
 Requires-Dist: uuid6 (>=2023.5.2,<2024.0.0)
 Project-URL: Repository, https://github.com/akhundMurad/typeid-python

typeid_python-0.3.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+typeid/__init__.py,sha256=bS8J12-a6sOcTIHBumVs9qLRxCX5P-KWVLeMw6m1e_U,149
+typeid/base32.py,sha256=UTYXJjb95_nn-vYIpw7nquguBac4GZ0TL0oE6BuujPg,6504
+typeid/cli.py,sha256=h93_EAOzWO3bqubgL83Q-smHp11lvxMjgAunwyTWwFM,872
+typeid/constants.py,sha256=2ApV0agNys2yI9NM8oQZbyTR2rgP-VtxXGrM6glBB2Q,37
+typeid/errors.py,sha256=QPHZ-DJg5OpPOHtuetsqMCYu-E_aHMJZTTeFqx9Gz_4,207
+typeid/typeid.py,sha256=clwA9ADePwO9bXclAk1G6_-ASGchRLaFbOvaBIyeyMU,3009
+typeid/validation.py,sha256=Cb9IkHrK1-HFukFYpSzyNGhllaF3MIZDcD5RnmsfrK8,910
+typeid_python-0.3.0.dist-info/LICENSE,sha256=f98oZ9FId4i3835UJYGw066BU8PSc57L1utGWS1ypcs,1070
+typeid_python-0.3.0.dist-info/METADATA,sha256=7kPAUATsQLMCKm5A1-fH49MrNh6qRyIuj8Frpl8_HTo,4124
+typeid_python-0.3.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+typeid_python-0.3.0.dist-info/RECORD,,

{typeid_python-0.2.2.dist-info → typeid_python-0.3.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.7.0
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any

typeid_python-0.2.2.dist-info/RECORD

@@ -1,11 +0,0 @@
-typeid/__init__.py,sha256=bS8J12-a6sOcTIHBumVs9qLRxCX5P-KWVLeMw6m1e_U,149
-typeid/base32.py,sha256=UTYXJjb95_nn-vYIpw7nquguBac4GZ0TL0oE6BuujPg,6504
-typeid/cli.py,sha256=h93_EAOzWO3bqubgL83Q-smHp11lvxMjgAunwyTWwFM,872
-typeid/constants.py,sha256=2ApV0agNys2yI9NM8oQZbyTR2rgP-VtxXGrM6glBB2Q,37
-typeid/errors.py,sha256=QPHZ-DJg5OpPOHtuetsqMCYu-E_aHMJZTTeFqx9Gz_4,207
-typeid/typeid.py,sha256=_hu8bHjFVcwe2QklrFmYZOj2ycltuL8p_XjAq2ncviY,2480
-typeid/validation.py,sha256=yvLO5lfMkJpduZzql_FJlj4hW6HcWURWYLRQvR92SSM,899
-typeid_python-0.2.2.dist-info/LICENSE,sha256=f98oZ9FId4i3835UJYGw066BU8PSc57L1utGWS1ypcs,1070
-typeid_python-0.2.2.dist-info/METADATA,sha256=RDsPvAGyBmrLMR0cCxu0-6ZvuOjKSJ_ndX227zSftcY,4073
-typeid_python-0.2.2.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-typeid_python-0.2.2.dist-info/RECORD,,