diff --git a/data/config/mosquitto/public/default-dynamic-security.json b/data/config/mosquitto/public/default-dynamic-security.json index 372d91a918..dd3bd51a14 100644 --- a/data/config/mosquitto/public/default-dynamic-security.json +++ b/data/config/mosquitto/public/default-dynamic-security.json @@ -291,6 +291,12 @@ "topic": "openWB/vehicle/+/name", "priority": 0, "allow": true + }, + { + "acltype": "publishClientReceive", + "topic": "openWB/vehicle/+/color", + "priority": 0, + "allow": true } ] }, @@ -1774,6 +1780,12 @@ "priority": 0, "allow": true }, + { + "acltype": "publishClientSend", + "topic": "openWB/set/vehicle/+/color", + "priority": 0, + "allow": true + }, { "acltype": "publishClientSend", "topic": "openWB/set/vehicle/+/charge_template", @@ -1852,6 +1864,12 @@ "priority": 0, "allow": true }, + { + "acltype": "publishClientReceive", + "topic": "openWB/vehicle/+/color", + "priority": 0, + "allow": true + }, { "acltype": "publishClientReceive", "topic": "openWB/vehicle/+/charge_template", diff --git a/docs/samples/sample_modbus/sample_modbus/config.py b/docs/samples/sample_modbus/sample_modbus/config.py index 0e3640f49e..d3a811bdb6 100644 --- a/docs/samples/sample_modbus/sample_modbus/config.py +++ b/docs/samples/sample_modbus/sample_modbus/config.py @@ -38,8 +38,9 @@ def __init__(self, name: str = "Sample Speicher", type: str = "bat", id: int = 0, - configuration: SampleBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SampleBatConfiguration()) + configuration: SampleBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SampleBatConfiguration(), **kwargs) @auto_str @@ -54,8 +55,9 @@ def __init__(self, name: str = "Sample Zähler", type: str = "counter", id: int = 0, - configuration: SampleCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SampleCounterConfiguration()) + configuration: SampleCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SampleCounterConfiguration(), **kwargs) @auto_str @@ -70,5 +72,6 @@ def __init__(self, name: str = "Sample Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SampleInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SampleInverterConfiguration()) + configuration: SampleInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SampleInverterConfiguration(), **kwargs) diff --git a/docs/samples/sample_request_by_component/sample_request_by_component/config.py b/docs/samples/sample_request_by_component/sample_request_by_component/config.py index 0a9b5d4328..2806ee4e46 100644 --- a/docs/samples/sample_request_by_component/sample_request_by_component/config.py +++ b/docs/samples/sample_request_by_component/sample_request_by_component/config.py @@ -37,8 +37,9 @@ def __init__(self, name: str = "Sample Speicher", type: str = "bat", id: int = 0, - configuration: SampleBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SampleBatConfiguration()) + configuration: SampleBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SampleBatConfiguration(), **kwargs) @auto_str @@ -53,8 +54,9 @@ def __init__(self, name: str = "Sample Zähler", type: str = "counter", id: int = 0, - configuration: SampleCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SampleCounterConfiguration()) + configuration: SampleCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SampleCounterConfiguration(), **kwargs) @auto_str @@ -69,5 +71,6 @@ def __init__(self, name: str = "Sample Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SampleInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SampleInverterConfiguration()) + configuration: SampleInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SampleInverterConfiguration(), **kwargs) diff --git a/docs/samples/sample_request_by_device/sample_request_by_device/config.py b/docs/samples/sample_request_by_device/sample_request_by_device/config.py index 0a9b5d4328..2806ee4e46 100644 --- a/docs/samples/sample_request_by_device/sample_request_by_device/config.py +++ b/docs/samples/sample_request_by_device/sample_request_by_device/config.py @@ -37,8 +37,9 @@ def __init__(self, name: str = "Sample Speicher", type: str = "bat", id: int = 0, - configuration: SampleBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SampleBatConfiguration()) + configuration: SampleBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SampleBatConfiguration(), **kwargs) @auto_str @@ -53,8 +54,9 @@ def __init__(self, name: str = "Sample Zähler", type: str = "counter", id: int = 0, - configuration: SampleCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SampleCounterConfiguration()) + configuration: SampleCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SampleCounterConfiguration(), **kwargs) @auto_str @@ -69,5 +71,6 @@ def __init__(self, name: str = "Sample Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SampleInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SampleInverterConfiguration()) + configuration: SampleInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SampleInverterConfiguration(), **kwargs) diff --git a/packages/control/chargepoint/chargepoint.py b/packages/control/chargepoint/chargepoint.py index 17f83f5bac..e90875fdcc 100644 --- a/packages/control/chargepoint/chargepoint.py +++ b/packages/control/chargepoint/chargepoint.py @@ -35,6 +35,7 @@ def get_chargepoint_config_default() -> dict: "name": "neuer Ladepunkt", "type": None, "ev": 0, + "color": "#007bff", "template": 0, "connected_phases": 3, "phase_1": 1, diff --git a/packages/control/chargepoint/chargepoint_data.py b/packages/control/chargepoint/chargepoint_data.py index f47e698735..2f25be1451 100644 --- a/packages/control/chargepoint/chargepoint_data.py +++ b/packages/control/chargepoint/chargepoint_data.py @@ -179,6 +179,7 @@ class Config: configuration: Dict = field(default_factory=empty_dict_factory) ev: int = 0 name: str = "neuer Ladepunkt" + color: str = "#007bff" type: Optional[str] = None template: int = 0 connected_phases: int = 3 diff --git a/packages/control/ev/ev.py b/packages/control/ev/ev.py index fa5071806b..2f7965dc96 100644 --- a/packages/control/ev/ev.py +++ b/packages/control/ev/ev.py @@ -34,6 +34,7 @@ def get_vehicle_default() -> dict: "charge_template": 0, "ev_template": 0, "name": "Fahrzeug", + "color": "#17a2b8", "info": { "manufacturer": None, "model": None, @@ -78,6 +79,7 @@ class EvData: charge_template: int = field(default=0, metadata={"topic": "charge_template"}) ev_template: int = field(default=0, metadata={"topic": "ev_template"}) name: str = field(default="neues Fahrzeug", metadata={"topic": "name"}) + color: str = field(default="#17a2b8", metadata={"topic": "color"}) tag_id: List[str] = field(default_factory=empty_list_factory, metadata={ "topic": "tag_id"}) get: Get = field(default_factory=get_factory) diff --git a/packages/helpermodules/measurement_logging/write_log.py b/packages/helpermodules/measurement_logging/write_log.py index 726ad8cdf0..194c1dcdbc 100644 --- a/packages/helpermodules/measurement_logging/write_log.py +++ b/packages/helpermodules/measurement_logging/write_log.py @@ -14,83 +14,86 @@ from helpermodules import timecheck from helpermodules.utils.json_file_handler import write_and_check from helpermodules.utils.topic_parser import decode_payload, get_index -from modules.common.utils.component_parser import get_component_name_by_id +from modules.common.utils.component_parser import get_component_name_by_id, get_component_color_by_id log = logging.getLogger(__name__) # erstellt für jeden Tag eine Datei, die die Daten für den Langzeitgraph enthält. # Dazu werden alle 5 Min folgende Daten als json-Liste gespeichert: -# {"entries": [ -# { -# "timestamp": int, -# "date": str, -# "prices": { -# "grid": Preis für Netzbezug, -# "pv": Preis für PV-Strom, -# "bat": Preis für Speicherstrom -# } -# "cp": { -# "cp1": { -# "imported": Zählerstand in Wh, -# "exported": Zählerstand in Wh -# } -# ... (dynamisch, je nach konfigurierter Anzahl) -# "all": { -# "imported": Zählerstand in Wh, -# "exported": Zählerstand in Wh -# } -# } -# "ev": { -# "ev1": { -# "soc": int in % +# { +# "entries": [ +# { +# "timestamp": int, +# "date": str, +# "prices": { +# "grid": Preis für Netzbezug, +# "pv": Preis für PV-Strom, +# "bat": Preis für Speicherstrom # } -# ... (dynamisch, je nach konfigurierter Anzahl) -# } -# "counter": { -# "counter0": { -# "grid": bool, -# "imported": Wh, -# "exported": Wh +# "cp": { +# "cp1": { +# "imported": Zählerstand in Wh, +# "exported": Zählerstand in Wh +# } +# ... (dynamisch, je nach konfigurierter Anzahl) +# "all": { +# "imported": Zählerstand in Wh, +# "exported": Zählerstand in Wh +# } # } -# ... (dynamisch, je nach konfigurierter Anzahl) -# } -# "pv": { -# "all": { -# "exported": Wh +# "ev": { +# "ev1": { +# "soc": int in % +# } +# ... (dynamisch, je nach konfigurierter Anzahl) # } -# "pv0": { -# "exported": Wh +# "counter": { +# "counter0": { +# "grid": bool, +# "imported": Wh, +# "exported": Wh +# } +# ... (dynamisch, je nach konfigurierter Anzahl) # } -# ... (dynamisch, je nach konfigurierter Anzahl) -# } -# "bat": { -# "all": { -# "imported": Wh, -# "exported": Wh, -# "soc": int in % +# "pv": { +# "all": { +# "exported": Wh +# } +# "pv0": { +# "exported": Wh +# } +# ... (dynamisch, je nach konfigurierter Anzahl) # } -# "bat0": { -# "imported": Wh, -# "exported": Wh, -# "soc": int in % +# "bat": { +# "all": { +# "imported": Wh, +# "exported": Wh, +# "soc": int in % +# } +# "bat0": { +# "imported": Wh, +# "exported": Wh, +# "soc": int in % +# } +# ... (dynamisch, je nach konfigurierter Anzahl) # } -# ... (dynamisch, je nach konfigurierter Anzahl) -# } -# "sh": { -# "sh1": { -# "exported": Wh, -# "imported": Wh, -# wenn konfiguriert: -# "temp1": int in °C, -# "temp2": int in °C, -# "temp3": int in °C +# "sh": { +# "sh1": { +# "exported": Wh, +# "imported": Wh, +# wenn konfiguriert: +# "temp1": int in °C, +# "temp2": int in °C, +# "temp3": int in °C +# }, +# ... (dynamisch, je nach Anzahl konfigurierter Geräte) # }, -# ... (dynamisch, je nach Anzahl konfigurierter Geräte) -# }, -# "hc": {"all": {"imported": Wh # Hausverbrauch}} -# }], -# "names": "names": {"sh1": "", "cp1": "", "counter2": "", "pv3": ""} -# } +# "hc": {"all": {"imported": Wh # Hausverbrauch}} +# } +# ], +# "names": {"cp1": "", "counter2": "", "pv3": ""}, +# "colors": {"cp1": "", "counter2": "", "pv3": ""}, +# } class LogType(Enum): @@ -165,6 +168,7 @@ def save_log(log_type: LogType): entries = content["entries"] entries.append(new_entry) content["names"] = get_names(content["entries"][-1], sh_log_data.sh_names) + content["colors"] = get_colors(content["entries"][-1]) write_and_check(filepath, content) return content["entries"] except Exception: @@ -371,3 +375,30 @@ def get_names(elements: Dict, sh_names: Dict, valid_names: Optional[Dict] = None except (ValueError, KeyError, AttributeError): names.update({entry: entry}) return names + + +def get_colors(elements: Dict) -> Dict: + """ Ermittelt die Farben der Fahrzeuge, Ladepunkte und Komponenten, welche + in elements vorhanden sind und gibt diese als Dictionary zurück. + Parameter + --------- + elements: dict + Dictionary, das die Messwerte enthält. + """ + colors = {} + for group in elements.items(): + if group[0] not in ("ev", "cp", "counter", "pv", "bat"): + continue + for entry in group[1]: + if "all" != entry: + try: + if "ev" in entry: + colors.update({entry: data.data.ev_data[entry].data.color}) + elif "cp" in entry: + colors.update({entry: data.data.cp_data[entry].data.config.color}) + else: + id = entry.strip(string.ascii_letters) + colors.update({entry: get_component_color_by_id(int(id))}) + except (ValueError, KeyError, AttributeError): + colors.update({entry: "#000000"}) + return colors diff --git a/packages/helpermodules/setdata.py b/packages/helpermodules/setdata.py index f2ff2bfc23..d168467c9d 100644 --- a/packages/helpermodules/setdata.py +++ b/packages/helpermodules/setdata.py @@ -365,6 +365,8 @@ def process_vehicle_topic(self, msg: mqtt.MQTTMessage): try: if "/name" in msg.topic: self._validate_value(msg, str) + elif "/color" in msg.topic: + self._validate_value(msg, str) elif "/info" in msg.topic: self._validate_value(msg, "json") elif "openWB/set/vehicle/set/vehicle_update_completed" in msg.topic: diff --git a/packages/helpermodules/update_config.py b/packages/helpermodules/update_config.py index 7ebe48c613..c4e930e543 100644 --- a/packages/helpermodules/update_config.py +++ b/packages/helpermodules/update_config.py @@ -1,3 +1,4 @@ +from concurrent.futures import ProcessPoolExecutor import copy from dataclasses import asdict import datetime @@ -57,7 +58,7 @@ class UpdateConfig: - DATASTORE_VERSION = 122 + DATASTORE_VERSION = 123 valid_topic = [ "^openWB/bat/config/bat_control_permitted$", @@ -385,6 +386,7 @@ class UpdateConfig: "^openWB/vehicle/[0-9]+/charge_template$", "^openWB/vehicle/[0-9]+/ev_template$", "^openWB/vehicle/[0-9]+/name$", + "^openWB/vehicle/[0-9]+/color$", "^openWB/vehicle/[0-9]+/info$", "^openWB/vehicle/[0-9]+/soc_module/calculated_soc_state$", "^openWB/vehicle/[0-9]+/soc_module/config$", @@ -586,6 +588,7 @@ class UpdateConfig: ("openWB/counter/config/consider_less_charging", counter_all.Config().consider_less_charging), ("openWB/counter/config/home_consumption_source_id", counter_all.Config().home_consumption_source_id), ("openWB/vehicle/0/name", "Standard-Fahrzeug"), + ("openWB/vehicle/0/color", "#17a2b8"), ("openWB/vehicle/0/info", {"manufacturer": None, "model": None}), ("openWB/vehicle/0/charge_template", ev.Ev(0).charge_template.data.id), ("openWB/vehicle/0/soc_module/config", NO_MODULE), @@ -3114,3 +3117,100 @@ def upgrade_datastore_122(self) -> None: except Exception: log.exception(f"Logdatei '{path}' konnte nicht konvertiert werden.") self._append_datastore_version(122) + + def upgrade_datastore_123(self) -> None: + DEFAULT_COLORS = { + "CHARGEPOINT": "#007bff", + "VEHICLE": "#17a2b8", + "INVERTER": "#28a745", + "COUNTER": "#dc3545", + "BATTERY": "#ffc107", + "UNKNOWN": "#000000" + } + + def _add_colors_to_log(file): + colors = {} + try: + with open(file, "r+") as jsonFile: + content_raw = jsonFile.read() + try: + content = json.loads(content_raw) + except json.JSONDecodeError: + log.warning("Skipping invalid log file (JSON decode failed): %s", file) + return + + if "colors" in content: + return + + names = content.get("names", {}) + if not isinstance(names, dict): + log.warning("Skipping log file without valid 'names' mapping: %s", file) + return + + for key in names.keys(): + if "bat" in key: + colors[key] = DEFAULT_COLORS["BATTERY"] + elif "counter" in key: + colors[key] = DEFAULT_COLORS["COUNTER"] + elif "cp" in key: + colors[key] = DEFAULT_COLORS["CHARGEPOINT"] + elif "ev" in key: + colors[key] = DEFAULT_COLORS["VEHICLE"] + elif "inverter" in key: + colors[key] = DEFAULT_COLORS["INVERTER"] + else: + colors[key] = DEFAULT_COLORS["UNKNOWN"] + + content["colors"] = colors + jsonFile.seek(0) + jsonFile.write(json.dumps(content)) + jsonFile.truncate() + except OSError: + # If the file cannot be opened or written, skip it without aborting the upgrade. + log.warning("Skipping log file due to I/O error: %s", file) + + def add_colors_to_logs(): + files = glob.glob(str(self.base_path / "data" / "daily_log") + "/*") + files.extend(glob.glob(str(self.base_path / "data" / "monthly_log") + "/*")) + files.sort() + with ProcessPoolExecutor() as executor: + executor.map(_add_colors_to_log, files) + + def upgrade(topic: str, payload) -> Optional[dict]: + # add vehicle color to vehicle topics + if re.search("^openWB/vehicle/[0-9]+/name$", topic) is not None: + log.debug(f"Received vehicle name topic '{topic}'") + vehicle_color_topic = topic.replace("/name", "/color") + log.debug(f"Checking for vehicle color topic '{vehicle_color_topic}'") + if vehicle_color_topic not in self.all_received_topics: + log.debug(f"Adding vehicle color topic '{vehicle_color_topic}'" + f" with value: '{DEFAULT_COLORS['VEHICLE']}'") + return {vehicle_color_topic: DEFAULT_COLORS['VEHICLE']} + # add property "color" to charge points + if re.search("^openWB/chargepoint/[0-9]+/config$", topic) is not None: + config = decode_payload(payload) + log.debug(f"Received charge point config topic '{topic}' with payload: {payload}") + if "color" not in config: + config.update({"color": DEFAULT_COLORS['CHARGEPOINT']}) + log.debug(f"Added color to charge point config: {config}") + return {topic: config} + # add property "color" to components + if re.search("^openWB/system/device/[0-9]+/component/[0-9]+/config$", topic) is not None: + config = decode_payload(payload) + log.debug(f"Received component config topic '{topic}' with payload: {payload}") + if "color" not in config: + component_type = (config.get("type") or "").lower() + if "counter" in component_type: + config.update({"color": DEFAULT_COLORS['COUNTER']}) + elif "bat" in component_type: + config.update({"color": DEFAULT_COLORS['BATTERY']}) + elif "inverter" in component_type: + config.update({"color": DEFAULT_COLORS['INVERTER']}) + else: + log.warning(f"Unknown component type '{config.get('type')}' for topic '{topic}'.") + config.update({"color": DEFAULT_COLORS['UNKNOWN']}) + log.debug(f"Updated component config with color: {config}") + return {topic: config} + self._loop_all_received_topics(upgrade) + add_colors_to_logs() + self._append_datastore_version(123) diff --git a/packages/modules/common/component_setup.py b/packages/modules/common/component_setup.py index c4eaffe1a1..1604b6c9b8 100644 --- a/packages/modules/common/component_setup.py +++ b/packages/modules/common/component_setup.py @@ -1,12 +1,29 @@ -from typing import Generic, TypeVar +from typing import Generic, Optional, TypeVar +import logging T = TypeVar("T") +log = logging.getLogger(__name__) + class ComponentSetup(Generic[T]): - def __init__(self, name: str, type: str, id: int, configuration: T) -> None: + def __init__(self, name: str, type: str, id: int, configuration: T, color: Optional[str] = None) -> None: self.name = name self.info = {"manufacturer": None, "model": None} self.type = type self.id = id self.configuration = configuration + if color: + self.color = color + log.error(f"Color specified for component '{self.name}' of type '{self.type}': {color}") + else: + log.error(f"No color specified for component '{self.name}' of type '{self.type}'. Using default color.") + if "counter" in type.lower(): + self.color = "#dc3545" + elif "bat" in type.lower(): + self.color = "#ffc107" + elif "inverter" in type.lower(): + self.color = "#28a745" + else: + # Default color for other types + self.color = "#000000" diff --git a/packages/modules/common/utils/component_parser.py b/packages/modules/common/utils/component_parser.py index 5dcbb226ac..4b3a27be95 100644 --- a/packages/modules/common/utils/component_parser.py +++ b/packages/modules/common/utils/component_parser.py @@ -18,6 +18,16 @@ def get_component_name_by_id(id: int): raise ValueError(f"Element {id} konnte keinem Gerät zugeordnet werden.") +def get_component_color_by_id(id: int): + for item in data.data.system_data.values(): + if isinstance(item, AbstractDevice): + for comp in item.components.values(): + if comp.component_config.id == id: + return comp.component_config.color + else: + raise ValueError(f"Element {id} konnte keinem Gerät zugeordnet werden.") + + def get_io_name_by_id(id: int): for item in data.data.system_data.values(): if isinstance(item, AbstractIoDevice): diff --git a/packages/modules/devices/algodue/algodue/config.py b/packages/modules/devices/algodue/algodue/config.py index d4717dcce0..3823aca23b 100644 --- a/packages/modules/devices/algodue/algodue/config.py +++ b/packages/modules/devices/algodue/algodue/config.py @@ -37,8 +37,9 @@ def __init__(self, name: str = "Algodue Zähler", type: str = "counter", id: int = 0, - configuration: AlgodueCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or AlgodueCounterConfiguration()) + configuration: AlgodueCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or AlgodueCounterConfiguration(), **kwargs) @auto_str @@ -53,8 +54,9 @@ def __init__(self, name: str = "Algodue Wechselrichterzähler", type: str = "inverter", id: int = 0, - configuration: AlgodueInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or AlgodueInverterConfiguration()) + configuration: AlgodueInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or AlgodueInverterConfiguration(), **kwargs) @auto_str @@ -69,5 +71,6 @@ def __init__(self, name: str = "Algodue Speicherzähler", type: str = "bat", id: int = 0, - configuration: AlgodueBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or AlgodueBatConfiguration()) + configuration: AlgodueBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or AlgodueBatConfiguration(), **kwargs) diff --git a/packages/modules/devices/alpha_ess/alpha_ess/config.py b/packages/modules/devices/alpha_ess/alpha_ess/config.py index 7183698ec0..0d7a58d9d4 100644 --- a/packages/modules/devices/alpha_ess/alpha_ess/config.py +++ b/packages/modules/devices/alpha_ess/alpha_ess/config.py @@ -39,8 +39,9 @@ def __init__(self, name: str = "Alpha ESS Speicher", type: str = "bat", id: int = 0, - configuration: AlphaEssBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or AlphaEssBatConfiguration()) + configuration: AlphaEssBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or AlphaEssBatConfiguration(), **kwargs) class AlphaEssCounterConfiguration: @@ -53,8 +54,9 @@ def __init__(self, name: str = "Alpha ESS Zähler", type: str = "counter", id: int = 0, - configuration: AlphaEssCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or AlphaEssCounterConfiguration()) + configuration: AlphaEssCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or AlphaEssCounterConfiguration(), **kwargs) class AlphaEssInverterConfiguration: @@ -67,5 +69,6 @@ def __init__(self, name: str = "Alpha ESS Wechselrichter", type: str = "inverter", id: int = 0, - configuration: AlphaEssInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or AlphaEssInverterConfiguration()) + configuration: AlphaEssInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or AlphaEssInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/ampere/ampere/config.py b/packages/modules/devices/ampere/ampere/config.py index d523d160ff..d47fc54efd 100644 --- a/packages/modules/devices/ampere/ampere/config.py +++ b/packages/modules/devices/ampere/ampere/config.py @@ -34,8 +34,9 @@ def __init__(self, name: str = "Ampere Speicher", type: str = "bat", id: int = 0, - configuration: AmpereBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or AmpereBatConfiguration()) + configuration: AmpereBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or AmpereBatConfiguration(), **kwargs) class AmpereCounterConfiguration: @@ -48,8 +49,9 @@ def __init__(self, name: str = "Ampere Pro Zähler", type: str = "counter", id: int = 0, - configuration: AmpereCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or AmpereCounterConfiguration()) + configuration: AmpereCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or AmpereCounterConfiguration(), **kwargs) class AmpereInverterConfiguration: @@ -62,5 +64,6 @@ def __init__(self, name: str = "Ampere Pro Wechselrichter", type: str = "inverter", id: int = 0, - configuration: AmpereInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or AmpereInverterConfiguration()) + configuration: AmpereInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or AmpereInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/avm/avm/config.py b/packages/modules/devices/avm/avm/config.py index 72cbda823e..e9057fcb2f 100644 --- a/packages/modules/devices/avm/avm/config.py +++ b/packages/modules/devices/avm/avm/config.py @@ -46,5 +46,6 @@ def __init__(self, name: str = "Avm Zähler", type: str = "counter", id: int = 0, - configuration: AvmCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or AvmCounterConfiguration()) + configuration: AvmCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or AvmCounterConfiguration(), **kwargs) diff --git a/packages/modules/devices/azzurro_zcs/azzurro_zcs/config.py b/packages/modules/devices/azzurro_zcs/azzurro_zcs/config.py index f81341f498..80186804f4 100644 --- a/packages/modules/devices/azzurro_zcs/azzurro_zcs/config.py +++ b/packages/modules/devices/azzurro_zcs/azzurro_zcs/config.py @@ -34,8 +34,9 @@ def __init__(self, name: str = "ZCS Speicher", type: str = "bat", id: int = 0, - configuration: ZCSBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or ZCSBatConfiguration()) + configuration: ZCSBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or ZCSBatConfiguration(), **kwargs) class ZCSCounterConfiguration: @@ -48,8 +49,9 @@ def __init__(self, name: str = "ZCS Zähler", type: str = "counter", id: int = 0, - configuration: ZCSCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or ZCSCounterConfiguration()) + configuration: ZCSCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or ZCSCounterConfiguration(), **kwargs) class ZCSInverterConfiguration: @@ -62,5 +64,6 @@ def __init__(self, name: str = "ZCS Wechselrichter", type: str = "inverter", id: int = 0, - configuration: ZCSInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or ZCSInverterConfiguration()) + configuration: ZCSInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or ZCSInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/azzurro_zcs/azzurro_zcs_3p/config.py b/packages/modules/devices/azzurro_zcs/azzurro_zcs_3p/config.py index b05c3b6ac0..2ebc862783 100644 --- a/packages/modules/devices/azzurro_zcs/azzurro_zcs_3p/config.py +++ b/packages/modules/devices/azzurro_zcs/azzurro_zcs_3p/config.py @@ -34,5 +34,6 @@ def __init__(self, name: str = "ZCS Azzurro Wechselrichter", type: str = "pv_inverter", id: int = 0, - configuration: ZCSPvInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or ZCSPvInverterConfiguration()) + configuration: ZCSPvInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or ZCSPvInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/batterx/batterx/config.py b/packages/modules/devices/batterx/batterx/config.py index b2f59f4b25..b4d87e93de 100644 --- a/packages/modules/devices/batterx/batterx/config.py +++ b/packages/modules/devices/batterx/batterx/config.py @@ -32,8 +32,9 @@ def __init__(self, name: str = "BatterX Speicher", type: str = "bat", id: int = 0, - configuration: BatterXBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or BatterXBatConfiguration()) + configuration: BatterXBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or BatterXBatConfiguration(), **kwargs) class BatterXCounterConfiguration: @@ -46,8 +47,9 @@ def __init__(self, name: str = "BatterX Zähler", type: str = "counter", id: int = 0, - configuration: BatterXCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or BatterXCounterConfiguration()) + configuration: BatterXCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or BatterXCounterConfiguration(), **kwargs) class BatterXExternalInverterConfiguration: @@ -60,8 +62,9 @@ def __init__(self, name: str = "BatterX externer Wechselrichter", type: str = "external_inverter", id: int = 0, - configuration: BatterXExternalInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or BatterXExternalInverterConfiguration()) + configuration: BatterXExternalInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or BatterXExternalInverterConfiguration(), **kwargs) class BatterXInverterConfiguration: @@ -74,5 +77,6 @@ def __init__(self, name: str = "BatterX Wechselrichter", type: str = "inverter", id: int = 0, - configuration: BatterXInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or BatterXInverterConfiguration()) + configuration: BatterXInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or BatterXInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/byd/byd/config.py b/packages/modules/devices/byd/byd/config.py index 009e607f04..9f3216f7a5 100644 --- a/packages/modules/devices/byd/byd/config.py +++ b/packages/modules/devices/byd/byd/config.py @@ -37,5 +37,6 @@ def __init__(self, name: str = "BYD Speicher", type: str = "bat", id: int = 0, - configuration: BYDBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or BYDBatConfiguration()) + configuration: BYDBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or BYDBatConfiguration(), **kwargs) diff --git a/packages/modules/devices/carlo_gavazzi/carlo_gavazzi/config.py b/packages/modules/devices/carlo_gavazzi/carlo_gavazzi/config.py index f453b51c7b..651f2982a8 100644 --- a/packages/modules/devices/carlo_gavazzi/carlo_gavazzi/config.py +++ b/packages/modules/devices/carlo_gavazzi/carlo_gavazzi/config.py @@ -34,5 +34,6 @@ def __init__(self, name: str = "Carlo Gavazzi Zähler", type: str = "counter", id: int = 0, - configuration: CarloGavazziCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or CarloGavazziCounterConfiguration()) + configuration: CarloGavazziCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or CarloGavazziCounterConfiguration(), **kwargs) diff --git a/packages/modules/devices/chint/chint/config.py b/packages/modules/devices/chint/chint/config.py index 377124ab62..4843471d64 100644 --- a/packages/modules/devices/chint/chint/config.py +++ b/packages/modules/devices/chint/chint/config.py @@ -38,5 +38,6 @@ def __init__(self, name: str = "CHINT DTSU666 Zähler", type: str = "counter", id: int = 0, - configuration: CHINTCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or CHINTCounterConfiguration()) + configuration: CHINTCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or CHINTCounterConfiguration(), **kwargs) diff --git a/packages/modules/devices/deye/deye/config.py b/packages/modules/devices/deye/deye/config.py index 991aa26486..c7aae257e9 100644 --- a/packages/modules/devices/deye/deye/config.py +++ b/packages/modules/devices/deye/deye/config.py @@ -38,8 +38,9 @@ def __init__(self, name: str = "Deye/Jinko Speicher", type: str = "bat", id: int = 0, - configuration: DeyeBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or DeyeBatConfiguration()) + configuration: DeyeBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or DeyeBatConfiguration(), **kwargs) @auto_str @@ -54,8 +55,9 @@ def __init__(self, name: str = "Deye/Jinko Zähler", type: str = "counter", id: int = 0, - configuration: DeyeCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or DeyeCounterConfiguration()) + configuration: DeyeCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or DeyeCounterConfiguration(), **kwargs) @auto_str @@ -70,5 +72,6 @@ def __init__(self, name: str = "Deye/Jinko Wechselrichter", type: str = "inverter", id: int = 0, - configuration: DeyeInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or DeyeInverterConfiguration()) + configuration: DeyeInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or DeyeInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/discovergy/discovergy/config.py b/packages/modules/devices/discovergy/discovergy/config.py index 2dd15aba30..f3124746c0 100644 --- a/packages/modules/devices/discovergy/discovergy/config.py +++ b/packages/modules/devices/discovergy/discovergy/config.py @@ -33,8 +33,9 @@ def __init__(self, name: str = "inexogy (Discovergy) Zähler", type: str = "counter", id: Optional[int] = 0, - configuration: DiscovergyCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or DiscovergyCounterConfiguration()) + configuration: DiscovergyCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or DiscovergyCounterConfiguration(), **kwargs) class DiscovergyInverterConfiguration: @@ -47,5 +48,6 @@ def __init__(self, name: str = "inexogy (Discovergy) Wechselrichter", type: str = "inverter", id: int = 0, - configuration: DiscovergyInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or DiscovergyInverterConfiguration()) + configuration: DiscovergyInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or DiscovergyInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/e3dc/e3dc/config.py b/packages/modules/devices/e3dc/e3dc/config.py index f3f7ff7012..d30e51ec15 100644 --- a/packages/modules/devices/e3dc/e3dc/config.py +++ b/packages/modules/devices/e3dc/e3dc/config.py @@ -37,9 +37,10 @@ def __init__(self, name: str = "E3DC Speicher", type: str = "bat", id: int = 0, - configuration: E3dcBatConfiguration = None) -> None: + configuration: E3dcBatConfiguration = None, + **kwargs) -> None: super().__init__(name, type, id, configuration - or E3dcBatConfiguration()) + or E3dcBatConfiguration(), **kwargs) @auto_str @@ -54,9 +55,10 @@ def __init__(self, name: str = "E3DC Zähler", type: str = "counter", id: int = 0, - configuration: E3dcCounterConfiguration = None) -> None: + configuration: E3dcCounterConfiguration = None, + **kwargs) -> None: super().__init__(name, type, id, configuration or - E3dcCounterConfiguration()) + E3dcCounterConfiguration(), **kwargs) @auto_str @@ -71,8 +73,9 @@ def __init__(self, name: str = "E3DC Wechselrichter", type: str = "inverter", id: int = 0, - configuration: E3dcInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or E3dcInverterConfiguration()) + configuration: E3dcInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or E3dcInverterConfiguration(), **kwargs) @auto_str @@ -87,5 +90,6 @@ def __init__(self, name: str = "E3DC externer Wechselrichter", type: str = "external_inverter", id: int = 0, - configuration: E3dcExternalInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or E3dcExternalInverterConfiguration()) + configuration: E3dcExternalInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or E3dcExternalInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/elgris/elgris/config.py b/packages/modules/devices/elgris/elgris/config.py index cccf6e5c02..b720099ce5 100644 --- a/packages/modules/devices/elgris/elgris/config.py +++ b/packages/modules/devices/elgris/elgris/config.py @@ -34,8 +34,9 @@ def __init__(self, name: str = "Elgris Smart Meter Speicher", type: str = "bat", id: int = 0, - configuration: ElgrisBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or ElgrisBatConfiguration()) + configuration: ElgrisBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or ElgrisBatConfiguration(), **kwargs) class ElgrisCounterConfiguration: @@ -48,8 +49,9 @@ def __init__(self, name: str = "Elgris Smart Meter", type: str = "counter", id: int = 0, - configuration: ElgrisCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or ElgrisCounterConfiguration()) + configuration: ElgrisCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or ElgrisCounterConfiguration(), **kwargs) class ElgrisInverterConfiguration: @@ -62,5 +64,6 @@ def __init__(self, name: str = "Elgris Smart Meter Welchselrichter", type: str = "inverter", id: int = 0, - configuration: ElgrisInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or ElgrisInverterConfiguration()) + configuration: ElgrisInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or ElgrisInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/enphase/enphase/config.py b/packages/modules/devices/enphase/enphase/config.py index 9a2a40a554..cbc1662644 100644 --- a/packages/modules/devices/enphase/enphase/config.py +++ b/packages/modules/devices/enphase/enphase/config.py @@ -48,8 +48,9 @@ def __init__(self, name: str = "Enphase Zähler", type: str = "counter", id: int = 0, - configuration: EnphaseCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or EnphaseCounterConfiguration()) + configuration: EnphaseCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or EnphaseCounterConfiguration(), **kwargs) class EnphaseInverterConfiguration: @@ -62,8 +63,9 @@ def __init__(self, name: str = "Enphase Wechselrichter", type: str = "inverter", id: int = 0, - configuration: EnphaseInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or EnphaseInverterConfiguration()) + configuration: EnphaseInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or EnphaseInverterConfiguration(), **kwargs) class EnphaseBatConfiguration: @@ -76,5 +78,6 @@ def __init__(self, name: str = "Enphase Speicher", type: str = "bat", id: int = 0, - configuration: EnphaseBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or EnphaseBatConfiguration()) + configuration: EnphaseBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or EnphaseBatConfiguration(), **kwargs) diff --git a/packages/modules/devices/fems/fems/config.py b/packages/modules/devices/fems/fems/config.py index 18c4c8d875..ad979fbf81 100644 --- a/packages/modules/devices/fems/fems/config.py +++ b/packages/modules/devices/fems/fems/config.py @@ -33,8 +33,9 @@ def __init__(self, name: str = "openEMS, Fenecon FEMS, CENTURIO 10, Kaco Hy-Control Speicher", type: str = "bat", id: int = 0, - configuration: FemsBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or FemsBatConfiguration()) + configuration: FemsBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or FemsBatConfiguration(), **kwargs) class FemsCounterConfiguration: @@ -47,8 +48,9 @@ def __init__(self, name: str = "openEMS, Fenecon FEMS, CENTURIO 10, Kaco Hy-Control Zähler", type: str = "counter", id: int = 0, - configuration: FemsCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or FemsCounterConfiguration()) + configuration: FemsCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or FemsCounterConfiguration(), **kwargs) class FemsInverterConfiguration: @@ -61,5 +63,6 @@ def __init__(self, name: str = "openEMS, Fenecon FEMS, CENTURIO 10, Kaco Hy-Control Wechselrichter", type: str = "inverter", id: int = 0, - configuration: FemsInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or FemsInverterConfiguration()) + configuration: FemsInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or FemsInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/fox_ess/fox_ess/config.py b/packages/modules/devices/fox_ess/fox_ess/config.py index f4b8ec20a2..328ccbde4d 100644 --- a/packages/modules/devices/fox_ess/fox_ess/config.py +++ b/packages/modules/devices/fox_ess/fox_ess/config.py @@ -38,8 +38,9 @@ def __init__(self, name: str = "FoxESS Speicher", type: str = "bat", id: int = 0, - configuration: FoxEssBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or FoxEssBatConfiguration()) + configuration: FoxEssBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or FoxEssBatConfiguration(), **kwargs) @auto_str @@ -54,8 +55,9 @@ def __init__(self, name: str = "FoxESS Zähler", type: str = "counter", id: int = 0, - configuration: FoxEssCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or FoxEssCounterConfiguration()) + configuration: FoxEssCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or FoxEssCounterConfiguration(), **kwargs) @auto_str @@ -70,5 +72,6 @@ def __init__(self, name: str = "FoxESS Wechselrichter", type: str = "inverter", id: int = 0, - configuration: FoxEssInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or FoxEssInverterConfiguration()) + configuration: FoxEssInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or FoxEssInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/fronius/fronius/config.py b/packages/modules/devices/fronius/fronius/config.py index c8e4f1a500..d292f6a623 100644 --- a/packages/modules/devices/fronius/fronius/config.py +++ b/packages/modules/devices/fronius/fronius/config.py @@ -53,8 +53,9 @@ def __init__(self, name: str = "Fronius Speicher", type: str = "bat", id: int = 0, - configuration: FroniusBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or FroniusBatConfiguration()) + configuration: FroniusBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or FroniusBatConfiguration(), **kwargs) class FroniusS0CounterConfiguration: @@ -67,8 +68,9 @@ def __init__(self, name: str = "Fronius S0 Zähler", type: str = "counter_s0", id: int = 0, - configuration: FroniusS0CounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or FroniusS0CounterConfiguration()) + configuration: FroniusS0CounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or FroniusS0CounterConfiguration(), **kwargs) class FroniusSmCounterConfiguration: @@ -82,8 +84,9 @@ def __init__(self, name: str = "Fronius SM Zähler", type: str = "counter_sm", id: int = 0, - configuration: FroniusSmCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or FroniusSmCounterConfiguration()) + configuration: FroniusSmCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or FroniusSmCounterConfiguration(), **kwargs) class FroniusInverterConfiguration: @@ -96,8 +99,9 @@ def __init__(self, name: str = "Fronius Wechselrichter", type: str = "inverter", id: int = 0, - configuration: FroniusInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or FroniusInverterConfiguration()) + configuration: FroniusInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or FroniusInverterConfiguration(), **kwargs) class FroniusSecondaryInverterConfiguration: @@ -110,8 +114,9 @@ def __init__(self, name: str = "Sekundärer Wechselrichter", type: str = "inverter_secondary", id: int = 0, - configuration: FroniusSecondaryInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or FroniusSecondaryInverterConfiguration()) + configuration: FroniusSecondaryInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or FroniusSecondaryInverterConfiguration(), **kwargs) class FroniusProductionMeterConfiguration: @@ -125,5 +130,6 @@ def __init__(self, name: str = "Fronius Erzeugerzähler", type: str = "inverter_production_meter", id: int = 0, - configuration: FroniusProductionMeterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or FroniusProductionMeterConfiguration()) + configuration: FroniusProductionMeterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or FroniusProductionMeterConfiguration(), **kwargs) diff --git a/packages/modules/devices/generic/http/config.py b/packages/modules/devices/generic/http/config.py index f40fcee1e9..5980d02941 100644 --- a/packages/modules/devices/generic/http/config.py +++ b/packages/modules/devices/generic/http/config.py @@ -47,8 +47,9 @@ def __init__(self, name: str = "HTTP Speicher", type: str = "bat", id: int = 0, - configuration: HttpBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or HttpBatConfiguration()) + configuration: HttpBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or HttpBatConfiguration(), **kwargs) @auto_str @@ -74,8 +75,9 @@ def __init__(self, name: str = "HTTP Zähler", type: str = "counter", id: int = 0, - configuration: HttpCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or HttpCounterConfiguration()) + configuration: HttpCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or HttpCounterConfiguration(), **kwargs) @auto_str @@ -91,5 +93,6 @@ def __init__(self, name: str = "HTTP Wechselrichter", type: str = "inverter", id: int = 0, - configuration: HttpInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or HttpInverterConfiguration()) + configuration: HttpInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or HttpInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/generic/json/config.py b/packages/modules/devices/generic/json/config.py index 85228ccaf8..e079bc1422 100644 --- a/packages/modules/devices/generic/json/config.py +++ b/packages/modules/devices/generic/json/config.py @@ -43,8 +43,9 @@ def __init__(self, name: str = "Json Speicher", type: str = "bat", id: int = 0, - configuration: JsonBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or JsonBatConfiguration()) + configuration: JsonBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or JsonBatConfiguration(), **kwargs) class JsonCounterConfiguration: @@ -78,8 +79,9 @@ def __init__(self, name: str = "Json Zähler", type: str = "counter", id: int = 0, - configuration: JsonCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or JsonCounterConfiguration()) + configuration: JsonCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or JsonCounterConfiguration(), **kwargs) class JsonInverterConfiguration: @@ -99,5 +101,6 @@ def __init__(self, name: str = "Json Wechselrichter", type: str = "inverter", id: int = 0, - configuration: JsonInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or JsonInverterConfiguration()) + configuration: JsonInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or JsonInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/generic/mqtt/config.py b/packages/modules/devices/generic/mqtt/config.py index aa14d4ad4b..48b462c906 100644 --- a/packages/modules/devices/generic/mqtt/config.py +++ b/packages/modules/devices/generic/mqtt/config.py @@ -31,8 +31,9 @@ def __init__(self, name: str = "MQTT-Speicher", type: str = "bat", id: int = 0, - configuration: MqttBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or MqttBatConfiguration()) + configuration: MqttBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or MqttBatConfiguration(), **kwargs) class MqttCounterConfiguration: @@ -45,8 +46,9 @@ def __init__(self, name: str = "MQTT-Zähler", type: str = "counter", id: int = 0, - configuration: MqttCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or MqttCounterConfiguration()) + configuration: MqttCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or MqttCounterConfiguration(), **kwargs) class MqttInverterConfiguration: @@ -59,5 +61,6 @@ def __init__(self, name: str = "MQTT-Wechselrichter", type: str = "inverter", id: int = 0, - configuration: MqttInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or MqttInverterConfiguration()) + configuration: MqttInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or MqttInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/generic/virtual/config.py b/packages/modules/devices/generic/virtual/config.py index eddd8ff345..fee30c4693 100644 --- a/packages/modules/devices/generic/virtual/config.py +++ b/packages/modules/devices/generic/virtual/config.py @@ -30,5 +30,6 @@ def __init__(self, name: str = "Virtueller Zähler", type: str = "counter", id: int = 0, - configuration: VirtualCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or VirtualCounterConfiguration()) + configuration: VirtualCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or VirtualCounterConfiguration(), **kwargs) diff --git a/packages/modules/devices/good_we/good_we/config.py b/packages/modules/devices/good_we/good_we/config.py index c244be0697..193d57a8cf 100644 --- a/packages/modules/devices/good_we/good_we/config.py +++ b/packages/modules/devices/good_we/good_we/config.py @@ -41,8 +41,9 @@ def __init__(self, name: str = "GoodWe Speicher", type: str = "bat", id: int = 0, - configuration: GoodWeBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or GoodWeBatConfiguration()) + configuration: GoodWeBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or GoodWeBatConfiguration(), **kwargs) class GoodWeCounterConfiguration: @@ -55,8 +56,9 @@ def __init__(self, name: str = "GoodWe Zähler", type: str = "counter", id: int = 0, - configuration: GoodWeCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or GoodWeCounterConfiguration()) + configuration: GoodWeCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or GoodWeCounterConfiguration(), **kwargs) class GoodWeInverterConfiguration: @@ -69,5 +71,6 @@ def __init__(self, name: str = "GoodWe Wechselrichter", type: str = "inverter", id: int = 0, - configuration: GoodWeInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or GoodWeInverterConfiguration()) + configuration: GoodWeInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or GoodWeInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/growatt/growatt/config.py b/packages/modules/devices/growatt/growatt/config.py index 75358b5dc4..f37c2e80c8 100644 --- a/packages/modules/devices/growatt/growatt/config.py +++ b/packages/modules/devices/growatt/growatt/config.py @@ -39,8 +39,9 @@ def __init__(self, name: str = "Growatt Speicher", type: str = "bat", id: int = 0, - configuration: GrowattBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or GrowattBatConfiguration()) + configuration: GrowattBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or GrowattBatConfiguration(), **kwargs) class GrowattCounterConfiguration: @@ -53,8 +54,9 @@ def __init__(self, name: str = "Growatt Zähler", type: str = "counter", id: int = 0, - configuration: GrowattCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or GrowattCounterConfiguration()) + configuration: GrowattCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or GrowattCounterConfiguration(), **kwargs) class GrowattInverterConfiguration: @@ -67,5 +69,6 @@ def __init__(self, name: str = "Growatt Wechselrichter", type: str = "inverter", id: int = 0, - configuration: GrowattInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or GrowattInverterConfiguration()) + configuration: GrowattInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or GrowattInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/huawei/huawei/config.py b/packages/modules/devices/huawei/huawei/config.py index cb3bcea267..97ecac76b4 100644 --- a/packages/modules/devices/huawei/huawei/config.py +++ b/packages/modules/devices/huawei/huawei/config.py @@ -39,8 +39,9 @@ def __init__(self, name: str = "Huawei Speicher", type: str = "bat", id: int = 0, - configuration: HuaweiBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or HuaweiBatConfiguration()) + configuration: HuaweiBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or HuaweiBatConfiguration(), **kwargs) class HuaweiCounterConfiguration: @@ -53,8 +54,9 @@ def __init__(self, name: str = "Huawei Zähler", type: str = "counter", id: int = 0, - configuration: HuaweiCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or HuaweiCounterConfiguration()) + configuration: HuaweiCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or HuaweiCounterConfiguration(), **kwargs) class HuaweiInverterConfiguration: @@ -67,5 +69,6 @@ def __init__(self, name: str = "Huawei Wechselrichter", type: str = "inverter", id: int = 0, - configuration: HuaweiInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or HuaweiInverterConfiguration()) + configuration: HuaweiInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or HuaweiInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/huawei/huawei_emma/config.py b/packages/modules/devices/huawei/huawei_emma/config.py index 45b3c0a9da..624a5aecd2 100644 --- a/packages/modules/devices/huawei/huawei_emma/config.py +++ b/packages/modules/devices/huawei/huawei_emma/config.py @@ -36,8 +36,9 @@ def __init__(self, name: str = "Huawei EMMA Speicher", type: str = "bat", id: int = 0, - configuration: Huawei_EmmaBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or Huawei_EmmaBatConfiguration()) + configuration: Huawei_EmmaBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or Huawei_EmmaBatConfiguration(), **kwargs) class Huawei_EmmaCounterConfiguration: @@ -50,8 +51,9 @@ def __init__(self, name: str = "Huawei EMMA Zähler", type: str = "counter", id: int = 0, - configuration: Huawei_EmmaCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or Huawei_EmmaCounterConfiguration()) + configuration: Huawei_EmmaCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or Huawei_EmmaCounterConfiguration(), **kwargs) class Huawei_EmmaInverterConfiguration: @@ -64,5 +66,6 @@ def __init__(self, name: str = "Huawei EMMA Wechselrichter", type: str = "inverter", id: int = 0, - configuration: Huawei_EmmaInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or Huawei_EmmaInverterConfiguration()) + configuration: Huawei_EmmaInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or Huawei_EmmaInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/huawei/huawei_smartlogger/config.py b/packages/modules/devices/huawei/huawei_smartlogger/config.py index f877529fb4..e05cf99aec 100644 --- a/packages/modules/devices/huawei/huawei_smartlogger/config.py +++ b/packages/modules/devices/huawei/huawei_smartlogger/config.py @@ -39,8 +39,9 @@ def __init__(self, name: str = "Huawei Luna", type: str = "bat", id: int = 0, - configuration: Huawei_SmartloggerBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or Huawei_SmartloggerBatConfiguration()) + configuration: Huawei_SmartloggerBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or Huawei_SmartloggerBatConfiguration(), **kwargs) @auto_str @@ -56,8 +57,9 @@ def __init__(self, name: str = "Huawei Zähler", type: str = "counter", id: int = 0, - configuration: Huawei_SmartloggerCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or Huawei_SmartloggerCounterConfiguration()) + configuration: Huawei_SmartloggerCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or Huawei_SmartloggerCounterConfiguration(), **kwargs) @auto_str @@ -73,5 +75,6 @@ def __init__(self, name: str = "Huawei Wechselrichter", type: str = "inverter", id: int = 0, - configuration: Huawei_SmartloggerInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or Huawei_SmartloggerInverterConfiguration()) + configuration: Huawei_SmartloggerInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or Huawei_SmartloggerInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/idm/idm/config.py b/packages/modules/devices/idm/idm/config.py index 99edcdddc8..7e6894b3cc 100644 --- a/packages/modules/devices/idm/idm/config.py +++ b/packages/modules/devices/idm/idm/config.py @@ -38,5 +38,6 @@ def __init__(self, name: str = "IDM Zähler", type: str = "counter", id: int = 0, - configuration: IDMCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or IDMCounterConfiguration()) + configuration: IDMCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or IDMCounterConfiguration(), **kwargs) diff --git a/packages/modules/devices/janitza/janitza/config.py b/packages/modules/devices/janitza/janitza/config.py index f0992dfa7b..5d6885e82d 100644 --- a/packages/modules/devices/janitza/janitza/config.py +++ b/packages/modules/devices/janitza/janitza/config.py @@ -34,8 +34,9 @@ def __init__(self, name: str = "Janitza Zähler", type: str = "counter", id: int = 0, - configuration: JanitzaCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or JanitzaCounterConfiguration()) + configuration: JanitzaCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or JanitzaCounterConfiguration(), **kwargs) class JanitzaInverterConfiguration: @@ -48,8 +49,9 @@ def __init__(self, name: str = "Janitza PV-Zähler", type: str = "inverter", id: int = 0, - configuration: JanitzaInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or JanitzaInverterConfiguration()) + configuration: JanitzaInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or JanitzaInverterConfiguration(), **kwargs) class JanitzaBatConfiguration: @@ -62,5 +64,6 @@ def __init__(self, name: str = "Janitza Speicher-Zähler", type: str = "bat", id: int = 0, - configuration: JanitzaBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or JanitzaBatConfiguration()) + configuration: JanitzaBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or JanitzaBatConfiguration(), **kwargs) diff --git a/packages/modules/devices/kaco/kaco_nh/config.py b/packages/modules/devices/kaco/kaco_nh/config.py index 75a2010a36..47003d2d85 100644 --- a/packages/modules/devices/kaco/kaco_nh/config.py +++ b/packages/modules/devices/kaco/kaco_nh/config.py @@ -37,8 +37,9 @@ def __init__(self, name: str = "Kaco NH Speicher", type: str = "bat", id: int = 0, - configuration: KacoNHBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or KacoNHBatConfiguration()) + configuration: KacoNHBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or KacoNHBatConfiguration(), **kwargs) class KacoNHCounterConfiguration: @@ -51,8 +52,9 @@ def __init__(self, name: str = "Kaco NH Zähler", type: str = "counter", id: int = 0, - configuration: KacoNHCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or KacoNHCounterConfiguration()) + configuration: KacoNHCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or KacoNHCounterConfiguration(), **kwargs) class KacoNHInverterConfiguration: @@ -65,5 +67,6 @@ def __init__(self, name: str = "KacoNH Wechselrichter", type: str = "inverter", id: int = 0, - configuration: KacoNHInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or KacoNHInverterConfiguration()) + configuration: KacoNHInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or KacoNHInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/kaco/kaco_tx/config.py b/packages/modules/devices/kaco/kaco_tx/config.py index 211fb5a2e2..f6dab74b8c 100644 --- a/packages/modules/devices/kaco/kaco_tx/config.py +++ b/packages/modules/devices/kaco/kaco_tx/config.py @@ -33,5 +33,6 @@ def __init__(self, name: str = "Kaco Wechselrichter", type: str = "inverter", id: int = 0, - configuration: KacoInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or KacoInverterConfiguration()) + configuration: KacoInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or KacoInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/kostal/kostal_piko/config.py b/packages/modules/devices/kostal/kostal_piko/config.py index 9d7e3a86d9..2873d6b39c 100644 --- a/packages/modules/devices/kostal/kostal_piko/config.py +++ b/packages/modules/devices/kostal/kostal_piko/config.py @@ -32,8 +32,9 @@ def __init__(self, name: str = "Kostal Piko Zähler", type: str = "counter", id: int = 0, - configuration: KostalPikoCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or KostalPikoCounterConfiguration()) + configuration: KostalPikoCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or KostalPikoCounterConfiguration(), **kwargs) class KostalPikoInverterConfiguration: @@ -46,5 +47,6 @@ def __init__(self, name: str = "Kostal Piko Wechselrichter", type: str = "inverter", id: int = 0, - configuration: KostalPikoInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or KostalPikoInverterConfiguration()) + configuration: KostalPikoInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or KostalPikoInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/kostal/kostal_piko_ci/config.py b/packages/modules/devices/kostal/kostal_piko_ci/config.py index 5cb6b05116..d7d731329e 100644 --- a/packages/modules/devices/kostal/kostal_piko_ci/config.py +++ b/packages/modules/devices/kostal/kostal_piko_ci/config.py @@ -38,8 +38,9 @@ def __init__(self, name: str = "Kostal Piko CI Zähler", type: str = "counter", id: int = 0, - configuration: KostalPikoCiCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or KostalPikoCiCounterConfiguration()) + configuration: KostalPikoCiCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or KostalPikoCiCounterConfiguration(), **kwargs) @auto_str @@ -54,5 +55,6 @@ def __init__(self, name: str = "Kostal Piko CI Wechselrichter", type: str = "inverter", id: int = 0, - configuration: KostalPikoCiInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or KostalPikoCiInverterConfiguration()) + configuration: KostalPikoCiInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or KostalPikoCiInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/kostal/kostal_piko_old/config.py b/packages/modules/devices/kostal/kostal_piko_old/config.py index e507138be6..cb516389c5 100644 --- a/packages/modules/devices/kostal/kostal_piko_old/config.py +++ b/packages/modules/devices/kostal/kostal_piko_old/config.py @@ -39,5 +39,6 @@ def __init__(self, name: str = "Kostal Piko (alte Generation) Wechselrichter", type: str = "inverter", id: int = 0, - configuration: KostalPikoOldInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or KostalPikoOldInverterConfiguration()) + configuration: KostalPikoOldInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or KostalPikoOldInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/kostal/kostal_plenticore/config.py b/packages/modules/devices/kostal/kostal_plenticore/config.py index 3971fccbad..3556d716a3 100644 --- a/packages/modules/devices/kostal/kostal_plenticore/config.py +++ b/packages/modules/devices/kostal/kostal_plenticore/config.py @@ -34,8 +34,9 @@ def __init__(self, name: str = "Kostal Plenticore Speicher", type: str = "bat", id: int = 0, - configuration: KostalPlenticoreBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or KostalPlenticoreBatConfiguration()) + configuration: KostalPlenticoreBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or KostalPlenticoreBatConfiguration(), **kwargs) class KostalPlenticoreCounterConfiguration: @@ -48,8 +49,9 @@ def __init__(self, name: str = "Kostal Plenticore Zähler", type: str = "counter", id: Optional[int] = 0, - configuration: KostalPlenticoreCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or KostalPlenticoreCounterConfiguration()) + configuration: KostalPlenticoreCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or KostalPlenticoreCounterConfiguration(), **kwargs) class KostalPlenticoreInverterConfiguration: @@ -62,5 +64,6 @@ def __init__(self, name: str = "Kostal Plenticore Wechselrichter", type: str = "inverter", id: int = 0, - configuration: KostalPlenticoreInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or KostalPlenticoreInverterConfiguration()) + configuration: KostalPlenticoreInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or KostalPlenticoreInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/kostal/kostal_sem/config.py b/packages/modules/devices/kostal/kostal_sem/config.py index d4e07cbc8f..e348defc0b 100644 --- a/packages/modules/devices/kostal/kostal_sem/config.py +++ b/packages/modules/devices/kostal/kostal_sem/config.py @@ -34,8 +34,6 @@ def __init__(self, name: str = "Kostal Smart Energy Meter oder TQ EM 410 Zähler", type: str = "counter", id: int = 0, - configuration: KostalSemCounterConfiguration = None) -> None: - self.name = name - self.type = type - self.id = id - super().__init__(name, type, id, configuration or KostalSemCounterConfiguration()) + configuration: KostalSemCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or KostalSemCounterConfiguration(), **kwargs) diff --git a/packages/modules/devices/kostal/kostal_steca/config.py b/packages/modules/devices/kostal/kostal_steca/config.py index 963a2aea8b..f6b401e900 100644 --- a/packages/modules/devices/kostal/kostal_steca/config.py +++ b/packages/modules/devices/kostal/kostal_steca/config.py @@ -37,5 +37,6 @@ def __init__(self, name: str = "Kostal Piko MP oder Steca Grid Coolcept Wechselrichter", type: str = "inverter", id: int = 0, - configuration: KostalStecaInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or KostalStecaInverterConfiguration()) + configuration: KostalStecaInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or KostalStecaInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/lg/lg/config.py b/packages/modules/devices/lg/lg/config.py index adb3f8e80b..8e573e1b8a 100644 --- a/packages/modules/devices/lg/lg/config.py +++ b/packages/modules/devices/lg/lg/config.py @@ -33,8 +33,9 @@ def __init__(self, name: str = "LG ESS V1.0 Speicher", type: str = "bat", id: int = 0, - configuration: LgBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or LgBatConfiguration()) + configuration: LgBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or LgBatConfiguration(), **kwargs) class LgCounterConfiguration: @@ -47,8 +48,9 @@ def __init__(self, name: str = "LG ESS V1.0 Zähler", type: str = "counter", id: int = 0, - configuration: LgCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or LgCounterConfiguration()) + configuration: LgCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or LgCounterConfiguration(), **kwargs) class LgInverterConfiguration: @@ -61,5 +63,6 @@ def __init__(self, name: str = "LG ESS V1.0 Wechselrichter", type: str = "inverter", id: int = 0, - configuration: LgInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or LgInverterConfiguration()) + configuration: LgInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or LgInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/marstek/venus_c_e/config.py b/packages/modules/devices/marstek/venus_c_e/config.py index 76f1a877ee..8734347c38 100644 --- a/packages/modules/devices/marstek/venus_c_e/config.py +++ b/packages/modules/devices/marstek/venus_c_e/config.py @@ -38,5 +38,6 @@ def __init__(self, name: str = "Marstek Venus C, E Speicher", type: str = "bat", id: int = 0, - configuration: VenusCEBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or VenusCEBatConfiguration()) + configuration: VenusCEBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or VenusCEBatConfiguration(), **kwargs) diff --git a/packages/modules/devices/mtec/mtec/config.py b/packages/modules/devices/mtec/mtec/config.py index 88bb5e9d0a..3d45f605ab 100644 --- a/packages/modules/devices/mtec/mtec/config.py +++ b/packages/modules/devices/mtec/mtec/config.py @@ -39,8 +39,9 @@ def __init__(self, name: str = "M-Tec Speicher", type: str = "bat", id: int = 0, - configuration: MTecBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or MTecBatConfiguration()) + configuration: MTecBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or MTecBatConfiguration(), **kwargs) @auto_str @@ -55,8 +56,9 @@ def __init__(self, name: str = "M-Tec Zähler", type: str = "counter", id: int = 0, - configuration: MTecCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or MTecCounterConfiguration()) + configuration: MTecCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or MTecCounterConfiguration(), **kwargs) @auto_str @@ -71,5 +73,6 @@ def __init__(self, name: str = "M-Tec Wechselrichter", type: str = "inverter", id: int = 0, - configuration: MTecInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or MTecInverterConfiguration()) + configuration: MTecInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or MTecInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/mystrom/mystrom/config.py b/packages/modules/devices/mystrom/mystrom/config.py index 7a92d551c6..5905059fc5 100644 --- a/packages/modules/devices/mystrom/mystrom/config.py +++ b/packages/modules/devices/mystrom/mystrom/config.py @@ -37,5 +37,6 @@ def __init__(self, name: str = "mystrom Zähler", type: str = "counter", id: int = 0, - configuration: MystromCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or MystromCounterConfiguration()) + configuration: MystromCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or MystromCounterConfiguration(), **kwargs) diff --git a/packages/modules/devices/nibe/nibe/config.py b/packages/modules/devices/nibe/nibe/config.py index 713da6d9a2..04a58e0dbc 100644 --- a/packages/modules/devices/nibe/nibe/config.py +++ b/packages/modules/devices/nibe/nibe/config.py @@ -38,5 +38,6 @@ def __init__(self, name: str = "Nibe Zähler", type: str = "counter", id: int = 0, - configuration: NibeCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or NibeCounterConfiguration()) + configuration: NibeCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or NibeCounterConfiguration(), **kwargs) diff --git a/packages/modules/devices/openwb/openwb_bat_kit/config.py b/packages/modules/devices/openwb/openwb_bat_kit/config.py index daf996c8e4..b4595b2d53 100644 --- a/packages/modules/devices/openwb/openwb_bat_kit/config.py +++ b/packages/modules/devices/openwb/openwb_bat_kit/config.py @@ -30,5 +30,6 @@ def __init__(self, name: str = "openWB Speicher-Kit", type: str = "bat", id: int = 0, - configuration: BatKitBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or BatKitBatConfiguration()) + configuration: BatKitBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or BatKitBatConfiguration(), **kwargs) diff --git a/packages/modules/devices/openwb/openwb_evu_kit/config.py b/packages/modules/devices/openwb/openwb_evu_kit/config.py index 6074550b68..9a089572bc 100644 --- a/packages/modules/devices/openwb/openwb_evu_kit/config.py +++ b/packages/modules/devices/openwb/openwb_evu_kit/config.py @@ -30,8 +30,9 @@ def __init__(self, name: str = "Speicher-Zähler an openWB EVU-Kit", type: str = "bat", id: int = 0, - configuration: EvuKitBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or EvuKitBatConfiguration()) + configuration: EvuKitBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or EvuKitBatConfiguration(), **kwargs) class EvuKitCounterConfiguration: @@ -44,8 +45,9 @@ def __init__(self, name: str = "openWB EVU-Kit", type: str = "counter", id: int = 0, - configuration: EvuKitCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or EvuKitCounterConfiguration()) + configuration: EvuKitCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or EvuKitCounterConfiguration(), **kwargs) class EvuKitInverterConfiguration: @@ -58,5 +60,6 @@ def __init__(self, name: str = "PV-Zähler an openWB EVU-Kit", type: str = "inverter", id: int = 0, - configuration: EvuKitInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or EvuKitInverterConfiguration()) + configuration: EvuKitInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or EvuKitInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/openwb/openwb_flex/config.py b/packages/modules/devices/openwb/openwb_flex/config.py index b3e95f5bf2..7d32f82d88 100644 --- a/packages/modules/devices/openwb/openwb_flex/config.py +++ b/packages/modules/devices/openwb/openwb_flex/config.py @@ -37,8 +37,9 @@ def __init__(self, name: str = "openWB Speicher-Kit flex", type: str = "bat", id: int = 0, - configuration: BatKitFlexConfiguration = None) -> None: - super().__init__(name, type, id, configuration or BatKitFlexConfiguration()) + configuration: BatKitFlexConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or BatKitFlexConfiguration(), **kwargs) class EvuKitFlexConfiguration: @@ -52,8 +53,9 @@ def __init__(self, name: str = "openWB EVU-Kit flex", type: str = "counter", id: int = 0, - configuration: EvuKitFlexConfiguration = None) -> None: - super().__init__(name, type, id, configuration or EvuKitFlexConfiguration()) + configuration: EvuKitFlexConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or EvuKitFlexConfiguration(), **kwargs) class ConsumptionCounterFlexConfiguration: @@ -67,8 +69,9 @@ def __init__(self, name: str = "openWB Verbrauchszähler flex", type: str = "consumption_counter", id: int = 0, - configuration: ConsumptionCounterFlexConfiguration = None) -> None: - super().__init__(name, type, id, configuration or ConsumptionCounterFlexConfiguration()) + configuration: ConsumptionCounterFlexConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or ConsumptionCounterFlexConfiguration(), **kwargs) class PvKitFlexConfiguration: @@ -82,8 +85,9 @@ def __init__(self, name: str = "openWB PV-Kit flex", type: str = "inverter", id: int = 0, - configuration: PvKitFlexConfiguration = None) -> None: - super().__init__(name, type, id, configuration or PvKitFlexConfiguration()) + configuration: PvKitFlexConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or PvKitFlexConfiguration(), **kwargs) @overload diff --git a/packages/modules/devices/openwb/openwb_pv_kit/config.py b/packages/modules/devices/openwb/openwb_pv_kit/config.py index 71c23ec79c..0e1b6f94e7 100644 --- a/packages/modules/devices/openwb/openwb_pv_kit/config.py +++ b/packages/modules/devices/openwb/openwb_pv_kit/config.py @@ -30,5 +30,6 @@ def __init__(self, name: str = "openWB PV-Kit", type: str = "inverter", id: int = 0, - configuration: PvKitInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or PvKitInverterConfiguration()) + configuration: PvKitInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or PvKitInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/orno/orno/config.py b/packages/modules/devices/orno/orno/config.py index e767d3a373..68b7dc237c 100644 --- a/packages/modules/devices/orno/orno/config.py +++ b/packages/modules/devices/orno/orno/config.py @@ -38,5 +38,6 @@ def __init__(self, name: str = "Orno Zähler", type: str = "counter", id: int = 0, - configuration: OrnoCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or OrnoCounterConfiguration()) + configuration: OrnoCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or OrnoCounterConfiguration(), **kwargs) diff --git a/packages/modules/devices/powerdog/powerdog/config.py b/packages/modules/devices/powerdog/powerdog/config.py index 4fa27f122a..abcad443de 100644 --- a/packages/modules/devices/powerdog/powerdog/config.py +++ b/packages/modules/devices/powerdog/powerdog/config.py @@ -34,8 +34,9 @@ def __init__(self, name: str = "Powerdog Zähler", type: str = "counter", id: int = 0, - configuration: PowerdogCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or PowerdogCounterConfiguration()) + configuration: PowerdogCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or PowerdogCounterConfiguration(), **kwargs) class PowerdogInverterConfiguration: @@ -48,5 +49,6 @@ def __init__(self, name: str = "Powerdog Wechselrichter", type: str = "inverter", id: int = 0, - configuration: PowerdogInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or PowerdogInverterConfiguration()) + configuration: PowerdogInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or PowerdogInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/powerfox/powerfox/config.py b/packages/modules/devices/powerfox/powerfox/config.py index 0d4da5802a..894449bffa 100644 --- a/packages/modules/devices/powerfox/powerfox/config.py +++ b/packages/modules/devices/powerfox/powerfox/config.py @@ -33,8 +33,9 @@ def __init__(self, name: str = "Powerfox Zähler", type: str = "counter", id: int = 0, - configuration: PowerfoxCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or PowerfoxCounterConfiguration()) + configuration: PowerfoxCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or PowerfoxCounterConfiguration(), **kwargs) class PowerfoxInverterConfiguration: @@ -47,5 +48,6 @@ def __init__(self, name: str = "Powerfox Wechselrichter", type: str = "inverter", id: int = 0, - configuration: PowerfoxInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or PowerfoxInverterConfiguration()) + configuration: PowerfoxInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or PowerfoxInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/qcells/qcells/config.py b/packages/modules/devices/qcells/qcells/config.py index 445e253b07..43272ddaf9 100644 --- a/packages/modules/devices/qcells/qcells/config.py +++ b/packages/modules/devices/qcells/qcells/config.py @@ -34,8 +34,9 @@ def __init__(self, name: str = "QCells Speicher", type: str = "bat", id: int = 0, - configuration: QCellsBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or QCellsBatConfiguration()) + configuration: QCellsBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or QCellsBatConfiguration(), **kwargs) class QCellsCounterConfiguration: @@ -48,8 +49,9 @@ def __init__(self, name: str = "QCells Zähler", type: str = "counter", id: int = 0, - configuration: QCellsCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or QCellsCounterConfiguration()) + configuration: QCellsCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or QCellsCounterConfiguration(), **kwargs) class QCellsInverterConfiguration: @@ -62,5 +64,6 @@ def __init__(self, name: str = "QCells Wechselrichter", type: str = "inverter", id: int = 0, - configuration: QCellsInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or QCellsInverterConfiguration()) + configuration: QCellsInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or QCellsInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/rct/rct/config.py b/packages/modules/devices/rct/rct/config.py index 9d29925671..27aa014c7d 100644 --- a/packages/modules/devices/rct/rct/config.py +++ b/packages/modules/devices/rct/rct/config.py @@ -37,8 +37,9 @@ def __init__(self, name: str = "RCT Speicher", type: str = "bat", id: int = 0, - configuration: RctBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or RctBatConfiguration()) + configuration: RctBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or RctBatConfiguration(), **kwargs) @auto_str @@ -53,8 +54,9 @@ def __init__(self, name: str = "RCT Zähler", type: str = "counter", id: int = 0, - configuration: RctCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or RctCounterConfiguration()) + configuration: RctCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or RctCounterConfiguration(), **kwargs) @auto_str @@ -69,5 +71,6 @@ def __init__(self, name: str = "RCT Wechselrichter", type: str = "inverter", id: int = 0, - configuration: RctInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or RctInverterConfiguration()) + configuration: RctInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or RctInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/saxpower/saxpower/config.py b/packages/modules/devices/saxpower/saxpower/config.py index b34e20f3ab..aaee741ee2 100644 --- a/packages/modules/devices/saxpower/saxpower/config.py +++ b/packages/modules/devices/saxpower/saxpower/config.py @@ -34,8 +34,9 @@ def __init__(self, name: str = "Saxpower Zähler", type: str = "counter", id: int = 0, - configuration: SaxpowerCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SaxpowerCounterConfiguration()) + configuration: SaxpowerCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SaxpowerCounterConfiguration(), **kwargs) class SaxpowerBatConfiguration: @@ -48,5 +49,6 @@ def __init__(self, name: str = "Saxpower Speicher", type: str = "bat", id: int = 0, - configuration: SaxpowerBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SaxpowerBatConfiguration()) + configuration: SaxpowerBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SaxpowerBatConfiguration(), **kwargs) diff --git a/packages/modules/devices/shelly/shelly/config.py b/packages/modules/devices/shelly/shelly/config.py index b4c87adcfc..07984f3dab 100644 --- a/packages/modules/devices/shelly/shelly/config.py +++ b/packages/modules/devices/shelly/shelly/config.py @@ -39,8 +39,9 @@ def __init__(self, name: str = "Shelly Zähler", type: str = "counter", id: int = 0, - configuration: ShellyCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or ShellyCounterConfiguration()) + configuration: ShellyCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or ShellyCounterConfiguration(), **kwargs) @auto_str @@ -55,8 +56,9 @@ def __init__(self, name: str = "Shelly Wechselrichter", type: str = "inverter", id: int = 0, - configuration: ShellyInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or ShellyInverterConfiguration()) + configuration: ShellyInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or ShellyInverterConfiguration(), **kwargs) @auto_str @@ -71,5 +73,6 @@ def __init__(self, name: str = "Shelly Speicher", type: str = "bat", id: int = 0, - configuration: ShellyBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or ShellyBatConfiguration()) + configuration: ShellyBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or ShellyBatConfiguration(), **kwargs) diff --git a/packages/modules/devices/siemens/siemens/config.py b/packages/modules/devices/siemens/siemens/config.py index 30208bdfac..a0f4ca1ccb 100644 --- a/packages/modules/devices/siemens/siemens/config.py +++ b/packages/modules/devices/siemens/siemens/config.py @@ -34,8 +34,9 @@ def __init__(self, name: str = "Siemens Speicher", type: str = "bat", id: int = 0, - configuration: SiemensBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SiemensBatConfiguration()) + configuration: SiemensBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SiemensBatConfiguration(), **kwargs) class SiemensCounterConfiguration: @@ -48,8 +49,9 @@ def __init__(self, name: str = "Siemens Zähler", type: str = "counter", id: int = 0, - configuration: SiemensCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SiemensCounterConfiguration()) + configuration: SiemensCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SiemensCounterConfiguration(), **kwargs) class SiemensInverterConfiguration: @@ -62,5 +64,6 @@ def __init__(self, name: str = "Siemens Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SiemensInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SiemensInverterConfiguration()) + configuration: SiemensInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SiemensInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/siemens/siemens_sentron/config.py b/packages/modules/devices/siemens/siemens_sentron/config.py index b610cf47df..8ffce748a2 100644 --- a/packages/modules/devices/siemens/siemens_sentron/config.py +++ b/packages/modules/devices/siemens/siemens_sentron/config.py @@ -34,8 +34,9 @@ def __init__(self, name: str = "Siemens Sentron Zähler", type: str = "counter", id: int = 0, - configuration: SiemensSentronCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SiemensSentronCounterConfiguration()) + configuration: SiemensSentronCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SiemensSentronCounterConfiguration(), **kwargs) class SiemensSentronInverterConfiguration: @@ -48,8 +49,9 @@ def __init__(self, name: str = "Siemens Sentron PV-Zähler", type: str = "inverter", id: int = 0, - configuration: SiemensSentronInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SiemensSentronInverterConfiguration()) + configuration: SiemensSentronInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SiemensSentronInverterConfiguration(), **kwargs) class SiemensSentronBatConfiguration: @@ -62,5 +64,6 @@ def __init__(self, name: str = "Siemens Sentron Speicher-Zähler", type: str = "bat", id: int = 0, - configuration: SiemensSentronBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SiemensSentronBatConfiguration()) + configuration: SiemensSentronBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SiemensSentronBatConfiguration(), **kwargs) diff --git a/packages/modules/devices/sigenergy/sigenergy/config.py b/packages/modules/devices/sigenergy/sigenergy/config.py index d723015f5f..3fd46a76ec 100644 --- a/packages/modules/devices/sigenergy/sigenergy/config.py +++ b/packages/modules/devices/sigenergy/sigenergy/config.py @@ -38,8 +38,9 @@ def __init__(self, name: str = "Sigenergy Speicher", type: str = "bat", id: int = 0, - configuration: SigenergyBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SigenergyBatConfiguration()) + configuration: SigenergyBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SigenergyBatConfiguration(), **kwargs) @auto_str @@ -54,8 +55,9 @@ def __init__(self, name: str = "Sigenergy Zähler", type: str = "counter", id: int = 0, - configuration: SigenergyCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SigenergyCounterConfiguration()) + configuration: SigenergyCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SigenergyCounterConfiguration(), **kwargs) @auto_str @@ -70,5 +72,6 @@ def __init__(self, name: str = "Sigenergy Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SigenergyInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SigenergyInverterConfiguration()) + configuration: SigenergyInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SigenergyInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/sma/sma_shm/config.py b/packages/modules/devices/sma/sma_shm/config.py index e17ca8338b..635256611a 100644 --- a/packages/modules/devices/sma/sma_shm/config.py +++ b/packages/modules/devices/sma/sma_shm/config.py @@ -30,8 +30,9 @@ def __init__(self, name: str = "SMA Sunny Home Manager 2.0, Energy Meter Zähler", type: str = "counter", id: int = 0, - configuration: SmaHomeManagerCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SmaHomeManagerCounterConfiguration()) + configuration: SmaHomeManagerCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SmaHomeManagerCounterConfiguration(), **kwargs) class SmaHomeManagerInverterConfiguration: @@ -44,5 +45,6 @@ def __init__(self, name: str = "SMA Sunny Home Manager 2.0, Energy Meter Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SmaHomeManagerInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SmaHomeManagerInverterConfiguration()) + configuration: SmaHomeManagerInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SmaHomeManagerInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/sma/sma_sunny_boy/config.py b/packages/modules/devices/sma/sma_sunny_boy/config.py index 8889b643a7..1f14001ec0 100644 --- a/packages/modules/devices/sma/sma_sunny_boy/config.py +++ b/packages/modules/devices/sma/sma_sunny_boy/config.py @@ -34,8 +34,9 @@ def __init__(self, name: str = "Sma Sunny Boy/Tripower Speicher", type: str = "bat", id: int = 0, - configuration: SmaSunnyBoyBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SmaSunnyBoyBatConfiguration()) + configuration: SmaSunnyBoyBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SmaSunnyBoyBatConfiguration(), **kwargs) class SmaSunnyBoySmartEnergyBatConfiguration: @@ -48,8 +49,9 @@ def __init__(self, name: str = "Sma Sunny Boy Smart Energy Speicher", type: str = "bat_smart_energy", id: int = 0, - configuration: SmaSunnyBoySmartEnergyBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SmaSunnyBoySmartEnergyBatConfiguration()) + configuration: SmaSunnyBoySmartEnergyBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SmaSunnyBoySmartEnergyBatConfiguration(), **kwargs) class SmaTesvoltBatConfiguration: @@ -62,8 +64,9 @@ def __init__(self, name: str = "Sma Tripower/Tesvolt Speicher", type: str = "bat_tesvolt", id: int = 0, - configuration: SmaTesvoltBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SmaTesvoltBatConfiguration()) + configuration: SmaTesvoltBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SmaTesvoltBatConfiguration(), **kwargs) class SmaSunnyBoyCounterConfiguration: @@ -76,8 +79,9 @@ def __init__(self, name: str = "Sma Sunny Boy/Tripower Zähler", type: str = "counter", id: int = 0, - configuration: SmaSunnyBoyCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SmaSunnyBoyCounterConfiguration()) + configuration: SmaSunnyBoyCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SmaSunnyBoyCounterConfiguration(), **kwargs) class SmaSunnyBoyInverterConfiguration: @@ -94,5 +98,6 @@ def __init__(self, name: str = "Sma Sunny Boy/Tripower Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SmaSunnyBoyInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SmaSunnyBoyInverterConfiguration()) + configuration: SmaSunnyBoyInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SmaSunnyBoyInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/sma/sma_sunny_island/config.py b/packages/modules/devices/sma/sma_sunny_island/config.py index 811fa51a04..62f5bf2c02 100644 --- a/packages/modules/devices/sma/sma_sunny_island/config.py +++ b/packages/modules/devices/sma/sma_sunny_island/config.py @@ -33,5 +33,6 @@ def __init__(self, name: str = "SMA Sunny Island Speicher, Sunny Tripower X", type: str = "bat", id: int = 0, - configuration: SmaSunnyIslandBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SmaSunnyIslandBatConfiguration()) + configuration: SmaSunnyIslandBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SmaSunnyIslandBatConfiguration(), **kwargs) diff --git a/packages/modules/devices/sma/sma_webbox/config.py b/packages/modules/devices/sma/sma_webbox/config.py index eea7af2b2b..879831edd5 100644 --- a/packages/modules/devices/sma/sma_webbox/config.py +++ b/packages/modules/devices/sma/sma_webbox/config.py @@ -32,5 +32,6 @@ def __init__(self, name: str = "SMA Wechselrichter Webbox", type: str = "inverter", id: int = 0, - configuration: SmaWebboxInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SmaWebboxInverterConfiguration()) + configuration: SmaWebboxInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SmaWebboxInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/smart_me/smart_me/config.py b/packages/modules/devices/smart_me/smart_me/config.py index 61fe8b3b27..c62ff3b0e9 100644 --- a/packages/modules/devices/smart_me/smart_me/config.py +++ b/packages/modules/devices/smart_me/smart_me/config.py @@ -33,8 +33,9 @@ def __init__(self, name: str = "smart-me Zähler", type: str = "counter", id: int = 0, - configuration: SmartMeCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SmartMeCounterConfiguration()) + configuration: SmartMeCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SmartMeCounterConfiguration(), **kwargs) class SmartMeInverterConfiguration: @@ -47,5 +48,6 @@ def __init__(self, name: str = "smart-me Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SmartMeInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SmartMeInverterConfiguration()) + configuration: SmartMeInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SmartMeInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/smartfox/smartfox/config.py b/packages/modules/devices/smartfox/smartfox/config.py index 9a460b1b35..57fa14dcd4 100644 --- a/packages/modules/devices/smartfox/smartfox/config.py +++ b/packages/modules/devices/smartfox/smartfox/config.py @@ -32,5 +32,6 @@ def __init__(self, name: str = "Smartfox Zähler", type: str = "counter", id: int = 0, - configuration: SmartfoxCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SmartfoxCounterConfiguration()) + configuration: SmartfoxCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SmartfoxCounterConfiguration(), **kwargs) diff --git a/packages/modules/devices/sofar/sofar/config.py b/packages/modules/devices/sofar/sofar/config.py index 678986a557..3a08cf7d9a 100644 --- a/packages/modules/devices/sofar/sofar/config.py +++ b/packages/modules/devices/sofar/sofar/config.py @@ -34,8 +34,9 @@ def __init__(self, name: str = "Sofar Speicher", type: str = "bat", id: int = 0, - configuration: SofarBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SofarBatConfiguration()) + configuration: SofarBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SofarBatConfiguration(), **kwargs) class SofarCounterConfiguration: @@ -48,8 +49,9 @@ def __init__(self, name: str = "Sofar Zähler", type: str = "counter", id: int = 0, - configuration: SofarCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SofarCounterConfiguration()) + configuration: SofarCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SofarCounterConfiguration(), **kwargs) class SofarInverterConfiguration: @@ -62,5 +64,6 @@ def __init__(self, name: str = "Sofar Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SofarInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SofarInverterConfiguration()) + configuration: SofarInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SofarInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/solakon/solakon_one/config.py b/packages/modules/devices/solakon/solakon_one/config.py index bdcb9f4db9..98807b2580 100644 --- a/packages/modules/devices/solakon/solakon_one/config.py +++ b/packages/modules/devices/solakon/solakon_one/config.py @@ -38,8 +38,9 @@ def __init__(self, name: str = "Solakon One Speicher", type: str = "bat", id: int = 0, - configuration: SolakonOneBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolakonOneBatConfiguration()) + configuration: SolakonOneBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolakonOneBatConfiguration(), **kwargs) @auto_str @@ -54,5 +55,6 @@ def __init__(self, name: str = "Solakon One Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SolakonOneInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolakonOneInverterConfiguration()) + configuration: SolakonOneInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolakonOneInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/solar_log/solar_log/config.py b/packages/modules/devices/solar_log/solar_log/config.py index 2ffce43bf3..53def9acd1 100644 --- a/packages/modules/devices/solar_log/solar_log/config.py +++ b/packages/modules/devices/solar_log/solar_log/config.py @@ -32,8 +32,9 @@ def __init__(self, name: str = "Solar-Log Zähler", type: str = "counter", id: int = 0, - configuration: SolarLogCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolarLogCounterConfiguration()) + configuration: SolarLogCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolarLogCounterConfiguration(), **kwargs) class SolarLogInverterConfiguration: @@ -46,5 +47,6 @@ def __init__(self, name: str = "Solar-Log Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SolarLogInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolarLogInverterConfiguration()) + configuration: SolarLogInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolarLogInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/solar_view/solar_view/config.py b/packages/modules/devices/solar_view/solar_view/config.py index c43e9deccd..daed6160d3 100644 --- a/packages/modules/devices/solar_view/solar_view/config.py +++ b/packages/modules/devices/solar_view/solar_view/config.py @@ -37,8 +37,9 @@ def __init__(self, name: str = "SolarView Zähler", type: str = "counter", id: int = 0, - configuration: SolarViewCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolarViewCounterConfiguration()) + configuration: SolarViewCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolarViewCounterConfiguration(), **kwargs) class SolarViewInverterConfiguration: @@ -51,5 +52,6 @@ def __init__(self, name: str = "SolarView Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SolarViewInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolarViewInverterConfiguration()) + configuration: SolarViewInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolarViewInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/solar_watt/solar_watt/config.py b/packages/modules/devices/solar_watt/solar_watt/config.py index 2f8a6081f9..91d779c798 100644 --- a/packages/modules/devices/solar_watt/solar_watt/config.py +++ b/packages/modules/devices/solar_watt/solar_watt/config.py @@ -33,8 +33,9 @@ def __init__(self, name: str = "Solarwatt/My Reserve Speicher", type: str = "bat", id: int = 0, - configuration: SolarWattBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolarWattBatConfiguration()) + configuration: SolarWattBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolarWattBatConfiguration(), **kwargs) class SolarWattCounterConfiguration: @@ -47,8 +48,9 @@ def __init__(self, name: str = "Solarwatt/My Reserve Zähler", type: str = "counter", id: int = 0, - configuration: SolarWattCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolarWattCounterConfiguration()) + configuration: SolarWattCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolarWattCounterConfiguration(), **kwargs) class SolarWattInverterConfiguration: @@ -61,5 +63,6 @@ def __init__(self, name: str = "Solarwatt/My Reserve Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SolarWattInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolarWattInverterConfiguration()) + configuration: SolarWattInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolarWattInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/solar_world/solar_world/config.py b/packages/modules/devices/solar_world/solar_world/config.py index 2cfcdda2e6..6ee05ec4ff 100644 --- a/packages/modules/devices/solar_world/solar_world/config.py +++ b/packages/modules/devices/solar_world/solar_world/config.py @@ -37,8 +37,9 @@ def __init__(self, name: str = "SolarWorld Zähler", type: str = "counter", id: int = 0, - configuration: SolarWorldCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolarWorldCounterConfiguration()) + configuration: SolarWorldCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolarWorldCounterConfiguration(), **kwargs) @auto_str @@ -53,5 +54,6 @@ def __init__(self, name: str = "SolarWorld Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SolarWorldInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolarWorldInverterConfiguration()) + configuration: SolarWorldInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolarWorldInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/solaredge/solaredge/config.py b/packages/modules/devices/solaredge/solaredge/config.py index a0e370cb45..cd7f248f39 100644 --- a/packages/modules/devices/solaredge/solaredge/config.py +++ b/packages/modules/devices/solaredge/solaredge/config.py @@ -34,8 +34,9 @@ def __init__(self, name: str = "SolarEdge Speicher", type: str = "bat", id: int = 0, - configuration: SolaredgeBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolaredgeBatConfiguration()) + configuration: SolaredgeBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolaredgeBatConfiguration(), **kwargs) class SolaredgeCounterConfiguration: @@ -49,8 +50,9 @@ def __init__(self, name: str = "SolarEdge Zähler", type: str = "counter", id: int = 0, - configuration: SolaredgeCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolaredgeCounterConfiguration()) + configuration: SolaredgeCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolaredgeCounterConfiguration(), **kwargs) class SolaredgeExternalInverterConfiguration: @@ -65,8 +67,9 @@ def __init__(self, name: str = "SolarEdge externer Wechselrichter", type: str = "external_inverter", id: int = 0, - configuration: SolaredgeExternalInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolaredgeExternalInverterConfiguration()) + configuration: SolaredgeExternalInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolaredgeExternalInverterConfiguration(), **kwargs) class SolaredgeInverterConfiguration: @@ -79,5 +82,6 @@ def __init__(self, name: str = "SolarEdge Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SolaredgeInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolaredgeInverterConfiguration()) + configuration: SolaredgeInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolaredgeInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/solarmax/solarmax/config.py b/packages/modules/devices/solarmax/solarmax/config.py index b0efd51e34..843bde9631 100644 --- a/packages/modules/devices/solarmax/solarmax/config.py +++ b/packages/modules/devices/solarmax/solarmax/config.py @@ -33,8 +33,9 @@ def __init__(self, name: str = "Solarmax MAX.STORAGE / MAX.STORAGE Ultimate Zähler", type: str = "counter_maxstorage", id: Optional[int] = 0, - configuration: SolarmaxMsCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolarmaxMsCounterConfiguration()) + configuration: SolarmaxMsCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolarmaxMsCounterConfiguration(), **kwargs) class SolarmaxBatConfiguration: @@ -48,8 +49,9 @@ def __init__(self, name: str = "Solarmax MAX.STORAGE / MAX.STORAGE Ultimate Speicher", type: str = "bat", id: int = 0, - configuration: SolarmaxBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolarmaxBatConfiguration()) + configuration: SolarmaxBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolarmaxBatConfiguration(), **kwargs) class SolarmaxMsInverterConfiguration: @@ -62,8 +64,9 @@ def __init__(self, name: str = "Solarmax MAX.STORAGE / MAX.STORAGE Ultimate Wechselrichter", type: str = "inverter_maxstorage", id: int = 0, - configuration: SolarmaxMsInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolarmaxMsInverterConfiguration()) + configuration: SolarmaxMsInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolarmaxMsInverterConfiguration(), **kwargs) class SolarmaxInverterConfiguration: @@ -76,5 +79,6 @@ def __init__(self, name: str = "Solarmax Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SolarmaxInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolarmaxInverterConfiguration()) + configuration: SolarmaxInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolarmaxInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/solax/solax/config.py b/packages/modules/devices/solax/solax/config.py index 88db0b73ea..dfabe44f88 100644 --- a/packages/modules/devices/solax/solax/config.py +++ b/packages/modules/devices/solax/solax/config.py @@ -39,8 +39,9 @@ def __init__(self, name: str = "Solax Speicher", type: str = "bat", id: int = 0, - configuration: SolaxBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolaxBatConfiguration()) + configuration: SolaxBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolaxBatConfiguration(), **kwargs) class SolaxCounterConfiguration: @@ -53,8 +54,9 @@ def __init__(self, name: str = "Solax Zähler", type: str = "counter", id: int = 0, - configuration: SolaxCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolaxCounterConfiguration()) + configuration: SolaxCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolaxCounterConfiguration(), **kwargs) class SolaxInverterConfiguration: @@ -67,5 +69,6 @@ def __init__(self, name: str = "Solax Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SolaxInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolaxInverterConfiguration()) + configuration: SolaxInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolaxInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/solis/solis/config.py b/packages/modules/devices/solis/solis/config.py index 470c7c55bb..93a1b9ecf7 100644 --- a/packages/modules/devices/solis/solis/config.py +++ b/packages/modules/devices/solis/solis/config.py @@ -41,8 +41,9 @@ def __init__(self, name: str = "Solis Speicher", type: str = "bat", id: int = 0, - configuration: SolisBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolisBatConfiguration()) + configuration: SolisBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolisBatConfiguration(), **kwargs) @auto_str @@ -57,8 +58,9 @@ def __init__(self, name: str = "Solis Zähler", type: str = "counter", id: int = 0, - configuration: SolisCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolisCounterConfiguration()) + configuration: SolisCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolisCounterConfiguration(), **kwargs) @auto_str @@ -73,5 +75,6 @@ def __init__(self, name: str = "Solis Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SolisInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SolisInverterConfiguration()) + configuration: SolisInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SolisInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/sonnen/sonnenbatterie/config.py b/packages/modules/devices/sonnen/sonnenbatterie/config.py index 469e4f23d9..65fd66319c 100644 --- a/packages/modules/devices/sonnen/sonnenbatterie/config.py +++ b/packages/modules/devices/sonnen/sonnenbatterie/config.py @@ -34,8 +34,9 @@ def __init__(self, name: str = "SonnenBatterie Speicher", type: str = "bat", id: int = 0, - configuration: SonnenbatterieBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SonnenbatterieBatConfiguration()) + configuration: SonnenbatterieBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SonnenbatterieBatConfiguration(), **kwargs) class SonnenbatterieCounterConfiguration: @@ -48,8 +49,9 @@ def __init__(self, name: str = "SonnenBatterie EVU-Zähler", type: str = "counter", id: int = 0, - configuration: SonnenbatterieCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SonnenbatterieCounterConfiguration()) + configuration: SonnenbatterieCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SonnenbatterieCounterConfiguration(), **kwargs) class SonnenbatterieConsumptionCounterConfiguration: @@ -62,8 +64,9 @@ def __init__(self, name: str = "SonnenBatterie Verbrauchs-Zähler", type: str = "counter_consumption", id: int = 0, - configuration: SonnenbatterieConsumptionCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SonnenbatterieConsumptionCounterConfiguration()) + configuration: SonnenbatterieConsumptionCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SonnenbatterieConsumptionCounterConfiguration(), **kwargs) class SonnenbatterieInverterConfiguration: @@ -76,5 +79,6 @@ def __init__(self, name: str = "SonnenBatterie Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SonnenbatterieInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SonnenbatterieInverterConfiguration()) + configuration: SonnenbatterieInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SonnenbatterieInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/studer/studer/config.py b/packages/modules/devices/studer/studer/config.py index d18767d979..a36810236a 100644 --- a/packages/modules/devices/studer/studer/config.py +++ b/packages/modules/devices/studer/studer/config.py @@ -33,8 +33,9 @@ def __init__(self, name: str = "Studer Speicher", type: str = "bat", id: int = 0, - configuration: StuderBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or StuderBatConfiguration()) + configuration: StuderBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or StuderBatConfiguration(), **kwargs) class StuderInverterConfiguration: @@ -48,5 +49,6 @@ def __init__(self, name: str = "Studer Wechselrichter", type: str = "inverter", id: int = 0, - configuration: StuderInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or StuderInverterConfiguration()) + configuration: StuderInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or StuderInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/sungrow/sungrow_ihm/config.py b/packages/modules/devices/sungrow/sungrow_ihm/config.py index 5fa7652372..3fdfb5e94d 100644 --- a/packages/modules/devices/sungrow/sungrow_ihm/config.py +++ b/packages/modules/devices/sungrow/sungrow_ihm/config.py @@ -37,8 +37,9 @@ def __init__(self, name: str = "Sungrow iHM Speicher", type: str = "bat", id: int = 0, - configuration: SungrowIHMBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SungrowIHMBatConfiguration()) + configuration: SungrowIHMBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SungrowIHMBatConfiguration(), **kwargs) class SungrowIHMCounterConfiguration: @@ -51,8 +52,9 @@ def __init__(self, name: str = "Sungrow iHM Zähler", type: str = "counter", id: int = 0, - configuration: SungrowIHMCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SungrowIHMCounterConfiguration()) + configuration: SungrowIHMCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SungrowIHMCounterConfiguration(), **kwargs) class SungrowIHMInverterConfiguration: @@ -65,5 +67,6 @@ def __init__(self, name: str = "Sungrow iHM Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SungrowIHMInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SungrowIHMInverterConfiguration()) + configuration: SungrowIHMInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SungrowIHMInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/sungrow/sungrow_micro/config.py b/packages/modules/devices/sungrow/sungrow_micro/config.py index b2bf9fcc99..e3fb0a8ad2 100644 --- a/packages/modules/devices/sungrow/sungrow_micro/config.py +++ b/packages/modules/devices/sungrow/sungrow_micro/config.py @@ -37,5 +37,6 @@ def __init__(self, name: str = "Sungrow Microwechselrichter SxxxxS", type: str = "inverter", id: int = 0, - configuration: SungrowMicroInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SungrowMicroInverterConfiguration()) + configuration: SungrowMicroInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SungrowMicroInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/sungrow/sungrow_sg/config.py b/packages/modules/devices/sungrow/sungrow_sg/config.py index a6bf4a3b76..29db422ee6 100644 --- a/packages/modules/devices/sungrow/sungrow_sg/config.py +++ b/packages/modules/devices/sungrow/sungrow_sg/config.py @@ -37,8 +37,9 @@ def __init__(self, name: str = "Sungrow SG Zähler", type: str = "counter", id: int = 0, - configuration: SungrowSGCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SungrowSGCounterConfiguration()) + configuration: SungrowSGCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SungrowSGCounterConfiguration(), **kwargs) class SungrowSGInverterConfiguration: @@ -51,5 +52,6 @@ def __init__(self, name: str = "Sungrow SG Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SungrowSGInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SungrowSGInverterConfiguration()) + configuration: SungrowSGInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SungrowSGInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/sungrow/sungrow_sh/config.py b/packages/modules/devices/sungrow/sungrow_sh/config.py index 6a1e8b1def..9b3338e7bf 100644 --- a/packages/modules/devices/sungrow/sungrow_sh/config.py +++ b/packages/modules/devices/sungrow/sungrow_sh/config.py @@ -40,8 +40,9 @@ def __init__(self, name: str = "Sungrow SH Speicher", type: str = "bat", id: int = 0, - configuration: SungrowSHBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SungrowSHBatConfiguration()) + configuration: SungrowSHBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SungrowSHBatConfiguration(), **kwargs) class SungrowSHCounterConfiguration: @@ -54,8 +55,9 @@ def __init__(self, name: str = "Sungrow SH Zähler", type: str = "counter", id: int = 0, - configuration: SungrowSHCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SungrowSHCounterConfiguration()) + configuration: SungrowSHCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SungrowSHCounterConfiguration(), **kwargs) class SungrowSHInverterConfiguration: @@ -68,5 +70,6 @@ def __init__(self, name: str = "Sungrow SH Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SungrowSHInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SungrowSHInverterConfiguration()) + configuration: SungrowSHInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SungrowSHInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/sunways/sunways/config.py b/packages/modules/devices/sunways/sunways/config.py index d31af93f95..32767a0f4c 100644 --- a/packages/modules/devices/sunways/sunways/config.py +++ b/packages/modules/devices/sunways/sunways/config.py @@ -33,5 +33,6 @@ def __init__(self, name: str = "Sunways Wechselrichter", type: str = "inverter", id: int = 0, - configuration: SunwaysInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or SunwaysInverterConfiguration()) + configuration: SunwaysInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or SunwaysInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/tasmota/tasmota/config.py b/packages/modules/devices/tasmota/tasmota/config.py index 8f6785b83c..9cb781fc3c 100644 --- a/packages/modules/devices/tasmota/tasmota/config.py +++ b/packages/modules/devices/tasmota/tasmota/config.py @@ -33,8 +33,9 @@ def __init__(self, name: str = "Tasmota Zähler", type: str = "counter", id: int = 0, - configuration: TasmotaCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or TasmotaCounterConfiguration()) + configuration: TasmotaCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or TasmotaCounterConfiguration(), **kwargs) class TasmotaInverterConfiguration: @@ -47,8 +48,9 @@ def __init__(self, name: str = "Tasmota Wechselrichterzähler", type: str = "inverter", id: int = 0, - configuration: TasmotaInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or TasmotaInverterConfiguration()) + configuration: TasmotaInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or TasmotaInverterConfiguration(), **kwargs) class TasmotaBatConfiguration: @@ -61,5 +63,6 @@ def __init__(self, name: str = "Tasmota Speicherzähler", type: str = "bat", id: int = 0, - configuration: TasmotaBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or TasmotaBatConfiguration()) + configuration: TasmotaBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or TasmotaBatConfiguration(), **kwargs) diff --git a/packages/modules/devices/tesla/tesla/config.py b/packages/modules/devices/tesla/tesla/config.py index c3da1d7d2d..ea111d1de9 100644 --- a/packages/modules/devices/tesla/tesla/config.py +++ b/packages/modules/devices/tesla/tesla/config.py @@ -34,8 +34,9 @@ def __init__(self, name: str = "Tesla Speicher", type: str = "bat", id: int = 0, - configuration: TeslaBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or TeslaBatConfiguration()) + configuration: TeslaBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or TeslaBatConfiguration(), **kwargs) class TeslaCounterConfiguration: @@ -48,8 +49,9 @@ def __init__(self, name: str = "Tesla Zähler", type: str = "counter", id: int = 0, - configuration: TeslaCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or TeslaCounterConfiguration()) + configuration: TeslaCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or TeslaCounterConfiguration(), **kwargs) class TeslaInverterConfiguration: @@ -62,5 +64,6 @@ def __init__(self, name: str = "Tesla Wechselrichter", type: str = "inverter", id: int = 0, - configuration: TeslaInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or TeslaInverterConfiguration()) + configuration: TeslaInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or TeslaInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/thermia/thermia/config.py b/packages/modules/devices/thermia/thermia/config.py index e597e10826..7b21a5d312 100644 --- a/packages/modules/devices/thermia/thermia/config.py +++ b/packages/modules/devices/thermia/thermia/config.py @@ -38,5 +38,6 @@ def __init__(self, name: str = "Thermia Zähler", type: str = "counter", id: int = 0, - configuration: ThermiaCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or ThermiaCounterConfiguration()) + configuration: ThermiaCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or ThermiaCounterConfiguration(), **kwargs) diff --git a/packages/modules/devices/upower/upower/config.py b/packages/modules/devices/upower/upower/config.py index 64d4148f1d..9cf9183512 100644 --- a/packages/modules/devices/upower/upower/config.py +++ b/packages/modules/devices/upower/upower/config.py @@ -35,8 +35,9 @@ def __init__(self, name: str = "UPower Speicher", type: str = "bat", id: int = 0, - configuration: UPowerBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or UPowerBatConfiguration()) + configuration: UPowerBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or UPowerBatConfiguration(), **kwargs) class UPowerCounterConfiguration: @@ -49,8 +50,9 @@ def __init__(self, name: str = "UPower Zähler", type: str = "counter", id: int = 0, - configuration: UPowerCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or UPowerCounterConfiguration()) + configuration: UPowerCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or UPowerCounterConfiguration(), **kwargs) class UPowerInverterConfiguration: @@ -63,5 +65,6 @@ def __init__(self, name: str = "UPower Wechselrichter", type: str = "inverter", id: int = 0, - configuration: UPowerInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or UPowerInverterConfiguration()) + configuration: UPowerInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or UPowerInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/varta/varta/config.py b/packages/modules/devices/varta/varta/config.py index e5a68b3c30..f2959e48ca 100644 --- a/packages/modules/devices/varta/varta/config.py +++ b/packages/modules/devices/varta/varta/config.py @@ -39,8 +39,9 @@ def __init__(self, name: str = "Varta Speicher (Abfrage per API)", type: str = "bat_api", id: int = 0, - configuration: VartaBatApiConfiguration = None) -> None: - super().__init__(name, type, id, configuration or VartaBatApiConfiguration()) + configuration: VartaBatApiConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or VartaBatApiConfiguration(), **kwargs) @auto_str @@ -55,8 +56,9 @@ def __init__(self, name: str = "Speicher Varta Pulse, Element, Neo, u.a. (Abfrage per Modbus)", type: str = "bat_modbus", id: int = 0, - configuration: VartaBatModbusConfiguration = None) -> None: - super().__init__(name, type, id, configuration or VartaBatModbusConfiguration()) + configuration: VartaBatModbusConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or VartaBatModbusConfiguration(), **kwargs) @auto_str @@ -71,8 +73,9 @@ def __init__(self, name: str = "Varta Zähler", type: str = "counter", id: int = 0, - configuration: VartaCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or VartaCounterConfiguration()) + configuration: VartaCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or VartaCounterConfiguration(), **kwargs) @auto_str @@ -87,5 +90,6 @@ def __init__(self, name: str = "Varta Wechselrichter", type: str = "inverter", id: int = 0, - configuration: VartaInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or VartaInverterConfiguration()) + configuration: VartaInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or VartaInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/victron/victron/config.py b/packages/modules/devices/victron/victron/config.py index 808ac01526..f49d0de7af 100644 --- a/packages/modules/devices/victron/victron/config.py +++ b/packages/modules/devices/victron/victron/config.py @@ -33,8 +33,9 @@ def __init__(self, name: str = "Victron Speicher", type: str = "bat", id: int = 0, - configuration: VictronBatConfiguration = None) -> None: - super().__init__(name, type, id, configuration or VictronBatConfiguration()) + configuration: VictronBatConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or VictronBatConfiguration(), **kwargs) class VictronCounterConfiguration: @@ -48,8 +49,9 @@ def __init__(self, name: str = "Victron Zähler", type: str = "counter", id: int = 0, - configuration: VictronCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or VictronCounterConfiguration()) + configuration: VictronCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or VictronCounterConfiguration(), **kwargs) class VictronInverterConfiguration: @@ -63,5 +65,6 @@ def __init__(self, name: str = "Victron Wechselrichter", type: str = "inverter", id: int = 0, - configuration: VictronInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or VictronInverterConfiguration()) + configuration: VictronInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or VictronInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/victron/victron_3p75ct/config.py b/packages/modules/devices/victron/victron_3p75ct/config.py index bd367b223f..89744e8be7 100644 --- a/packages/modules/devices/victron/victron_3p75ct/config.py +++ b/packages/modules/devices/victron/victron_3p75ct/config.py @@ -33,5 +33,6 @@ def __init__(self, name: str = "Victron Zähler", type: str = "counter", id: int = 0, - configuration: VictronCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or VictronCounterConfiguration()) + configuration: VictronCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or VictronCounterConfiguration(), **kwargs) diff --git a/packages/modules/devices/vzlogger/vzlogger/config.py b/packages/modules/devices/vzlogger/vzlogger/config.py index baf8703118..c39e343598 100644 --- a/packages/modules/devices/vzlogger/vzlogger/config.py +++ b/packages/modules/devices/vzlogger/vzlogger/config.py @@ -39,8 +39,9 @@ def __init__(self, name: str = "VZLogger Zähler", type: str = "counter", id: int = 0, - configuration: VZLoggerCounterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or VZLoggerCounterConfiguration()) + configuration: VZLoggerCounterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or VZLoggerCounterConfiguration(), **kwargs) @auto_str @@ -56,5 +57,6 @@ def __init__(self, name: str = "VZLogger Wechselrichter", type: str = "inverter", id: int = 0, - configuration: VZLoggerInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or VZLoggerInverterConfiguration()) + configuration: VZLoggerInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or VZLoggerInverterConfiguration(), **kwargs) diff --git a/packages/modules/devices/youless/youless/config.py b/packages/modules/devices/youless/youless/config.py index 4c084399e7..6b2878215f 100644 --- a/packages/modules/devices/youless/youless/config.py +++ b/packages/modules/devices/youless/youless/config.py @@ -37,5 +37,6 @@ def __init__(self, name: str = "Youless LS120 Wechselrichter", type: str = "inverter", id: int = 0, - configuration: YoulessInverterConfiguration = None) -> None: - super().__init__(name, type, id, configuration or YoulessInverterConfiguration()) + configuration: YoulessInverterConfiguration = None, + **kwargs) -> None: + super().__init__(name, type, id, configuration or YoulessInverterConfiguration(), **kwargs) diff --git a/packages/modules/web_themes/koala/source/package-lock.json b/packages/modules/web_themes/koala/source/package-lock.json index 68b4ed1c8c..57ef5167aa 100644 --- a/packages/modules/web_themes/koala/source/package-lock.json +++ b/packages/modules/web_themes/koala/source/package-lock.json @@ -4584,9 +4584,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "25.8.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-25.8.0.tgz", - "integrity": "sha512-TCFSk8IZh+iLX1xtksoBVtdmgL+1IX0fC9BeU4QqFSuNdN/K+HUlhqOzEmSYYpZUVsLYcPqc9KX+60iDuninSQ==", + "version": "25.9.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.0.tgz", + "integrity": "sha512-AOQwYUNolgy3VosiRqXrACUXTN8nJUtPl7FJXMqZVyxiiCLhQuG3jXKvCS1ALr+Y2OmZhzzLVlYPEqJaiqkaJQ==", "license": "MIT", "dependencies": { "undici-types": ">=7.24.0 <7.24.7" @@ -4660,17 +4660,17 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.59.3", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.59.3.tgz", - "integrity": "sha512-PwFvSKsXGShKGW6n5bZOhGHEcCZXM8HofLK9fNsEwZXzFRjoY+XT1Vsf1zgyXdwTr0ZYz1/2tkZ0DBTT9jZjhw==", + "version": "8.59.4", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.59.4.tgz", + "integrity": "sha512-PegsU+XfyJJNjd4+u/k6f9yTyp0lEXXiPopUNobZcIAUJFGICFLN+sP0Rb3JehVmiij1Ph0dFGYqODoRo/2+6A==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.12.2", - "@typescript-eslint/scope-manager": "8.59.3", - "@typescript-eslint/type-utils": "8.59.3", - "@typescript-eslint/utils": "8.59.3", - "@typescript-eslint/visitor-keys": "8.59.3", + "@typescript-eslint/scope-manager": "8.59.4", + "@typescript-eslint/type-utils": "8.59.4", + "@typescript-eslint/utils": "8.59.4", + "@typescript-eslint/visitor-keys": "8.59.4", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.5.0" @@ -4683,22 +4683,22 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.59.3", + "@typescript-eslint/parser": "^8.59.4", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/parser": { - "version": "8.59.3", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.3.tgz", - "integrity": "sha512-HPwA+hVkfcriajbNvTmZv4VRauibay+cWArYUYq7u7W7PmGShMxbPxLvrwDme55a6d5alG3nrYfhyJ/G28XlLg==", + "version": "8.59.4", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.59.4.tgz", + "integrity": "sha512-zORHqO/tuhxY1zWuTvMUqddRxpiFJ72xVfcNoWpqdLjs6lfPbuQBJuW4pk+49/uBMy7Ssr4bzgjiKmmDB1UbZQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.59.3", - "@typescript-eslint/types": "8.59.3", - "@typescript-eslint/typescript-estree": "8.59.3", - "@typescript-eslint/visitor-keys": "8.59.3", + "@typescript-eslint/scope-manager": "8.59.4", + "@typescript-eslint/types": "8.59.4", + "@typescript-eslint/typescript-estree": "8.59.4", + "@typescript-eslint/visitor-keys": "8.59.4", "debug": "^4.4.3" }, "engines": { @@ -4714,14 +4714,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.59.3", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.59.3.tgz", - "integrity": "sha512-ECiUWa/KYRGDFUqTNehaRgzDshnJfkTABJxVemHk4ko22gcr0ukloKjWvyQ64g8YCV/UI47kN1dbmjf/GaQYng==", + "version": "8.59.4", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.59.4.tgz", + "integrity": "sha512-Ly00Vu4oAacfDeHp2Zg85ioNG6l8HG+tN1D7J+xTHSxu9y0awYKJ2zH1rFBn8ZSfuGK+7FxK3Cgl3uAz0aZZLg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.59.3", - "@typescript-eslint/types": "^8.59.3", + "@typescript-eslint/tsconfig-utils": "^8.59.4", + "@typescript-eslint/types": "^8.59.4", "debug": "^4.4.3" }, "engines": { @@ -4736,14 +4736,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.59.3", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.59.3.tgz", - "integrity": "sha512-t2LvZnoEfzKtnPjgeEu41xw5gxq9mQVfYy4OoZ4Vlt0sk3JwxmhCca/AR7DwOiHrjWgjAj6as4AhRLKSDfvZIA==", + "version": "8.59.4", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.59.4.tgz", + "integrity": "sha512-mUeR/3H1WrTAddJrwut8OoPjfauaztMQmRwV5fQTUyNVJCLiUXXe4lGEyYIL2oFDpP7UtgbGJXCt72wT0z2S3Q==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.59.3", - "@typescript-eslint/visitor-keys": "8.59.3" + "@typescript-eslint/types": "8.59.4", + "@typescript-eslint/visitor-keys": "8.59.4" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -4754,9 +4754,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.59.3", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.3.tgz", - "integrity": "sha512-PcIJHjmaREXLgIAIzLnSY9VucEzz8FKXsRgFa1DmdGCK/5tJpW03TKJF01Q6VZd1lLdz2sIKPWaDUZN9dp//dw==", + "version": "8.59.4", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.4.tgz", + "integrity": "sha512-DLCpnKgD4alVxTBSKulK+gU1KCqOgUXfDRDXh2mZgzokQKa/70ax93I2uVO3m/LLvIAtWZIFoiifudmIqAxpMA==", "dev": true, "license": "MIT", "engines": { @@ -4771,15 +4771,15 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.59.3", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.59.3.tgz", - "integrity": "sha512-g71d8QD8UaiHGvrJwyIS1hCX5r63w6Jll+4VEYhEAHXTDIqX1JgxhTAbEHtKntL9kuc4jRo7/GWw5xfCepSccQ==", + "version": "8.59.4", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.59.4.tgz", + "integrity": "sha512-uonTuPAAKr9XaBGqJ3LjYTh72zy5DyGesljO9gtmk/eFW0W1fRHjnwVYKB35Lm8d5Q5CluEW3gPHjTvZTmgrfA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.59.3", - "@typescript-eslint/typescript-estree": "8.59.3", - "@typescript-eslint/utils": "8.59.3", + "@typescript-eslint/types": "8.59.4", + "@typescript-eslint/typescript-estree": "8.59.4", + "@typescript-eslint/utils": "8.59.4", "debug": "^4.4.3", "ts-api-utils": "^2.5.0" }, @@ -4796,9 +4796,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.59.3", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.59.3.tgz", - "integrity": "sha512-ePFoH0g4ludssdRFqqDxQePCxU4WQyRa9+XVwjm7yLn0FKhMeoetC+qBEEI1Eyb1pGSDveTIT09Bvw2WhlGayg==", + "version": "8.59.4", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.59.4.tgz", + "integrity": "sha512-F1o7WJcCq+bc8dwcO/YsSEOudAH8RDtaOhM6wcAQhcUsFhnWQl81JKy48q1hoxAU0qrzM89+31GYh1515Zde3Q==", "dev": true, "license": "MIT", "engines": { @@ -4810,16 +4810,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.59.3", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.3.tgz", - "integrity": "sha512-CbRjVRAf7Lr9Kr8RopKcbY45p2VfmmHrm0ygOCYFi7oU8q19m0Fs/6iHS7kNOmwpp+ob07ZVcAqlxUod9lYdmg==", + "version": "8.59.4", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.4.tgz", + "integrity": "sha512-F+RuOmcDXo4+TPdfd/TCLS3m2nw8gE9XXyZLrA3JBfaA5tz9TtdkyD3YJFmPxulyc2cKbEok/CvFE3MgSLWnag==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.59.3", - "@typescript-eslint/tsconfig-utils": "8.59.3", - "@typescript-eslint/types": "8.59.3", - "@typescript-eslint/visitor-keys": "8.59.3", + "@typescript-eslint/project-service": "8.59.4", + "@typescript-eslint/tsconfig-utils": "8.59.4", + "@typescript-eslint/types": "8.59.4", + "@typescript-eslint/visitor-keys": "8.59.4", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", @@ -4838,16 +4838,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.59.3", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.59.3.tgz", - "integrity": "sha512-JAvT14goBzRzzzZyqq3P9BLArIxTtQURUtFgQ/V7FO+eU+Gg6ES+5ymOPP1wRxXcxAYeivCk4uS3jCKWI1K8Zg==", + "version": "8.59.4", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.59.4.tgz", + "integrity": "sha512-cYXeNAUsG4lJo5dbc1FcKm+JwIWrj1/UpTORsC6tGMjEZ81DYcvIr9/ueikhMa/Y/gDQYGp+YX9/xQrXje5BJw==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.59.3", - "@typescript-eslint/types": "8.59.3", - "@typescript-eslint/typescript-estree": "8.59.3" + "@typescript-eslint/scope-manager": "8.59.4", + "@typescript-eslint/types": "8.59.4", + "@typescript-eslint/typescript-estree": "8.59.4" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -4862,13 +4862,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.59.3", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.3.tgz", - "integrity": "sha512-f1UQF7ggd42YiwI5wGrRaPsa+P0CINBlrkLPmGfpq/u/I/oVtecoEIfFR9ag/oa1sLOsRNZ6xehf6qMZhQGBDg==", + "version": "8.59.4", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.4.tgz", + "integrity": "sha512-U3gxVaDVnuZKhSspW/MzMxE1kq7zOdc072FcSNoqA1I9p8HyKbBFfEHoWckBAMgNMph4MamwS5iTVzFmrnt8TQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.59.3", + "@typescript-eslint/types": "8.59.4", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -5193,9 +5193,9 @@ } }, "node_modules/@vue/language-core": { - "version": "3.2.9", - "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-3.2.9.tgz", - "integrity": "sha512-ie0ojt/0fU/GfIogh+zgHbaYRPlt9S+cLOxcWwF7nTSFh897BVgnFKL2byT4kpp1mlqYWZ2psGwSniyE2xsxYw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-3.3.0.tgz", + "integrity": "sha512-EyUxq1b8Yoxk6hQ6X33BIRnfFLb9Rbm9w/8G8y6uMxlQu7CW7yy9JS/z54xSpIvBvVWX6Lt5v1aBGwmrqD4aJw==", "dev": true, "license": "MIT", "dependencies": { @@ -5789,9 +5789,9 @@ "license": "MIT" }, "node_modules/baseline-browser-mapping": { - "version": "2.10.30", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.30.tgz", - "integrity": "sha512-xjOFN16Ha1+Rz4nFYKqHU/LSB+gx/Vi3yQLX7r7sAW+Wa+8hhF2h4pvqTrTMc8+WcDBEunnUurr46Jvv0jk3Vg==", + "version": "2.10.31", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.31.tgz", + "integrity": "sha512-MujYO3eP72uvmSE0i4wltsodRfIpZATP3jvzRNRGGxgzId7aVocVJJV3nf01qnzzKFGxQVC9bpWxl5cjxTr/7Q==", "dev": true, "license": "Apache-2.0", "bin": { @@ -7125,9 +7125,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.357", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.357.tgz", - "integrity": "sha512-NHlTIQDK8fmVwHwuIzmXYEJ1Ewq3D9wDNc0cWXxDGysP6Pb21giwGNkxiTifyKy/4SoPuN5l6GLP1W9Sv7zB2g==", + "version": "1.5.359", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.359.tgz", + "integrity": "sha512-8lPELWuYZIWk7NDvCNthtmMw/7Q5Wu25NpM4djFMHBmk8DubPAtL4YTOp7ou0e7HyJtwkVlWv8XMLURnrtgJQw==", "dev": true, "license": "ISC" }, @@ -10661,9 +10661,9 @@ } }, "node_modules/postcss": { - "version": "8.5.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.14.tgz", - "integrity": "sha512-SoSL4+OSEtR99LHFZQiJLkT59C5B1amGO1NzTwj7TT1qCUgUO6hxOvzkOYxD+vMrXBM3XJIKzokoERdqQq/Zmg==", + "version": "8.5.15", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.15.tgz", + "integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==", "funding": [ { "type": "opencollective", @@ -10680,7 +10680,7 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.11", + "nanoid": "^3.3.12", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" }, @@ -13832,14 +13832,14 @@ "license": "MIT" }, "node_modules/vue-tsc": { - "version": "3.2.9", - "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-3.2.9.tgz", - "integrity": "sha512-qm8/nbo+9eZc1SCndm9wT+gq23pM+wRIdHY0wjm83B3lIginHTwcdrLUyTrKjDWXbMVNjKegNrnymhpdqnCL3A==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-3.3.0.tgz", + "integrity": "sha512-kY8RcoTOENASi0P1GLPvJgA2+hoGF+t8We1UGgmnAb1r/GjTUMSE3zz+WGfjPORZNnBHdAt67sVPhBLXWunkeg==", "dev": true, "license": "MIT", "dependencies": { "@volar/typescript": "2.4.28", - "@vue/language-core": "3.2.9" + "@vue/language-core": "3.3.0" }, "bin": { "vue-tsc": "bin/vue-tsc.js" diff --git a/packages/modules/web_themes/koala/source/public/icons/owbBattery.svg b/packages/modules/web_themes/koala/source/public/icons/owbBattery.svg deleted file mode 100644 index dd1fc748d3..0000000000 --- a/packages/modules/web_themes/koala/source/public/icons/owbBattery.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/packages/modules/web_themes/koala/source/public/icons/owbChargePoint.svg b/packages/modules/web_themes/koala/source/public/icons/owbChargePoint.svg deleted file mode 100644 index 29cca3f93c..0000000000 --- a/packages/modules/web_themes/koala/source/public/icons/owbChargePoint.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/packages/modules/web_themes/koala/source/public/icons/owbCounter.svg b/packages/modules/web_themes/koala/source/public/icons/owbCounter.svg deleted file mode 100644 index 8a8f271fce..0000000000 --- a/packages/modules/web_themes/koala/source/public/icons/owbCounter.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/packages/modules/web_themes/koala/source/public/icons/owbGrid.svg b/packages/modules/web_themes/koala/source/public/icons/owbGrid.svg deleted file mode 100644 index e098048efa..0000000000 --- a/packages/modules/web_themes/koala/source/public/icons/owbGrid.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/packages/modules/web_themes/koala/source/public/icons/owbHouse.svg b/packages/modules/web_themes/koala/source/public/icons/owbHouse.svg deleted file mode 100644 index 412dc8613b..0000000000 --- a/packages/modules/web_themes/koala/source/public/icons/owbHouse.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/modules/web_themes/koala/source/public/icons/owbPV.svg b/packages/modules/web_themes/koala/source/public/icons/owbPV.svg deleted file mode 100644 index becf88bc97..0000000000 --- a/packages/modules/web_themes/koala/source/public/icons/owbPV.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/packages/modules/web_themes/koala/source/quasar.config.ts b/packages/modules/web_themes/koala/source/quasar.config.ts index 70f849936f..3b1e88bad6 100644 --- a/packages/modules/web_themes/koala/source/quasar.config.ts +++ b/packages/modules/web_themes/koala/source/quasar.config.ts @@ -71,6 +71,7 @@ export default defineConfig((ctx) => { }, { server: false }, ], + ['vite-svg-loader'], ctx.prod ? [ 'vite-plugin-remove-console', diff --git a/packages/modules/web_themes/koala/source/src/assets/icons/owbBattery.svg b/packages/modules/web_themes/koala/source/src/assets/icons/owbBattery.svg new file mode 100644 index 0000000000..efcd7cd76a --- /dev/null +++ b/packages/modules/web_themes/koala/source/src/assets/icons/owbBattery.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/modules/web_themes/koala/source/src/assets/icons/owbBattery_2.svg b/packages/modules/web_themes/koala/source/src/assets/icons/owbBattery_2.svg new file mode 100644 index 0000000000..a4c8e5c709 --- /dev/null +++ b/packages/modules/web_themes/koala/source/src/assets/icons/owbBattery_2.svg @@ -0,0 +1 @@ + diff --git a/packages/modules/web_themes/koala/source/src/assets/icons/owbChargePoint.svg b/packages/modules/web_themes/koala/source/src/assets/icons/owbChargePoint.svg new file mode 100644 index 0000000000..67dd481526 --- /dev/null +++ b/packages/modules/web_themes/koala/source/src/assets/icons/owbChargePoint.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/modules/web_themes/koala/source/src/assets/icons/owbChargePoint_2.svg b/packages/modules/web_themes/koala/source/src/assets/icons/owbChargePoint_2.svg new file mode 100644 index 0000000000..ff7ae019b1 --- /dev/null +++ b/packages/modules/web_themes/koala/source/src/assets/icons/owbChargePoint_2.svg @@ -0,0 +1 @@ + diff --git a/packages/modules/web_themes/koala/source/src/assets/icons/owbCounter.svg b/packages/modules/web_themes/koala/source/src/assets/icons/owbCounter.svg new file mode 100644 index 0000000000..c8e39fe79b --- /dev/null +++ b/packages/modules/web_themes/koala/source/src/assets/icons/owbCounter.svg @@ -0,0 +1 @@ + diff --git a/packages/modules/web_themes/koala/source/src/assets/icons/owbGrid.svg b/packages/modules/web_themes/koala/source/src/assets/icons/owbGrid.svg new file mode 100644 index 0000000000..487386825c --- /dev/null +++ b/packages/modules/web_themes/koala/source/src/assets/icons/owbGrid.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/modules/web_themes/koala/source/src/assets/icons/owbHouse.svg b/packages/modules/web_themes/koala/source/src/assets/icons/owbHouse.svg new file mode 100644 index 0000000000..cee1b4ce3d --- /dev/null +++ b/packages/modules/web_themes/koala/source/src/assets/icons/owbHouse.svg @@ -0,0 +1 @@ + diff --git a/packages/modules/web_themes/koala/source/src/assets/icons/owbPV.svg b/packages/modules/web_themes/koala/source/src/assets/icons/owbPV.svg new file mode 100644 index 0000000000..1ccb43e72b --- /dev/null +++ b/packages/modules/web_themes/koala/source/src/assets/icons/owbPV.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/modules/web_themes/koala/source/public/icons/owbVehicle.svg b/packages/modules/web_themes/koala/source/src/assets/icons/owbVehicle.svg similarity index 96% rename from packages/modules/web_themes/koala/source/public/icons/owbVehicle.svg rename to packages/modules/web_themes/koala/source/src/assets/icons/owbVehicle.svg index e721de12f4..cd79270a80 100644 --- a/packages/modules/web_themes/koala/source/public/icons/owbVehicle.svg +++ b/packages/modules/web_themes/koala/source/src/assets/icons/owbVehicle.svg @@ -33,7 +33,6 @@ inkscape:current-layer="svg4" /> + fill="currentColor" /> diff --git a/packages/modules/web_themes/koala/source/src/components/BaseCarousel.vue b/packages/modules/web_themes/koala/source/src/components/BaseCarousel.vue index c22dd866cd..8ad1104d2e 100644 --- a/packages/modules/web_themes/koala/source/src/components/BaseCarousel.vue +++ b/packages/modules/web_themes/koala/source/src/components/BaseCarousel.vue @@ -4,7 +4,6 @@ v-model="currentSlide" swipeable :animated="true" - control-color="primary" infinite @update:model-value="handleSlideChange" padding diff --git a/packages/modules/web_themes/koala/source/src/components/BaseMessage.vue b/packages/modules/web_themes/koala/source/src/components/BaseMessage.vue index 3c524ecdf9..3820016620 100644 --- a/packages/modules/web_themes/koala/source/src/components/BaseMessage.vue +++ b/packages/modules/web_themes/koala/source/src/components/BaseMessage.vue @@ -1,12 +1,14 @@ -