dcicutils 8.16.6.1b6__tar.gz → 8.17.0.1b1__tar.gz

{dcicutils-8.16.6.1b6 → dcicutils-8.17.0.1b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.16.6.1b6
+Version: 8.17.0.1b1
 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.16.6.1b6 → dcicutils-8.17.0.1b1}/dcicutils/structured_data.py

@@ -242,7 +242,7 @@ class StructuredDataSet:
                 for portal_object in self.data[type_name]:
                     portal_object = PortalObject(portal_object, portal=self.portal, type=type_name)
                     existing_object, identifying_path, nlookups = (
-                        portal_object.lookup(raw=True, ref_lookup_strategy=self._ref_lookup_strategy))
+                        portal_object.lookup(raw=False, ref_lookup_strategy=self._ref_lookup_strategy))
                     if existing_object:
                         object_diffs, nlookups_compare = portal_object.compare(
                             existing_object, consider_refs=True, resolved_refs=refs)
@@ -322,7 +322,7 @@ class StructuredDataSet:
         for sheet_name in sorted(excel.sheet_names, key=lambda key: order.get(Schema.type_name(key), sys.maxsize)):
             # This effective_sheet_name function added 2025-01-21 to allow sheets whose sheet names are
             # other than simply the name of the type, but which do contain that type somehow; i.e. e.g.
-            # specifically where the sheet name is like "DSA:ExternalQualityMetric" where the "DSA"
+            # specifically where the sheet name is like "DSA_ExternalQualityMetric" where the "DSA"
             # part is purely informational, and the "ExternalQualityMetric" is the type name; so we
             # now can have multiple sheets of the same type (impossible before as sheet names need
             # to be unique); this is simply a mechanism to allow the user to partition/organize their
@@ -459,7 +459,7 @@ class StructuredDataSet:
         just returns the given object. Note that the given object may be CHANGED in place.
         """
         for identifying_path in self._portal.get_identifying_paths(portal_object, portal_type):
-            if existing_portal_object := self._portal.get_metadata(identifying_path, raw=True, raise_exception=False):
+            if existing_portal_object := self._portal.get_metadata(identifying_path, raw=False, raise_exception=False):
                 return merge_objects(existing_portal_object, portal_object, primitive_lists=True)
         return portal_object
 
@@ -981,7 +981,7 @@ class Portal(PortalBase):
 
     def ref_lookup_uncached(self, object_name: str) -> Optional[dict]:
         try:
-            result = super().get_metadata(object_name, raw=True)
+            result = super().get_metadata(object_name, raw=False)
             self._ref_lookup_found_count += 1
             return result
         except Exception as e:

{dcicutils-8.16.6.1b6 → dcicutils-8.17.0.1b1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.16.6.1b6"  # TODO: 8.17.0
+version = "8.17.0.1b1"  # TODO: 8.18.0
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"