dcicutils 8.8.0.1b17__py3-none-any.whl → 8.8.0.1b18__py3-none-any.whl

dcicutils/structured_data.py

@@ -92,15 +92,16 @@ class StructuredDataSet:
         self._load_file(file) if file else None
 
     def _progress_update(self, nrows: Union[int, Callable],
-                         nrefs_resolved: Optional[int] = None,
-                         nrefs_unresolved: Optional[int] = None,
-                         nlookups: Optional[int] = None,
-                         ncachehits: Optional[int] = None) -> None:
+                         ref_resolved: Optional[int] = None,
+                         ref_unresolved: Optional[int] = None,
+                         ref_lookups: Optional[int] = None,
+                         ref_cache_hits: Optional[int] = None,
+                         ref_incorrect: Optional[int] = None) -> None:
         if self._progress:
             if callable(nrows):
                 nrows = nrows()
             if isinstance(nrows, int) and nrows != 0:
-                self._progress(nrows, nrefs_resolved, nrefs_unresolved, nlookups, ncachehits)
+                self._progress(nrows, ref_resolved, ref_unresolved, ref_lookups, ref_cache_hits, ref_incorrect)
 
     @property
     def data(self) -> dict:
@@ -299,7 +300,8 @@ class StructuredDataSet:
             self._add(type_name, structured_row)
             if self._progress:
                 self._progress_update(-1, self.ref_total_count, self.ref_total_notfound_count,
-                                      self.ref_lookup_count, self.ref_lookup_cache_hit_count)
+                                      self.ref_lookup_count, self.ref_lookup_cache_hit_count,
+                                      self.ref_incorrect_identifying_property_count)
         self._note_warning(reader.warnings, "reader")
         if schema:
             self._note_error(schema._unresolved_refs, "ref")

{dcicutils-8.8.0.1b17.dist-info → dcicutils-8.8.0.1b18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.8.0.1b17
+Version: 8.8.0.1b18
 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.8.0.1b17.dist-info → dcicutils-8.8.0.1b18.dist-info}/RECORD

@@ -62,15 +62,15 @@ dcicutils/secrets_utils.py,sha256=8dppXAsiHhJzI6NmOcvJV5ldvKkQZzh3Fl-cb8Wm7MI,19
 dcicutils/sheet_utils.py,sha256=VlmzteONW5VF_Q4vo0yA5vesz1ViUah1MZ_yA1rwZ0M,33629
 dcicutils/snapshot_utils.py,sha256=ymP7PXH6-yEiXAt75w0ldQFciGNqWBClNxC5gfX2FnY,22961
 dcicutils/ssl_certificate_utils.py,sha256=F0ifz_wnRRN9dfrfsz7aCp4UDLgHEY8LaK7PjnNvrAQ,9707
-dcicutils/structured_data.py,sha256=7YbhsaLSchdBnuT-eAzsvnd-e54EMrfFRJx0Ph7aUcI,55444
+dcicutils/structured_data.py,sha256=7yWs6u9PaK6zvGOr81rMxSAAQpubi_8Jx7cpOaZkSZ8,55612
 dcicutils/task_utils.py,sha256=MF8ujmTD6-O2AC2gRGPHyGdUrVKgtr8epT5XU8WtNjk,8082
 dcicutils/tmpfile_utils.py,sha256=n95XF8dZVbQRSXBZTGToXXfSs3JUVRyN6c3ZZ0nhAWI,1403
 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.8.0.1b17.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.8.0.1b17.dist-info/METADATA,sha256=IfFJQR5cgBXBNWmpi29A7xvreB9dHHdP61gOI1opYYg,3357
-dcicutils-8.8.0.1b17.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.8.0.1b17.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
-dcicutils-8.8.0.1b17.dist-info/RECORD,,
+dcicutils-8.8.0.1b18.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.8.0.1b18.dist-info/METADATA,sha256=IRepwL7YhLgXCirTlvTCl4vxj4_EdJ4UoPky-wWIJjI,3357
+dcicutils-8.8.0.1b18.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.8.0.1b18.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
+dcicutils-8.8.0.1b18.dist-info/RECORD,,