Rename settings variables (remove prefixes)

src/akkudoktoreos/measurement/measurement.py

@@ -25,19 +25,19 @@ logger = get_logger(__name__)
 class MeasurementCommonSettings(SettingsBaseModel):
     """Measurement Configuration."""
 
-    measurement_load0_name: Optional[str] = Field(
+    load0_name: Optional[str] = Field(
         default=None, description="Name of the load0 source", examples=["Household", "Heat Pump"]
     )
-    measurement_load1_name: Optional[str] = Field(
+    load1_name: Optional[str] = Field(
         default=None, description="Name of the load1 source", examples=[None]
     )
-    measurement_load2_name: Optional[str] = Field(
+    load2_name: Optional[str] = Field(
         default=None, description="Name of the load2 source", examples=[None]
     )
-    measurement_load3_name: Optional[str] = Field(
+    load3_name: Optional[str] = Field(
         default=None, description="Name of the load3 source", examples=[None]
     )
-    measurement_load4_name: Optional[str] = Field(
+    load4_name: Optional[str] = Field(
         default=None, description="Name of the load4 source", examples=[None]
     )
 
@@ -50,42 +50,42 @@ class MeasurementDataRecord(DataRecord):
     """
 
     # Single loads, to be aggregated to total load
-    measurement_load0_mr: Optional[float] = Field(
+    load0_mr: Optional[float] = Field(
         default=None, ge=0, description="Load0 meter reading [kWh]", examples=[40421]
     )
-    measurement_load1_mr: Optional[float] = Field(
+    load1_mr: Optional[float] = Field(
         default=None, ge=0, description="Load1 meter reading [kWh]", examples=[None]
     )
-    measurement_load2_mr: Optional[float] = Field(
+    load2_mr: Optional[float] = Field(
         default=None, ge=0, description="Load2 meter reading [kWh]", examples=[None]
     )
-    measurement_load3_mr: Optional[float] = Field(
+    load3_mr: Optional[float] = Field(
         default=None, ge=0, description="Load3 meter reading [kWh]", examples=[None]
     )
-    measurement_load4_mr: Optional[float] = Field(
+    load4_mr: Optional[float] = Field(
         default=None, ge=0, description="Load4 meter reading [kWh]", examples=[None]
     )
 
-    measurement_max_loads: ClassVar[int] = 5  # Maximum number of loads that can be set
+    max_loads: ClassVar[int] = 5  # Maximum number of loads that can be set
 
-    measurement_grid_export_mr: Optional[float] = Field(
+    grid_export_mr: Optional[float] = Field(
         default=None, ge=0, description="Export to grid meter reading [kWh]", examples=[1000]
     )
 
-    measurement_grid_import_mr: Optional[float] = Field(
+    grid_import_mr: Optional[float] = Field(
         default=None, ge=0, description="Import from grid meter reading [kWh]", examples=[1000]
     )
 
     # Computed fields
     @computed_field  # type: ignore[prop-decorator]
     @property
-    def measurement_loads(self) -> List[str]:
+    def loads(self) -> List[str]:
         """Compute a list of active loads."""
         active_loads = []
 
-        # Loop through measurement_loadx
-        for i in range(self.measurement_max_loads):
-            load_attr = f"measurement_load{i}_mr"
+        # Loop through loadx
+        for i in range(self.max_loads):
+            load_attr = f"load{i}_mr"
 
             # Check if either attribute is set and add to active loads
             if getattr(self, load_attr, None):
@@ -105,7 +105,7 @@ class Measurement(SingletonMixin, DataImportMixin, DataSequence):
     )
 
     topics: ClassVar[List[str]] = [
-        "measurement_load",
+        "load",
     ]
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:
@@ -147,14 +147,16 @@ class Measurement(SingletonMixin, DataImportMixin, DataSequence):
         """Provides measurement key for given name and topic."""
         topic = topic.lower()
 
+        print(self.topics)
         if topic not in self.topics:
             return None
 
         topic_keys = [
             key for key in self.config.measurement.model_fields.keys() if key.startswith(topic)
         ]
+        print(topic_keys)
         key = None
-        if topic == "measurement_load":
+        if topic == "load":
             for config_key in topic_keys:
                 if (
                     config_key.endswith("_name")
@@ -255,9 +257,9 @@ class Measurement(SingletonMixin, DataImportMixin, DataSequence):
             end_datetime = self[-1].date_time
         size = self._interval_count(start_datetime, end_datetime, interval)
         load_total_array = np.zeros(size)
-        # Loop through measurement_load<x>_mr
-        for i in range(self.record_class().measurement_max_loads):
-            key = f"measurement_load{i}_mr"
+        # Loop through load<x>_mr
+        for i in range(self.record_class().max_loads):
+            key = f"load{i}_mr"
             # Calculate load per interval
             load_array = self._energy_from_meter_readings(
                 key=key, start_datetime=start_datetime, end_datetime=end_datetime, interval=interval