thrid

Author: Hellowlol

custom_components/nordpool/aio_price.py

@@ -100,7 +100,7 @@ def __init__(self, currency, client, timeezone=None):
             "AggregatePrices",
             "AggregatePrices",
             "AggregatePrices",
-            "GetAnnuals",
+            "AggregatePrices/GetAnnuals",
         )
         self.API_URL = "https://dataportal-api.nordpoolgroup.com/api/%s"
         self.currency = currency
@@ -142,7 +142,7 @@ def _parse_json(self, data, areas=None, data_type=None):
             areas = list(areas)
 
         # Ripped from Kipe's nordpool
-        elif data_type == self.DAILY:
+        if data_type == self.DAILY:
             data_source = ("multiAreaDailyAggregates", "averagePerArea")
         elif data_type == self.WEEKLY:
             data_source = ("multiAreaWeeklyAggregates", "averagePerArea")
@@ -157,9 +157,12 @@ def _parse_json(self, data, areas=None, data_type=None):
             raise Exception(f"Invalid response from Nordpool API: {data}")
 
         # Update currency from data
-        currency = data["currency"]
+        # currency it not avaiable in yearly... We just have to trust that the one
+        # we set in the class is correct.
+        currency = data.get("currency", self.currency)
 
         # Ensure that the provided currency match the requested one
+
         if currency != self.currency:
             raise CurrencyMismatch
 
@@ -222,6 +225,9 @@ async def _fetch_json(self, data_type, end_date=None, areas=None):
         if not isinstance(end_date, date) and not isinstance(end_date, datetime):
             end_date = parse_dt(end_date)
 
+        if not isinstance(areas, list) and areas is not None:
+            areas = [i.strip() for i in areas.split(",")]
+
         kws = {
             "currency": self.currency,
             "market": "DayAhead",
@@ -237,9 +243,9 @@ async def _fetch_json(self, data_type, end_date=None, areas=None):
 
     # Add more exceptions as we find them. KeyError is raised when the api return
     # junk due to currency not being available in the data.
-    @backoff.on_exception(
-        backoff.expo, (aiohttp.ClientError, KeyError), logger=_LOGGER, max_value=20
-    )
+    # @backoff.on_exception(
+    #    backoff.expo, (aiohttp.ClientError, KeyError), logger=_LOGGER, max_value=20
+    # )
     async def fetch(self, data_type, end_date=None, areas=None):
         """
         Fetch data from API.
@@ -268,12 +274,16 @@ async def fetch(self, data_type, end_date=None, areas=None):
         today = datetime.now()
         tomorrow = datetime.now() + timedelta(days=1)
 
-        jobs = [
-            self._fetch_json(data_type, yesterday, areas),
-            self._fetch_json(data_type, today, areas),
-            self._fetch_json(data_type, tomorrow, areas),
-        ]
-        print(jobs)
+        if data_type == self.HOURLY:
+            jobs = [
+                self._fetch_json(data_type, yesterday, areas),
+                self._fetch_json(data_type, today, areas),
+                self._fetch_json(data_type, tomorrow, areas),
+            ]
+        else:
+            # This is really not today but a year..
+            # All except from hourly returns the raw values
+            return await self._fetch_json(data_type, today, areas)
 
         res = await asyncio.gather(*jobs)
         raw = [

custom_components/nordpool/services.py

@@ -7,17 +7,32 @@
 from homeassistant.core import HomeAssistant, ServiceCall, SupportsResponse
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv
-from .const import _REGIONS
+from .const import _REGIONS, DEFAULT_TEMPLATE
 
 
 _LOGGER = logging.getLogger(__name__)
 
 
+def check(values):
+    return any([i for i in values if i in list(_REGIONS.keys())])
+
+
+def check2(value):
+    def validator(value):
+        c = any([i for i in value if i in list(_REGIONS.keys())])
+        if c is not True:
+            vol.Invalid("ERRRR")
+        print(value)
+        return value
+
+    return validator
+
+
 HOURLY_SCHEMA = vol.Schema(
     {
         vol.Required("currency"): str,
         vol.Required("date"): cv.date,
-        vol.Required("area"): vol.In(list(_REGIONS.keys())),
+        vol.Required("area"): check2(cv.ensure_list),
     }
 )
 
@@ -26,7 +41,8 @@
     {
         vol.Required("currency"): str,
         vol.Required("year"): cv.matches_regex(r"^[1|2]\d{3}$"),
-        vol.Required("area"): vol.ensure_list,
+        vol.Required("area"): check2(cv.ensure_list),
+        vol.Optional("template"): str,
     }
 )
 
@@ -39,25 +55,40 @@ async def async_setup_services(hass: HomeAssistant):
 
     async def hourly(service_call: ServiceCall) -> Any:
         sc = service_call.data
+        _LOGGER.debug("called hourly with %r", sc)
 
         return await AioPrices(sc["currency"], client).hourly(
             areas=sc["area"], end_date=sc["date"]
         )
 
     async def yearly(service_call: ServiceCall):
         sc = service_call.data
-        return await AioPrices(sc["currency"], client).yearly(
+        _LOGGER.debug("called hourly with %r", sc)
+
+        value = await AioPrices(sc["currency"], client).yearly(
             areas=sc["area"], end_date=sc["year"]
         )
+        print(value)
+
+        t = cv.template(sc["template"]).async_render_with_possible_json_value(
+            value, parse_result=True
+        )
+        print(t)
+
+        return ""
 
     async def monthly(service_call: ServiceCall):
         sc = service_call.data
+        _LOGGER.debug("called monthly with %r", sc)
+
         return await AioPrices(sc["currency"], client).monthly(
             areas=sc["area"], end_date=sc["year"]
         )
 
     async def daily(service_call: ServiceCall):
         sc = service_call.data
+        _LOGGER.debug("called daily with %r", sc)
+
         return await AioPrices(sc["currency"], client).daily(
             areas=sc["area"], end_date=sc["year"]
         )