Compute monitoring vis dims

Author: nikoleskinen

src/monitoring/instruments/halo_doppler_lidar.py

@@ -119,9 +119,7 @@ def plot_housekeeping_variable(
     format_time_axis(ax)
     pretty_ax(ax, grid="y")
     fig_ = save_fig(fig)
-    return MonitoringVisualization(
-        fig_.bytes, variable, Dimensions(fig_.width, fig_.height)
-    )
+    return MonitoringVisualization(fig_.bytes, variable, Dimensions(fig, [ax]))
 
 
 def monitor_background(
@@ -212,9 +210,7 @@ def plot_background_profile(
     format_time_axis(ax)
     pretty_ax_2d(ax)
     fig_ = save_fig(fig)
-    return MonitoringVisualization(
-        fig_.bytes, variable, Dimensions(fig_.width, fig_.height)
-    )
+    return MonitoringVisualization(fig_.bytes, variable, Dimensions(fig, [ax]))
 
 
 def plot_background_variance(
@@ -227,9 +223,7 @@ def plot_background_variance(
     format_time_axis(ax)
     pretty_ax(ax, grid="y")
     fig_ = save_fig(fig)
-    return MonitoringVisualization(
-        fig_.bytes, variable, Dimensions(fig_.width, fig_.height)
-    )
+    return MonitoringVisualization(fig_.bytes, variable, Dimensions(fig, [ax]))
 
 
 def plot_time_averaged_background_profile(
@@ -249,9 +243,7 @@ def plot_time_averaged_background_profile(
 
     pretty_ax(ax, grid="y")
     fig_ = save_fig(fig)
-    return MonitoringVisualization(
-        fig_.bytes, variable, Dimensions(fig_.width, fig_.height)
-    )
+    return MonitoringVisualization(fig_.bytes, variable, Dimensions(fig, [ax]))
 
 
 def monitor_signal(
@@ -352,9 +344,7 @@ def plot_radial_velocity_histogram(
     ax.set_ylabel("Count")
     pretty_ax(ax, grid="both")
     fig_ = save_fig(fig)
-    return MonitoringVisualization(
-        fig_.bytes, variable, Dimensions(fig_.width, fig_.height)
-    )
+    return MonitoringVisualization(fig_.bytes, variable, Dimensions(fig, [ax]))
 
 
 def plot_signal_radial_velocity(
@@ -370,6 +360,4 @@ def plot_signal_radial_velocity(
     ax.set_ylabel("Radial velocity")
     pretty_ax(ax)
     fig_ = save_fig(fig)
-    return MonitoringVisualization(
-        fig_.bytes, variable, Dimensions(fig_.width, fig_.height)
-    )
+    return MonitoringVisualization(fig_.bytes, variable, Dimensions(fig, [ax]))

src/monitoring/monitoring_file.py

@@ -9,25 +9,7 @@
 from monitoring.product import MonitoringProduct, MonitoringVariable
 from monitoring.utils import get_apis
 
-
-@dataclass
-class Dimensions:
-    width: int
-    height: int
-    margin_top: int | None = None
-    margin_right: int | None = None
-    margin_bottom: int | None = None
-    margin_left: int | None = None
-
-    def as_payload_dict(self) -> dict[str, int | None]:
-        return {
-            "width": self.width,
-            "height": self.height,
-            "marginTop": self.margin_top,
-            "marginRight": self.margin_right,
-            "marginBottom": self.margin_bottom,
-            "marginLeft": self.margin_left,
-        }
+from cloudnetpy.plotting.plotting import Dimensions
 
 
 @dataclass
@@ -37,6 +19,17 @@ class MonitoringVisualization:
     dimensions: Dimensions
 
 
+def _dimemsions_as_payload(dim: Dimensions) -> dict[str, int]:
+    return {
+        "width": dim.width,
+        "height": dim.height,
+        "marginTop": dim.margin_top,
+        "marginRight": dim.margin_right,
+        "marginBottom": dim.margin_bottom,
+        "marginLeft": dim.margin_left,
+    }
+
+
 @dataclass
 class MonitoringFile:
     instrument: Instrument
@@ -81,6 +74,7 @@ def upload(self) -> None:
                 "s3key": s3key,
                 "sourceFileUuid": file_uuid,
                 "variableId": vis.variable.id,
+                **_dimemsions_as_payload(vis.dimensions),
             }
             res = md_api.post("monitoring-visualizations", payload=payload)
             if not res.ok:
@@ -101,8 +95,8 @@ def generate_s3_key(
 
 def _period_for_s3key(p: Period) -> str:
     if isinstance(p, AllPeriod):
-        return "All"
-    period_str = p.period.capitalize()
+        return "all"
+    period_str = p.period
     match p.period:
         case "year":
             date_str = p.start_date.strftime("%Y")