From 8ff1ef1373b6fa8b1de706d24b907736f2d48c6a Mon Sep 17 00:00:00 2001 From: Yingge He Date: Fri, 16 Aug 2024 16:26:19 -0700 Subject: [PATCH] Add histogram args tests --- qa/python_models/custom_metrics/model.py | 28 ++++++++++++++++++------ 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/qa/python_models/custom_metrics/model.py b/qa/python_models/custom_metrics/model.py index 8b6a2715f9..08459a4423 100644 --- a/qa/python_models/custom_metrics/model.py +++ b/qa/python_models/custom_metrics/model.py @@ -233,16 +233,11 @@ def test_histogram_e2e(self): description="test metric histogram kind end to end", kind=pb_utils.MetricFamily.HISTOGRAM, ) - labels = {"example1": "histogram_label1", "example2": "histogram_label2"} - - # Test non-ascending order buckets - with self.assertRaises(pb_utils.TritonModelException): - metric = metric_family.Metric( - labels=labels, buckets=[2.5, 0.1, 1.0, 10.0, 5.0] - ) + labels = {"example1": "histogram_label1", "example2": "histogram_label2"} buckets = [0.1, 1.0, 2.5, 5.0, 10.0] metric = metric_family.Metric(labels=labels, buckets=buckets) + labels_str = 'example1="histogram_label1",example2="histogram_label2"' self._histogram_api_helper(metric, name, labels_str) @@ -254,6 +249,25 @@ def test_histogram_e2e(self): self.assertEqual(metrics.count(sum_pattern), 1) self.assertEqual(metrics.count(bucket_pattern), len(buckets) + 1) + def test_histogram_args(self): + name = "test_histogram_args" + metric_family = pb_utils.MetricFamily( + name=name, + description="test metric histogram args", + kind=pb_utils.MetricFamily.HISTOGRAM, + ) + + # Test non-ascending order buckets + with self.assertRaises(pb_utils.TritonModelException): + metric_family.Metric(labels={}, buckets=[2.5, 0.1, 1.0, 10.0, 5.0]) + + # Test duplicate value buckets + with self.assertRaises(pb_utils.TritonModelException): + metric_family.Metric(labels={}, buckets=[1, 1, 2, 5, 5]) + + # Test non-ascending order buckets + metric_family.Metric(labels={}, buckets=[]) + def test_dup_metric_family_diff_kind(self): # Test that a duplicate metric family can't be added with a conflicting type/kind metric_family1 = pb_utils.MetricFamily(