diff options
| -rw-r--r-- | server/szurubooru/func/metrics.py | 1 | ||||
| -rw-r--r-- | server/szurubooru/func/tags.py | 1 | ||||
| -rw-r--r-- | server/szurubooru/tests/func/test_metrics.py | 3 | ||||
| -rw-r--r-- | server/szurubooru/tests/func/test_tags.py | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/server/szurubooru/func/metrics.py b/server/szurubooru/func/metrics.py index 5fa4e0c..93fb973 100644 --- a/server/szurubooru/func/metrics.py +++ b/server/szurubooru/func/metrics.py @@ -30,6 +30,7 @@ class MetricSerializer(serialization.BaseSerializer): def _serializers(self) -> Dict[str, Callable[[], Any]]: return { + 'version': lambda: self.metric.version, 'min': lambda: self.metric.min, 'max': lambda: self.metric.max, } diff --git a/server/szurubooru/func/tags.py b/server/szurubooru/func/tags.py index c6e2ab9..3384b4e 100644 --- a/server/szurubooru/func/tags.py +++ b/server/szurubooru/func/tags.py @@ -134,6 +134,7 @@ class TagSerializer(serialization.BaseSerializer): return None else: return { + 'version': self.tag.metric.version, 'min': self.tag.metric.min, 'max': self.tag.metric.max, } diff --git a/server/szurubooru/tests/func/test_metrics.py b/server/szurubooru/tests/func/test_metrics.py index e43757d..e84060e 100644 --- a/server/szurubooru/tests/func/test_metrics.py +++ b/server/szurubooru/tests/func/test_metrics.py @@ -6,8 +6,11 @@ from szurubooru.func import metrics def test_serialize_metric(tag_factory): tag = tag_factory() metric = model.Metric(tag=tag, min=1, max=2) + db.session.add(metric) + db.session.flush() result = metrics.serialize_metric(metric) assert result == { + 'version': 1, 'min': 1, 'max': 2, } diff --git a/server/szurubooru/tests/func/test_tags.py b/server/szurubooru/tests/func/test_tags.py index 23d6c9b..1ecc142 100644 --- a/server/szurubooru/tests/func/test_tags.py +++ b/server/szurubooru/tests/func/test_tags.py @@ -85,6 +85,7 @@ def test_serialize_tag( {'names': ['impl2'], 'category': 'cat', 'usages': 0}, ], 'metric': { + 'version': 1, 'min': 1.5, 'max': 10 }, |