fix copilot findings

Author: tpd-opitz

packages/control/optional.py

@@ -150,14 +150,14 @@ def remove(price_data: Dict, last_active_timestamp: int = 0) -> Dict:
             first_timestamp = (max([timestamp for timestamp in price_data.keys()
                                     if float(timestamp) <= now], default=0))
             return {int(timestamp): price for timestamp, price in price_data.items()
-                    if (timestamp) >= first_timestamp and
+                    if int(timestamp) >= int(first_timestamp) and
                     (int(timestamp) <= last_active_timestamp if last_active_timestamp > 0 else True)}
 
         try:
             if self.data.electricity_pricing.configured:
                 ep = self.data.electricity_pricing
                 #  prices lists are updated in optional_data via mqtt listener
-                if len(ep.get.prices) >= 0:
+                if len(ep.get.prices) > 0:
                     Pub().pub(f"{MQTT_PREFIX}/get/prices", remove(ep.get.prices))
                 if self._flexible_tariff_module:
                     Pub().pub(f"{MQTT_PREFIX}/flexible_tariff/get/prices", remove(ep.flexible_tariff.get.prices))
@@ -171,7 +171,7 @@ def remove(price_data: Dict, last_active_timestamp: int = 0) -> Dict:
 
     def __get_current_timeslot_start(self) -> int:
         timestamp = self.__get_first_entry()[0]
-        return float(timestamp)
+        return int(timestamp)
 
     def ep_get_current_price(self) -> float:
         if self.data.electricity_pricing.configured:

packages/modules/common/configurable_tariff.py

@@ -64,7 +64,7 @@ def __update_et_provider_data(self) -> tuple[TariffState, int]:
         tariff_state = self._remove_outdated_prices(tariff_state, timeslot_length_seconds)
         return tariff_state, timeslot_length_seconds
 
-    def __calculate_next_query_time(self) -> float:
+    def __calculate_next_query_time(self) -> None:
         now = datetime.now()
         current_hour = now.hour + 1  # next full hour
         log.debug(f"Aktuelle Tarif Update Stunde: {current_hour} Uhr."

packages/modules/common/store/_tariff.py

@@ -73,8 +73,8 @@ def __reduce_prices(prices: Dict[str, float]) -> Dict[int, float]:
         def __get_default_grid_fee_price(prices: Dict[str, float]) -> float:
             if (hasattr(data.data.optional_data.grid_fee_module.config, "default_price") and
                     data.data.optional_data.grid_fee_module.config.default_price is not None):
-                print("Using default grid fee price from configuration: " +
-                      f"{data.data.optional_data.grid_fee_module.config.default_price}")
+                log.debug("Using default grid fee price from configuration: " +
+                          f"{data.data.optional_data.grid_fee_module.config.default_price}")
                 return data.data.optional_data.grid_fee_module.config.default_price
             else:
                 # Fallback: Median der vorhandenen Netzentgelte wird
@@ -87,7 +87,7 @@ def __get_default_grid_fee_price(prices: Dict[str, float]) -> float:
         def __normalize_grid_fee_prices(grid_fee_prices: Dict[int, float], max_timestamp: int) -> Dict[int, float]:
             '''
               Normalisiert die Netzentgelte.
-              Dies ist notwendig, da Nettzentgelte die Preisen einiger Stromanbieter
+              Dies ist notwendig, da die Preise einiger Stromanbieter
               bereits ein festes Netzentgeld enthalten.
             '''
             grid_fee_prices = __reduce_prices(grid_fee_prices)
@@ -97,7 +97,7 @@ def __normalize_grid_fee_prices(grid_fee_prices: Dict[int, float], max_timestamp
                     and data.data.optional_data.flexible_tariff_module.config.includes_grid_fee is False):
                 return grid_fee_prices
             else:
-                #  Bei flexiblen Tarifen, die das Netzentgeln _nicht_ enthalten,
+                #  Bei flexiblen Tarifen, die das Netzentgelt _nicht_ enthalten,
                 #  muss "includes_grid_fee" explizit auf False gesetzt werden.
                 return {int(float(k)): v - __get_default_grid_fee_price(grid_fee_prices)
                         for k, v in grid_fee_prices.items()}

packages/modules/common/store/_tariff_test.py

@@ -114,7 +114,7 @@ def mock_data() -> None:
         ),
         pytest.param(
             {DEFAULT_START_TIMESTAMP + step * 900: 10 for step in range(5)},
-            {DEFAULT_START_TIMESTAMP + step * 900: 14 for step in range(5)},  # nedian 14
+            {DEFAULT_START_TIMESTAMP + step * 900: 14 for step in range(5)},  # median 14
             True,
             10,  # default_grid_fee_price overrides median grid fee price of 14
             {

packages/modules/electricity_pricing/flexible_tariffs/fixed_hours/tariff.py

@@ -59,12 +59,12 @@ def _fetch_price_for_time_slot(config: FixedHoursTariffConfiguration,
     return config.default_price
 
 
-def _calculate_price_timeslots(config: FixedHoursTariffConfiguration) -> int:
+def _calculate_price_timeslots(config: FixedHoursTariffConfiguration) -> TariffState:
     current_hour = datetime.datetime.now().replace(minute=0, second=0, microsecond=0)
     prices: Dict[str, float] = {}
     # 36 hours to cover the next day and the current day,
-    # this ensures enough values in prises list when used as grid fee adjustment for flexible tariffs
-    # that might provide prices untill midnight next day.
+    # this ensures enough values in prices list when used as grid fee adjustment for flexible tariffs
+    # that might provide prices until midnight next day.
     for i in range(36):
         for j in range(4):  # get prices for quarter hours
             time_slot = current_hour + datetime.timedelta(hours=i, minutes=j * 15)