Switch generation back to new API

JRascagneres · Aug 3, 2023 · d8659b8 · d8659b8
1 parent abb034c
commit d8659b8
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/custom_components/national_grid/coordinators/national_grid.py b/custom_components/national_grid/coordinators/national_grid.py
@@ -351,28 +351,28 @@ def get_generation_old(
 
 
 def get_generation_combined(api_key: str, now_utc_full: datetime, today_utc: str):
-    # grid_generation = get_generation(
-    #     now_utc_full,
-    # )
+    grid_generation = get_generation(
+        now_utc_full,
+    )
 
     now_utc_formatted_datetime = now_utc_full.strftime("%Y-%m-%d %H:%M:%S")
     two_hours_ago_utc_formatted_datetime = (now_utc_full - timedelta(hours=2)).strftime(
         "%Y-%m-%d %H:%M:%S"
     )
 
-    grid_generation = get_generation_old(
-        api_key, two_hours_ago_utc_formatted_datetime, now_utc_formatted_datetime
-    )
+    # grid_generation = get_generation_old(
+    #     api_key, two_hours_ago_utc_formatted_datetime, now_utc_formatted_datetime
+    # )
 
     national_grid_data = get_national_grid_data(today_utc, now_utc_full)
     if national_grid_data is None:
         return UnexpectedDataError("National Grid ESO data None")
 
     grid_generation["wind_mwh"] += int(national_grid_data["EMBEDDED_WIND_GENERATION"])
     grid_generation["solar_mwh"] = int(national_grid_data["EMBEDDED_SOLAR_GENERATION"])
-    grid_generation["pumped_storage_mwh"] += -int(
-        national_grid_data["PUMP_STORAGE_PUMPING"]
-    )
+    # grid_generation["pumped_storage_mwh"] += -int(
+    #     national_grid_data["PUMP_STORAGE_PUMPING"]
+    # )
 
     return grid_generation