Monthly yearly Pv yield

packages/helpermodules/measurement_logging/update_yields.py

@@ -0,0 +1,120 @@
+import json
+import logging
+from pathlib import Path
+from typing import Dict, List
+
+from control import data
+from control.bat_all import BatAll
+from helpermodules import timecheck
+from helpermodules.measurement_logging.process_log import get_totals
+from helpermodules.pub import Pub
+from control.bat import Bat
+from control.chargepoint.chargepoint import Chargepoint
+from control.counter import Counter
+from control.ev import Ev
+from control.pv import Pv
+
+log = logging.getLogger(__name__)
+
+
+def update_daily_yields(entries):
+    """ veröffentlicht die Tageserträge für Ladepunkte, Zähler, PV und Speicher.
+    """
+    totals = get_totals(entries)
+    [update_module_yields(type, totals) for type in ("bat", "counter", "cp", "pv")]
+    data.data.counter_all_data.data.set.daily_yield_home_consumption = totals["hc"]["all"]["energy_imported"]
+    Pub().pub("openWB/set/counter/set/daily_yield_home_consumption", totals["hc"]["all"]["energy_imported"])
+
+
+def update_module_yields(module: str, totals: Dict) -> None:
+    def update_imported_exported(daily_imported: float, daily_exported: float) -> None:
+        module_data.data.get.daily_imported = daily_imported
+        module_data.data.get.daily_exported = daily_exported
+        if module == "cp":
+            topic = "chargepoint"
+        else:
+            topic = module
+        if isinstance(module_data, (Ev, Chargepoint, Pv, Bat, Counter)):
+            Pub().pub(f"openWB/set/{topic}/{module_data.num}/get/daily_imported", daily_imported)
+            Pub().pub(f"openWB/set/{topic}/{module_data.num}/get/daily_exported", daily_exported)
+        elif not isinstance(module_data, BatAll):
+            # wird im changed_values_handler an den Broker gesendet
+            Pub().pub(f"openWB/set/{topic}/get/daily_imported", daily_imported)
+            Pub().pub(f"openWB/set/{topic}/get/daily_exported", daily_exported)
+
+    def update_exported(daily_exported: float) -> None:
+        module_data.data.get.daily_exported = daily_exported
+        if module in m:
+            Pub().pub(f"openWB/set/pv/{module_data.num}/get/daily_exported", daily_exported)
+        else:
+            Pub().pub("openWB/set/pv/get/daily_exported", daily_exported)
+
+    for m in totals[module]:
+        if m in getattr(data.data, f"{module}_data") or m == "all":
+            if m == "all":
+                module_data = getattr(data.data, f"{module}_all_data")
+            else:
+                module_data = getattr(data.data, f"{module}_data")[m]
+            if module == "pv":
+                update_exported(totals[module][m]["energy_exported"])
+            else:
+                update_imported_exported(totals[module][m]["energy_imported"], totals[module][m]["energy_exported"])
+        else:
+            log.info(f"Modul {m} wurde zwischenzeitlich gelöscht und wird daher nicht mehr aufgeführt.")
+
+
+def update_pv_monthly_yearly_yields():
+    """ veröffentlicht die monatlichen und jährlichen Erträge für PV
+    """
+    _update_pv_monthly_yields()
+    _update_pv_yearly_yields()
+
+
+def _update_pv_monthly_yields():
+    """ veröffentlicht die monatlichen Erträge für PV
+    """
+    with open(f"data/monthly_log/{timecheck.create_timestamp_YYYYMM()}.json", "r") as f:
+        monthly_log = json.load(f)
+    monthly_yield = data.data.pv_all_data.data.get.exported - monthly_log["entries"][0]["pv"]["all"]["exported"]
+    Pub().pub("openWB/set/pv/get/monthly_exported", monthly_yield)
+    for pv_module in data.data.pv_data.values():
+        for i in range(0, len(monthly_log["entries"])):
+            # erster Eintrag im Monat, in dem das PV-Modul existiert (falls ein Modul im laufenden Monat hinzugefügt
+            # wurde)
+            if monthly_log["entries"][i]["pv"].get(f"pv{pv_module.num}"):
+                monthly_yield = data.data.pv_data[f"pv{pv_module.num}"].data.get.exported - \
+                    monthly_log["entries"][i]["pv"][f"pv{pv_module.num}"]["exported"]
+                Pub().pub(f"openWB/set/pv/{pv_module.num}/get/monthly_exported", monthly_yield)
+                break
+
+
+def pub_yearly_module_yield(sorted_path_list: List[str], pv_module: Pv):
+    for path in sorted_path_list:
+        with open(path, "r") as f:
+            monthly_log = json.load(f)
+        for i in range(0, len(monthly_log["entries"])):
+            # erster Eintrag im Jahr, in dem das PV-Modul existiert (falls ein Modul im laufenden Jahr hinzugefügt
+            # wurde)
+            if monthly_log["entries"][i]["pv"].get(f"pv{pv_module.num}"):
+                yearly_yield = data.data.pv_data[f"pv{pv_module.num}"].data.get.exported - \
+                    monthly_log["entries"][i]["pv"][f"pv{pv_module.num}"]["exported"]
+                Pub().pub(f"openWB/set/pv/{pv_module.num}/get/yearly_exported", yearly_yield)
+                return
+
+
+def _update_pv_yearly_yields():
+    """ veröffentlicht die jährlichen Erträge für PV
+    """
+    path_list = list(Path(_get_parent_path()/"data"/"monthly_log").glob(f"{timecheck.create_timestamp_YYYY()}*"))
+    sorted_path_list = sorted([str(p) for p in path_list])
+    with open(sorted_path_list[0], "r") as f:
+        monthly_log = json.load(f)
+    yearly_yield = data.data.pv_all_data.data.get.exported - monthly_log["entries"][0]["pv"]["all"]["exported"]
+    Pub().pub("openWB/set/pv/get/yearly_exported", yearly_yield)
+    log.debug(f"sorted_path_list{sorted_path_list}")
+    for pv_module in data.data.pv_data.values():
+        pub_yearly_module_yield(sorted_path_list, pv_module)
+
+
+def _get_parent_path() -> Path:
+    return Path(__file__).resolve().parents[3]

packages/helpermodules/measurement_logging/update_daily_yields_test.py → packages/helpermodules/measurement_logging/update_yields_test.py

@@ -1,6 +1,6 @@
 import pytest
 
-from helpermodules.measurement_logging.update_daily_yields import update_module_yields
+from helpermodules.measurement_logging.update_yields import update_module_yields
 
 
 def test_update_module_yields(daily_log_totals, mock_pub):

packages/main.py

@@ -12,7 +12,7 @@
 from control.chargelog.chargelog import calculate_charge_cost
 
 from helpermodules.changed_values_handler import ChangedValuesHandler
-from helpermodules.measurement_logging.update_daily_yields import update_daily_yields
+from helpermodules.measurement_logging.update_yields import update_daily_yields, update_pv_monthly_yearly_yields
 from helpermodules.measurement_logging.write_log import LogType, save_log
 from modules import loadvars
 from modules import configuration
@@ -89,6 +89,7 @@ def handler5MinAlgorithm(self):
             changed_values_handler.store_initial_values()
             totals = save_log(LogType.DAILY)
             update_daily_yields(totals)
+            update_pv_monthly_yearly_yields()
             data.data.general_data.grid_protection()
             data.data.optional_data.et_get_prices()
             data.data.counter_all_data.validate_hierarchy()