Merge pull request #52 from FZJ-INM1-BDA/hotfix_spatialPropOriginDs

hotfix: regional spatial prop

Author: xgui3783

app/service/request_utils.py

@@ -58,6 +58,11 @@ def _create_region_json_object(region, space_id=None, atlas=None, detail=False):
     region_json['availableIn'] = get_available_spaces_for_region(region)
 
     if detail:
+        region_json['_dataset_specs'] = [{
+            'name': ds.name,
+            'description': ds.description,
+            'urls': ds.urls
+        } for ds in region.datasets if type(ds) == siibra.features.ebrains.EbrainsDataset]
         region_json['hasRegionalMap'] = region.has_regional_map(
             siibra.spaces[space_id],
             siibra.commons.MapType.CONTINUOUS) if space_id is not None else None
@@ -138,7 +143,13 @@ def get_region_props(space_id, atlas, region) -> list:
     space = atlas.get_space(space_id)
     try:
         logger.info(f'Getting region props for: {region}')
-        result_props = region.spatialprops(space, force=True)
+        result_props = region.spatial_props(space)
+        result_props = {
+            'components': [{
+                'centroid': list(c['centroid']),
+                'volume': c['volume']
+            }for c in result_props['components']]
+        }
     except:
         logger.info(f'Could not get region properties for region: {region} and space: {space}')
         result_props = []

test/core/test_parcellation_api.py

@@ -81,11 +81,31 @@ def test_get_one_region_for_parcellation_without_extra_data(self):
 
 
     def test_get_one_region_for_parcellation_with_extra_data(self):
-        response = client.get('/v1_0/atlases/{}/parcellations/{}/regions/{}?space_id={}'.format(ATLAS_ID.replace('/', '%2F'), PARCELLATION_ID, REGION_BASAL, SPACE_ID))
+        response = client.get('/v1_0/atlases/{}/parcellations/{}/regions/{}?space_id={}'.format(
+            ATLAS_ID.replace('/', '%2F'),
+            PARCELLATION_ID,
+            HOC1_LEFT_REGION_NAME,
+            SPACE_ID))
         result_content = json.loads(response.content)
         assert response.status_code == 200
 
-        assert result_content['name'] == REGION_BASAL
+        assert result_content['name'] == HOC1_LEFT_REGION_NAME
+
+        # spatial props
+        props_components = result_content.get('props', {}).get('components', [])
+        assert type(props_components) == list
+        assert len(props_components) > 0
+        
+        assert type(props_components[0].get('centroid')) == list
+        assert len(props_components[0].get('centroid')) == 3
+        assert all([type(v) == float for v in props_components[0].get('centroid')])
+        assert type(props_components[0].get('volume')) == float
+
+        # _dataset_specs
+        _dataset_specs = result_content.get('_dataset_specs')
+        assert _dataset_specs is not None
+        assert type(_dataset_specs) == list
+        assert len(_dataset_specs) > 0
         # Add Assertion for extra data