Skip to content

Commit c3a7d41

Browse files
committed
Revert template_roi_tree cache bucket rename from v1.13.3
v1.13.3 renamed the @with_solr_cache bucket from 'template_roi_tree' to 'template_roi_tree_v2' to dodge v1.13.2 stale entries with the narrower walk. Robbie flagged this as overkill — the rename orphans the previous bucket in SOLR for 90 days, and force_refresh on the 10 affected templates does the same job surgically. Reverts the decorator name in both vfb_queries.get_template_roi_tree and cached_functions.get_template_roi_tree_cached back to 'template_roi_tree'. The Cypher walk (innervates + unbounded depth) and the painted_domain_index class_label fallback from v1.13.3 are unchanged. Post-deploy: the run.sh accompanying this release fires ?force_refresh=true against each of the 10 production templates so the v1.13.2-shape entries still cached under 'template_roi_tree' (the canonical bucket) get overwritten with v1.13.4 results. The orphaned 'template_roi_tree_v2' entries from v1.13.3 will TTL out in 90 days; nothing reads from them. No __version__ bump.
1 parent 103bdec commit c3a7d41

2 files changed

Lines changed: 3 additions & 8 deletions

File tree

src/vfbquery/cached_functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ def get_painted_domains_cached(template_short_form: str, return_dataframe=True,
325325
"""
326326
return _original_get_painted_domains(template_short_form=template_short_form, return_dataframe=return_dataframe, limit=limit)
327327

328-
@with_solr_cache('template_roi_tree_v2')
328+
@with_solr_cache('template_roi_tree')
329329
def get_template_roi_tree_cached(template_short_form: str, return_dataframe: bool = False, force_refresh: bool = False):
330330
"""
331331
Enhanced get_template_roi_tree with SOLR caching.

src/vfbquery/vfb_queries.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4883,7 +4883,7 @@ def get_painted_domains(template_short_form: str, return_dataframe=True, limit:
48834883
_VFB_SHORT_FORM_RE = re.compile(r"^[A-Za-z0-9_]+$")
48844884

48854885

4886-
@with_solr_cache('template_roi_tree_v2')
4886+
@with_solr_cache('template_roi_tree')
48874887
def get_template_roi_tree(template_short_form: str, return_dataframe=False):
48884888
"""Build a hierarchical ROI tree for a template.
48894889
@@ -4895,12 +4895,7 @@ def get_template_roi_tree(template_short_form: str, return_dataframe=False):
48954895
on this template, materialising the nodes and edges required to
48964896
render the tree. ``innervates`` is what connects e.g. the adult VNC
48974897
nerves (which are part_of the peripheral nervous system, NOT the
4898-
central VNC) to the neuromeres they innervate, so without it the
4899-
legacy walk dropped 16 of the 22 painted VNS nerves from the tree.
4900-
4901-
Cache bucket ``template_roi_tree_v2`` (was ``template_roi_tree``)
4902-
forces a clean re-populate so v1.13.2 entries with the narrower
4903-
rel-set don't shadow the new walk.
4898+
central VNC) to the neuromeres they innervate.
49044899
49054900
FBbt's DAG character is preserved (multi-parent classes appear under
49064901
each parent), matching the legacy VFBTree behaviour.

0 commit comments

Comments
 (0)