feat: group comparisons

ing-bank · Jul 7, 2022 · 67d54af · 67d54af
1 parent 8e8ac00
commit 67d54af
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 13 deletions.
diff --git a/popmon/visualization/histogram_section.py b/popmon/visualization/histogram_section.py
@@ -159,14 +159,15 @@ def transform(self, data_obj: dict, sections: Optional[list] = None):
                 plot_type_layouts["heatmap"] = hplots[0]["layout"]
 
             plots = hplots + plots
-            # print(plot_types,layouts)
+
             features_w_metrics.append(
                 {
                     "name": feature,
                     "plot_type_layouts": plot_type_layouts,
                     "plots": plots,
                 }
             )
+
         sections.append(
             {
                 "section_title": self.section_name,

diff --git a/popmon/visualization/section_generator.py b/popmon/visualization/section_generator.py
@@ -26,9 +26,8 @@
 
 from popmon.analysis.comparison import Comparisons
 from popmon.analysis.profiling import Profiles
-
 from ..base import Module
-from ..config import Report
+from ..config import Report, Settings, Comparison
 from ..utils import filter_metrics, parallel, short_date
 from ..visualization.utils import _prune, plot_bars
 
@@ -126,13 +125,12 @@ def __init__(
         self.skip_empty_plots = settings.skip_empty_plots
         self.description = description
         self.show_stats = settings.show_stats if not settings.extended_report else None
-
         self.primary_color = settings.primary_color
         self.tl_colors = settings.tl_colors
 
     def get_description(self):
         return self.section_name
-
+    
     def transform(
         self,
         data_obj: dict,
@@ -204,14 +202,33 @@ def transform(
                     del layouts["shapes"]
                 if "range" in layouts["yaxis"]:
                     del layouts["yaxis"]["range"]
-
-            features_w_metrics.append(
-                {
-                    "name": feature,
-                    "plot_type_layouts": {"barplot": layouts},
-                    "plots": sorted(plots, key=lambda plot: plot["name"]),
-                }
-            )
+
+
+            if(self.section_name == "Comparisons"):
+                prev_key = "Rolling Reference " + "(window = " + str(Comparison().window) + ", Shift = " + str(Comparison().shift) + ")" 
+                reference_key = Settings().reference_type + " Reference"
+                grouped_metrics = {reference_key: [], prev_key:[]}
+                for plot in plots:
+                    if "ref" in plot["name"]:
+                        grouped_metrics[reference_key].append(plot) 
+                    else :
+                        grouped_metrics[prev_key].append(plot)
+
+                features_w_metrics.append(
+                    {
+                        "name": feature,
+                        "plot_type_layouts": {"barplot": layouts},
+                        "plots": grouped_metrics,
+                    }
+                )
+            else:
+                features_w_metrics.append(
+                    {
+                        "name": feature,
+                        "plot_type_layouts": {"barplot": layouts},
+                        "plots": plots,
+                    }
+                )
 
         sections.append(
             {

diff --git a/popmon/visualization/templates/assets/css/custom-style.css b/popmon/visualization/templates/assets/css/custom-style.css
@@ -14,6 +14,11 @@ section {
   padding: 70px 0
 }
 
+h3 {
+  width: calc(100% - 100px);
+  margin: 20px 20px 20px 20px;
+}
+
 a.nav-link {
   cursor: pointer;
   font-weight: 300;

diff --git a/popmon/visualization/templates/section.html b/popmon/visualization/templates/section.html
@@ -30,12 +30,25 @@ <h2>{{ section_title }}</h2>
         {%- endfor -%}
         </script>
         <div class="row section_feature" data-section-feature="{{ feature.name }}">
+          {%- if feature.plots is mapping -%}
+            {%- for ref,plots in feature.plots.items() -%}
+              {%- set count = (plots|length + 1)*(loop.index - 1) -%}
+              <h3> {{ref}} </h3>
+              {%- for metric in plots -%}
+                {%- set plt = count + loop.index  -%}
+                {%- with metric=metric -%}
+                  {%- include 'card.html' -%}
+                {%- endwith -%}
+              {%- endfor -%}
+            {%- endfor -%}
+          {%- else -%}
             {%- for metric in feature.plots -%}
               {%- set plt = loop.index  -%}
               {%- with metric=metric -%}
                 {%- include 'card.html' -%}
               {%- endwith -%}
             {%- endfor -%}
+          {%- endif-%}
         </div>
       {%- endfor -%}
     {%- else -%}