vfbquery 0.2.7__py3-none-any.whl → 0.2.9__py3-none-any.whl

vfbquery/vfb_queries.py

@@ -14,7 +14,7 @@ vfb_solr = pysolr.Solr('http://solr.virtualflybrain.org/solr/vfb_json/', always_
 vc = VfbConnect()
 
 class Query:
-    def __init__(self, query, label, function, takes, preview=0, preview_columns=[], preview_results=[], count=-1):
+    def __init__(self, query, label, function, takes, preview=0, preview_columns=[], preview_results=[], output_format="table", count=-1):
         self.query = query
         self.label = label
         self.function = function
@@ -22,6 +22,7 @@ class Query:
         self.preview = preview
         self.preview_columns = preview_columns
         self.preview_results = preview_results
+        self.output_format = output_format
         self.count = count
 
     def __str__(self):
@@ -36,6 +37,7 @@ class Query:
             "preview": self.preview,
             "preview_columns": self.preview_columns,
             "preview_results": self.preview_results,
+            "output_format": self.output_format,
             "count": self.count,
         }
 
@@ -49,6 +51,7 @@ class Query:
             preview=data["preview"],
             preview_columns=data["preview_columns"],
             preview_results=data["preview_results"],
+            output_format=data.get("output_format", 'table'),
             count=data["count"],
         )
 
@@ -64,6 +67,7 @@ class QuerySchema(Schema):
     preview = fields.Integer(required=False, missing=0)
     preview_columns = fields.List(fields.String(), required=False, missing=[])
     preview_results = fields.List(fields.Dict(), required=False, missing=[])
+    output_format = fields.String(required=False, missing='table')
     count = fields.Integer(required=False, missing=-1)
 
 class License:
@@ -423,7 +427,7 @@ def term_info_parse_object(results, short_form):
                 if "image_" in key and not ("thumbnail" in key or "folder" in key) and len(vars(image)[key]) > 1:
                     record[key.replace("image_","")] = vars(image)[key].replace("http://","https://")
             if len(image.index) > 0:
-              record[image.index] = int(image.index[0])
+              record[int(image.index[0])] = int(image.index[0])
             vars(image).keys()
             image_vars = vars(image)
             if 'center' in image_vars.keys():
@@ -470,6 +474,9 @@ def term_info_parse_object(results, short_form):
         if contains_all_tags(termInfo["SuperTypes"], ["Individual", "Neuron"]):
             q = SimilarMorphologyTo_to_schema(termInfo["Name"], {"neuron": vfbTerm.term.core.short_form, "similarity_score": "NBLAST_score"})
             queries.append(q)
+        if contains_all_tags(termInfo["SuperTypes"], ["Individual", "Neuron", "has_neuron_connectivity"]):
+            q = NeuronInputsTo_to_schema(termInfo["Name"], {"neuron_short_form": vfbTerm.term.core.short_form})
+            queries.append(q)
         # Add the queries to the term info
         termInfo["Queries"] = queries
 
@@ -479,6 +486,20 @@ def term_info_parse_object(results, short_form):
     # print("termInfo object before schema validation:", termInfo)
     return TermInfoOutputSchema().load(termInfo)
 
+def NeuronInputsTo_to_schema(name, take_default):
+    query = "NeuronInputsTo"
+    label = f"Find neurons with synapses into {name}"
+    function = "get_individual_neuron_inputs"
+    takes = {
+        "neuron_short_form": {"$and": ["Individual", "Neuron"]},
+        "default": take_default,
+    }
+    preview = -1
+    preview_columns = ["Neurotransmitter", "Weight"]
+    output_format = "ribbon"
+
+    return Query(query=query, label=label, function=function, takes=takes, preview=preview, preview_columns=preview_columns, output_format=output_format)
+
 def SimilarMorphologyTo_to_schema(name, take_default):
     query = "SimilarMorphologyTo"
     label = f"Find similar neurons to {name}"
@@ -715,6 +736,43 @@ def get_templates(limit: int = -1, return_dataframe: bool = False):
         }
     return formatted_results
 
