dcicutils 8.8.0.1b16__tar.gz → 8.8.0.1b18__tar.gz

{dcicutils-8.8.0.1b16 → dcicutils-8.8.0.1b18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.8.0.1b16
+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.1b16 → dcicutils-8.8.0.1b18}/dcicutils/structured_data.py

@@ -92,14 +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) -> 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)
+                self._progress(nrows, ref_resolved, ref_unresolved, ref_lookups, ref_cache_hits, ref_incorrect)
 
     @property
     def data(self) -> dict:
@@ -297,7 +299,9 @@ class StructuredDataSet:
                     self._add_properties(structured_row, self._autoadd_properties, schema)
             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._progress_update(-1, self.ref_total_count, self.ref_total_notfound_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.1b16 → dcicutils-8.8.0.1b18}/pyproject.toml

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