Merge pull request #1807 from gridsingularity/fix-monthly-fees

GSYE-780: Fixed monthly power fees on the CoefficientArea class. Remo…

src/gsy_e/gsy_e_core/util.py

@@ -23,6 +23,7 @@
 import sys
 import termios
 import tty
+from calendar import monthrange
 from functools import wraps
 from logging import LoggerAdapter, getLogger, getLoggerClass, addLevelName, setLoggerClass, NOTSET
 from typing import TYPE_CHECKING, Optional
@@ -529,3 +530,10 @@ def memory_usage_percent():
         return 0
 
     return round(int(mem_usage) / int(mem_limit) * 100)
+
+
+def get_slots_per_month(time_slot: DateTime) -> int:
+    """Get number of slots for the month defined by the time_slot."""
+    return (duration(days=1) / GlobalConfig.slot_length) * monthrange(
+        time_slot.year, time_slot.month
+    )[1]

src/gsy_e/models/area/coefficient_area.py

@@ -28,6 +28,7 @@
 from gsy_e.models.strategy.external_strategies import ExternalMixin
 from gsy_e.models.strategy.scm import SCMStrategy
 from gsy_e.models.area.scm_dataclasses import SCMAreaProperties
+from gsy_e.gsy_e_core.util import get_slots_per_month
 
 log = getLogger(__name__)
 
@@ -80,7 +81,9 @@ def activate_energy_parameters(self, current_time_slot: DateTime) -> None:
         for child in self.children:
             child.activate_energy_parameters(current_time_slot)
 
-    def _handle_area_parameters_from_profiles(self, area_profiles: dict) -> None:
+    def _handle_area_parameters_from_profiles(
+        self, current_time_slot: DateTime, area_profiles: dict
+    ) -> None:
         if self.uuid not in area_profiles:
             return
         area_profile = area_profiles[self.uuid]
@@ -94,19 +97,23 @@ def _handle_area_parameters_from_profiles(self, area_profiles: dict) -> None:
             self.area_properties.PER_KWH_FEES["energy_cargo_fee"] = area_profile.energy_cargo_fee
         if area_profile.power_fee:
             self.area_properties.MONTHLY_FEES["power_fee"] = (
-                area_profile.power_fee * area_profile.contracted_power_kw
+                area_profile.power_fee
+                * area_profile.contracted_power_kw
+                / get_slots_per_month(current_time_slot)
             )
         if area_profile.power_cargo_fee:
             self.area_properties.MONTHLY_FEES["power_cargo_fee"] = (
-                area_profile.power_cargo_fee * area_profile.contracted_power_kw
+                area_profile.power_cargo_fee
+                * area_profile.contracted_power_kw
+                / get_slots_per_month(current_time_slot)
             )
 
     def cycle_coefficients_trading(self, current_time_slot: DateTime, area_profiles: dict) -> None:
         """Perform operations that should be executed on coefficients trading cycle."""
         self.past_market_time_slot = self.current_market_time_slot
         self.current_market_time_slot = current_time_slot
 
-        self._handle_area_parameters_from_profiles(area_profiles)
+        self._handle_area_parameters_from_profiles(current_time_slot, area_profiles)
         if self.strategy:
             self.strategy.market_cycle(self)
 

src/gsy_e/models/area/scm_dataclasses.py

@@ -276,7 +276,6 @@ class AreaFees:
     grid_export_fee_const: float = 0.0
     grid_fees_reduction: float = 0.0
     per_kWh_fees: Dict[str, FeeContainer] = field(default_factory=dict)
-    per_kW_fees: Dict[str, ContractedPowerFeeContainer] = field(default_factory=dict)
     monthly_fees: Dict[str, FeeContainer] = field(default_factory=dict)
 
     def prices_as_dict(self) -> Dict:

src/gsy_e/models/area/scm_manager.py

@@ -1,16 +1,16 @@
-from calendar import monthrange
 from math import isclose
 from typing import TYPE_CHECKING, Dict, Optional
 
-from gsy_framework.constants_limits import ConstSettings, GlobalConfig
-from pendulum import DateTime, duration
+from gsy_framework.constants_limits import ConstSettings
+from pendulum import DateTime
 
 import gsy_e.constants
 from gsy_e.constants import (
     DEFAULT_SCM_COMMUNITY_NAME,
     DEFAULT_SCM_GRID_NAME,
     FLOATING_POINT_TOLERANCE,
 )
+from gsy_e.gsy_e_core.util import get_slots_per_month
 from gsy_e.models.area.scm_dataclasses import (
     HomeAfterMeterData,
     CommunityData,
@@ -111,9 +111,7 @@ def calculate_community_after_meter_data(self):
             )
 
     def _init_area_energy_rates(self, home_data: HomeAfterMeterData) -> AreaEnergyRates:
-        slots_per_month = (duration(days=1) / GlobalConfig.slot_length) * monthrange(
-            self._time_slot.year, self._time_slot.month
-        )[1]
+        slots_per_month = get_slots_per_month(self._time_slot)
         market_maker_rate = home_data.area_properties.AREA_PROPERTIES["market_maker_rate"]
         intracommunity_base_rate = (
             market_maker_rate