vfbquery 0.5.2__py3-none-any.whl → 0.5.4__py3-none-any.whl

vfbquery/__init__.py

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

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/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.dist-info → vfbquery-0.5.4.dist-info}/METADATA

@@ -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.dist-info → vfbquery-0.5.4.dist-info}/RECORD

@@ -22,19 +22,19 @@ test/test_query_performance.py,sha256=0T4qybM2GRInUmpKCQV4Q-cl6sCfxi6PjIodpirQtf
 test/test_similar_morphology.py,sha256=SRtr1Zj2_RW55Qe8O6m6SCvb9QfltWgAmxPEzMX-7hg,7390
 test/test_tracts_nerves_innervating.py,sha256=k9l-XlrvLfqzKJNyPhuJq8qBfhhrU5b8QLRnAPv1LMI,8077
 test/test_transcriptomics.py,sha256=VZf3Tgh2XgyGZpojM87j04y42RT2Dbca6xP46h_fQHg,9969
-vfbquery/__init__.py,sha256=ynXX01PeCgSjeIoEv9Kaz1RQoY8DKKqjg0TPSSROk50,3754
+vfbquery/__init__.py,sha256=mlfU70SyHi4p3idaOflhnCBmgi6omkx1lRLZn40v4ak,3754
 vfbquery/cache_enhancements.py,sha256=-PCM0YZHPjwUJwJODZLgmz91sDyFGuYz_QRph_kTbB8,17341
 vfbquery/cached_functions.py,sha256=P0YMkKxqWsB7ZNW2AZ8uCoPlD6dMNqh9foqiYiXv1QM,45067
 vfbquery/neo4j_client.py,sha256=zyekidmosybvR5_Qcf18W4rLJt16d-kYMojbeOEkZWY,3904
 vfbquery/owlery_client.py,sha256=LU84VMGsgLUURXY0wXXkNZxrhJc8sSqN6jE6nFIbhWc,19071
 vfbquery/solr_cache_integration.py,sha256=cFXqva26qJisJbpVUxoxjMDjpXninzmbalEGaFurVoM,8406
 vfbquery/solr_fetcher.py,sha256=_6Cb6W7JmMwZxytDPwB8ydUqZ7MNN7j2YmaF6gpBn0Y,5696
-vfbquery/solr_result_cache.py,sha256=sR17d-0V7-TfVf9b0MFmJORXginfg3rDb0mFS-yy8iI,50441
+vfbquery/solr_result_cache.py,sha256=Ru535zPd5Jvkg_ISTSaJveANF_gb2Vuus_BOFQjjjBE,50687
 vfbquery/term_info_queries.py,sha256=GHf1nFFJ32be7-h26EBgE8gRrfIN0XRR5qSlgDxUD9w,42010
 vfbquery/test_utils.py,sha256=7wUA3xgaGu3eLnjC98msNYt1wL538nOimVJjkC0ZLjU,5791
-vfbquery/vfb_queries.py,sha256=ettVmoAuwpJiA4uut7tyqq9wAMuLn-z8bCPxD44j-bU,199026
-vfbquery-0.5.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-vfbquery-0.5.2.dist-info/METADATA,sha256=uyNejo9A3hMDB2IeJauL2J302xmkx8S6BwJH-NKi4UE,114719
-vfbquery-0.5.2.dist-info/WHEEL,sha256=hPN0AlP2dZM_3ZJZWP4WooepkmU9wzjGgCLCeFjkHLA,92
-vfbquery-0.5.2.dist-info/top_level.txt,sha256=UgaRTTOy4JBdKbkr_gkeknT4eaibm3ztF520G4NTQZs,14
-vfbquery-0.5.2.dist-info/RECORD,,
+vfbquery/vfb_queries.py,sha256=zM7e1nwk0iXZ1kp68zjRXrkxha6j0Z5WBX_h6Divql8,199924
+vfbquery-0.5.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+vfbquery-0.5.4.dist-info/METADATA,sha256=Tw2xvd7kdyw8Y4VebPUppY2EdouWYg6YGzt1wBbTa9I,114719
+vfbquery-0.5.4.dist-info/WHEEL,sha256=hPN0AlP2dZM_3ZJZWP4WooepkmU9wzjGgCLCeFjkHLA,92
+vfbquery-0.5.4.dist-info/top_level.txt,sha256=UgaRTTOy4JBdKbkr_gkeknT4eaibm3ztF520G4NTQZs,14
+vfbquery-0.5.4.dist-info/RECORD,,