From daffef4ac8c66568c250ba7f8dfc25a53ae52874 Mon Sep 17 00:00:00 2001 From: "pierre-francois.duc" Date: Tue, 27 Aug 2024 11:28:11 +0200 Subject: [PATCH 1/2] Suggestion 1: always add carrier as empty string if absent --- src/oemof/tabular/datapackage/reading.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/oemof/tabular/datapackage/reading.py b/src/oemof/tabular/datapackage/reading.py index 36fff0cb..1b836eeb 100644 --- a/src/oemof/tabular/datapackage/reading.py +++ b/src/oemof/tabular/datapackage/reading.py @@ -100,6 +100,9 @@ def read_facade( ) ) ) + # This is to avoid an error + if "carrier" not in facade: + facade["carrier"] = "" instance = create(mapping, facade, facade) facades[facade["name"]] = instance return instance From ffc9b42cae28208ec87746c5f8fbad6b9e9d00ed Mon Sep 17 00:00:00 2001 From: "pierre-francois.duc" Date: Tue, 27 Aug 2024 11:28:33 +0200 Subject: [PATCH 2/2] Suggestion 2: make carrier optional in all Facades --- src/oemof/tabular/facades/conversion.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/oemof/tabular/facades/conversion.py b/src/oemof/tabular/facades/conversion.py index 133e5560..bf142707 100644 --- a/src/oemof/tabular/facades/conversion.py +++ b/src/oemof/tabular/facades/conversion.py @@ -1,4 +1,5 @@ from dataclasses import field +from typing import Optional from oemof.solph._plumbing import sequence from oemof.solph.buses import Bus @@ -81,10 +82,10 @@ class Conversion(Converter, Facade): to_bus: Bus - carrier: str - tech: str + carrier: Optional[str] = None + capacity: float = None efficiency: float = 1