Enhance caching mechanism for term_info queries by including preview parameter in cache key

Author: Robbie1977

src/vfbquery/solr_result_cache.py

@@ -585,16 +585,23 @@ def wrapper(*args, **kwargs):
                     logger.warning(f"No term_id found for caching {query_type}")
                     return func(*args, **kwargs)
 
+            # Include preview parameter in cache key for term_info queries
+            # This ensures preview=True and preview=False have separate cache entries
+            cache_term_id = term_id
+            if query_type == 'term_info':
+                preview = kwargs.get('preview', True)  # Default is True
+                cache_term_id = f"{term_id}_preview_{preview}"
+            
             cache = get_solr_cache()
 
             # Clear cache if force_refresh is True
             if force_refresh:
                 logger.info(f"Force refresh requested for {query_type}({term_id})")
-                cache.clear_cache_entry(query_type, term_id)
+                cache.clear_cache_entry(query_type, cache_term_id)
 
             # Try cache first (will be empty if force_refresh was True)
             if not force_refresh:
-                cached_result = cache.get_cached_result(query_type, term_id, **kwargs)
+                cached_result = cache.get_cached_result(query_type, cache_term_id, **kwargs)
                 if cached_result is not None:
                     # Validate that cached result has essential fields for term_info
                     if query_type == 'term_info':
@@ -653,15 +660,15 @@ def wrapper(*args, **kwargs):
                     if (result and isinstance(result, dict) and 
                         result.get('Id') and result.get('Name')):
                         try:
-                            cache.cache_result(query_type, term_id, result, **kwargs)
+                            cache.cache_result(query_type, cache_term_id, result, **kwargs)
                             logger.debug(f"Cached complete result for {term_id}")
                         except Exception as e:
                             logger.debug(f"Failed to cache result: {e}")
                     else:
                         logger.warning(f"Not caching incomplete result for {term_id}")
                 else:
                     try:
-                        cache.cache_result(query_type, term_id, result, **kwargs)
+                        cache.cache_result(query_type, cache_term_id, result, **kwargs)
                     except Exception as e:
                         logger.debug(f"Failed to cache result: {e}")
 

src/vfbquery/vfb_queries.py

@@ -1072,13 +1072,13 @@ def serialize_solr_output(results):
     return json_string 
 
 @with_solr_cache('term_info')
-def get_term_info(short_form: str, preview: bool = False):
+def get_term_info(short_form: str, preview: bool = True):
     """
     Retrieves the term info for the given term short form.
     Results are cached in SOLR for 3 months to improve performance.
 
     :param short_form: short form of the term
-    :param preview: if False, skips executing query previews (much faster)
+    :param preview: if True, executes query previews to populate preview_results (default: True)
     :return: term info
     """
     parsed_object = None