Move uuid property to Releasable base class, fixing None guard and validation in KGProxy

Author: apdavison

fairgraph/base.py

@@ -19,9 +19,10 @@
 
 
 from __future__ import annotations
-from typing import TYPE_CHECKING, Optional, Dict, List, Any
+from typing import TYPE_CHECKING, Optional, Dict, List, Any, Union
 from enum import Enum
 import logging
+from uuid import UUID
 from warnings import warn
 
 from .errors import AuthorizationError
@@ -67,6 +68,14 @@ class Releasable(Resolvable):  # KGObject, KGProxy
     id: Optional[str]
     remote_data: Optional[JSONdict]
 
+    @property
+    def uuid(self) -> Union[str, None]:
+        if self.id is not None:
+            value = self.id.split("/")[-1]
+            return str(UUID(value))
+        else:
+            return None
+
     def children(
         self, client: KGClient, follow_links: Optional[Dict[str, Any]] = None
     ) -> List[Releasable]:

fairgraph/kgobject.py

@@ -355,15 +355,6 @@ def from_alias(
             )
             return candidates[0]
 
-    @property
-    def uuid(self) -> Union[str, None]:
-        # todo: consider using client._kg_client.uuid_from_absolute_id
-        if self.id is not None:
-            value = self.id.split("/")[-1]
-            return str(UUID(value))
-        else:
-            return None
-
     @classmethod
     def uri_from_uuid(cls, uuid: str, client: KGClient) -> str:
         """Convert an instances short-form identifier (a UUID) into the long-form (a URI)"""

fairgraph/kgproxy.py

@@ -161,10 +161,6 @@ def __ne__(self, other):
             not isinstance(other, self.__class__) or set(self.classes).isdisjoint(other.classes) or self.id != other.id
         )
 
-    @property
-    def uuid(self) -> str:
-        return self.id.split("/")[-1]
-
     def delete(self, client: KGClient, ignore_not_found: bool = True):
         """Delete the instance which this proxy represents"""
         try: