to viz update for new mlm changes

Author: najiyacl

ads/feature_store/statistics/abs_feature_value.py

@@ -17,6 +17,8 @@
 
 
 class AbsFeatureValue:
+    CONST_METRIC_DATA = "metric_data"
+
     def __init__(self):
         self.__validate__()
 

ads/feature_store/statistics/charts/box_plot.py

@@ -45,10 +45,11 @@ def __init__(self, q1: float, q2: float, q3: float):
 
         @classmethod
         def __from_json__(cls, json_dict: dict) -> "BoxPlot.Quartiles":
+            metric_data = json_dict.get(AbsFeatureValue.CONST_METRIC_DATA)
             return cls(
-                json_dict.get(cls.CONST_Q1),
-                json_dict.get(cls.CONST_Q2),
-                json_dict.get(cls.CONST_Q3),
+                metric_data[0],
+                metric_data[1],
+                metric_data[2]
             )
 
         def __validate__(self):

ads/feature_store/statistics/charts/frequency_distribution.py

@@ -5,6 +5,7 @@
 
 from typing import List
 from ads.common.decorator.runtime_dependency import OptionalDependency
+from ads.feature_store.statistics.abs_feature_value import AbsFeatureValue
 from ads.feature_store.statistics.charts.abstract_feature_plot import AbsFeaturePlot
 
 try:
@@ -29,21 +30,22 @@ def __init__(self, frequency: List, bins: List):
     def __validate__(self):
         assert type(self.frequency) == list
         assert type(self.bins) == list
-        assert 0 < len(self.frequency) == len(self.bins) > 0
+        # assert 0 < len(self.frequency) == len(self.bins) > 0
 
     @classmethod
     def __from_json__(cls, json_dict: dict) -> "FrequencyDistribution":
+        metric_data = json_dict.get(AbsFeatureValue.CONST_METRIC_DATA)
         return FrequencyDistribution(
-            frequency=json_dict.get(cls.CONST_FREQUENCY),
-            bins=json_dict.get(cls.CONST_BINS),
+            bins=metric_data[0],
+            frequency=metric_data[1]
         )
 
     def add_to_figure(self, fig: Figure, xaxis: int, yaxis: int):
         xaxis_str, yaxis_str, x_str, y_str = self.get_x_y_str_axes(xaxis, yaxis)
         if (
-            type(self.frequency) == list
-            and type(self.bins) == list
-            and 0 < len(self.frequency) == len(self.bins) > 0
+                type(self.frequency) == list
+                and type(self.bins) == list
+                and 0 < len(self.frequency) and 0 < len(self.bins)
         ):
             fig.add_bar(
                 x=self.bins, y=self.frequency, xaxis=x_str, yaxis=y_str, name=""

ads/feature_store/statistics/charts/probability_distribution.py

@@ -5,6 +5,7 @@
 from typing import List
 
 from ads.common.decorator.runtime_dependency import OptionalDependency
+from ads.feature_store.statistics.abs_feature_value import AbsFeatureValue
 from ads.feature_store.statistics.charts.abstract_feature_plot import AbsFeaturePlot
 
 try:
@@ -29,21 +30,22 @@ def __init__(self, density: List, bins: List):
     def __validate__(self):
         assert type(self.density) == list
         assert type(self.bins) == list
-        assert 0 < len(self.density) == len(self.bins) > 0
+        # assert 0 < len(self.density) == len(self.bins) > 0
 
     @classmethod
     def __from_json__(cls, json_dict: dict) -> "ProbabilityDistribution":
+        metric_data = json_dict.get(AbsFeatureValue.CONST_METRIC_DATA)
         return cls(
-            density=json_dict.get(ProbabilityDistribution.CONST_DENSITY),
-            bins=json_dict.get(ProbabilityDistribution.CONST_BINS),
+            bins=metric_data[0],
+            density=metric_data[1]
         )
 
     def add_to_figure(self, fig: Figure, xaxis: int, yaxis: int):
         xaxis_str, yaxis_str, x_str, y_str = self.get_x_y_str_axes(xaxis, yaxis)
         if (
             type(self.density) == list
             and type(self.bins) == list
-            and 0 < len(self.density) == len(self.bins) > 0
+            and 0 < len(self.density) and 0 < len(self.bins)
         ):
             fig.add_bar(
                 x=self.bins,

ads/feature_store/statistics/charts/top_k_frequent_elements.py

@@ -30,7 +30,7 @@ class TopKFrequentElement(AbsFeatureValue):
         CONST_UPPER_BOUND = "upper_bound"
 
         def __init__(
-            self, value: str, estimate: int, lower_bound: int, upper_bound: int
+                self, value: str, estimate: int, lower_bound: int, upper_bound: int
         ):
             self.value = value
             self.estimate = estimate
@@ -53,26 +53,30 @@ def __from_json__(
                 upper_bound=json_dict.get(cls.CONST_UPPER_BOUND),
             )
 
-    def __init__(self, elements: List[TopKFrequentElement]):
-        self.elements = elements
+    def __init__(self, values: List, estimates: List):
+        self.values = values
+        self.estimates = estimates
         super().__init__()
 
     def __validate__(self):
-        assert type(self.elements) == list
-        assert len(self.elements) > 0
-        for element in self.elements:
-            assert element is not None
+        assert type(self.values) == list
+        assert type(self.estimates) == list
+        assert 0 < len(self.values) == len(self.estimates) > 0
 
     @classmethod
     def __from_json__(cls, json_dict: dict) -> "TopKFrequentElements":
-        elements = json_dict.get(cls.CONST_VALUE)
-        return cls([cls.TopKFrequentElement.from_json(element) for element in elements])
+        metric_data = json_dict.get(AbsFeatureValue.CONST_METRIC_DATA)
+        return cls(
+            values=metric_data[0],
+            estimates=metric_data[1]
+        )
 
     def add_to_figure(self, fig: Figure, xaxis: int, yaxis: int):
         xaxis_str, yaxis_str, x_str, y_str = self.get_x_y_str_axes(xaxis, yaxis)
-        if type(self.elements) == list and len(self.elements) > 0:
-            y_axis = [element.value for element in self.elements]
-            x_axis = [element.estimate for element in self.elements]
+        if type(self.values) == list and len(self.values) > 0 and \
+                type(self.estimates) == list and len(self.estimates) > 0:
+            y_axis = [value for value in self.values]
+            x_axis = [estimate for estimate in self.estimates]
             fig.add_bar(
                 x=x_axis, y=y_axis, xaxis=x_str, yaxis=y_str, name="", orientation="h"
             )

ads/feature_store/statistics/generic_feature_value.py

@@ -19,6 +19,6 @@ def __validate__(self):
     def __from_json__(cls, json_dict: dict) -> "GenericFeatureValue":
         val = None
         if type(json_dict) == dict:
-            val = json_dict.get(cls.CONST_VALUE)
-
+            metric_data = json_dict.get(AbsFeatureValue.CONST_METRIC_DATA)
+            val = metric_data[0]
         return GenericFeatureValue(val=val)