dcicutils 8.8.1__tar.gz → 8.8.1.1b1__tar.gz

{dcicutils-8.8.1 → dcicutils-8.8.1.1b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.8.1
+Version: 8.8.1.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.8.1 → dcicutils-8.8.1.1b1}/dcicutils/structured_data.py

@@ -307,7 +307,7 @@ class StructuredDataSet:
                     "refs_found": self.ref_total_found_count,
                     "refs_not_found": self.ref_total_notfound_count,
                     "refs_lookup": self.ref_lookup_count,
-                    "refs_cache_hit": self.ref_lookup_cache_hit_count,
+                    "refs_cache_hit": self.ref_exists_cache_hit_count,
                     "refs_invalid": self.ref_invalid_identifying_property_count
                 })
         self._note_warning(reader.warnings, "reader")
@@ -956,7 +956,9 @@ class Portal(PortalBase):
                 self._cache_ref(type_name, value, resolved)
                 return resolved
         if update_counts:
-            self._ref_total_notfound_count += 1
+            # No do not update the not-found count if not found internally (2024-03-14).
+            # self._ref_total_notfound_count += 1
+            pass
         return {}  # Empty return means not resolved internally.
 
     def _ref_exists_single_internally(self, type_name: str, value: str) -> Tuple[bool, Optional[dict]]:
@@ -1025,8 +1027,9 @@ class Portal(PortalBase):
 
     def _ref_exists_from_cache(self, type_name: str, value: str) -> Optional[List[dict]]:
         if self._ref_cache is not None:
-            self._ref_exists_cache_hit_count += 1
-            return self._ref_cache.get(f"/{type_name}/{value}", None)
+            if ref := self._ref_cache.get(f"/{type_name}/{value}", None):
+                self._ref_exists_cache_hit_count += 1
+            return ref
         self._ref_exists_cache_miss_count += 1
         return None
 

{dcicutils-8.8.1 → dcicutils-8.8.1.1b1}/pyproject.toml

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