typeid-python 0.2.3__py3-none-any.whl → 0.3.1__py3-none-any.whl

typeid/typeid.py

@@ -1,8 +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
@@ -11,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)
@@ -25,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:
@@ -38,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:
@@ -75,29 +74,29 @@ def from_string(string: str) -> TypeID:
     return TypeID.from_string(string=string)
 
 
-def from_uuid(suffix: UUID, prefix: Optional[str] = None) -> TypeID:
+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
+    parts = string.rsplit("_", 1)
     if len(parts) == 1:
+        prefix = None
         suffix = parts[0]
-    elif len(parts) == 2 and parts[0] != "":
-        suffix = parts[1]
-        prefix = parts[0]
-    else:
+    elif len(parts) == 2 and parts[0] == "":
         raise InvalidTypeIDStringException(f"Invalid TypeID: {string}")
+    else:
+        prefix, suffix = parts
 
     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.3.dist-info → typeid_python-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: typeid-python
-Version: 0.2.3
+Version: 0.3.1
 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
@@ -18,7 +18,7 @@ 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)
+Requires-Dist: uuid6 (>=2023.5.2)
 Project-URL: Repository, https://github.com/akhundMurad/typeid-python
 Description-Content-Type: text/markdown
 

{typeid_python-0.2.3.dist-info → typeid_python-0.3.1.dist-info}/RECORD

@@ -3,9 +3,9 @@ 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=jGMZ3FZXSe6x8Ib6AQi5lVbmlb2PWJcwKhXDEScW_pU,2927
-typeid/validation.py,sha256=yvLO5lfMkJpduZzql_FJlj4hW6HcWURWYLRQvR92SSM,899
-typeid_python-0.2.3.dist-info/LICENSE,sha256=f98oZ9FId4i3835UJYGw066BU8PSc57L1utGWS1ypcs,1070
-typeid_python-0.2.3.dist-info/METADATA,sha256=HLC7cDDSYyth-xd1bRDxNeCLPAMI2Pa6jAhz9RzHkaE,4124
-typeid_python-0.2.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-typeid_python-0.2.3.dist-info/RECORD,,
+typeid/typeid.py,sha256=6deYh-fDaJdcKjs14TVzMVNnfzsU2M9f_4FdqWnlNw4,2996
+typeid/validation.py,sha256=Cb9IkHrK1-HFukFYpSzyNGhllaF3MIZDcD5RnmsfrK8,910
+typeid_python-0.3.1.dist-info/LICENSE,sha256=f98oZ9FId4i3835UJYGw066BU8PSc57L1utGWS1ypcs,1070
+typeid_python-0.3.1.dist-info/METADATA,sha256=3b8dCEoGwAlMgk3GcDuh2j5IoDBCWAEtcVeMQcvk5kQ,4114
+typeid_python-0.3.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+typeid_python-0.3.1.dist-info/RECORD,,