vfbquery 0.4.0__py3-none-any.whl → 0.4.1__py3-none-any.whl

test/readme_parser.py

@@ -27,7 +27,35 @@ def extract_code_blocks(readme_path):
         # Look for vfb.* calls and extract them
         vfb_calls = re.findall(r'(vfb\.[^)]*\))', block)
         if vfb_calls:
-            processed_python_blocks.extend(vfb_calls)
+            # Add force_refresh=True to each call to ensure fresh data in tests
+            # Exceptions:
+            # - get_templates() doesn't support force_refresh (no SOLR cache)
+            # - Performance test terms (FBbt_00003748, VFB_00101567) should use cache
+            for call in vfb_calls:
+                # Check if this is get_templates() - if so, don't add force_refresh
+                if 'get_templates' in call:
+                    processed_python_blocks.append(call)
+                    continue
+                
+                # Check if this call uses performance test terms - skip force_refresh for those
+                if 'FBbt_00003748' in call or 'VFB_00101567' in call:
+                    processed_python_blocks.append(call)
+                    continue
+                
+                # Check if the call already has parameters
+                if '(' in call and ')' in call:
+                    # Insert force_refresh=True before the closing parenthesis
+                    # Handle both cases: with and without existing parameters
+                    if call.rstrip(')').endswith('('):
+                        # No parameters: vfb.function()
+                        modified_call = call[:-1] + 'force_refresh=True)'
+                    else:
+                        # Has parameters: vfb.function(param1, param2)
+                        modified_call = call[:-1] + ', force_refresh=True)'
+                    processed_python_blocks.append(modified_call)
+                else:
+                    # Shouldn't happen, but include original call if no parentheses
+                    processed_python_blocks.append(call)
     
     # Process JSON blocks
     processed_json_blocks = []

test/term_info_queries_test.py

@@ -551,14 +551,14 @@ class TermInfoQueriesTest(unittest.TestCase):
         
         # Performance categories
         total_time = duration_1 + duration_2
-        if total_time < 1.0:
-            performance_level = "🟢 Excellent (< 1 second)"
-        elif total_time < 2.0:
-            performance_level = "🟡 Good (1-2 seconds)"  
-        elif total_time < 4.0:
-            performance_level = "🟠 Acceptable (2-4 seconds)"
+        if total_time < 1.5:
+            performance_level = "🟢 Excellent (< 1.5 seconds)"
+        elif total_time < 3.0:
+            performance_level = "🟡 Good (1.5-3 seconds)"  
+        elif total_time < 6.0:
+            performance_level = "🟠 Acceptable (3-6 seconds)"
         else:
-            performance_level = "🔴 Slow (> 4 seconds)"
+            performance_level = "🔴 Slow (> 6 seconds)"
             
         print(f"Performance Level: {performance_level}")
         print(f"="*50)
@@ -569,8 +569,8 @@ class TermInfoQueriesTest(unittest.TestCase):
         
         # Performance assertions - fail if queries take too long
         # These thresholds are based on observed performance characteristics
-        max_single_query_time = 2.0  # seconds
-        max_total_time = 4.0  # seconds (2 queries * 2 seconds each)
+        max_single_query_time = 3.0  # seconds (increased from 2.0 to account for SOLR cache overhead)
+        max_total_time = 6.0  # seconds (2 queries * 3 seconds each)
         
         self.assertLess(duration_1, max_single_query_time, 
                        f"FBbt_00003748 query took {duration_1:.4f}s, exceeding {max_single_query_time}s threshold")

vfbquery/__init__.py

@@ -1,4 +1,5 @@
 from .vfb_queries import *
+from .solr_result_cache import get_solr_cache
 
 # Caching enhancements (optional import - don't break if dependencies missing)
 try:
@@ -48,6 +49,26 @@ except ImportError:
     __caching_available__ = False
     print("VFBquery: Caching not available (dependencies missing)")
 
