From 76704feee43c56316a5c53151de9c531f5ae77f3 Mon Sep 17 00:00:00 2001
From: Eric Callahan <arksine.code@gmail.com>
Date: Wed, 15 May 2024 07:16:59 -0400
Subject: [PATCH] sensor:  add support for parameter configuration

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
---
 moonraker/common.py            | 14 ++++++++++++++
 moonraker/components/sensor.py | 32 ++++++++++++++++++++++++++------
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/moonraker/common.py b/moonraker/common.py
index 3ebb421..22f9c46 100644
--- a/moonraker/common.py
+++ b/moonraker/common.py
@@ -1172,6 +1172,20 @@ class HistoryFieldData:
             return value._provider == self._provider and value._name == self._name
         raise ValueError("Invalid type for comparison")
 
+    def get_configuration(self) -> Dict[str, Any]:
+        return {
+            "field": self._name,
+            "provider": self._provider,
+            "description": self._desc,
+            "strategy": self._strategy.name.lower(),
+            "units": self._units,
+            "init_tracker": self._tracker.reset_callback is not None,
+            "exclude_paused": self._tracker.exclude_paused,
+            "report_total": self._report_total,
+            "report_maximum": self._report_maximum,
+            "precision": self._precision
+        }
+
     def as_dict(self) -> Dict[str, Any]:
         val = self._tracker.get_tracked_value()
         if self._precision is not None and isinstance(val, float):
diff --git a/moonraker/components/sensor.py b/moonraker/components/sensor.py
index 4c91ad8..4b3bcdb 100644
--- a/moonraker/components/sensor.py
+++ b/moonraker/components/sensor.py
@@ -58,12 +58,20 @@ class BaseSensor:
         self.values: DefaultDict[str, Deque[Union[int, float]]] = defaultdict(
             lambda: deque(maxlen=store_size)
         )
+        self.param_info: List[Dict[str, str]] = []
         history: History = self.server.lookup_component("history")
         self.field_info: Dict[str, List[HistoryFieldData]] = {}
         all_opts = list(config.get_options().keys())
         cfg_name = config.get_name()
+        param_prefix = "parameter_"
         hist_field_prefix = "history_field_"
         for opt in all_opts:
+            if opt.startswith(param_prefix):
+                name = opt[len(param_prefix):]
+                data = config.getdict(opt)
+                data["name"] = opt[len(param_prefix):]
+                self.param_info.append(data)
+                continue
             if not opt.startswith(hist_field_prefix):
                 continue
             name = opt[len(hist_field_prefix):]
@@ -127,13 +135,23 @@ class BaseSensor:
         logging.info("Registered sensor '%s'", self.name)
         return True
 
-    def get_sensor_info(self) -> Dict[str, Any]:
-        return {
+    def get_sensor_info(self, extended: bool = False) -> Dict[str, Any]:
+        ret: Dict[str, Any] = {
             "id": self.id,
             "friendly_name": self.name,
             "type": self.type,
             "values": self.last_measurements,
         }
+        if extended:
+            ret["parameter_info"] = self.param_info
+            history_fields: List[Dict[str, Any]] = []
+            for parameter, field_list in self.field_info.items():
+                for field_data in field_list:
+                    field_config = field_data.get_configuration()
+                    field_config["parameter"] = parameter
+                    history_fields.append(field_config)
+            ret["history_fields"] = history_fields
+        return ret
 
     def get_sensor_measurements(self) -> Dict[str, List[Union[int, float]]]:
         return {key: list(values) for key, values in self.values.items()}
@@ -285,21 +303,23 @@ class Sensors:
     async def _handle_sensor_list_request(
         self, web_request: WebRequest
     ) -> Dict[str, Dict[str, Any]]:
-        output = {
+        extended = web_request.get_boolean("extended", False)
+        return {
             "sensors": {
-                key: sensor.get_sensor_info() for key, sensor in self.sensors.items()
+                key: sensor.get_sensor_info(extended)
+                for key, sensor in self.sensors.items()
             }
         }
-        return output
 
     async def _handle_sensor_info_request(
         self, web_request: WebRequest
     ) -> Dict[str, Any]:
         sensor_name: str = web_request.get_str("sensor")
+        extended = web_request.get_boolean("extended", False)
         if sensor_name not in self.sensors:
             raise self.server.error(f"No valid sensor named {sensor_name}")
         sensor = self.sensors[sensor_name]
-        return sensor.get_sensor_info()
+        return sensor.get_sensor_info(extended)
 
     async def _handle_sensor_measurements_request(
         self, web_request: WebRequest