+def get_related_anatomy(template_short_form: str, limit: int = -1, return_dataframe: bool = False):
+    """
+    Retrieve related anatomical structures for a given template.
+
+    :param template_short_form: The short form of the template to query.
+    :param limit: Maximum number of results to return. Default is -1, which returns all results.
+    :param return_dataframe: If True, returns results as a pandas DataFrame. Otherwise, returns a list of dicts.
+    :return: Related anatomical structures and paths.
+    """
+
+    # Define the Cypher query
+    query = f"""
+    MATCH (root:Class)<-[:INSTANCEOF]-(t:Template {{short_form:'{template_short_form}'}})<-[:depicts]-(tc:Template)<-[ie:in_register_with]-(c:Individual)-[:depicts]->(image:Individual)-[r:INSTANCEOF]->(anat:Class:Anatomy)
+    WHERE exists(ie.index)
+    WITH root, anat,r,image
+    MATCH p=allshortestpaths((root)<-[:SUBCLASSOF|part_of*..50]-(anat))
+    UNWIND nodes(p) as n
+    UNWIND nodes(p) as m
+    WITH * WHERE id(n) < id(m)
+    MATCH path = allShortestPaths( (n)-[:SUBCLASSOF|part_of*..1]-(m) )
+    RETURN collect(distinct {{ node_id: id(anat), short_form: anat.short_form, image: image.short_form }}) AS image_nodes, id(root) AS root, collect(path)
+    """
+
+    if limit != -1:
+        query += f" LIMIT {limit}"
+
+    # Execute the query using your database connection (e.g., VFB_connect)
+    results = vc.nc.commit_list([query])
+
+    # Convert the results to a DataFrame (if needed)
+    if return_dataframe:
+        df = pd.DataFrame.from_records(results)
+        return df
+
+    # Otherwise, return the raw results
+    return results
+
 def get_similar_neurons(neuron, similarity_score='NBLAST_score', return_dataframe=True, limit: int = -1):
     """Get JSON report of individual neurons similar to input neuron
 
@@ -791,6 +849,135 @@ def get_similar_neurons(neuron, similarity_score='NBLAST_score', return_datafram
         }
         return formatted_results
 
+def get_individual_neuron_inputs(neuron_short_form: str, return_dataframe=True, limit: int = -1, summary_mode: bool = False):
+    """
+    Retrieve neurons that have synapses into the specified neuron, along with the neurotransmitter
+    types, and additional information about the neurons.
+
+    :param neuron_short_form: The short form identifier of the neuron to query.
+    :param return_dataframe: If True, returns results as a pandas DataFrame. Otherwise, returns a dictionary.
+    :param limit: Maximum number of results to return. Default is -1, which returns all results.
+    :param summary_mode: If True, returns a preview of the results with summed weights for each neurotransmitter type.
+    :return: Neurons, neurotransmitter types, and additional neuron information.
+    """
+
+    # Define the common part of the Cypher query
+    query_common = f"""
+    MATCH (a:has_neuron_connectivity {{short_form:'{neuron_short_form}'}})<-[r:synapsed_to]-(b:has_neuron_connectivity)
+    UNWIND(labels(b)) as l
+    WITH * WHERE l contains "ergic"
+    OPTIONAL MATCH (c:Class:Neuron) WHERE c.short_form starts with "FBbt_" AND toLower(c.label)=toLower(l+" neuron")
+    """
+    if not summary_mode:
+        count_query = f"""{query_common}
+                    RETURN COUNT(DISTINCT b) AS total_count"""
+    else:
+        count_query = f"""{query_common}
+                    RETURN COUNT(DISTINCT c) AS total_count"""
+
+    count_results = vc.nc.commit_list([count_query])
+    count_df = pd.DataFrame.from_records(dict_cursor(count_results))
+    total_count = count_df['total_count'][0] if not count_df.empty else 0
+
+    # Define the part of the query for normal mode
+    query_normal = f"""
+    OPTIONAL MATCH (b)-[:INSTANCEOF]->(neuronType:Class),
+                   (b)<-[:depicts]-(imageChannel:Individual)-[image:in_register_with]->(templateChannel:Template)-[:depicts]->(templ:Template),
+                   (imageChannel)-[:is_specified_output_of]->(imagingTechnique:Class)
+    RETURN 
+        b.short_form as id,
+        apoc.text.format("[%s](%s)", [l, c.short_form]) as Neurotransmitter, 
+        sum(r.weight[0]) as Weight,
+        apoc.text.format("[%s](%s)", [b.label, b.short_form]) as Name,
+        apoc.text.format("[%s](%s)", [neuronType.label, neuronType.short_form]) as Type,
+        apoc.text.join(b.uniqueFacets, '|') as Gross_Type,
+        apoc.text.join(collect(apoc.text.format("[%s](%s)", [templ.label, templ.short_form])), ', ') as Template_Space,
+        apoc.text.format("[%s](%s)", [imagingTechnique.label, imagingTechnique.short_form]) as Imaging_Technique,
+        apoc.text.join(collect(REPLACE(apoc.text.format("[![%s](%s '%s')](%s)",[COALESCE(b.symbol[0],b.label), REPLACE(COALESCE(image.thumbnail[0],""),"thumbnailT.png","thumbnail.png"), COALESCE(b.symbol[0],b.label), b.short_form]), "[![null]( 'null')](null)", "")), ' | ') as Images
+    ORDER BY Weight Desc
+    """
+
+    # Define the part of the query for preview mode
+    query_preview = f"""
+    RETURN DISTINCT c.short_form as id,
+        apoc.text.format("[%s](%s)", [l, c.short_form]) as Neurotransmitter, 
+        sum(r.weight[0]) as Weight
+    ORDER BY Weight Desc
+    """
+
+    # Choose the appropriate part of the query based on the summary_mode parameter
+    query = query_common + (query_preview if summary_mode else query_normal)
+
+    if limit != -1 and not summary_mode:
+        query += f" LIMIT {limit}"
+
+    # Execute the query using your database connection (e.g., vc.nc)
+    results = vc.nc.commit_list([query])
+
+    # Convert the results to a DataFrame
+    df = pd.DataFrame.from_records(dict_cursor(results))
+
+    # If return_dataframe is True, return the results as a DataFrame
+    if return_dataframe:
+        return df
+
+    # Format the results for the preview
+    if not summary_mode:
+        results = {
+            "headers": {
+                "id": {"title": "ID", "type": "text", "order": -1},
+                "Neurotransmitter": {"title": "Neurotransmitter", "type": "markdown", "order": 0},
+                "Weight": {"title": "Weight", "type": "numeric", "order": 1},
+                "Name": {"title": "Name", "type": "markdown", "order": 2},
+                "Type": {"title": "Type", "type": "markdown", "order": 3},
+                "Gross_Type": {"title": "Gross Type", "type": "text", "order": 4},
+                "Template_Space": {"title": "Template Space", "type": "markdown", "order": 5},
+                "Imaging_Technique": {"title": "Imaging Technique", "type": "markdown", "order": 6},
+                "Images": {"title": "Images", "type": "markdown", "order": 7}
+            },
+            "rows": [
+                {
+                    key: row[key]
+                    for key in [
+                        "id",
+                        "Neurotransmitter",
+                        "Weight",
+                        "Name",
+                        "Type",
+                        "Gross_Type",
+                        "Template_Space",
+                        "Imaging_Technique",
+                        "Images"
+                    ]
+                }
+                for row in df.to_dict("records")
+            ],
+            "count": total_count
+        }
+    else:
+        results = {
+            "headers": {
+                "id": {"title": "ID", "type": "text", "order": -1},
+                "Neurotransmitter": {"title": "Neurotransmitter", "type": "markdown", "order": 0},
+                "Weight": {"title": "Weight", "type": "numeric", "order": 1},
+            },
+            "rows": [
+                {
+                    key: row[key]
+                    for key in [
+                        "id",
+                        "Neurotransmitter",
+                        "Weight",
+                    ]
+                }
+                for row in df.to_dict("records")
+            ],
+            "count": total_count
+        }
+    
+    return results
+
+
 def contains_all_tags(lst: List[str], tags: List[str]) -> bool:
     """
     Checks if the given list contains all the tags passed.
