Use dictionary for load overrides

Signed-off-by: Jimmy Tung <jimmy.tung@zepben.com>

Author: Esaotuelr

src/zepben/eas/client/eas_client.py

@@ -480,24 +480,22 @@ async def async_run_hosting_capacity_work_package(self, work_package: WorkPackag
                                 "defaultLoadVar": work_package.generator_config.model.default_load_var,
                                 "defaultGenVar": work_package.generator_config.model.default_gen_var,
                                 "transformerTapSettings": work_package.generator_config.model.transformer_tap_settings,
-                                "fixedTimeLoadOverride": work_package.generator_config.model.fixed_time_load_override and [
-                                    {
-                                        "loadId": lo.load_id,
-                                        "loadWattsOverride": lo.load_watts_override,
-                                        "genWattsOverride": lo.gen_watts_override,
-                                        "loadVarOverride": lo.load_var_override,
-                                        "genVarOverride": lo.gen_var_override,
+                                "fixedTimeLoadOverride": work_package.generator_config.model.fixed_time_load_override and {
+                                    lo:{
+                                        "loadWattsOverride": work_package.generator_config.model.fixed_time_load_override[lo].load_watts_override,
+                                        "genWattsOverride": work_package.generator_config.model.fixed_time_load_override[lo].gen_watts_override,
+                                        "loadVarOverride": work_package.generator_config.model.fixed_time_load_override[lo].load_var_override,
+                                        "genVarOverride": work_package.generator_config.model.fixed_time_load_override[lo].gen_var_override,
                                     } for lo in work_package.generator_config.model.fixed_time_load_override
-                                ],
-                                "TimePeriodLoadOverride": work_package.generator_config.model.time_period_load_override and [
-                                    {
-                                        "loadId": lo.load_id,
-                                        "loadWattsOverride": lo.load_watts_override,
-                                        "genWattsOverride": lo.gen_watts_override,
-                                        "loadVarOverride": lo.load_var_override,
-                                        "genVarOverride": lo.gen_var_override,
+                                },
+                                "TimePeriodLoadOverride": work_package.generator_config.model.time_period_load_override and {
+                                    lo:{
+                                        "loadWatts": work_package.generator_config.model.time_period_load_override[lo].load_watts_override,
+                                        "genWatts": work_package.generator_config.model.time_period_load_override[lo].gen_watts_override,
+                                        "loadVar": work_package.generator_config.model.time_period_load_override[lo].load_var_override,
+                                        "genVar": work_package.generator_config.model.time_period_load_override[lo].gen_var_override,
                                     } for lo in work_package.generator_config.model.time_period_load_override
-                                ],
+                                },
                             },
                             "solve": work_package.generator_config.solve and {
                                 "normVMinPu": work_package.generator_config.solve.norm_vmin_pu,

src/zepben/eas/client/work_package.py

@@ -6,7 +6,7 @@
 from dataclasses import dataclass
 from datetime import datetime
 from enum import Enum
-from typing import List, Optional, Union
+from typing import List, Optional, Union, Dict
 
 __all__ = [
     "SwitchClass",
@@ -131,8 +131,6 @@ class MeterPlacementConfig:
 
 @dataclass
 class FixedTimeLoadOverride:
-    load_id: str
-    """Id of the meter to replace the load data for."""
 
     load_watts_override: Optional[float]
     """
@@ -157,8 +155,6 @@ class FixedTimeLoadOverride:
 
 @dataclass
 class TimePeriodLoadOverride:
-    load_id: str
-    """Id of the meter to replace the load data for."""
 
     load_watts_override: Optional[List[float]]
     """
@@ -436,12 +432,12 @@ class ModelConfig:
     The name of the set of distribution transformer tap settings to be applied to the model from an external source.
     """
 
-    fixed_time_load_override: Optional[List[FixedTimeLoadOverride]] = None
+    fixed_time_load_override: Optional[Dict[str, FixedTimeLoadOverride]] = None
     """
     The list of meters and load profiles replacement to be applied to the work package model (Fixed time point).
     """
 
-    time_period_load_override: Optional[List[TimePeriodLoadOverride]] = None
+    time_period_load_override: Optional[Dict[str, TimePeriodLoadOverride]] = None
     """
     The list of meters and load profiles replacement to be applied to the work package model (Time period).
     """