dcicutils 8.7.0.1b32__tar.gz → 8.7.0.1b33__tar.gz

{dcicutils-8.7.0.1b32 → dcicutils-8.7.0.1b33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.7.0.1b32
+Version: 8.7.0.1b33
 Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
 Home-page: https://github.com/4dn-dcic/utils
 License: MIT

{dcicutils-8.7.0.1b32 → dcicutils-8.7.0.1b33}/dcicutils/portal_object_utils.py

@@ -8,9 +8,13 @@ class PortalObject:
 
     def __init__(self, portal: Portal, portal_object: dict, portal_object_type: Optional[str] = None) -> None:
         self._portal = portal
-        self._object = portal_object
+        self._data = portal_object
         self._type = portal_object_type if isinstance(portal_object_type, str) and portal_object_type else None
 
+    @property
+    def data(self):
+        return self._data
+
     @property
     @lru_cache(maxsize=1)
     def schema(self):
@@ -19,12 +23,12 @@ class PortalObject:
     @property
     @lru_cache(maxsize=1)
     def schema_type(self):
-        return self._type or Portal.get_schema_type(self._object)
+        return self._type or Portal.get_schema_type(self._data)
 
     @property
     @lru_cache(maxsize=1)
     def schema_types(self):
-        return self._type or Portal.get_schema_types(self._object)
+        return self._type or Portal.get_schema_types(self._data)
 
     @property
     @lru_cache(maxsize=1)
@@ -36,7 +40,7 @@ class PortalObject:
     @property
     @lru_cache(maxsize=1)
     def uuid(self) -> Optional[str]:
-        return PortalObject.get_uuid(self._object)
+        return PortalObject.get_uuid(self._data)
 
     @staticmethod
     def get_uuid(portal_object: dict) -> Optional[str]:
@@ -53,13 +57,13 @@ class PortalObject:
         identifying_properties = []
         for identifying_property in self.schema_identifying_properties:
             if identifying_property not in ["uuid", "identifier", "aliases"]:
-                if self._object.get(identifying_property):
+                if self._data.get(identifying_property):
                     identifying_properties.append(identifying_property)
-        if self._object.get("identifier"):
+        if self._data.get("identifier"):
             identifying_properties.insert(0, "identifier")
-        if self._object.get("uuid"):
+        if self._data.get("uuid"):
             identifying_properties.insert(0, "uuid")
-        if "aliases" in self.schema_identifying_properties and self._object.get("aliases"):
+        if "aliases" in self.schema_identifying_properties and self._data.get("aliases"):
             identifying_properties.append("aliases")
         return identifying_properties
 
@@ -73,7 +77,7 @@ class PortalObject:
             return []
         identifying_paths = []
         for identifying_property in identifying_properties:
-            if (identifying_value := self._object.get(identifying_property)):
+            if (identifying_value := self._data.get(identifying_property)):
                 if identifying_property == "uuid":
                     identifying_paths.append(f"/{identifying_value}")
                 # For now at least we include the path both with and without the schema type component

{dcicutils-8.7.0.1b32 → dcicutils-8.7.0.1b33}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.7.0.1b32"  # TODO: To become 8.7.1
+version = "8.7.0.1b33"  # TODO: To become 8.7.1
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"