dcicutils 8.7.0.1b32__py3-none-any.whl → 8.7.0.1b33__py3-none-any.whl

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.dist-info → dcicutils-8.7.0.1b33.dist-info}/METADATA

@@ -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.dist-info → dcicutils-8.7.0.1b33.dist-info}/RECORD

@@ -44,7 +44,7 @@ dcicutils/log_utils.py,sha256=7pWMc6vyrorUZQf-V-M3YC6zrPgNhuV_fzm9xqTPph0,10883
 dcicutils/misc_utils.py,sha256=bMRWWxdbhuF3PKdCZEH-H4U1ecgT3Nag3EL92D9XGoY,100973
 dcicutils/obfuscation_utils.py,sha256=fo2jOmDRC6xWpYX49u80bVNisqRRoPskFNX3ymFAmjw,5963
 dcicutils/opensearch_utils.py,sha256=V2exmFYW8Xl2_pGFixF4I2Cc549Opwe4PhFi5twC0M8,1017
-dcicutils/portal_object_utils.py,sha256=Ys_jfycB364KRGK8r15Qw61gZpqdasU5yPvsdYMwTes,5208
+dcicutils/portal_object_utils.py,sha256=io5XCdfHarFb1H2S3IyDNb25n9LPw2IZjcsiBowmeN4,5251
 dcicutils/portal_utils.py,sha256=jKYgZUYVdkg6VOs1hsiX4bSULLguOIBJFFRpvvZEklU,26704
 dcicutils/project_utils.py,sha256=qPdCaFmWUVBJw4rw342iUytwdQC0P-XKpK4mhyIulMM,31250
 dcicutils/qa_checkers.py,sha256=cdXjeL0jCDFDLT8VR8Px78aS10hwNISOO5G_Zv2TZ6M,20534
@@ -66,8 +66,8 @@ dcicutils/trace_utils.py,sha256=g8kwV4ebEy5kXW6oOrEAUsurBcCROvwtZqz9fczsGRE,1769
 dcicutils/validation_utils.py,sha256=cMZIU2cY98FYtzK52z5WUYck7urH6JcqOuz9jkXpqzg,14797
 dcicutils/variant_utils.py,sha256=2H9azNx3xAj-MySg-uZ2SFqbWs4kZvf61JnK6b-h4Qw,4343
 dcicutils/zip_utils.py,sha256=rnjNv_k6L9jT2SjDSgVXp4BEJYLtz9XN6Cl2Fy-tqnM,2027
-dcicutils-8.7.0.1b32.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.7.0.1b32.dist-info/METADATA,sha256=esjo1TTuUTAkh_01JHpIF8Rj5-mLsiQGoA6K5YjlCos,3315
-dcicutils-8.7.0.1b32.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.7.0.1b32.dist-info/entry_points.txt,sha256=8wbw5csMIgBXhkwfgsgJeuFcoUc0WsucUxmOyml2aoA,209
-dcicutils-8.7.0.1b32.dist-info/RECORD,,
+dcicutils-8.7.0.1b33.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.7.0.1b33.dist-info/METADATA,sha256=oBnl8kr-p0xukoz_JLaF6utwsnX0CK79u9ykMwe8rCU,3315
+dcicutils-8.7.0.1b33.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.7.0.1b33.dist-info/entry_points.txt,sha256=8wbw5csMIgBXhkwfgsgJeuFcoUc0WsucUxmOyml2aoA,209
+dcicutils-8.7.0.1b33.dist-info/RECORD,,