vfbquery 0.5.2__tar.gz → 0.5.4__tar.gz

{vfbquery-0.5.2/src/vfbquery.egg-info → vfbquery-0.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vfbquery
-Version: 0.5.2
+Version: 0.5.4
 Summary: Wrapper for querying VirtualFlyBrain knowledge graph.
 Home-page: https://github.com/VirtualFlyBrain/VFBquery
 Author: VirtualFlyBrain

{vfbquery-0.5.2 → vfbquery-0.5.4}/setup.py

@@ -3,7 +3,7 @@ from os import path
 
 here = path.abspath(path.dirname(__file__))
 
-__version__ = "0.5.2"
+__version__ = "0.5.4"
 
 # Get the long description from the README file
 with open(path.join(here, 'README.md')) as f:

{vfbquery-0.5.2 → vfbquery-0.5.4}/src/vfbquery/__init__.py

@@ -95,4 +95,4 @@ except ImportError:
     __solr_caching_available__ = False
 
 # Version information
-__version__ = "0.5.2"
+__version__ = "0.5.4"

{vfbquery-0.5.2 → vfbquery-0.5.4}/src/vfbquery/solr_result_cache.py

@@ -660,7 +660,9 @@ def with_solr_cache(query_type: str):
                                    'similar_morphology_part_of', 'similar_morphology_part_of_exp', 
                                    'similar_morphology_nb', 'similar_morphology_nb_exp', 
                                    'similar_morphology_userdata', 'neurons_part_here', 'neurons_synaptic',
-                                   'neurons_presynaptic', 'neurons_postsynaptic']
+                                   'neurons_presynaptic', 'neurons_postsynaptic', 'neuron_neuron_connectivity_query',
+                                   'neuron_region_connectivity_query', 'instances', 'templates', 'images_neurons',
+                                   'images_that_develop_from', 'expression_pattern_fragments']
             if query_type in dataframe_query_types:
                 return_dataframe = kwargs.get('return_dataframe', True)  # Default is True
                 cache_term_id = f"{cache_term_id}_dataframe_{return_dataframe}"

{vfbquery-0.5.2 → vfbquery-0.5.4}/src/vfbquery/vfb_queries.py

@@ -2698,7 +2698,7 @@ def get_neuron_neuron_connectivity(short_form: str, return_dataframe=True, limit
     }
     return {
         'headers': headers,
-        'data': rows,
+        'rows': rows,
         'count': len(rows)
     }
 
@@ -2756,7 +2756,7 @@ def get_neuron_region_connectivity(short_form: str, return_dataframe=True, limit
     }
     return {
         'headers': headers,
-        'data': rows,
+        'rows': rows,
         'count': len(rows)
     }
 
@@ -3924,6 +3924,20 @@ def fill_query_results(term_info):
                             filtered_item = item
                         filtered_result.append(filtered_item)
                         
+                    if 'headers' in result:
+                        if 'preview_columns' in query.keys() and len(query['preview_columns']) > 0:
+                            filtered_headers = {col: result['headers'][col] for col in query['preview_columns']}
+                        else:
+                            filtered_headers = result['headers']
+                elif isinstance(result, dict) and 'data' in result:
+                    # Handle legacy 'data' key as alias for 'rows'
+                    for item in result['data']:
+                        if 'preview_columns' in query.keys() and len(query['preview_columns']) > 0:
+                            filtered_item = {col: item[col] for col in query['preview_columns']}
+                        else:
+                            filtered_item = item
+                        filtered_result.append(filtered_item)
+                        
                     if 'headers' in result:
                         if 'preview_columns' in query.keys() and len(query['preview_columns']) > 0:
                             filtered_headers = {col: result['headers'][col] for col in query['preview_columns']}

{vfbquery-0.5.2 → vfbquery-0.5.4/src/vfbquery.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vfbquery
-Version: 0.5.2
+Version: 0.5.4
 Summary: Wrapper for querying VirtualFlyBrain knowledge graph.
 Home-page: https://github.com/VirtualFlyBrain/VFBquery
 Author: VirtualFlyBrain