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

vfbquery/__init__.py

@@ -1,55 +1,67 @@
 from .vfb_queries import *
 from .solr_result_cache import get_solr_cache
 
-# Caching enhancements (optional import - don't break if dependencies missing)
+# SOLR-based caching (simplified single-layer approach)
 try:
-    from .cache_enhancements import (
-        enable_vfbquery_caching, 
-        disable_vfbquery_caching,
-        clear_vfbquery_cache,
-        get_vfbquery_cache_stats,
-        set_cache_ttl,
-        set_cache_memory_limit,
-        set_cache_max_items,
-        enable_disk_cache,
-        disable_disk_cache,
-        get_cache_config,
-        CacheConfig
-    )
     from .cached_functions import (
         get_term_info_cached,
-        get_instances_cached, 
-        patch_vfbquery_with_caching,
-        unpatch_vfbquery_caching
+        get_instances_cached,
+        get_templates_cached,
+        get_related_anatomy_cached,
+        get_similar_neurons_cached,
+        get_individual_neuron_inputs_cached,
+        get_expression_overlaps_here_cached,
+        get_neurons_with_part_in_cached,
+        get_neurons_with_synapses_in_cached,
+        get_neurons_with_presynaptic_terminals_in_cached,
+        get_neurons_with_postsynaptic_terminals_in_cached,
+        get_components_of_cached,
+        get_parts_of_cached,
+        get_subclasses_of_cached,
+        get_neuron_classes_fasciculating_here_cached,
+        get_tracts_nerves_innervating_here_cached,
+        get_lineage_clones_in_cached,
+        get_neuron_neuron_connectivity_cached,
+        get_neuron_region_connectivity_cached,
+        get_images_neurons_cached,
+        get_images_that_develop_from_cached,
+        get_expression_pattern_fragments_cached,
+        get_anatomy_scrnaseq_cached,
+        get_cluster_expression_cached,
+        get_expression_cluster_cached,
+        get_scrnaseq_dataset_data_cached,
+        get_similar_morphology_cached,
+        get_similar_morphology_part_of_cached,
+        get_similar_morphology_part_of_exp_cached,
+        get_similar_morphology_nb_cached,
+        get_similar_morphology_nb_exp_cached,
+        get_similar_morphology_userdata_cached,
+        get_painted_domains_cached,
+        get_dataset_images_cached,
+        get_all_aligned_images_cached,
+        get_aligned_datasets_cached,
+        get_all_datasets_cached,
+        get_terms_for_pub_cached,
+        get_transgene_expression_here_cached,
     )
     __caching_available__ = True
-    
-    # Enable caching by default with 3-month TTL and 2GB memory cache
+
+    # Enable SOLR caching by default with 3-month TTL
     import os
     
     # Check if caching should be disabled via environment variable
     cache_disabled = os.getenv('VFBQUERY_CACHE_ENABLED', 'true').lower() in ('false', '0', 'no', 'off')
     
     if not cache_disabled:
-        # Enable caching with VFB_connect-like defaults
-        enable_vfbquery_caching(
-            cache_ttl_hours=2160,      # 3 months (90 days)
-            memory_cache_size_mb=2048, # 2GB memory cache
-            max_items=10000,           # Max 10k items as safeguard
-            disk_cache_enabled=True    # Persistent across sessions
-        )
-        
-        # Automatically patch existing functions for transparent caching
+        # Import and patch functions with caching
+        from .cached_functions import patch_vfbquery_with_caching
         patch_vfbquery_with_caching()
-        
-        print("VFBquery: Caching enabled by default (3-month TTL, 2GB memory)")
+        print("VFBquery: SOLR caching enabled by default (3-month TTL)")
         print("         Disable with: export VFBQUERY_CACHE_ENABLED=false")
-    
+
 except ImportError:
     __caching_available__ = False
-    print("VFBquery: Caching not available (dependencies missing)")
-
-# Convenience function for clearing SOLR cache entries
+    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
@@ -83,4 +95,4 @@ except ImportError:
     __solr_caching_available__ = False
 
 # Version information
-__version__ = "0.4.1"
+__version__ = "0.5.1"