typeid-python 0.2.3__tar.gz → 0.3.0__tar.gz

{typeid_python-0.2.3 → typeid_python-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: typeid-python
-Version: 0.2.3
+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

{typeid_python-0.2.3 → typeid_python-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "typeid-python"
-version = "0.2.3"
+version = "0.3.0"
 description = "Python implementation of TypeIDs: type-safe, K-sortable, and globally unique identifiers inspired by Stripe IDs"
 authors = ["Murad Akhundov <akhundov1murad@gmail.com>"]
 license = "MIT"

{typeid_python-0.2.3 → typeid_python-0.3.0}/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,14 +74,13 @@ 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
     if len(parts) == 1:
         suffix = parts[0]
@@ -95,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_python-0.2.3 → typeid_python-0.3.0}/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}.")