Skip to content

Commit 9dff8c5

Browse files
Robbie1977Robbie1977
committed
Add detailed metadata and example queries for JRC2018Unisex brain template in README and update tests for serialization consistency
1 parent a744412 commit 9dff8c5

2 files changed

Lines changed: 65 additions & 12 deletions

File tree

‎README.md‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1322,6 +1322,56 @@ vfb.get_term_info('VFB_00101567')
13221322
"Anatomy",
13231323
"Nervous_system",
13241324
"Template",
1325+
"has_image"
1326+
],
1327+
"Meta": {
1328+
"Name": "[JRC2018Unisex](VFB_00101567)",
1329+
"Symbol": "[JRC2018U](VFB_00101567)",
1330+
"Description": "Janelia 2018 unisex, averaged adult brain template",
1331+
"Comment": "",
1332+
"Types": "[adult brain](FBbt_00003624)"
1333+
},
1334+
"Tags": [
1335+
"Adult",
1336+
"Nervous_system"
1337+
],
1338+
"Queries": [
1339+
{
1340+
"query": "PaintedDomains",
1341+
"label": "Painted domains for JRC2018U",
1342+
"function": "get_painted_domains",
1343+
"takes": {
1344+
"short_form": {
1345+
"$and": [
1346+
"Template",
1347+
"Individual"
1348+
]
1349+
},
1350+
"default": {
1351+
"short_form": "VFB_00101567"
1352+
}
1353+
},
1354+
"preview": 10,
1355+
"preview_columns": [
1356+
"id",
1357+
"name",
1358+
},
1359+
"48": {
1360+
"id": "VFB_00102275",
1361+
"label": "CAN on JRC2018Unisex adult brain",
1362+
"thumbnail": "https://www.virtualflybrain.org/data/VFB/i/0010/2275/VFB_00101567/thumbnail.png",
1363+
"thumbnail_transparent": "https://www.virtualflybrain.org/data/VFB/i/0010/2275/VFB_00101567/thumbnailT.png",
1364+
"nrrd": "https://www.virtualflybrain.org/data/VFB/i/0010/2275/VFB_00101567/volume.nrrd",
1365+
"wlz": "https://www.virtualflybrain.org/data/VFB/i/0010/2275/VFB_00101567/volume.wlz",
1366+
"obj": "https://www.virtualflybrain.org/data/VFB/i/0010/2275/VFB_00101567/volume_man.obj",
1367+
"index": 48,
1368+
"type_label": "cantle",
1369+
"type_id": "FBbt_00045051"
1370+
},
1371+
"49": {
1372+
"id": "VFB_00102276",
1373+
"label": "PRW on JRC2018Unisex adult brain",
1374+
"thumbnail": "https://www.virtualflybrain.org/data/VFB/i/0010/2276/VFB_00101567/thumbnail.png",
13251375
"thumbnail_transparent": "https://www.virtualflybrain.org/data/VFB/i/0010/2276/VFB_00101567/thumbnailT.png",
13261376
"nrrd": "https://www.virtualflybrain.org/data/VFB/i/0010/2276/VFB_00101567/volume.nrrd",
13271377
"wlz": "https://www.virtualflybrain.org/data/VFB/i/0010/2276/VFB_00101567/volume.wlz",

‎src/test/term_info_queries_test.py‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -336,18 +336,21 @@ def test_term_info_serialization_split_class(self):
336336

337337
self.assertTrue("relationships" in serialized)
338338
self.assertEqual(2, len(serialized["relationships"]))
339-
self.assertTrue(serialized["relationships"][0] == "has hemidriver [P{VT043927-GAL4.DBD}](FBtp0124468)" or serialized["relationships"][0] == "has hemidriver [P{VT017491-p65.AD}](FBtp0133404)", "Hemidriver Missing")
339+
expected_rel_1 = "has hemidriver [P{VT043927-GAL4.DBD}](FBtp0124468)"
340+
expected_rel_2 = "has hemidriver [P{VT017491-p65.AD}](FBtp0133404)"
341+
self.assertIn(expected_rel_1, serialized["relationships"])
342+
self.assertIn(expected_rel_2, serialized["relationships"])
340343

341344
self.assertFalse("related_individuals" in serialized)
342345
self.assertTrue("xrefs" in serialized)
343346
self.assertEqual(2, len(serialized["xrefs"]))
344-
self.assertEqual({'icon': 'http://www.virtualflybrain.org/data/VFB/logos/fly_light_color.png',
345-
'label': '[P{VT043927-GAL4.DBD} ∩ P{VT017491-p65.AD} expression pattern on '
346-
'Driver Line on the FlyLight Split-GAL4 Site]'
347-
'(http://splitgal4.janelia.org/cgi-bin/view_splitgal4_imagery.cgi?line=SS50574)',
348-
'site': '[FlyLightSplit]'
349-
'(http://splitgal4.janelia.org/cgi-bin/view_splitgal4_imagery.cgi?line=SS50574) '},
350-
serialized["xrefs"][0])
347+
expected_xref = {'icon': 'https://www.virtualflybrain.org/data/VFB/logos/fly_light_color.png',
348+
'label': '[P{VT043927-GAL4.DBD} ∩ P{VT017491-p65.AD} expression pattern on '
349+
'Driver Line on the FlyLight Split-GAL4 Site]'
350+
'(http://splitgal4.janelia.org/cgi-bin/view_splitgal4_imagery.cgi?line=SS50574)',
351+
'site': '[FlyLightSplit]'
352+
'(http://splitgal4.janelia.org/cgi-bin/view_splitgal4_imagery.cgi?line=SS50574) '}
353+
self.assertIn(expected_xref, serialized["xrefs"])
351354

352355
self.assertTrue("examples" in serialized)
353356
self.assertFalse("thumbnail" in serialized)
@@ -382,7 +385,7 @@ def test_term_info_serialization_dataset(self):
382385
self.assertFalse("source" in serialized)
383386
self.assertTrue("license" in serialized)
384387
self.assertEqual(1, len(serialized["license"]))
385-
self.assertEqual({'icon': 'http://mirrors.creativecommons.org/presskit/buttons/88x31/png/by-nc-sa.png',
388+
self.assertEqual({'icon': 'https://mirrors.creativecommons.org/presskit/buttons/88x31/png/by-nc-sa.png',
386389
'label': '[CC-BY-NC-SA_4.0](VFBlicense_CC_BY_NC_SA_4_0)'}, serialized["license"][0])
387390
self.assertFalse("Classification" in serialized)
388391
self.assertFalse("relationships" in serialized)
@@ -480,13 +483,13 @@ def test_term_info_serialization_template(self):
480483
self.assertTrue("filemeta" in serialized)
481484
self.assertEqual(3, len(serialized["filemeta"]))
482485
self.assertEqual({'obj': {'local': '/MeshFiles(OBJ)/my_id_(my_name).obj',
483-
'url': 'https://v2.virtualflybrain.org/data/VFB/i/0020/0000/VFB_00200000/volume_man.obj'}},
486+
'url': 'http://www.virtualflybrain.org/data/VFB/i/0020/0000/VFB_00200000/volume_man.obj'}},
484487
serialized["filemeta"][0])
485488
self.assertEqual({'wlz': {'local': '/Slices(WOOLZ)/my_id_(my_name).wlz',
486-
'url': 'https://v2.virtualflybrain.org/data/VFB/i/0020/0000/VFB_00200000/volume.wlz'}},
489+
'url': 'http://www.virtualflybrain.org/data/VFB/i/0020/0000/VFB_00200000/volume.wlz'}},
487490
serialized["filemeta"][1])
488491
self.assertEqual({'nrrd': {'local': '/SignalFiles(NRRD)/my_id_(my_name).nrrd',
489-
'url': 'https://v2.virtualflybrain.org/data/VFB/i/0020/0000/VFB_00200000/volume.nrrd'}},
492+
'url': 'http://www.virtualflybrain.org/data/VFB/i/0020/0000/VFB_00200000/volume.nrrd'}},
490493
serialized["filemeta"][2])
491494
self.assertTrue("template" in serialized)
492495
self.assertEqual("[JRC2018UnisexVNC](VFB_00200000)", serialized["template"])

0 commit comments

Comments
 (0)