Skip to content

Commit 051e1fb

Browse files
committed
Refactor result structure: replace 'data' key with 'rows' and handle legacy support
1 parent 1970ee7 commit 051e1fb

1 file changed

Lines changed: 16 additions & 2 deletions

File tree

src/vfbquery/vfb_queries.py

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2698,7 +2698,7 @@ def get_neuron_neuron_connectivity(short_form: str, return_dataframe=True, limit
26982698
}
26992699
return {
27002700
'headers': headers,
2701-
'data': rows,
2701+
'rows': rows,
27022702
'count': len(rows)
27032703
}
27042704

@@ -2756,7 +2756,7 @@ def get_neuron_region_connectivity(short_form: str, return_dataframe=True, limit
27562756
}
27572757
return {
27582758
'headers': headers,
2759-
'data': rows,
2759+
'rows': rows,
27602760
'count': len(rows)
27612761
}
27622762

@@ -3924,6 +3924,20 @@ def process_query(query):
39243924
filtered_item = item
39253925
filtered_result.append(filtered_item)
39263926

3927+
if 'headers' in result:
3928+
if 'preview_columns' in query.keys() and len(query['preview_columns']) > 0:
3929+
filtered_headers = {col: result['headers'][col] for col in query['preview_columns']}
3930+
else:
3931+
filtered_headers = result['headers']
3932+
elif isinstance(result, dict) and 'data' in result:
3933+
# Handle legacy 'data' key as alias for 'rows'
3934+
for item in result['data']:
3935+
if 'preview_columns' in query.keys() and len(query['preview_columns']) > 0:
3936+
filtered_item = {col: item[col] for col in query['preview_columns']}
3937+
else:
3938+
filtered_item = item
3939+
filtered_result.append(filtered_item)
3940+
39273941
if 'headers' in result:
39283942
if 'preview_columns' in query.keys() and len(query['preview_columns']) > 0:
39293943
filtered_headers = {col: result['headers'][col] for col in query['preview_columns']}

0 commit comments

Comments
 (0)