diff --git a/src/igvfd/mappings/model_set.json b/src/igvfd/mappings/model_set.json index 176360619..e0186a4c0 100644 --- a/src/igvfd/mappings/model_set.json +++ b/src/igvfd/mappings/model_set.json @@ -1,6 +1,6 @@ { - "hash": "56d08c0be68d30b249392aed56008958", - "index_name": "model_set_56d08c0b", + "hash": "17ca2e5fd32ceb3147f0b274f0c6ccfe", + "index_name": "model_set_17ca2e5f", "item_type": "model_set", "mapping": { "dynamic_templates": [ diff --git a/src/igvfd/schemas/changelogs/model_set.md b/src/igvfd/schemas/changelogs/model_set.md index a7b8dc5b8..73e82a2e7 100644 --- a/src/igvfd/schemas/changelogs/model_set.md +++ b/src/igvfd/schemas/changelogs/model_set.md @@ -2,6 +2,7 @@ ### Minor changes since schema version 4 +* Update calculation of `summary`. * Add `control_type`. ### Schema version 4 diff --git a/src/igvfd/tests/test_types_model_set.py b/src/igvfd/tests/test_types_model_set.py new file mode 100644 index 000000000..922c67055 --- /dev/null +++ b/src/igvfd/tests/test_types_model_set.py @@ -0,0 +1,6 @@ +import pytest + + +def test_summary(testapp, model_set_no_input): + res = testapp.get(model_set_no_input['@id']) + assert res.json.get('summary') == 'predictive model v0.0.1 neural network predicting genes' diff --git a/src/igvfd/types/file_set.py b/src/igvfd/types/file_set.py index 268a155be..4e023f326 100644 --- a/src/igvfd/types/file_set.py +++ b/src/igvfd/types/file_set.py @@ -584,6 +584,16 @@ class ModelSet(FileSet): ] set_status_down = FileSet.set_status_down + [] + @calculated_property( + schema={ + 'title': 'Summary', + 'type': 'string', + 'notSubmittable': True, + } + ) + def summary(self, request, file_set_type, model_name, model_version, prediction_objects): + return f'{model_name} {model_version} {file_set_type} predicting {", ".join(prediction_objects)}' + @collection( name='auxiliary-sets',