hive-common: Add hive.common.parse_uuid

libs/chat/hive/chat/message.py

@@ -4,7 +4,9 @@
 from datetime import datetime, timezone
 from types import NoneType
 from typing import Any, Optional
-from uuid import RFC_4122, UUID, uuid4
+from uuid import UUID, uuid4
+
+from hive.common import parse_uuid
 
 from .matrix import ClientEvent as MatrixEvent
 
@@ -34,13 +36,7 @@ def __post_init__(self):
         if not isinstance(self.timestamp, datetime):
             self.timestamp = datetime.fromisoformat(self.timestamp)
 
-        if not isinstance(self.uuid, UUID):
-            self.uuid = UUID(self.uuid)
-
-        if self.uuid.variant != RFC_4122:
-            raise ValueError(self.uuid)
-        if self.uuid.version != 4:
-            raise ValueError(self.uuid)
+        self.uuid = parse_uuid(self.uuid)
 
     @classmethod
     def json_keys(cls) -> list[str]:

libs/common/hive/common/__init__.py

@@ -1,3 +1,4 @@
 from .argument_parser import HiveArgumentParser as ArgumentParser
 from .config import read as read_config
 from .resource import read_resource
+from .uuid import parse_uuid

libs/common/hive/common/uuid.py

@@ -0,0 +1,13 @@
+from uuid import RFC_4122, UUID
+
+
+def parse_uuid(uuid: str | UUID) -> UUID:
+    if not isinstance(uuid, UUID):
+        uuid = UUID(uuid)
+
+    if uuid.variant != RFC_4122:
+        raise ValueError(uuid)
+    if uuid.version != 4:
+        raise ValueError(uuid)
+
+    return uuid

services/service-monitor/hive/service_monitor/service.py

@@ -6,14 +6,14 @@
 from functools import cached_property
 from html import escape
 from typing import Optional
-from uuid import RFC_4122, UUID
 
 from pika import BasicProperties
 from pika.spec import Basic
 
 from valkey import Valkey
 
 from hive.chat import tell_user
+from hive.common import parse_uuid
 from hive.messaging import Channel
 from hive.service import HiveService, RestartMonitor
 
@@ -43,11 +43,7 @@ def on_service_status_event(
         if report["meta"]["type"] != "service_status_report":
             raise ValueError(body)
 
-        uuid = UUID(report["meta"]["uuid"])
-        if uuid.variant != RFC_4122:
-            raise ValueError(body)
-        if uuid.version != 4:
-            raise ValueError(body)
+        uuid = parse_uuid(report["meta"]["uuid"])
 
         timestamp = datetime.fromisoformat(report["meta"]["timestamp"])