Merge pull request #13 from iron3oxide/update-typeid-from-uuid-fix

fix: Improve type prefix and suffix extraction

Author: akhundMurad

tests/test_typeid.py

@@ -2,7 +2,7 @@
 import uuid6
 
 from typeid import TypeID
-from typeid.errors import InvalidTypeIDStringException
+from typeid.errors import SuffixValidationException
 
 
 def test_default_suffix() -> None:
@@ -84,10 +84,20 @@ def test_construct_type_from_string_with_prefix_standalone() -> None:
     assert isinstance(typeid.suffix, str)
 
 
+def test_construct_type_from_string_with_multi_underscore_prefix() -> None:
+    string = "double_prefix_00041061050r3gg28a1c60t3gf"
+
+    typeid = TypeID.from_string(string)
+
+    assert isinstance(typeid, TypeID)
+    assert typeid.prefix == "double_prefix"
+    assert isinstance(typeid.suffix, str)
+
+
 def test_construct_type_from_invalid_string() -> None:
     string = "invalid_string_to_typeid"
 
-    with pytest.raises(InvalidTypeIDStringException):
+    with pytest.raises(SuffixValidationException):
         TypeID.from_string(string)
 
 

typeid/typeid.py

@@ -80,15 +80,14 @@ def from_uuid(suffix: uuid6.UUID, prefix: Optional[str] = None) -> TypeID:
 
 
 def get_prefix_and_suffix(string: str) -> tuple:
-    parts = string.split("_")
-    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