dcicutils 8.8.1__py3-none-any.whl → 8.8.1.1b1__py3-none-any.whl

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

@@ -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.dist-info → dcicutils-8.8.1.1b1.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=9ybYdvGUc4g9N8PNg7Krcn02DYWa_1yO_4KdGpAnP_k,56628
+dcicutils/structured_data.py,sha256=oOozZWoPVthgT4phMUvfdKrkGrtXr4iG8bJx-N8WgJM,56767
 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.1.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.8.1.dist-info/METADATA,sha256=ylw0oUj2MDMzlFwrsOVWf-AqepVXsoeiYQpNvDYeEhU,3352
-dcicutils-8.8.1.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.8.1.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
-dcicutils-8.8.1.dist-info/RECORD,,
+dcicutils-8.8.1.1b1.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.8.1.1b1.dist-info/METADATA,sha256=E-U3-FafQD1JV8l1hGicvGeGMtkH7p3xqPtexiTmxyM,3356
+dcicutils-8.8.1.1b1.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.8.1.1b1.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
+dcicutils-8.8.1.1b1.dist-info/RECORD,,