openms-insight 0.1.8__py3-none-any.whl → 0.1.9__py3-none-any.whl

openms_insight/rendering/bridge.py

@@ -130,10 +130,27 @@ def clear_component_annotations() -> None:
         st.session_state[_COMPONENT_ANNOTATIONS_KEY].clear()
 
 
+def _compute_annotation_hash(component: "BaseComponent") -> Optional[str]:
+    """
+    Compute hash of component's dynamic annotations, if any.
+
+    Args:
+        component: The component to check for annotations
+
+    Returns:
+        Short hash string if annotations exist, None otherwise
+    """
+    annotations = getattr(component, "_dynamic_annotations", None)
+    if annotations is None:
+        return None
+    # Hash the sorted keys (sufficient for change detection)
+    return hashlib.md5(str(sorted(annotations.keys())).encode()).hexdigest()[:8]
+
+
 def _get_cached_vue_data(
     component_id: str,
     filter_state_hashable: Tuple[Tuple[str, Any], ...],
-) -> Optional[Tuple[Dict[str, Any], str]]:
+) -> Optional[Tuple[Dict[str, Any], str, Optional[str]]]:
     """
     Get cached Vue data for component if filter state matches.
 
@@ -145,13 +162,19 @@ def _get_cached_vue_data(
         filter_state_hashable: Current filter state (for cache validation)
 
     Returns:
-        Tuple of (vue_data, data_hash) if cache hit, None otherwise
+        Tuple of (vue_data, data_hash, annotation_hash) if cache hit, None otherwise
     """
     cache = _get_component_cache()
     if component_id in cache:
-        cached_state, vue_data, data_hash = cache[component_id]
+        entry = cache[component_id]
+        # Support both old (3-tuple) and new (4-tuple) format
+        if len(entry) == 4:
+            cached_state, vue_data, data_hash, ann_hash = entry
+        else:
+            cached_state, vue_data, data_hash = entry
+            ann_hash = None
         if cached_state == filter_state_hashable:
-            return (vue_data, data_hash)
+            return (vue_data, data_hash, ann_hash)
     return None
 
 
@@ -160,6 +183,7 @@ def _set_cached_vue_data(
     filter_state_hashable: Tuple[Tuple[str, Any], ...],
     vue_data: Dict[str, Any],
     data_hash: str,
+    ann_hash: Optional[str] = None,
 ) -> None:
     """
     Cache Vue data for component, replacing any previous entry.
@@ -171,9 +195,10 @@ def _set_cached_vue_data(
         filter_state_hashable: Current filter state
         vue_data: Data to cache
         data_hash: Hash of the data
+        ann_hash: Hash of dynamic annotations (if any)
     """
     cache = _get_component_cache()