+# Convenience function for clearing SOLR cache entries
+def clear_solr_cache(query_type: str, term_id: str) -> bool:
+    """
+    Clear a specific SOLR cache entry to force refresh
+    
+    Args:
+        query_type: Type of query ('term_info', 'instances', etc.)
+        term_id: Term identifier (e.g., 'FBbt_00003748')
+    
+    Returns:
+        True if successfully cleared, False otherwise
+    
+    Example:
+        >>> import vfbquery as vfb
+        >>> vfb.clear_solr_cache('term_info', 'FBbt_00003748')
+        >>> result = vfb.get_term_info('FBbt_00003748')  # Will fetch fresh data
+    """
+    cache = get_solr_cache()
+    return cache.clear_cache_entry(query_type, term_id)
+
 # SOLR-based result caching (experimental - for cold start optimization)
 try:
     from .solr_cache_integration import (
@@ -62,4 +83,4 @@ except ImportError:
     __solr_caching_available__ = False
 
 # Version information
-__version__ = "0.4.0"
+__version__ = "0.4.1"

vfbquery/solr_result_cache.py

@@ -240,6 +240,36 @@ class SolrResultCache:
         except Exception as e:
             logger.debug(f"Failed to clear expired cache document: {e}")
     
+    def clear_cache_entry(self, query_type: str, term_id: str) -> bool:
+        """
+        Manually clear a specific cache entry to force refresh
+        
+        Args:
+            query_type: Type of query ('term_info', 'instances', etc.)
+            term_id: Term identifier
+            
+        Returns:
+            True if successfully cleared, False otherwise
+        """
+        try:
+            cache_doc_id = f"vfb_query_{term_id}"
+            response = requests.post(
+                f"{self.cache_url}/update",
+                data=f'<delete><id>{cache_doc_id}</id></delete>',
+                headers={"Content-Type": "application/xml"},
+                params={"commit": "true"},  # Commit immediately to ensure it's cleared
+                timeout=5
+            )
+            if response.status_code == 200:
+                logger.info(f"Cleared cache entry for {query_type}({term_id})")
+                return True
+            else:
+                logger.error(f"Failed to clear cache entry: HTTP {response.status_code}")
+                return False
+        except Exception as e:
+            logger.error(f"Error clearing cache entry: {e}")
+            return False
+    
     def _increment_cache_hit_count(self, cache_doc_id: str, current_count: int):
         """Increment hit count for cache document (background operation)"""
         try:
@@ -533,57 +563,73 @@ def with_solr_cache(query_type: str):
     
     Usage:
         @with_solr_cache('term_info')
-        def get_term_info(short_form, **kwargs):
+        def get_term_info(short_form, force_refresh=False, **kwargs):
             # ... existing implementation
+    
+    The decorated function can accept a 'force_refresh' parameter to bypass cache.
     """
     def decorator(func):
         def wrapper(*args, **kwargs):
+            # Check if force_refresh is requested (pop it before passing to function)
+            force_refresh = kwargs.pop('force_refresh', False)
+            
             # Extract term_id from first argument or kwargs
             term_id = args[0] if args else kwargs.get('short_form') or kwargs.get('term_id')
             
+            # For functions like get_templates that don't have a term_id, use query_type as cache key
             if not term_id:
-                logger.warning("No term_id found for caching")
-                return func(*args, **kwargs)
+                if query_type == 'templates':
+                    # Use a fixed cache key for templates since it doesn't take a term_id
+                    term_id = 'all_templates'
+                else:
+                    logger.warning(f"No term_id found for caching {query_type}")
+                    return func(*args, **kwargs)
             
             cache = get_solr_cache()
             
-            # Try cache first
-            cached_result = cache.get_cached_result(query_type, term_id, **kwargs)
-            if cached_result is not None:
-                # Validate that cached result has essential fields for term_info
-                if query_type == 'term_info':
-                    is_valid = (cached_result and isinstance(cached_result, dict) and 
-                               cached_result.get('Id') and cached_result.get('Name'))
-                    
-                    # Additional validation for query results
-                    if is_valid and 'Queries' in cached_result:
-                        logger.debug(f"Validating {len(cached_result['Queries'])} queries for {term_id}")
-                        for i, query in enumerate(cached_result['Queries']):
-                            count = query.get('count', 0)
-                            preview_results = query.get('preview_results')
-                            headers = preview_results.get('headers', []) if isinstance(preview_results, dict) else []
-                            
-                            logger.debug(f"Query {i}: count={count}, preview_results_type={type(preview_results)}, headers={headers}")
-                            
-                            # Check if query has unrealistic count (0 or -1) which indicates failed execution
-                            if count <= 0:
-                                is_valid = False
-                                logger.debug(f"Cached result has invalid query count {count} for {term_id}")
-                                break
-                            # Check if preview_results is missing or has empty headers when it should have data
-                            if not isinstance(preview_results, dict) or not headers:
-                                is_valid = False
-                                logger.debug(f"Cached result has invalid preview_results structure for {term_id}")
-                                break
-                    
-                    if is_valid:
-                        logger.debug(f"Using valid cached result for {term_id}")
-                        return cached_result
+            # 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)
+            
+            # 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)
+                if cached_result is not None:
+                    # Validate that cached result has essential fields for term_info
+                    if query_type == 'term_info':
+                        is_valid = (cached_result and isinstance(cached_result, dict) and 
+                                   cached_result.get('Id') and cached_result.get('Name'))
+                        
+                        # Additional validation for query results
+                        if is_valid and 'Queries' in cached_result:
+                            logger.debug(f"Validating {len(cached_result['Queries'])} queries for {term_id}")
+                            for i, query in enumerate(cached_result['Queries']):
+                                count = query.get('count', 0)
+                                preview_results = query.get('preview_results')
+                                headers = preview_results.get('headers', []) if isinstance(preview_results, dict) else []
+                                
+                                logger.debug(f"Query {i}: count={count}, preview_results_type={type(preview_results)}, headers={headers}")
+                                
+                                # Check if query has unrealistic count (0 or -1) which indicates failed execution
+                                if count <= 0:
+                                    is_valid = False
+                                    logger.debug(f"Cached result has invalid query count {count} for {term_id}")
+                                    break
+                                # Check if preview_results is missing or has empty headers when it should have data
+                                if not isinstance(preview_results, dict) or not headers:
+                                    is_valid = False
+                                    logger.debug(f"Cached result has invalid preview_results structure for {term_id}")
+                                    break
+                        
+                        if is_valid:
+                            logger.debug(f"Using valid cached result for {term_id}")
+                            return cached_result
+                        else:
+                            logger.warning(f"Cached result incomplete for {term_id}, re-executing function")
+                            # Don't return the incomplete cached result, continue to execute function
                     else:
-                        logger.warning(f"Cached result incomplete for {term_id}, re-executing function")
-                        # Don't return the incomplete cached result, continue to execute function
-                else:
-                    return cached_result
+                        return cached_result
             
             # Execute function and cache result
             result = func(*args, **kwargs)

vfbquery/vfb_queries.py

@@ -9,6 +9,7 @@ import pandas as pd
 from marshmallow import ValidationError
 import json
 import numpy as np
+from urllib.parse import unquote
 from .solr_result_cache import with_solr_cache
 
 # Custom JSON encoder to handle NumPy and pandas types
@@ -59,6 +60,23 @@ vfb_solr = pysolr.Solr('http://solr.virtualflybrain.org/solr/vfb_json/', always_
 # Replace VfbConnect with SolrTermInfoFetcher
 vc = SolrTermInfoFetcher()
 
+def initialize_vfb_connect():
+    """
+    Initialize VFB_connect by triggering the lazy load of the vfb and nc properties.
+    This causes VFB_connect to cache all terms, which takes ~95 seconds on first call.
+    Subsequent calls to functions using vc.nc will be fast.
+    
+    :return: True if initialization successful, False otherwise
+    """
+    try:
+        # Access the properties to trigger lazy loading
+        _ = vc.vfb
+        _ = vc.nc
+        return True
+    except Exception as e:
+        print(f"Failed to initialize VFB_connect: {e}")
+        return False
+
 class Query:
     def __init__(self, query, label, function, takes, preview=0, preview_columns=[], preview_results=[], output_format="table", count=-1):
         self.query = query
@@ -294,19 +312,19 @@ class TermInfoOutputSchema(Schema):
 
 def encode_brackets(text):
     """
-    Encodes brackets in the given text.
+    Encodes square brackets in the given text to prevent breaking markdown link syntax.
+    Parentheses are NOT encoded as they don't break markdown syntax.
 
     :param text: The text to encode.
-    :return: The text with brackets encoded.
+    :return: The text with square brackets encoded.
     """
-    return (text.replace('(', '%28')
-                .replace(')', '%29')
-                .replace('[', '%5B')
+    return (text.replace('[', '%5B')
                 .replace(']', '%5D'))
 
 def encode_markdown_links(df, columns):
     """
-    Encodes brackets in the labels and titles within markdown links and images, leaving the link syntax intact.
+    Encodes brackets in the labels within markdown links, leaving the link syntax intact.
+    Does NOT encode alt text in linked images ([![...](...)(...)] format).
     :param df: DataFrame containing the query results.
     :param columns: List of column names to apply encoding to.
     """
@@ -315,28 +333,10 @@ def encode_markdown_links(df, columns):
             return label
             
         try:
-            # Process linked images (format: [![alt text](image_url "title")](link))
+            # Skip linked images (format: [![alt text](image_url "title")](link))
+            # These should NOT be encoded
             if label.startswith("[!["):
-                # Split into image part and link part
-                parts = label.split(")](")
-                if len(parts) < 2:
-                    return label
-                
-                image_part = parts[0]
-                link_part = parts[1]
-                
-                # Process the image part
-                image_parts = image_part.split("](")
-                if len(image_parts) < 2:
-                    return label
-                
-                alt_text = image_parts[0][3:]  # Remove the "[![" prefix
-                # Encode brackets in alt text
-                alt_text_encoded = encode_brackets(alt_text)
-                
-                # Reconstruct the linked image with encoded alt text
-                encoded_label = f"[![{alt_text_encoded}]({image_parts[1]})]({link_part}"
-                return encoded_label
+                return label
             
             # Process regular markdown links
             elif label.startswith("[") and "](" in label:
@@ -905,6 +905,7 @@ def get_term_info(short_form: str, preview: bool = False):
         print(f"Unexpected error when retrieving term info: {type(e).__name__}: {e}")
         return parsed_object
 
+@with_solr_cache('instances')
 def get_instances(short_form: str, return_dataframe=True, limit: int = -1):
     """
     Retrieves available instances for the given class short form.
@@ -1041,19 +1042,34 @@ def _get_instances_from_solr(short_form: str, return_dataframe=True, limit: int
             # Use the ordered tags to match expected format
             tags = '|'.join(ordered_tags)
             
-            # Extract thumbnail URL
+            # Extract thumbnail URL and convert to HTTPS
             thumbnail_url = image_info.get('image_thumbnail', '') if image_info else ''
+            if thumbnail_url:
+                # Replace http with https and thumbnailT.png with thumbnail.png
+                thumbnail_url = thumbnail_url.replace('http://', 'https://').replace('thumbnailT.png', 'thumbnail.png')
             
             # Format thumbnail with proper markdown link (matching Neo4j format)
             thumbnail = ''
             if thumbnail_url and template_anatomy:
+                # Prefer symbol over label for template (matching Neo4j behavior)
                 template_label = template_anatomy.get('label', '')
+                if template_anatomy.get('symbol') and len(template_anatomy.get('symbol', '')) > 0:
+                    template_label = template_anatomy.get('symbol')
+                # Decode URL-encoded strings from SOLR (e.g., ME%28R%29 -> ME(R))
+                template_label = unquote(template_label)
                 template_short_form = template_anatomy.get('short_form', '')
+                
+                # Prefer symbol over label for anatomy (matching Neo4j behavior)
                 anatomy_label = anatomy.get('label', '')
+                if anatomy.get('symbol') and len(anatomy.get('symbol', '')) > 0:
+                    anatomy_label = anatomy.get('symbol')
+                # Decode URL-encoded strings from SOLR (e.g., ME%28R%29 -> ME(R))
+                anatomy_label = unquote(anatomy_label)
                 anatomy_short_form = anatomy.get('short_form', '')
                 
                 if template_label and anatomy_label:
                     # Create thumbnail markdown link matching the original format
+                    # DO NOT encode brackets in alt text - that's done later by encode_markdown_links
                     alt_text = f"{anatomy_label} aligned to {template_label}"
                     link_target = f"{template_short_form},{anatomy_short_form}"
                     thumbnail = f"[![{alt_text}]({thumbnail_url} '{alt_text}')]({link_target})"
@@ -1061,27 +1077,27 @@ def _get_instances_from_solr(short_form: str, return_dataframe=True, limit: int
             # Format template information
             template_formatted = ''
             if template_anatomy:
+                # Prefer symbol over label (matching Neo4j behavior)
                 template_label = template_anatomy.get('label', '')
+                if template_anatomy.get('symbol') and len(template_anatomy.get('symbol', '')) > 0:
+                    template_label = template_anatomy.get('symbol')
+                # Decode URL-encoded strings from SOLR (e.g., ME%28R%29 -> ME(R))
+                template_label = unquote(template_label)
                 template_short_form = template_anatomy.get('short_form', '')
                 if template_label and template_short_form:
                     template_formatted = f"[{template_label}]({template_short_form})"
             
-            # Handle URL encoding for labels (match Neo4j format)
+            # Handle label formatting (match Neo4j format - prefer symbol over label)
             anatomy_label = anatomy.get('label', 'Unknown')
+            if anatomy.get('symbol') and len(anatomy.get('symbol', '')) > 0:
+                anatomy_label = anatomy.get('symbol')
+            # Decode URL-encoded strings from SOLR (e.g., ME%28R%29 -> ME(R))
+            anatomy_label = unquote(anatomy_label)
             anatomy_short_form = anatomy.get('short_form', '')
             
-            # URL encode special characters in label for markdown links (matching Neo4j behavior)
-            # Only certain labels need encoding (like those with parentheses)
-            import urllib.parse
-            if '(' in anatomy_label or ')' in anatomy_label:
-                # URL encode but keep spaces and common characters
-                encoded_label = urllib.parse.quote(anatomy_label, safe=' -_.')
-            else:
-                encoded_label = anatomy_label
-            
             row = {
                 'id': anatomy_short_form,
-                'label': f"[{encoded_label}]({anatomy_short_form})",
+                'label': f"[{anatomy_label}]({anatomy_short_form})",
                 'tags': tags,
                 'parent': f"[{term_info.get('term', {}).get('core', {}).get('label', 'Unknown')}]({short_form})",
                 'source': '',  # Not readily available in SOLR anatomy_channel_image
@@ -1099,7 +1115,11 @@ def _get_instances_from_solr(short_form: str, return_dataframe=True, limit: int
         total_count = len(anatomy_images)
         
         if return_dataframe:
-            return pd.DataFrame(rows)
+            df = pd.DataFrame(rows)
+            # Apply encoding to markdown links (matches Neo4j implementation)
+            columns_to_encode = ['label', 'parent', 'source', 'source_id', 'template', 'dataset', 'license', 'thumbnail']
+            df = encode_markdown_links(df, columns_to_encode)
+            return df
         
         return {
             "headers": _get_instances_headers(),

{vfbquery-0.4.0.dist-info → vfbquery-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vfbquery
-Version: 0.4.0
+Version: 0.4.1
 Summary: Wrapper for querying VirtualFlyBrain knowledge graph.
 Home-page: https://github.com/VirtualFlyBrain/VFBquery
 Author: VirtualFlyBrain
@@ -117,25 +117,25 @@ vfb.get_term_info('FBbt_00003748')
                   "id": "VFB_00102107",
                   "label": "[ME on JRC2018Unisex adult brain](VFB_00102107)",
                   "tags": "Nervous_system|Adult|Visual_system|Synaptic_neuropil_domain",
-                  "thumbnail": "[![ME on JRC2018Unisex adult brain aligned to JRC2018Unisex](http://www.virtualflybrain.org/data/VFB/i/0010/2107/VFB_00101567/thumbnail.png 'ME on JRC2018Unisex adult brain aligned to JRC2018Unisex')](VFB_00101567,VFB_00102107)"
+                  "thumbnail": "[![ME on JRC2018Unisex adult brain aligned to JRC2018U](http://www.virtualflybrain.org/data/VFB/i/0010/2107/VFB_00101567/thumbnail.png 'ME on JRC2018Unisex adult brain aligned to JRC2018U')](VFB_00101567,VFB_00102107)"
                },
                {
                   "id": "VFB_00101385",
-                  "label": "[ME%28R%29 on JRC_FlyEM_Hemibrain](VFB_00101385)",
+                  "label": "[ME(R) on JRC_FlyEM_Hemibrain](VFB_00101385)",
                   "tags": "Nervous_system|Adult|Visual_system|Synaptic_neuropil_domain",
-                  "thumbnail": "[![ME(R) on JRC_FlyEM_Hemibrain aligned to JRC_FlyEM_Hemibrain](http://www.virtualflybrain.org/data/VFB/i/0010/1385/VFB_00101384/thumbnail.png 'ME(R) on JRC_FlyEM_Hemibrain aligned to JRC_FlyEM_Hemibrain')](VFB_00101384,VFB_00101385)"
+                  "thumbnail": "[![ME(R) on JRC_FlyEM_Hemibrain aligned to JRCFIB2018Fum](http://www.virtualflybrain.org/data/VFB/i/0010/1385/VFB_00101384/thumbnail.png 'ME(R) on JRC_FlyEM_Hemibrain aligned to JRCFIB2018Fum')](VFB_00101384,VFB_00101385)"
                },
                {
                   "id": "VFB_00030810",
                   "label": "[medulla on adult brain template Ito2014](VFB_00030810)",
-                  "tags": "Nervous_system|Adult|Visual_system|Synaptic_neuropil_domain",
+                  "tags": "Nervous_system|Visual_system|Adult|Synaptic_neuropil_domain",
                   "thumbnail": "[![medulla on adult brain template Ito2014 aligned to adult brain template Ito2014](http://www.virtualflybrain.org/data/VFB/i/0003/0810/VFB_00030786/thumbnail.png 'medulla on adult brain template Ito2014 aligned to adult brain template Ito2014')](VFB_00030786,VFB_00030810)"
                },
                {
                   "id": "VFB_00030624",
                   "label": "[medulla on adult brain template JFRC2](VFB_00030624)",
-                  "tags": "Nervous_system|Adult|Visual_system|Synaptic_neuropil_domain",
-                  "thumbnail": "[![medulla on adult brain template JFRC2 aligned to adult brain template JFRC2](http://www.virtualflybrain.org/data/VFB/i/0003/0624/VFB_00017894/thumbnail.png 'medulla on adult brain template JFRC2 aligned to adult brain template JFRC2')](VFB_00017894,VFB_00030624)"
+                  "tags": "Nervous_system|Visual_system|Adult|Synaptic_neuropil_domain",
+                  "thumbnail": "[![medulla on adult brain template JFRC2 aligned to JFRC2](http://www.virtualflybrain.org/data/VFB/i/0003/0624/VFB_00017894/thumbnail.png 'medulla on adult brain template JFRC2 aligned to JFRC2')](VFB_00017894,VFB_00030624)"
                }
             ]
          },
@@ -143,8 +143,8 @@ vfb.get_term_info('FBbt_00003748')
          "count": 4
       }
    ],
-   "IsIndividual": false,
-   "IsClass": true,
+   "IsIndividual": False,
+   "IsClass": True,
    "Examples": {
       "VFB_00101384": [
          {
@@ -191,7 +191,7 @@ vfb.get_term_info('FBbt_00003748')
          }
       ]
    },
-   "IsTemplate": false,
+   "IsTemplate": False,
    "Synonyms": [
       {
          "label": "ME",
@@ -1122,7 +1122,7 @@ vfb.get_instances('FBbt_00003748', return_dataframe=False)
       },
       {
          "id": "VFB_00101385",
-         "label": "[ME%28R%29 on JRC_FlyEM_Hemibrain](VFB_00101385)",
+         "label": "[ME(R) on JRC_FlyEM_Hemibrain](VFB_00101385)",
          "tags": "Nervous_system|Adult|Visual_system|Synaptic_neuropil_domain",
          "parent": "[medulla](FBbt_00003748)",
          "source": "",
@@ -1130,7 +1130,7 @@ vfb.get_instances('FBbt_00003748', return_dataframe=False)
          "template": "[JRCFIB2018Fum](VFB_00101384)",
          "dataset": "[JRC_FlyEM_Hemibrain painted domains](Xu2020roi)",
          "license": "",
-         "thumbnail": "[![ME%28R%29 on JRC_FlyEM_Hemibrain aligned to JRCFIB2018Fum](http://www.virtualflybrain.org/data/VFB/i/0010/1385/VFB_00101384/thumbnail.png 'ME(R) on JRC_FlyEM_Hemibrain aligned to JRCFIB2018Fum')](VFB_00101384,VFB_00101385)"
+         "thumbnail": "[![ME(R) on JRC_FlyEM_Hemibrain aligned to JRCFIB2018Fum](http://www.virtualflybrain.org/data/VFB/i/0010/1385/VFB_00101384/thumbnail.png 'ME(R) on JRC_FlyEM_Hemibrain aligned to JRCFIB2018Fum')](VFB_00101384,VFB_00101385)"
       },
       {
          "id": "VFB_00030810",
@@ -1152,7 +1152,7 @@ vfb.get_instances('FBbt_00003748', return_dataframe=False)
          "source": "",
          "source_id": "",
          "template": "[JFRC2](VFB_00017894)",
-         "dataset": "[BrainName neuropils on adult brain JFRC2 %28Jenett, Shinomya%29](JenettShinomya_BrainName)",
+         "dataset": "[BrainName neuropils on adult brain JFRC2 (Jenett, Shinomya)](JenettShinomya_BrainName)",
          "license": "",
          "thumbnail": "[![medulla on adult brain template JFRC2 aligned to JFRC2](http://www.virtualflybrain.org/data/VFB/i/0003/0624/VFB_00017894/thumbnail.png 'medulla on adult brain template JFRC2 aligned to JFRC2')](VFB_00017894,VFB_00030624)"
       }
@@ -1234,7 +1234,7 @@ vfb.get_templates(return_dataframe=False)
          "name": "[JFRC2](VFB_00017894)",
          "tags": "Nervous_system|Adult",
          "thumbnail": "[![JFRC2](http://www.virtualflybrain.org/data/VFB/i/0001/7894/VFB_00017894/thumbnail.png 'JFRC2')](VFB_00017894)",
-         "dataset": "[FlyLight - GMR GAL4 collection %28Jenett2012%29](Jenett2012)",
+         "dataset": "[FlyLight - GMR GAL4 collection (Jenett2012)](Jenett2012)",
          "license": "[CC-BY-NC-SA](VFBlicense_CC_BY_NC_SA_4_0)"
       },
       {
@@ -1252,7 +1252,7 @@ vfb.get_templates(return_dataframe=False)
          "name": "[L1 larval CNS ssTEM - Cardona/Janelia](VFB_00050000)",
          "tags": "Nervous_system|Larva",
          "thumbnail": "[![L1 larval CNS ssTEM - Cardona/Janelia](http://www.virtualflybrain.org/data/VFB/i/0005/0000/VFB_00050000/thumbnail.png 'L1 larval CNS ssTEM - Cardona/Janelia')](VFB_00050000)",
-         "dataset": "[Neurons involved in larval fast escape response - EM %28Ohyama2016%29](Ohyama2015)",
+         "dataset": "[Neurons involved in larval fast escape response - EM (Ohyama2016)](Ohyama2015)",
          "license": "[CC_BY_SA](VFBlicense_CC_BY_SA_4_0)"
       },
       {
@@ -1261,7 +1261,7 @@ vfb.get_templates(return_dataframe=False)
          "name": "[L1 larval CNS ssTEM - Cardona/Janelia](VFB_00050000)",
          "tags": "Nervous_system|Larva",
          "thumbnail": "[![L1 larval CNS ssTEM - Cardona/Janelia](http://www.virtualflybrain.org/data/VFB/i/0005/0000/VFB_00050000/thumbnail.png 'L1 larval CNS ssTEM - Cardona/Janelia')](VFB_00050000)",
-         "dataset": "[larval hugin neurons - EM %28Schlegel2016%29](Schlegel2016)",
+         "dataset": "[larval hugin neurons - EM (Schlegel2016)](Schlegel2016)",
          "license": "[CC_BY](VFBlicense_CC_BY_4_0)"
       },
       {
@@ -1270,7 +1270,7 @@ vfb.get_templates(return_dataframe=False)
          "name": "[L3 CNS template - Wood2018](VFB_00049000)",
          "tags": "Nervous_system|Larva",
          "thumbnail": "[![L3 CNS template - Wood2018](http://www.virtualflybrain.org/data/VFB/i/0004/9000/VFB_00049000/thumbnail.png 'L3 CNS template - Wood2018')](VFB_00049000)",
-         "dataset": "[L3 Larval CNS Template %28Truman2016%29](Truman2016)",
+         "dataset": "[L3 Larval CNS Template (Truman2016)](Truman2016)",
          "license": "[CC_BY_SA](VFBlicense_CC_BY_SA_4_0)"
       },
       {
@@ -1279,7 +1279,7 @@ vfb.get_templates(return_dataframe=False)
          "name": "[COURT2018VNS](VFB_00100000)",
          "tags": "Nervous_system|Adult|Ganglion",
          "thumbnail": "[![COURT2018VNS](http://www.virtualflybrain.org/data/VFB/i/0010/0000/VFB_00100000/thumbnail.png 'COURT2018VNS')](VFB_00100000)",
-         "dataset": "[Adult VNS neuropils %28Court2017%29](Court2017)",
+         "dataset": "[Adult VNS neuropils (Court2017)](Court2017)",
          "license": "[CC_BY_SA](VFBlicense_CC_BY_SA_4_0)"
       },
       {
@@ -1294,7 +1294,7 @@ vfb.get_templates(return_dataframe=False)
       {
          "id": "VFB_00110000",
          "order": 9,
-         "name": "[Adult Head %28McKellar2020%29](VFB_00110000)",
+         "name": "[Adult Head (McKellar2020)](VFB_00110000)",
          "tags": "Adult|Anatomy",
          "thumbnail": "[![Adult Head (McKellar2020)](http://www.virtualflybrain.org/data/VFB/i/0011/0000/VFB_00110000/thumbnail.png 'Adult Head (McKellar2020)')](VFB_00110000)",
          "dataset": "[GAL4 lines from McKellar et al., 2020](McKellar2020)",
@@ -1303,7 +1303,7 @@ vfb.get_templates(return_dataframe=False)
       {
          "id": "VFB_00120000",
          "order": 10,
-         "name": "[Adult T1 Leg %28Kuan2020%29](VFB_00120000)",
+         "name": "[Adult T1 Leg (Kuan2020)](VFB_00120000)",
          "tags": "Adult|Anatomy",
          "thumbnail": "[![Adult T1 Leg (Kuan2020)](http://www.virtualflybrain.org/data/VFB/i/0012/0000/VFB_00120000/thumbnail.png 'Adult T1 Leg (Kuan2020)')](VFB_00120000)",
          "dataset": "[Millimeter-scale imaging of a Drosophila leg at single-neuron resolution](Kuan2020)",

{vfbquery-0.4.0.dist-info → vfbquery-0.4.1.dist-info}/RECORD

@@ -1,19 +1,19 @@
 test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-test/readme_parser.py,sha256=puvcq4_oEltjx_faw1kQJ8mmIWiQU-40oLJjtJBQCsQ,4170
-test/term_info_queries_test.py,sha256=Od3i2DfaOlYFQGNQh2G7EiTC5ZqzgySyH3Wk6GntkWE,36902
+test/readme_parser.py,sha256=I15lzWyYaYRgbFqZ1EZOBrUyzeJJK0VWzpxvH25lAZE,5772
+test/term_info_queries_test.py,sha256=bb3oTnPqpGzegWDkWyIBySVbYEeyMdKB3epgzm0yf40,36963
 test/test_default_caching.py,sha256=-KW2Mkz9x0tjlhXMreqJvjgo3pWOg49G0r22Woa9U5U,6616
 test/test_examples_diff.py,sha256=TPo7gHPcus-24T7kxBXMQiCl0EHcXaEXeVuOG7C3rUo,15853
-vfbquery/__init__.py,sha256=oKdgjIoseGwhdNwejXndg0CSpZdPgZes-PlHtYZT0zk,2262
+vfbquery/__init__.py,sha256=IQ2W2LkrVKThB-00cuaIsW5fwQRN8PgPlKSXGdGY2Q8,3010
 vfbquery/cache_enhancements.py,sha256=-PCM0YZHPjwUJwJODZLgmz91sDyFGuYz_QRph_kTbB8,17341
 vfbquery/cached_functions.py,sha256=5-aIiRP9mfEhVT3mXkLvIPDmdFq6iIExiLZAyir12IQ,10255
 vfbquery/solr_cache_integration.py,sha256=Q87z_pXPdS9zn0r9kp2YBLGpCKOXVvcmzNmkRN7D8MU,7984
 vfbquery/solr_fetcher.py,sha256=1FAyqaLrvZLaAmCW96en9y8lKTcs-ZFjt_UlnohP0jo,5683
-vfbquery/solr_result_cache.py,sha256=oIUPCNmxG_nmyhfvx1gSiy5uvtvVrkLMJFgA6MNEqpY,27864
+vfbquery/solr_result_cache.py,sha256=qkR13mCiqRHLCv5PWd1pT-rPIboZcGuusn065HgvV-0,30111
 vfbquery/term_info_queries.py,sha256=oE-Ogm7jCPPlKtD3W3EtttYZcHnInwDOpOj-phAEOaI,42009
 vfbquery/test_utils.py,sha256=7wUA3xgaGu3eLnjC98msNYt1wL538nOimVJjkC0ZLjU,5791
-vfbquery/vfb_queries.py,sha256=50phVwDP28YaZdOmLom_Opem0Bdf2cEPo18jLjGig1I,76626
-vfbquery-0.4.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-vfbquery-0.4.0.dist-info/METADATA,sha256=skaC5fQa-atagVzYyDmL7bAvgGcSF7KIAkxT2HueGa8,63157
-vfbquery-0.4.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-vfbquery-0.4.0.dist-info/top_level.txt,sha256=UgaRTTOy4JBdKbkr_gkeknT4eaibm3ztF520G4NTQZs,14
-vfbquery-0.4.0.dist-info/RECORD,,
+vfbquery/vfb_queries.py,sha256=tLLphDbsjv0MsEnA5JWvKzT1a8OutsCUH6gmrVahZKg,78143
+vfbquery-0.4.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+vfbquery-0.4.1.dist-info/METADATA,sha256=d5onNHbLwdQXpfNLNgvvtVNbOV2L920AO8aFf-A3rbY,63049
+vfbquery-0.4.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+vfbquery-0.4.1.dist-info/top_level.txt,sha256=UgaRTTOy4JBdKbkr_gkeknT4eaibm3ztF520G4NTQZs,14
+vfbquery-0.4.1.dist-info/RECORD,,