@@ -807,7 +994,8 @@ def fill_query_results(term_info):
         
         if "preview" in query.keys() and (query['preview'] > 0 or query['count'] < 0) and query['count'] != 0:
             function = globals().get(query['function'])
-            
+            summary_mode = query.get('output_format', 'table') == 'ribbon'
+
             if function:
                 # print(f"Function {query['function']} found")
                 
@@ -816,7 +1004,10 @@ def fill_query_results(term_info):
                 # print(f"Function args: {function_args}")
 
                 # Modify this line to use the correct arguments and pass the default arguments
-                result = function(return_dataframe=False, limit=query['preview'], **function_args)
+                if summary_mode:
+                    result = function(return_dataframe=False, limit=query['preview'], summary_mode=summary_mode, **function_args)
+                else:
+                    result = function(return_dataframe=False, limit=query['preview'], **function_args)
                 # print(f"Function result: {result}")
                 
                 # Filter columns based on preview_columns

{vfbquery-0.2.7.dist-info → vfbquery-0.2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vfbquery
-Version: 0.2.7
+Version: 0.2.9
 Summary: Wrapper for querying VirtualFlyBrain knowledge graph.
 Home-page: https://github.com/VirtualFlyBrain/VFBquery
 Author: VirtualFlyBrain
@@ -38,137 +38,138 @@ vfb.get_term_info('FBbt_00003748')
 ```
 ```json
 {
-   'Name':'medulla',
-   'Meta':{
-      'Name':'[medulla](FBbt_00003748)',
-      'Description':'The second optic neuropil, sandwiched between the lamina and the lobula complex. It is divided into 10 layers: 1-6 make up the outer (distal) medulla, the seventh (or serpentine) layer exhibits a distinct architecture and layers 8-10 make up the inner (proximal) medulla (Ito et al., 2014).',
-      'Comment':'',
-      'Types':'[synaptic neuropil domain](FBbt_00040007)',
-      'Relationships':'[develops from](RO_0002202): [medulla anlage](FBbt_00001935); [is part of](BFO_0000050): [adult optic lobe](FBbt_00003701)',
-      'Cross References':'![Insect Brain DB](https://insectbraindb.org/app/assets/images/Megalopta_frontal.png) [Insect Brain DB](https://insectbraindb.org/): [38](https://insectbraindb.org/app/structures/38)'
-   },
-   'Id':'FBbt_00003748',
-   'Tags':[
-      'Adult',
-      'Nervous_system',
-      'Synaptic_neuropil_domain',
-      'Visual_system'
-   ],
-   'IsClass':True,
-   'Queries':[
-      {
-         'query':'ListAllAvailableImages',
-         'label':'List all available images of medulla',
-         'function':'get_instances',
-         'takes':{
-            'short_form':{
-               '$and':[
-                  'Class',
-                  'Anatomy'
-               ]
-            },
-            'default':{
-               'short_form':'FBbt_00003748'
+  'Name':'medulla',
+  'Id':'FBbt_00003748',
+  'SuperTypes':[
+    'Entity',
+    'Adult',
+    'Anatomy',
+    'Class',
+    'Nervous_system',
+    'Synaptic_neuropil',
+    'Synaptic_neuropil_domain',
+    'Visual_system'
+  ],
+  'Meta':{
+    'Name':'[medulla](FBbt_00003748)',
+    'Description':'The second optic neuropil, sandwiched between the lamina and the lobula complex. It is divided into 10 layers: 1-6 make up the outer (distal) medulla, the seventh (or serpentine) layer exhibits a distinct architecture and layers 8-10 make up the inner (proximal) medulla (Ito et al., 2014).',
+    'Comment':'',
+    'Types':'[synaptic neuropil domain](FBbt_00040007)',
+    'Relationships':'[develops from](RO_0002202): [medulla anlage](FBbt_00001935); [is part of](BFO_0000050): [adult optic lobe](FBbt_00003701)',
+    'Cross References':'![Insect Brain DB](https://insectbraindb.org/app/assets/images/Megalopta_frontal.png) [Insect Brain DB](https://insectbraindb.org/): [38](https://insectbraindb.org/app/structures/38)'
+  },
+  'Tags':[
+    'Adult',
+    'Nervous_system',
+    'Synaptic_neuropil_domain',
+    'Visual_system'
+  ],
+  'Queries':[
+    {
+      'query':'ListAllAvailableImages',
+      'label':'List all available images of medulla',
+      'function':'get_instances',
+      'takes':{
+        'short_form':{
+          '$and':[
+            'Class',
+            'Anatomy'
+          ]
+        },
+        'default':{
+          'short_form':'FBbt_00003748'
+        }
+      },
+      'preview':0,
+      'preview_columns':[
+        'id',
+        'label',
+        'tags',
+        'thumbnail'
+      ],
+      'preview_results':{
+        'headers':{
+          'id':{
+            'title':'Add',
+            'type':'selection_id',
+            'order':-1
+          },
+          'label':{
+            'title':'Name',
+            'type':'markdown',
+            'order':0,
+            'sort':{
+              0:'Asc'
             }
-         },
-         'preview':0,
-         'preview_columns':[
-            'id',
-            'label',
-            'tags',
-            'thumbnail'
-         ],
-         'preview_results':{
-            'headers':{
-               'id':{
-                  'title':'Add',
-                  'type':'selection_id',
-                  'order':-1
-               },
-               'label':{
-                  'title':'Name',
-                  'type':'markdown',
-                  'order':0,
-                  'sort':{
-                     0:'Asc'
-                  }
-               },
-               'tags':{
-                  'title':'Gross Types',
-                  'type':'tags',
-                  'order':3
-               },
-               'thumbnail':{
-                  'title':'Thumbnail',
-                  'type':'markdown',
-                  'order':9
-               }
-            },
-            'rows':[
-               
-            ]
-         },
-         'count':4
+          },
+          'tags':{
+            'title':'Gross Types',
+            'type':'tags',
+            'order':3
+          },
+          'thumbnail':{
+            'title':'Thumbnail',
+            'type':'markdown',
+            'order':9
+          }
+        },
+        'rows':[
+          
+        ]
+      },
+      'output_format':'table',
+      'count':4
+    }
+  ],
+  'IsIndividual':False,
+  'IsClass':True,
+  'Examples':{
+    'VFB_00030786':[
+      {
+        'id':'VFB_00030810',
+        'label':'medulla on adult brain template Ito2014',
+        'thumbnail':'https://www.virtualflybrain.org/data/VFB/i/0003/0810/thumbnail.png',
+        'thumbnail_transparent':'https://www.virtualflybrain.org/data/VFB/i/0003/0810/thumbnailT.png',
+        'nrrd':'https://www.virtualflybrain.org/data/VFB/i/0003/0810/volume.nrrd',
+        'wlz':'https://www.virtualflybrain.org/data/VFB/i/0003/0810/volume.wlz',
+        'obj':'https://www.virtualflybrain.org/data/VFB/i/0003/0810/volume_man.obj'
       }
-   ],
-   'IsTemplate':False,
-   'IsIndividual':False,
-   'SuperTypes':[
-      'Entity',
-      'Adult',
-      'Anatomy',
-      'Class',
-      'Nervous_system',
-      'Synaptic_neuropil',
-      'Synaptic_neuropil_domain',
-      'Visual_system'
-   ],
-   'Examples':{
-      'VFB_00030786':[
-         {
-            'thumbnail_transparent':'https://www.virtualflybrain.org/data/VFB/i/0003/0810/thumbnailT.png',
-            'obj':'https://www.virtualflybrain.org/data/VFB/i/0003/0810/volume_man.obj',
-            'wlz':'https://www.virtualflybrain.org/data/VFB/i/0003/0810/volume.wlz',
-            'label':'medulla on adult brain template Ito2014',
-            'id':'VFB_00030810',
-            'nrrd':'https://www.virtualflybrain.org/data/VFB/i/0003/0810/volume.nrrd',
-            'thumbnail':'https://www.virtualflybrain.org/data/VFB/i/0003/0810/thumbnail.png'
-         }
-      ],
-      'VFB_00101567':[
-         {
-            'thumbnail_transparent':'https://www.virtualflybrain.org/data/VFB/i/0010/2107/VFB_00101567/thumbnailT.png',
-            'obj':'https://www.virtualflybrain.org/data/VFB/i/0010/2107/VFB_00101567/volume_man.obj',
-            'wlz':'https://www.virtualflybrain.org/data/VFB/i/0010/2107/VFB_00101567/volume.wlz',
-            'label':'ME on JRC2018Unisex adult brain',
-            'id':'VFB_00102107',
-            'nrrd':'https://www.virtualflybrain.org/data/VFB/i/0010/2107/VFB_00101567/volume.nrrd',
-            'thumbnail':'https://www.virtualflybrain.org/data/VFB/i/0010/2107/VFB_00101567/thumbnail.png'
-         }
-      ],
-      'VFB_00017894':[
-         {
-            'thumbnail_transparent':'https://www.virtualflybrain.org/data/VFB/i/0003/0624/thumbnailT.png',
-            'obj':'https://www.virtualflybrain.org/data/VFB/i/0003/0624/volume_man.obj',
-            'wlz':'https://www.virtualflybrain.org/data/VFB/i/0003/0624/volume.wlz',
-            'label':'medulla on adult brain template JFRC2',
-            'id':'VFB_00030624',
-            'nrrd':'https://www.virtualflybrain.org/data/VFB/i/0003/0624/volume.nrrd',
-            'thumbnail':'https://www.virtualflybrain.org/data/VFB/i/0003/0624/thumbnail.png'
-         }
-      ],
-      'VFB_00101384':[
-         {
-            'thumbnail_transparent':'https://www.virtualflybrain.org/data/VFB/i/0010/1385/VFB_00101384/thumbnailT.png',
-            'obj':'https://www.virtualflybrain.org/data/VFB/i/0010/1385/VFB_00101384/volume_man.obj',
-            'wlz':'https://www.virtualflybrain.org/data/VFB/i/0010/1385/VFB_00101384/volume.wlz',
-            'label':'ME(R) on JRC_FlyEM_Hemibrain',
-            'id':'VFB_00101385',
-            'nrrd':'https://www.virtualflybrain.org/data/VFB/i/0010/1385/VFB_00101384/volume.nrrd',
-            'thumbnail':'https://www.virtualflybrain.org/data/VFB/i/0010/1385/VFB_00101384/thumbnail.png'
-         }
-      ]
-   }
+    ],
+    'VFB_00101567':[
+      {
+        'id':'VFB_00102107',
+        'label':'ME on JRC2018Unisex adult brain',
+        'thumbnail':'https://www.virtualflybrain.org/data/VFB/i/0010/2107/VFB_00101567/thumbnail.png',
+        'thumbnail_transparent':'https://www.virtualflybrain.org/data/VFB/i/0010/2107/VFB_00101567/thumbnailT.png',
+        'nrrd':'https://www.virtualflybrain.org/data/VFB/i/0010/2107/VFB_00101567/volume.nrrd',
+        'wlz':'https://www.virtualflybrain.org/data/VFB/i/0010/2107/VFB_00101567/volume.wlz',
+        'obj':'https://www.virtualflybrain.org/data/VFB/i/0010/2107/VFB_00101567/volume_man.obj'
+      }
+    ],
+    'VFB_00017894':[
+      {
+        'id':'VFB_00030624',
+        'label':'medulla on adult brain template JFRC2',
+        'thumbnail':'https://www.virtualflybrain.org/data/VFB/i/0003/0624/thumbnail.png',
+        'thumbnail_transparent':'https://www.virtualflybrain.org/data/VFB/i/0003/0624/thumbnailT.png',
+        'nrrd':'https://www.virtualflybrain.org/data/VFB/i/0003/0624/volume.nrrd',
+        'wlz':'https://www.virtualflybrain.org/data/VFB/i/0003/0624/volume.wlz',
+        'obj':'https://www.virtualflybrain.org/data/VFB/i/0003/0624/volume_man.obj'
+      }
+    ],
+    'VFB_00101384':[
+      {
+        'id':'VFB_00101385',
+        'label':'ME(R) on JRC_FlyEM_Hemibrain',
+        'thumbnail':'https://www.virtualflybrain.org/data/VFB/i/0010/1385/VFB_00101384/thumbnail.png',
+        'thumbnail_transparent':'https://www.virtualflybrain.org/data/VFB/i/0010/1385/VFB_00101384/thumbnailT.png',
+        'nrrd':'https://www.virtualflybrain.org/data/VFB/i/0010/1385/VFB_00101384/volume.nrrd',
+        'wlz':'https://www.virtualflybrain.org/data/VFB/i/0010/1385/VFB_00101384/volume.wlz',
+        'obj':'https://www.virtualflybrain.org/data/VFB/i/0010/1385/VFB_00101384/volume_man.obj'
+      }
+    ]
+  },
+  'IsTemplate':False
 }
 ```
 Individual example:
@@ -305,6 +306,7 @@ vfb.get_term_info('VFB_00000001')
           }
         ]
       },
+      'output_format':'table',
       'count':60
     }
   ],
@@ -1061,6 +1063,15 @@ vfb.get_templates(return_dataframe=False)
     }
   },
   'rows':[
+    {
+      'id':'VFB_00101567',
+      'order':1,
+      'name':'[JRC2018Unisex](VFB_00101567)',
+      'tags':'Nervous_system|Adult',
+      'thumbnail':"[![JRC2018Unisex](http://www.virtualflybrain.org/data/VFB/i/0010/1567/VFB_00101567/thumbnail.png 'JRC2018Unisex')](VFB_00101567)",
+      'dataset':'[JRC 2018 templates & ROIs](JRC2018)',
+      'license':'[CC-BY-NC-SA_4.0](VFBlicense_CC_BY_NC_SA_4_0)'
+    },
     {
       'id':'VFB_00200000',
       'order':2,
@@ -1071,30 +1082,12 @@ vfb.get_templates(return_dataframe=False)
       'license':'[CC-BY-NC-SA_4.0](VFBlicense_CC_BY_NC_SA_4_0)'
     },
     {
-      'id':'VFB_00120000',
-      'order':10,
-      '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)',
-      'license':'[CC-BY_4.0](VFBlicense_CC_BY_4_0)'
-    },
-    {
-      'id':'VFB_00110000',
-      'order':9,
-      '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':'[Split-GAL4 lines from McKellar et al., 2020](McKellar2020)',
-      'license':'[CC-BY-SA_4.0](VFBlicense_CC_BY_SA_4_0)'
-    },
-    {
-      'id':'VFB_00101567',
-      'order':1,
-      'name':'[JRC2018Unisex](VFB_00101567)',
+      'id':'VFB_00017894',
+      'order':3,
+      'name':'[adult brain template JFRC2](VFB_00017894)',
       'tags':'Nervous_system|Adult',
-      'thumbnail':"[![JRC2018Unisex](http://www.virtualflybrain.org/data/VFB/i/0010/1567/VFB_00101567/thumbnail.png 'JRC2018Unisex')](VFB_00101567)",
-      'dataset':'[JRC 2018 templates & ROIs](JRC2018)',
+      'thumbnail':"[![adult brain template JFRC2](http://www.virtualflybrain.org/data/VFB/i/0001/7894/VFB_00017894/thumbnail.png 'adult brain template JFRC2')](VFB_00017894)",
+      'dataset':'[FlyLight - GMR GAL4 collection (Jenett2012)](Jenett2012)',
       'license':'[CC-BY-NC-SA_4.0](VFBlicense_CC_BY_NC_SA_4_0)'
     },
     {
@@ -1106,15 +1099,6 @@ vfb.get_templates(return_dataframe=False)
       'dataset':'[JRC_FlyEM_Hemibrain painted domains](Xu2020roi)',
       'license':'[CC-BY_4.0](VFBlicense_CC_BY_4_0)'
     },
-    {
-      'id':'VFB_00100000',
-      'order':7,
-      'name':'[adult VNS template - Court2018](VFB_00100000)',
-      'tags':'Nervous_system|Adult|Ganglion',
-      'thumbnail':"[![adult VNS template - Court2018](http://www.virtualflybrain.org/data/VFB/i/0010/0000/thumbnail.png 'adult VNS template - Court2018')](VFB_00100000)",
-      'dataset':'[Adult VNS neuropils (Court2017)](Court2017)',
-      'license':'[CC-BY-SA_4.0](VFBlicense_CC_BY_SA_4_0)'
-    },
     {
       'id':'VFB_00050000',
       'order':5,
@@ -1142,6 +1126,15 @@ vfb.get_templates(return_dataframe=False)
       'dataset':'[L3 Larval CNS Template (Truman2016)](Truman2016)',
       'license':'[CC-BY-SA_4.0](VFBlicense_CC_BY_SA_4_0)'
     },
+    {
+      'id':'VFB_00100000',
+      'order':7,
+      'name':'[adult VNS template - Court2018](VFB_00100000)',
+      'tags':'Nervous_system|Adult|Ganglion',
+      'thumbnail':"[![adult VNS template - Court2018](http://www.virtualflybrain.org/data/VFB/i/0010/0000/thumbnail.png 'adult VNS template - Court2018')](VFB_00100000)",
+      'dataset':'[Adult VNS neuropils (Court2017)](Court2017)',
+      'license':'[CC-BY-SA_4.0](VFBlicense_CC_BY_SA_4_0)'
+    },
     {
       'id':'VFB_00030786',
       'order':8,
@@ -1152,13 +1145,22 @@ vfb.get_templates(return_dataframe=False)
       'license':'[CC-BY-SA_4.0](VFBlicense_CC_BY_SA_4_0)'
     },
     {
-      'id':'VFB_00017894',
-      'order':3,
-      'name':'[adult brain template JFRC2](VFB_00017894)',
-      'tags':'Nervous_system|Adult',
-      'thumbnail':"[![adult brain template JFRC2](http://www.virtualflybrain.org/data/VFB/i/0001/7894/VFB_00017894/thumbnail.png 'adult brain template JFRC2')](VFB_00017894)",
-      'dataset':'[FlyLight - GMR GAL4 collection (Jenett2012)](Jenett2012)',
-      'license':'[CC-BY-NC-SA_4.0](VFBlicense_CC_BY_NC_SA_4_0)'
+      'id':'VFB_00110000',
+      'order':9,
+      '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':'[Split-GAL4 lines from McKellar et al., 2020](McKellar2020)',
+      'license':'[CC-BY-SA_4.0](VFBlicense_CC_BY_SA_4_0)'
+    },
+    {
+      'id':'VFB_00120000',
+      'order':10,
+      '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)',
+      'license':'[CC-BY_4.0](VFBlicense_CC_BY_4_0)'
     }
   ],
   'count':10

vfbquery-0.2.9.dist-info/RECORD

@@ -0,0 +1,10 @@
+test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+test/term_info_queries_test.py,sha256=w982rbxOb0wx8azWc_vUk4q3LXsfn_SKSJVXoxceqPk,39530
+vfbquery/__init__.py,sha256=KPkQWJsiUtew3IrygX17djJJfCxJtqw3cy3rB-e3cL4,28
+vfbquery/term_info_queries.py,sha256=3y346po7tSgneeV38-kRl_kmjffR3Uv1WMYGy8fmekk,39184
+vfbquery/vfb_queries.py,sha256=40lNwiewlsaBxBX2u8tM0ijrTfgBLFQs2fD5ZbJMi6E,49654
+vfbquery-0.2.9.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+vfbquery-0.2.9.dist-info/METADATA,sha256=xyyYjkTpyf6C39u1wl8UjQlVM0Mg1r9mRCqcXFU3c0c,43892
+vfbquery-0.2.9.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+vfbquery-0.2.9.dist-info/top_level.txt,sha256=UgaRTTOy4JBdKbkr_gkeknT4eaibm3ztF520G4NTQZs,14
+vfbquery-0.2.9.dist-info/RECORD,,

{vfbquery-0.2.7.dist-info → vfbquery-0.2.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

vfbquery-0.2.7.dist-info/RECORD

@@ -1,10 +0,0 @@
-test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-test/term_info_queries_test.py,sha256=w982rbxOb0wx8azWc_vUk4q3LXsfn_SKSJVXoxceqPk,39530
-vfbquery/__init__.py,sha256=KPkQWJsiUtew3IrygX17djJJfCxJtqw3cy3rB-e3cL4,28
-vfbquery/term_info_queries.py,sha256=3y346po7tSgneeV38-kRl_kmjffR3Uv1WMYGy8fmekk,39184
-vfbquery/vfb_queries.py,sha256=MIQfkSRr80PoQAwBk395kdu5GAAbUkJIBDyUr8AgrHU,40852
-vfbquery-0.2.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-vfbquery-0.2.7.dist-info/METADATA,sha256=y40-lI9KajwgminblTYMczcEzw_xjZ5Rxckv7nUi7EA,44281
-vfbquery-0.2.7.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-vfbquery-0.2.7.dist-info/top_level.txt,sha256=UgaRTTOy4JBdKbkr_gkeknT4eaibm3ztF520G4NTQZs,14
-vfbquery-0.2.7.dist-info/RECORD,,