-    cache[component_id] = (filter_state_hashable, vue_data, data_hash)
+    cache[component_id] = (filter_state_hashable, vue_data, data_hash, ann_hash)
 
 
 def _prepare_vue_data_cached(
@@ -217,7 +242,7 @@ def _prepare_vue_data_cached(
         )
 
     if cached is not None:
-        cached_data, cached_hash = cached
+        cached_data, cached_hash, _ = cached  # Ignore cached annotation hash here
 
         if has_dynamic_annotations:
             # Cache hit but need to re-apply annotations (they may have changed)
@@ -240,6 +265,9 @@ def _prepare_vue_data_cached(
     # Cache miss - compute data
     vue_data = component._prepare_vue_data(state_dict)
 
+    # Compute annotation hash for cache storage
+    ann_hash = _compute_annotation_hash(component)
+
     if has_dynamic_annotations:
         # Store BASE data (without dynamic annotation columns) in cache
         if hasattr(component, "_strip_dynamic_columns"):
@@ -248,7 +276,7 @@ def _prepare_vue_data_cached(
             # Fallback: store without _plotConfig (may have stale column refs)
             base_data = {k: v for k, v in vue_data.items() if k != "_plotConfig"}
         base_hash = _hash_data(base_data)
-        _set_cached_vue_data(component_id, filter_state_hashable, base_data, base_hash)
+        _set_cached_vue_data(component_id, filter_state_hashable, base_data, base_hash, ann_hash)
 
         # Return full data with annotations
         data_hash = _hash_data(vue_data)
@@ -256,7 +284,7 @@ def _prepare_vue_data_cached(
     else:
         # Store complete data in cache
         data_hash = _hash_data(vue_data)
-        _set_cached_vue_data(component_id, filter_state_hashable, vue_data, data_hash)
+        _set_cached_vue_data(component_id, filter_state_hashable, vue_data, data_hash, ann_hash)
         return vue_data, data_hash
 
 
@@ -377,16 +405,28 @@ def render_component(
     # Check if cached data is VALID for current state
     # KEY FIX: Only send data when cache matches current state
     # - Before: Always sent cached data, even if stale (page 38 when Vue wants page 1)
-    # - Now: Only send if cache matches current state
+    # - Now: Only send if cache matches current state AND annotation state matches
     cache_valid = False
+    current_ann_hash = _compute_annotation_hash(component)
+
     if cached_entry is not None:
-        cached_state, cached_data, cached_hash = cached_entry
-        cache_valid = (cached_state == current_filter_state)
+        # Support both old (3-tuple) and new (4-tuple) cache format
+        if len(cached_entry) == 4:
+            cached_state, cached_data, cached_hash, cached_ann_hash = cached_entry
+        else:
+            cached_state, cached_data, cached_hash = cached_entry
+            cached_ann_hash = None
+
+        # Cache valid only if BOTH filter state AND annotation state match
+        filter_state_matches = (cached_state == current_filter_state)
+        ann_state_matches = (cached_ann_hash == current_ann_hash)
+        cache_valid = filter_state_matches and ann_state_matches
+
         if _DEBUG_STATE_SYNC:
             _logger.warning(
                 f"[Bridge:{component._cache_id}] Phase1: cache_valid={cache_valid}, "
-                f"cached_state={cached_state[:2] if cached_state else None}..., "
-                f"current_state={current_filter_state[:2] if current_filter_state else None}..."
+                f"filter_match={filter_state_matches}, ann_match={ann_state_matches}, "
+                f"cached_ann={cached_ann_hash}, current_ann={current_ann_hash}"
             )
 
     # Build payload - only send data if cache is valid for current state
@@ -538,8 +578,8 @@ def render_component(
             else:
                 converted_data[data_key] = value
 
-        # Store in cache for next render
-        cache[component_id] = (filter_state_hashable, converted_data, data_hash)
+        # Store in cache for next render (include annotation hash for validity check)
+        cache[component_id] = (filter_state_hashable, converted_data, data_hash, current_ann_hash)
 
         # If cache was invalid at Phase 1, we didn't send data to Vue (dataChanged=False).
         # Trigger a rerun so the newly cached data gets sent on the next render.

{openms_insight-0.1.8.dist-info → openms_insight-0.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openms-insight
-Version: 0.1.8
+Version: 0.1.9
 Summary: Interactive visualization components for mass spectrometry data in Streamlit
 Project-URL: Homepage, https://github.com/t0mdavid-m/OpenMS-Insight
 Project-URL: Documentation, https://github.com/t0mdavid-m/OpenMS-Insight#readme

{openms_insight-0.1.8.dist-info → openms_insight-0.1.9.dist-info}/RECORD

@@ -16,7 +16,7 @@ openms_insight/preprocessing/compression.py,sha256=T4YbX9PUlfTfPit_kpuLZn8hYpqLY
 openms_insight/preprocessing/filtering.py,sha256=fkmaIXfR5hfjyWfaMYqaeybMHaZjvUZYaKCqvxPOWMQ,14152
 openms_insight/preprocessing/scatter.py,sha256=2ifCNTUKHEW9UVpv4z9c5GaLnz5zw9o1119IenzAe9s,4703
 openms_insight/rendering/__init__.py,sha256=ApHvKeh87yY4GTIEai-tCeIXpNbwOXWlmcmIwMMRZYc,198
-openms_insight/rendering/bridge.py,sha256=3FiMlNL3hBHue28-0RWP9pt7GaNeczZbQwZl4cupXlc,23935
+openms_insight/rendering/bridge.py,sha256=a_6lq3jR9tDFxdSxMjeJhyV_Tgw7ALcm-UFEvl_TE_M,25615
 openms_insight/js-component/dist/index.html,sha256=LSJ3B_YmGUrCCdZ1UaZO2p6Wqsih6nTH62Z_0uZxpD8,430
 openms_insight/js-component/dist/assets/index.css,sha256=wFvo7FbG132LL7uw0slXfrL_oSQ8u2RKL1DW9hD9-kk,884264
 openms_insight/js-component/dist/assets/index.js,sha256=aqGc3g7XLTRr7ptEgoA3XDu5oMS47yxxjUBXgansIo0,6091480
@@ -24,7 +24,7 @@ openms_insight/js-component/dist/assets/materialdesignicons-webfont.eot,sha256=C
 openms_insight/js-component/dist/assets/materialdesignicons-webfont.ttf,sha256=YeirpaTpgf4iz3yOi82-oAR251xiw38Bv37jM2HWhCg,1307660
 openms_insight/js-component/dist/assets/materialdesignicons-webfont.woff,sha256=pZKKDVwvYk5G-Y2bFcL2AEU3f3xZTdeKF1kTLqO0Y-s,587984
 openms_insight/js-component/dist/assets/materialdesignicons-webfont.woff2,sha256=Zi_vqPL4qVwYWI0hd0eJwQfGTnccvmWmmvRikcQxGvw,403216
-openms_insight-0.1.8.dist-info/METADATA,sha256=l5aHKdSHf5z046vRxq8xJLDN7UywXFfLEcLTxfEEn4Q,16787
-openms_insight-0.1.8.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-openms_insight-0.1.8.dist-info/licenses/LICENSE,sha256=INFF4rOMmpah7Oi14hLqu7NTOsx56KRRNChAAUcfh2E,1823
-openms_insight-0.1.8.dist-info/RECORD,,
+openms_insight-0.1.9.dist-info/METADATA,sha256=--VBuRN6Co39E_BZYFk6OwYkOyWEE9uOq_OBK21PdWE,16787
+openms_insight-0.1.9.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+openms_insight-0.1.9.dist-info/licenses/LICENSE,sha256=INFF4rOMmpah7Oi14hLqu7NTOsx56KRRNChAAUcfh2E,1823
+openms_insight-0.1.9.dist-info/RECORD,,