dycw-utilities 0.152.0__py3-none-any.whl → 0.153.1__py3-none-any.whl

utilities/uuid.py

@@ -1,24 +1,61 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from collections.abc import Callable
+from random import Random
+from typing import TYPE_CHECKING, assert_never, overload
 from uuid import UUID, uuid4
 
 from utilities.random import get_state
+from utilities.sentinel import Sentinel
 
 if TYPE_CHECKING:
-    from utilities.types import Seed
+    from utilities.types import MaybeCallableUUIDLike, Seed
 
 
 UUID_PATTERN = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"
 UUID_EXACT_PATTERN = f"^{UUID_PATTERN}$"
 
 
-def get_uuid(*, seed: Seed | None = None) -> UUID:
+##
+
+
+def get_uuid(seed: Seed | None = None, /) -> UUID:
     """Generate a UUID, possibly with a seed."""
     if seed is None:
         return uuid4()
-    state = get_state(seed=seed)
+    state = get_state(seed)
     return UUID(int=state.getrandbits(128), version=4)
 
 
-__all__ = ["UUID_EXACT_PATTERN", "UUID_PATTERN", "get_uuid"]
+##
+
+
+@overload
+def to_uuid(uuid: Sentinel, /, *, seed: Seed | None = None) -> Sentinel: ...
+@overload
+def to_uuid(
+    uuid: MaybeCallableUUIDLike | None = get_uuid, /, *, seed: Seed | None = None
+) -> UUID: ...
+def to_uuid(
+    uuid: MaybeCallableUUIDLike | None | Sentinel = get_uuid,
+    /,
+    *,
+    seed: Seed | None = None,
+) -> UUID | Sentinel:
+    """Convert to a UUID."""
+    match uuid:
+        case UUID() | Sentinel():
+            return uuid
+        case None:
+            return get_uuid(seed)
+        case str():
+            return UUID(uuid)
+        case int() | float() | bytes() | bytearray() | Random() as seed:
+            return get_uuid(seed)
+        case Callable() as func:
+            return to_uuid(func(), seed=seed)
+        case never:
+            assert_never(never)
+
+
+__all__ = ["UUID_EXACT_PATTERN", "UUID_PATTERN", "get_uuid", "to_uuid"]

utilities/version.py

@@ -6,7 +6,7 @@ from dataclasses import dataclass, field, replace
 from functools import total_ordering
 from typing import Any, Self, assert_never, overload, override
 
-from utilities.sentinel import Sentinel, sentinel
+from utilities.sentinel import Sentinel
 from utilities.types import MaybeCallable, MaybeStr
 
 type VersionLike = MaybeStr[Version]
@@ -131,30 +131,6 @@ class _VersionEmptySuffixError(VersionError):
 ##
 
 
-@overload
-def get_version(*, version: MaybeCallableVersionLike) -> Version: ...
-@overload
-def get_version(*, version: None) -> None: ...
-@overload
-def get_version(*, version: Sentinel) -> Sentinel: ...
-def get_version(
-    *, version: MaybeCallableVersionLike | None | Sentinel = sentinel
-) -> Version | None | Sentinel:
-    """Get the version."""
-    match version:
-        case Version() | None | Sentinel():
-            return version
-        case str():
-            return parse_version(version)
-        case Callable() as func:
-            return get_version(version=func())
-        case never:
-            assert_never(never)
-
-
-##
-
-
 def parse_version(version: str, /) -> Version:
     """Parse a string into a version object."""
     try:
@@ -178,12 +154,37 @@ class ParseVersionError(Exception):
         return f"Invalid version string: {self.version!r}"
 
 
+##
+
+
+@overload
+def to_version(version: MaybeCallableVersionLike, /) -> Version: ...
+@overload
+def to_version(version: None, /) -> None: ...
+@overload
+def to_version(version: Sentinel, /) -> Sentinel: ...
+def to_version(
+    version: MaybeCallableVersionLike | None | Sentinel, /
+) -> Version | None | Sentinel:
+    """Convert to a version."""
+    match version:
+        case Version() | None | Sentinel():
+            return version
+        case str():
+            return parse_version(version)
+        case Callable() as func:
+            return to_version(func())
+        case never:
+            assert_never(never)
+
+
+##
 __all__ = [
     "MaybeCallableVersionLike",
     "ParseVersionError",
     "Version",
     "VersionError",
     "VersionLike",
-    "get_version",
     "parse_version",
+    "to_version",
 ]