dcicutils 8.16.6.1b6__py3-none-any.whl → 8.17.0.1b1__py3-none-any.whl

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

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

@@ -66,7 +66,7 @@ dcicutils/secrets_utils.py,sha256=8dppXAsiHhJzI6NmOcvJV5ldvKkQZzh3Fl-cb8Wm7MI,19
 dcicutils/sheet_utils.py,sha256=VlmzteONW5VF_Q4vo0yA5vesz1ViUah1MZ_yA1rwZ0M,33629
 dcicutils/snapshot_utils.py,sha256=YDeI3vD-MhAtHwKDzfEm2q-n3l-da2yRpRR3xp0Ah1M,23021
 dcicutils/ssl_certificate_utils.py,sha256=F0ifz_wnRRN9dfrfsz7aCp4UDLgHEY8LaK7PjnNvrAQ,9707
-dcicutils/structured_data.py,sha256=Sys0lgHIN8Zv28PhwYz5taL7EXSMfeaGcr0JwVNvyz8,67402
+dcicutils/structured_data.py,sha256=IvF_VqDs5rvipGfoBfm6zWwfSln3WGcioPs51P1D_64,67405
 dcicutils/submitr/progress_constants.py,sha256=5bxyX77ql8qEJearfHEvsvXl7D0GuUODW0T65mbRmnE,2895
 dcicutils/submitr/ref_lookup_strategy.py,sha256=VJN-Oo0LLna6Vo2cu47eC-eU-yUC9NFlQP29xajejVU,4741
 dcicutils/task_utils.py,sha256=MF8ujmTD6-O2AC2gRGPHyGdUrVKgtr8epT5XU8WtNjk,8082
@@ -75,8 +75,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=_Y9EmL3D2dUZhxucxHvrtmmlbZmK4FpSsHEb7rGSJLU,3265
-dcicutils-8.16.6.1b6.dist-info/LICENSE.txt,sha256=IrWHOFtMb2inTgr2ZqwQriRC8H3uMQfQVO6lniaaoE0,1102
-dcicutils-8.16.6.1b6.dist-info/METADATA,sha256=qfnPzqrHqPwYsYvYJsP2zarLjDVCAT2rgAs0LoAGobc,3493
-dcicutils-8.16.6.1b6.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.16.6.1b6.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
-dcicutils-8.16.6.1b6.dist-info/RECORD,,
+dcicutils-8.17.0.1b1.dist-info/LICENSE.txt,sha256=IrWHOFtMb2inTgr2ZqwQriRC8H3uMQfQVO6lniaaoE0,1102
+dcicutils-8.17.0.1b1.dist-info/METADATA,sha256=5aSjZzim0fpz8qWJYcgz1q9fUDog--5C1oyB2rAMmYg,3493
+dcicutils-8.17.0.1b1.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.17.0.1b1.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
+dcicutils-8.17.0.1b1.dist-info/RECORD,,