From 64e8a565ee7728b93fc7a74d1d751acc83810b93 Mon Sep 17 00:00:00 2001 From: Jennifer Jou Date: Thu, 29 Aug 2024 14:23:35 -0700 Subject: [PATCH 1/8] Update model set summary --- src/igvfd/schemas/changelogs/model_set.md | 1 + src/igvfd/types/file_set.py | 10 ++++++++++ 2 files changed, 11 insertions(+) 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/types/file_set.py b/src/igvfd/types/file_set.py index 268a155be..87b062644 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} targeting {prediction_objects}' + @collection( name='auxiliary-sets', From f33be31358dae07aa969901895598ac72ee5604a Mon Sep 17 00:00:00 2001 From: Jennifer Jou Date: Thu, 29 Aug 2024 14:26:18 -0700 Subject: [PATCH 2/8] Add test --- src/igvfd/tests/test_types_model_set.py | 6 ++++++ src/igvfd/types/file_set.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 src/igvfd/tests/test_types_model_set.py 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..09e3eee05 --- /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 targeting genes' diff --git a/src/igvfd/types/file_set.py b/src/igvfd/types/file_set.py index 87b062644..f5b906535 100644 --- a/src/igvfd/types/file_set.py +++ b/src/igvfd/types/file_set.py @@ -592,7 +592,7 @@ class ModelSet(FileSet): } ) def summary(self, request, file_set_type, model_name, model_version, prediction_objects): - return f'{model_name} {model_version} {file_set_type} targeting {prediction_objects}' + return f'{model_name} {model_version} {file_set_type} targeting {",".join(prediction_objects)}' @collection( From eb2b3e4ba8ed27d5315851e68e149d5bf1019a25 Mon Sep 17 00:00:00 2001 From: Jennifer Jou Date: Tue, 3 Sep 2024 09:30:43 -0700 Subject: [PATCH 3/8] Update mapping --- src/igvfd/mappings/model_set.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/igvfd/mappings/model_set.json b/src/igvfd/mappings/model_set.json index 176360619..dee046490 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": "9590c1d9a49687976bb9d195d0afe93b", + "index_name": "model_set_9590c1d9", "item_type": "model_set", "mapping": { "dynamic_templates": [ From 329e262991f62e47cd68838e061e745ebc4cecb6 Mon Sep 17 00:00:00 2001 From: Jennifer Jou Date: Mon, 16 Sep 2024 09:49:13 -0700 Subject: [PATCH 4/8] Update mapping --- src/igvfd/mappings/model_set.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/igvfd/mappings/model_set.json b/src/igvfd/mappings/model_set.json index dee046490..e08305ea1 100644 --- a/src/igvfd/mappings/model_set.json +++ b/src/igvfd/mappings/model_set.json @@ -1,6 +1,6 @@ { - "hash": "9590c1d9a49687976bb9d195d0afe93b", - "index_name": "model_set_9590c1d9", + "hash": "262f90b394abbfb656c7a08529eb802c", + "index_name": "model_set_262f90b3", "item_type": "model_set", "mapping": { "dynamic_templates": [ From ddd59abb3924b47cf05ae37399a98a131bbc5b7c Mon Sep 17 00:00:00 2001 From: Jennifer Jou Date: Mon, 16 Sep 2024 13:02:49 -0700 Subject: [PATCH 5/8] Adjust summary wording --- src/igvfd/types/file_set.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/igvfd/types/file_set.py b/src/igvfd/types/file_set.py index f5b906535..04fa58b0b 100644 --- a/src/igvfd/types/file_set.py +++ b/src/igvfd/types/file_set.py @@ -592,7 +592,7 @@ class ModelSet(FileSet): } ) def summary(self, request, file_set_type, model_name, model_version, prediction_objects): - return f'{model_name} {model_version} {file_set_type} targeting {",".join(prediction_objects)}' + return f'{model_name} {model_version} {file_set_type} predicting {",".join(prediction_objects)}' @collection( From cff5eec084f65bc6776b58957a64ed449de8fc28 Mon Sep 17 00:00:00 2001 From: Jennifer Jou Date: Mon, 16 Sep 2024 13:03:19 -0700 Subject: [PATCH 6/8] update mapping --- src/igvfd/mappings/model_set.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/igvfd/mappings/model_set.json b/src/igvfd/mappings/model_set.json index e08305ea1..9406de81b 100644 --- a/src/igvfd/mappings/model_set.json +++ b/src/igvfd/mappings/model_set.json @@ -1,6 +1,6 @@ { - "hash": "262f90b394abbfb656c7a08529eb802c", - "index_name": "model_set_262f90b3", + "hash": "3af4c7231d0c9fc3bc63496b5d51a4d6", + "index_name": "model_set_3af4c723", "item_type": "model_set", "mapping": { "dynamic_templates": [ From 50a7dc70d06ab3cdb888bac63314652f06f2fa2c Mon Sep 17 00:00:00 2001 From: Jennifer Jou Date: Mon, 16 Sep 2024 13:34:51 -0700 Subject: [PATCH 7/8] fix test --- src/igvfd/tests/test_types_model_set.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/igvfd/tests/test_types_model_set.py b/src/igvfd/tests/test_types_model_set.py index 09e3eee05..922c67055 100644 --- a/src/igvfd/tests/test_types_model_set.py +++ b/src/igvfd/tests/test_types_model_set.py @@ -3,4 +3,4 @@ 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 targeting genes' + assert res.json.get('summary') == 'predictive model v0.0.1 neural network predicting genes' From c4a8537705a522e0e8316f1b033955cd3a9aad42 Mon Sep 17 00:00:00 2001 From: Jennifer Jou Date: Tue, 17 Sep 2024 15:16:26 -0700 Subject: [PATCH 8/8] Address error from review --- src/igvfd/mappings/model_set.json | 4 ++-- src/igvfd/types/file_set.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/igvfd/mappings/model_set.json b/src/igvfd/mappings/model_set.json index 9406de81b..e0186a4c0 100644 --- a/src/igvfd/mappings/model_set.json +++ b/src/igvfd/mappings/model_set.json @@ -1,6 +1,6 @@ { - "hash": "3af4c7231d0c9fc3bc63496b5d51a4d6", - "index_name": "model_set_3af4c723", + "hash": "17ca2e5fd32ceb3147f0b274f0c6ccfe", + "index_name": "model_set_17ca2e5f", "item_type": "model_set", "mapping": { "dynamic_templates": [ diff --git a/src/igvfd/types/file_set.py b/src/igvfd/types/file_set.py index 04fa58b0b..4e023f326 100644 --- a/src/igvfd/types/file_set.py +++ b/src/igvfd/types/file_set.py @@ -592,7 +592,7 @@ class ModelSet(FileSet): } ) 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)}' + return f'{model_name} {model_version} {file_set_type} predicting {", ".join(prediction_objects)}' @collection(