Skip to content

Commit

Permalink
Merge pull request #1546 from LKuemmel/fix
Browse files Browse the repository at this point in the history 
Improve error handling
  • Loading branch information
@LKuemmel
LKuemmel authored Apr 15, 2024
2 parents 3980025 + d5dadf1 commit cfc0248
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 68 deletions.
7 changes: 5 additions & 2 deletions packages/control/counter_all.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,8 +380,11 @@ def _get_list_of_elements_per_level(self, elements_per_level: List, child: Dict,
return elements_per_level

def validate_hierarchy(self):
self._delete_obsolete_entries()
self._add_missing_entries()
try:
self._delete_obsolete_entries()
self._add_missing_entries()
except Exception:
log.exception("Fehler bei der Validierung der Hierarchie")

def _delete_obsolete_entries(self):
def check_and_remove(name, type_name: ComponentType, data_structure):
Expand Down
92 changes: 52 additions & 40 deletions packages/helpermodules/measurement_logging/update_yields.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,33 @@
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"])
try:
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"])
except Exception:
log.exception("Fehler beim Veröffentlichen der Tageserträge.")


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)
try:
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)
except Exception:
log.exception(f"Fehler beim Veröffentlichen der Tageserträge für {module}")

def update_exported(daily_exported: float) -> None:
module_data.data.get.daily_exported = daily_exported
Expand Down Expand Up @@ -73,19 +79,22 @@ def update_pv_monthly_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
try:
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
except Exception:
log.exception("Fehler beim Veröffentlichen der monatlichen Erträge für PV")


def pub_yearly_module_yield(sorted_path_list: List[str], pv_module: Pv):
Expand All @@ -105,15 +114,18 @@ def pub_yearly_module_yield(sorted_path_list: List[str], pv_module: Pv):
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)
try:
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)
except Exception:
log.exception("Fehler beim Veröffentlichen der jährlichen Erträge für PV")


def _get_parent_path() -> Path:
Expand Down
56 changes: 30 additions & 26 deletions packages/helpermodules/measurement_logging/write_log.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,37 +127,41 @@ def save_log(log_type: LogType):
folder: str
gibt an, ob ein Tages-oder Monats-Log-Eintrag erstellt werden soll.
"""
parent_file = Path(__file__).resolve().parents[3] / "data" / \
("daily_log" if log_type == LogType.DAILY else "monthly_log")
parent_file.mkdir(mode=0o755, parents=True, exist_ok=True)
if log_type == LogType.DAILY:
file_name = timecheck.create_timestamp_YYYYMMDD()
else:
file_name = timecheck.create_timestamp_YYYYMM()
filepath = str(parent_file / f"{file_name}.json")

try:
with open(filepath, "r") as jsonFile:
content = json.load(jsonFile)
except FileNotFoundError:
with open(filepath, "w") as jsonFile:
json.dump({"entries": [], "names": {}}, jsonFile)
with open(filepath, "r") as jsonFile:
content = json.load(jsonFile)
parent_file = Path(__file__).resolve().parents[3] / "data" / \
("daily_log" if log_type == LogType.DAILY else "monthly_log")
parent_file.mkdir(mode=0o755, parents=True, exist_ok=True)
if log_type == LogType.DAILY:
file_name = timecheck.create_timestamp_YYYYMMDD()
else:
file_name = timecheck.create_timestamp_YYYYMM()
filepath = str(parent_file / f"{file_name}.json")

try:
with open(filepath, "r") as jsonFile:
content = json.load(jsonFile)
except FileNotFoundError:
with open(filepath, "w") as jsonFile:
json.dump({"entries": [], "names": {}}, jsonFile)
with open(filepath, "r") as jsonFile:
content = json.load(jsonFile)

previous_entry = get_previous_entry(parent_file, content)
previous_entry = get_previous_entry(parent_file, content)

sh_log_data = LegacySmartHomeLogData()
new_entry = create_entry(log_type, sh_log_data, previous_entry)
sh_log_data = LegacySmartHomeLogData()
new_entry = create_entry(log_type, sh_log_data, previous_entry)

# json-Objekt in Datei einfügen
# json-Objekt in Datei einfügen

entries = content["entries"]
entries.append(new_entry)
content["names"] = get_names(content["entries"][-1], sh_log_data.sh_names)
with open(filepath, "w") as jsonFile:
json.dump(content, jsonFile)
return content["entries"]
entries = content["entries"]
entries.append(new_entry)
content["names"] = get_names(content["entries"][-1], sh_log_data.sh_names)
# with open(filepath, "w") as jsonFile:
# json.dump(content, jsonFile)
return content["entries"]
except Exception:
log.exception("Fehler beim Speichern des Log-Eintrags")
return None


def get_previous_entry(parent_file: Path, content: Dict) -> Optional[Dict]:
Expand Down

0 comments on commit cfc0248

Please sign in to comment.