update changelog

- Cleanup pending async tasks
- fix deprecated warning about event_loop

.github/workflows/python-app.yml

@@ -5,7 +5,7 @@ name: Python application
 
 on:
   push:
-    branches: [ "main", "dev-*", "*/issue*", "releases/*" ]
+    branches: [ "main", "dev-*", "*/issue*" ]
     paths-ignore:
     - '**.md' # Do no build on *.md changes
     - '**.yml' # Do no build on *.yml changes
@@ -18,7 +18,7 @@ on:
     - '**.dockerfile' # Do no build on *.dockerfile changes
     - '**.sh' # Do no build on *.sh changes     
   pull_request:
-    branches: [ "main", "dev-*", "releases/*" ]
+    branches: [ "main", "dev-*" ]
 
 permissions:
   contents: read
@@ -34,13 +34,13 @@ jobs:
     runs-on: ubuntu-24.04
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-    - name: Set up Python 3.14
+    - name: Set up Python 3.13
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@v5
       with:
-        python-version: "3.14"
+        python-version: "3.13"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -58,7 +58,7 @@ jobs:
         coverage report
     - name: Analyze with SonarCloud
       if: ${{ env.SONAR_TOKEN != 0 }}
-      uses: SonarSource/sonarqube-scan-action@v6
+      uses: SonarSource/sonarqube-scan-action@v5
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:

.python-version

@@ -1 +1 @@
-3.14.0
+3.13.2

CHANGELOG.md

@@ -7,32 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
-- use python 3.14 in github action
-- Update ghcr.io/hassio-addons/base Docker tag to v18.1.4
-- Update dependency pytest-asyncio to v1.1.0
-- save task references, to avoid a task disappearing mid-execution
-- catch socket.gaierror exception and log this with info level
-- Update dependency coverage to v7.9.2
-- add-on: bump base-image to version 18.0.3
-- add-on: remove armhf and armv7 support
-- add-on: add links to config and log-file to the web-UI
-- fix some SonarQube warnings
-- remove unused 32-bit architectures
-- Babel don't build new po file if only the pot creation-date was changed
-- Improve Makefile
-- Update dependency pytest-asyncio to v1
-
-## [0.14.1] - 2025-05-31
-
-- handle missing MQTT addon [#438](https://github.com/s-allius/tsun-gen3-proxy/issues/438)
-
-## [0.14.0] - 2025-05-29
-
-- add-on: bump python to version 3.12.10-r1
-- set no of pv modules for MS800 GEN3PLUS inverters
-- fix the paths to copy the config.example.toml file during proxy start
-- add MQTT topic `dcu_power` for setting output power on DCUs
-- Update ghcr.io/hassio-addons/base Docker tag to v17.2.5
 - fix a lot of pytest-asyncio problems in the unit tests  
 - Cleanup startup code for Quart and the Proxy
 - Redirect the hypercorn traces to a separate log-file

Makefile

@@ -1,37 +1,27 @@
-.PHONY: help build babel clean addon-dev addon-debug addon-rc addon-rel debug dev preview rc rel check-docker-compose install
+.PHONY: build babel clean addon-dev addon-debug addon-rc addon-rel debug dev preview rc rel check-docker-compose install
 
-help: ## show help message
+babel:
-	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m\033[0m\n"} /^[$$()% a-zA-Z0-9_-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
-
-babel:            ## build language files
 	$(MAKE) -C app $@
 
 build:
 	$(MAKE) -C ha_addons $@ 
 
-clean:             ## delete all built files
+clean:
 	$(MAKE) -C app $@
 	$(MAKE) -C ha_addons $@ 
 
-debug dev preview rc rel:  ## build docker container in <dev|debg|rc|rel> version
+debug dev preview rc rel:
 	$(MAKE) -C app babel
 	$(MAKE) -C app $@
 
-addon-dev addon-debug addon-rc addon-rel: ## build HA add-on in <dev|debg|rc|rel> version
+addon-dev addon-debug addon-rc addon-rel:
 	$(MAKE) -C app babel
 	$(MAKE) -C ha_addons $(patsubst addon-%,%,$@)
 
-check-docker-compose: ## check the docker-compose file
+check-docker-compose:
 	docker-compose config -q
 
-PY_VER := $(shell cat .python-version)
+install:
-
+	python3 -m pip install --upgrade pip
-install:           ## install requirements into the pyenv and switch to proper venv
+	python3 -m pip install -r requirements.txt
-	@pyenv local $(PY_VER) || { pyenv install $(PY_VER) && pyenv local $(PY_VER) || exit 1; }
+	python3 -m pip install -r requirements-test.txt
-	@pyenv exec pip install --upgrade pip
-	@pyenv exec pip install -r requirements.txt
-	@pyenv exec pip install -r requirements-test.txt
-	pyenv exec python --version
-
-run:  ## run proxy locally out of the actual venv
-	pyenv exec python app/src/server.py -c /app/src/cnf

README.md

@@ -7,7 +7,7 @@
 <p align="center">integration</p>
 <p align="center">
     <a href="https://opensource.org/licenses/BSD-3-Clause"><img alt="License: BSD-3-Clause" src="https://img.shields.io/badge/License-BSD_3--Clause-green.svg"></a>
-    <a href="https://www.python.org/downloads/release/python-3140/"><img alt="Supported Python versions" src="https://img.shields.io/badge/python-3.14-blue.svg"></a>
+    <a href="https://www.python.org/downloads/release/python-3130/"><img alt="Supported Python versions" src="https://img.shields.io/badge/python-3.13-blue.svg"></a>
     <a href="https://aiomqtt.bo3hm.com/introduction.html"><img alt="Supported aiomqtt versions" src="https://img.shields.io/badge/aiomqtt-2.3.1-lightblue.svg"></a>
     <a href="https://libraries.io/pypi/aiocron"><img alt="Supported aiocron versions" src="https://img.shields.io/badge/aiocron-1.8-lightblue.svg"></a>
     <a href="https://toml.io/en/v1.0.0"><img alt="Supported toml versions" src="https://img.shields.io/badge/toml-1.0.0-lightblue.svg"></a>

app/.version

@@ -1 +1 @@
-0.15.0
+0.14.0

app/Dockerfile

@@ -4,7 +4,7 @@ ARG GID=1000
 
 #
 # first stage for our base image
-FROM python:3.14-alpine AS base
+FROM python:3.13-alpine AS base
 
 COPY --chmod=0700 ./hardening_base.sh /
 RUN apk upgrade --no-cache && \

app/Makefile

@@ -55,7 +55,7 @@ $(BABEL_TRANSLATIONS)/%.pot : $(SRC)/.babel.cfg $(BABEL_INPUT)
 
 $(BABEL_TRANSLATIONS)/%/LC_MESSAGES/messages.po : $(BABEL_TRANSLATIONS)/messages.pot
 	@mkdir -p $(@D)
-	@pybabel update  --init-missing --ignore-pot-creation-date -i $< -d $(BABEL_TRANSLATIONS) -l $*
+	@pybabel update  --init-missing -i $< -d $(BABEL_TRANSLATIONS) -l $*
 
 $(BABEL_TRANSLATIONS)/%/LC_MESSAGES/messages.mo : $(BABEL_TRANSLATIONS)/%/LC_MESSAGES/messages.po
 	@pybabel compile  -d $(BABEL_TRANSLATIONS) -l $*

app/docker-bake.hcl

@@ -29,17 +29,17 @@ target "_common" {
     "type =sbom,generator=docker/scout-sbom-indexer:latest"
   ]
   annotations = [
-    "index,manifest-descriptor:org.opencontainers.image.title=TSUN-Proxy",
+    "index:org.opencontainers.image.title=TSUN Gen3 Proxy",
-    "index,manifest-descriptor:org.opencontainers.image.authors=Stefan Allius",
+    "index:org.opencontainers.image.authors=Stefan Allius",
-    "index,manifest-descriptor:org.opencontainers.image.created=${BUILD_DATE}",
+    "index:org.opencontainers.image.created=${BUILD_DATE}",
-    "index,manifest-descriptor:org.opencontainers.image.version=${VERSION}",
+    "index:org.opencontainers.image.version=${VERSION}",
-    "index,manifest-descriptor:org.opencontainers.image.revision=${BRANCH}",
+    "index:org.opencontainers.image.revision=${BRANCH}",
-    "index,manifest-descriptor:org.opencontainers.image.description=${DESCRIPTION}",
+    "index:org.opencontainers.image.description=${DESCRIPTION}",
     "index:org.opencontainers.image.licenses=BSD-3-Clause",
     "index:org.opencontainers.image.source=https://github.com/s-allius/tsun-gen3-proxy"
   ]
   labels = {
-    "org.opencontainers.image.title" = "TSUN-Proxy"
+    "org.opencontainers.image.title" = "TSUN Gen3 Proxy"
     "org.opencontainers.image.authors" = "Stefan Allius"
     "org.opencontainers.image.created" = "${BUILD_DATE}"
     "org.opencontainers.image.version" = "${VERSION}"
@@ -53,7 +53,7 @@ target "_common" {
   ]
 
   no-cache = false
-  platforms = ["linux/amd64", "linux/arm64"]
+  platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7"]
 }
 
 target "_debug" {

app/requirements-test.txt

@@ -1,8 +1,8 @@
-    flake8==7.3.0
+    flake8==7.2.0
-    pytest==8.4.2
+    pytest==8.3.5
-    pytest-asyncio==1.2.0
+    pytest-asyncio==0.26.0
-    pytest-cov==7.0.0
+    pytest-cov==6.1.1
-    python-dotenv==1.1.1
+    python-dotenv==1.1.0
     mock==5.2.0
-    coverage==7.10.7
+    coverage==7.8.0
     jinja2-cli==0.8.2

app/src/cnf/config.py

@@ -162,8 +162,7 @@ class Config():
     )
 
     @classmethod
-    def init(cls, def_reader: ConfigIfc, log_path: str = '',
+    def init(cls, def_reader: ConfigIfc, log_path: str = '') -> None | str:
-             cnf_path: str = 'config') -> None | str:
         '''Initialise the Proxy-Config
 
 Copy the internal default config file into the config directory
@@ -174,13 +173,12 @@ and initialise the Config with the default configuration '''
         try:
             # make the default config transparaent by copying it
             # in the config.example file
-            logging.info(
+            logging.debug('Copy Default Config to config.example.toml')
-                f'Copy Default Config to {cnf_path}config.example.toml')
 
-            shutil.copy2("cnf/default_config.toml",
+            shutil.copy2("default_config.toml",
-                         cnf_path + "config.example.toml")
+                         "config/config.example.toml")
-        except Exception as e:
+        except Exception:
-            logging.error(e)
+            pass
 
         # read example config file as default configuration
         try:

app/src/gen3plus/infos_g3p.py

@@ -216,7 +216,7 @@ class InfosG3P(Infos):
         self.set_db_def_value(Register.MANUFACTURER, 'TSUN')
         self.set_db_def_value(Register.EQUIPMENT_MODEL, 'TSOL-MSxx00')
         self.set_db_def_value(Register.CHIP_TYPE, 'IGEN TECH')
-        self.set_db_def_value(Register.NO_INPUTS, 2)
+        self.set_db_def_value(Register.NO_INPUTS, 4)
 
     def __hide_topic(self, row: dict) -> bool:
         if 'dep' in row:

app/src/gen3plus/solarman_v5.py

@@ -247,7 +247,6 @@ class SolarmanBase(Message):
 class SolarmanV5(SolarmanBase):
     AT_CMD = 1
     MB_RTU_CMD = 2
-    DCU_CMD = 5
     AT_CMD_RSP = 8
     MB_CLIENT_DATA_UP = 30
     '''Data up time in client mode'''
@@ -327,7 +326,6 @@ class SolarmanV5(SolarmanBase):
         self.sensor_list = 0
         self.mb_regs = [{'addr': 0x3000, 'len': 48},
                         {'addr': 0x2000, 'len': 96}]
-        self.background_tasks = set()
 
     '''
     Our puplic methods
@@ -340,12 +338,11 @@ class SolarmanV5(SolarmanBase):
         self.inverter = None
         self.switch.clear()
         self.log_lvl.clear()
-        self.background_tasks.clear()
         super().close()
 
-    def send_start_cmd(self, snr: int, host: str,
+    async def send_start_cmd(self, snr: int, host: str,
-                       forward: bool,
+                             forward: bool,
-                       start_timeout=MB_CLIENT_DATA_UP):
+                             start_timeout=MB_CLIENT_DATA_UP):
         self.no_forwarding = True
         self.establish_inv_emu = forward
         self.snr = snr
@@ -535,26 +532,6 @@ class SolarmanV5(SolarmanBase):
         except Exception:
             self.ifc.tx_clear()
 
-    def send_dcu_cmd(self, pdu: bytearray):
-        if self.sensor_list != 0x3026:
-            logger.debug(f'[{self.node_id}] DCU CMD not allowed,'
-                         f' for sensor: {self.sensor_list:#04x}')
-            return
-
-        if self.state != State.up:
-            logger.warning(f'[{self.node_id}] ignore DCU CMD,'
-                           ' cause the state is not UP anymore')
-            return
-
-        self.inverter.forward_dcu_cmd_resp = False
-        self._build_header(0x4510)
-        self.ifc.tx_add(struct.pack('<BHLLL', self.DCU_CMD,
-                                    self.sensor_list, 0, 0, 0))
-        self.ifc.tx_add(pdu)
-        self._finish_send_msg()
-        self.ifc.tx_log(logging.INFO, f'Send DCU CMD :{self.addr}:')
-        self.ifc.tx_flush()
-
     def __forward_msg(self):
         self.forward(self.ifc.rx_peek(), self.header_len+self.data_len+2)
 
@@ -564,17 +541,12 @@ class SolarmanV5(SolarmanBase):
         rated = db.get_db_value(Register.RATED_POWER, 0)
         model = None
         if max_pow == 2000:
-            db.set_db_def_value(Register.NO_INPUTS, 4)
             if rated == 800 or rated == 600:
                 model = f'TSOL-MS{max_pow}({rated})'
             else:
                 model = f'TSOL-MS{max_pow}'
         elif max_pow == 1800 or max_pow == 1600:
-            db.set_db_def_value(Register.NO_INPUTS, 4)
             model = f'TSOL-MS{max_pow}'
-        elif max_pow <= 800:
-            model = f'TSOL-MS{max_pow}'
-
         if model:
             logger.info(f'Model: {model}')
             self.db.set_db_def_value(Register.EQUIPMENT_MODEL, model)
@@ -675,10 +647,6 @@ class SolarmanV5(SolarmanBase):
             self.inc_counter('AT_Command')
             self.inverter.forward_at_cmd_resp = True
 
-        if ftype == self.DCU_CMD:
-            self.inc_counter('DCU_Command')
-            self.inverter.forward_dcu_cmd_resp = True
-
         elif ftype == self.MB_RTU_CMD:
             rstream = self.ifc.remote.stream
             if rstream.mb.recv_req(data[15:],
@@ -692,10 +660,8 @@ class SolarmanV5(SolarmanBase):
         self.__forward_msg()
 
     def publish_mqtt(self, key, data):  # pragma: no cover
-        task = asyncio.ensure_future(
+        asyncio.ensure_future(
             Proxy.mqtt.publish(key, data))
-        self.background_tasks.add(task)
-        task.add_done_callback(self.background_tasks.discard)
 
     def get_cmd_rsp_log_lvl(self) -> int:
         ftype = self.ifc.rx_peek()[self.header_len]
@@ -704,10 +670,6 @@ class SolarmanV5(SolarmanBase):
             if self.inverter.forward_at_cmd_resp:
                 return logging.INFO
             return logging.DEBUG
-        elif ftype == self.DCU_CMD:
-            if self.inverter.forward_dcu_cmd_resp:
-                return logging.INFO
-            return logging.DEBUG
         elif ftype == self.MB_RTU_CMD \
                 and self.server_side:
             return self.mb.last_log_lvl
@@ -727,16 +689,6 @@ class SolarmanV5(SolarmanBase):
                 logger.info(f'{key}: {data_json}')
                 self.publish_mqtt(f'{Proxy.entity_prfx}{node_id}{key}', data_json)  # noqa: E501
                 return
-
-        elif ftype == self.DCU_CMD:
-            if not self.inverter.forward_dcu_cmd_resp:
-                data_json = '+ok'
-                node_id = self.node_id
-                key = 'dcu_resp'
-                logger.info(f'{key}: {data_json}')
-                self.publish_mqtt(f'{Proxy.entity_prfx}{node_id}{key}', data_json)  # noqa: E501
-                return
-
         elif ftype == self.MB_RTU_CMD:
             self.__modbus_command_rsp(data)
             return

app/src/infos.py

@@ -44,7 +44,6 @@ class Register(Enum):
     MODBUS_COMMAND = 60
     AT_COMMAND_BLOCKED = 61
     CLOUD_CONN_CNT = 62
-    DCU_COMMAND = 63
     OUTPUT_POWER = 83
     RATED_POWER = 84
     INVERTER_TEMP = 85
@@ -626,7 +625,6 @@ class Infos:
         Register.INVALID_MSG_FMT:    {'name': ['proxy', 'Invalid_Msg_Format'], 'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'inv_msg_fmt_',   'fmt': FMT_INT, 'name': 'Invalid Message Format', 'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
         Register.AT_COMMAND:         {'name': ['proxy', 'AT_Command'],         'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'at_cmd_',        'fmt': FMT_INT, 'name': 'AT Command',           'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
         Register.AT_COMMAND_BLOCKED: {'name': ['proxy', 'AT_Command_Blocked'], 'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'at_cmd_blocked_', 'fmt': FMT_INT, 'name': 'AT Command Blocked',   'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
-        Register.DCU_COMMAND:        {'name': ['proxy', 'DCU_Command'],        'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'dcu_cmd_',       'fmt': FMT_INT, 'name': 'DCU Command',          'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
         Register.MODBUS_COMMAND:     {'name': ['proxy', 'Modbus_Command'],     'singleton': True,   'ha': {'dev': 'proxy', 'comp': 'sensor', 'dev_cla': None, 'stat_cla': None, 'id': 'modbus_cmd_',    'fmt': FMT_INT, 'name': 'Modbus Command',       'icon': COUNTER, 'ent_cat': 'diagnostic'}},  # noqa: E501
         # 0xffffff03:  {'name':['proxy', 'Voltage'],                        'level': logging.DEBUG, 'unit': 'V',    'ha':{'dev':'proxy', 'dev_cla': 'voltage',     'stat_cla': 'measurement', 'id':'proxy_volt_',  'fmt':FMT_FLOAT,'name': 'Grid Voltage'}},  # noqa: E501
 

app/src/inverter_base.py

@@ -4,7 +4,6 @@ import logging
 import traceback
 import json
 import gc
-import socket
 from aiomqtt import MqttCodeError
 from asyncio import StreamReader, StreamWriter
 from ipaddress import ip_address
@@ -39,7 +38,6 @@ class InverterBase(InverterIfc, Proxy):
             self.use_emulation = False
         self.__ha_restarts = -1
         self.remote = StreamPtr(None)
-        self.background_tasks = set()
         ifc = AsyncStreamServer(reader, writer,
                                 self.async_publ_mqtt,
                                 self.create_remote,
@@ -74,7 +72,6 @@ class InverterBase(InverterIfc, Proxy):
         if self.remote.ifc:
             self.remote.ifc.close()
             self.remote.ifc = None
-        self.background_tasks.clear()
 
     async def disc(self, shutdown_started=False) -> None:
         if self.remote.stream:
@@ -139,14 +136,9 @@ class InverterBase(InverterIfc, Proxy):
             logging.info(f'[{self.remote.stream.node_id}:'
                          f'{self.remote.stream.conn_no}] '
                          f'Connected to {addr}')
-            task = asyncio.create_task(
+            asyncio.create_task(self.remote.ifc.client_loop(addr))
-                self.remote.ifc.client_loop(addr))
-            self.background_tasks.add(task)
-            task.add_done_callback(self.background_tasks.discard)
 
-        except (ConnectionRefusedError,
+        except (ConnectionRefusedError, TimeoutError) as error:
-                TimeoutError,
-                socket.gaierror) as error:
             logging.info(f'{error}')
         except Exception:
             Infos.inc_counter('SW_Exception')

app/src/messages.py

@@ -193,7 +193,7 @@ class Message(ProtocolIfc):
             return
         self.mb.build_msg(dev_id, func, addr, val, log_lvl)
 
-    def send_modbus_cmd(self, func, addr, val, log_lvl) -> None:
+    async def send_modbus_cmd(self, func, addr, val, log_lvl) -> None:
         self._send_modbus_cmd(Modbus.INV_ADDR, func, addr, val, log_lvl)
 
     def _send_modbus_scan(self):

app/src/modbus_tcp.py

@@ -43,7 +43,6 @@ class ModbusTcp():
 
     def __init__(self, loop, tim_restart=10) -> None:
         self.tim_restart = tim_restart
-        self.background_tasks = set()
 
         inverters = Config.get('inverters')
         batteries = Config.get('batteries')
@@ -55,13 +54,10 @@ class ModbusTcp():
                and 'client_mode' in inv):
                 client = inv['client_mode']
                 logger.info(f"'client_mode' for Monitoring-SN: {inv['monitor_sn']} host: {client['host']}:{client['port']}, forward: {client['forward']}")  # noqa: E501
-                task = loop.create_task(
+                loop.create_task(self.modbus_loop(client['host'],
-                    self.modbus_loop(client['host'],
+                                                  client['port'],
-                                     client['port'],
+                                                  inv['monitor_sn'],
-                                     inv['monitor_sn'],
+                                                  client['forward']))
-                                     client['forward']))
-                self.background_tasks.add(task)
-                task.add_done_callback(self.background_tasks.discard)
 
     async def modbus_loop(self, host, port,
                           snr: int, forward: bool) -> None:
@@ -70,7 +66,7 @@ class ModbusTcp():
             try:
                 async with ModbusConn(host, port) as inverter:
                     stream = inverter.local.stream
-                    stream.send_start_cmd(snr, host, forward)
+                    await stream.send_start_cmd(snr, host, forward)
                     await stream.ifc.loop()
                     logger.info(f'[{stream.node_id}:{stream.conn_no}] '
                                 f'Connection closed - Shutdown: '

app/src/mqtt.py

@@ -2,8 +2,6 @@ import asyncio
 import logging
 import aiomqtt
 import traceback
-import struct
-import inspect
 
 from modbus import Modbus
 from messages import Message
@@ -29,27 +27,14 @@ class Mqtt(metaclass=Singleton):
         loop = asyncio.get_event_loop()
         self.task = loop.create_task(self.__loop())
         self.ha_restarts = 0
-        self.topic_defs = [
-            {'prefix': 'auto_conf_prefix', 'topic': '/status',
-             'fnc': self._ha_status, 'args': []},
-            {'prefix': 'entity_prefix', 'topic': '/+/rated_load',
-             'fnc': self._modbus_cmd,
-             'args': [Modbus.WRITE_SINGLE_REG, 1, 0x2008]},
-            {'prefix': 'entity_prefix', 'topic': '/+/out_coeff',
-             'fnc': self._out_coeff, 'args': []},
-            {'prefix': 'entity_prefix', 'topic': '/+/dcu_power',
-             'fnc': self._dcu_cmd, 'args': []},
-            {'prefix': 'entity_prefix', 'topic': '/+/modbus_read_regs',
-             'fnc': self._modbus_cmd, 'args': [Modbus.READ_REGS, 2]},
-            {'prefix': 'entity_prefix', 'topic': '/+/modbus_read_inputs',
-             'fnc': self._modbus_cmd, 'args': [Modbus.READ_INPUTS, 2]},
-            {'prefix': 'entity_prefix', 'topic': '/+/at_cmd',
-             'fnc': self._at_cmd, 'args': []},
-        ]
 
         ha = Config.get('ha')
-        for entry in self.topic_defs:
+        self.ha_status_topic = f"{ha['auto_conf_prefix']}/status"
-            entry['full_topic'] = f"{ha[entry['prefix']]}{entry['topic']}"
+        self.mb_rated_topic = f"{ha['entity_prefix']}/+/rated_load"
+        self.mb_out_coeff_topic = f"{ha['entity_prefix']}/+/out_coeff"
+        self.mb_reads_topic = f"{ha['entity_prefix']}/+/modbus_read_regs"
+        self.mb_inputs_topic = f"{ha['entity_prefix']}/+/modbus_read_inputs"
+        self.mb_at_cmd_topic = f"{ha['entity_prefix']}/+/at_cmd"
 
     @property
     def ha_restarts(self):
@@ -90,7 +75,19 @@ class Mqtt(metaclass=Singleton):
             try:
                 async with self.__client:
                     logger_mqtt.info('MQTT broker connection established')
-                    await self._init_new_conn()
+                    self.ctime = datetime.now()
+                    self.published = 0
+                    self.received = 0
+
+                    if self.__cb_mqtt_is_up:
+                        await self.__cb_mqtt_is_up()
+
+                    await self.__client.subscribe(self.ha_status_topic)
+                    await self.__client.subscribe(self.mb_rated_topic)
+                    await self.__client.subscribe(self.mb_out_coeff_topic)
+                    await self.__client.subscribe(self.mb_reads_topic)
+                    await self.__client.subscribe(self.mb_inputs_topic)
+                    await self.__client.subscribe(self.mb_at_cmd_topic)
 
                     async for message in self.__client.messages:
                         await self.dispatch_msg(message)
@@ -112,7 +109,7 @@ class Mqtt(metaclass=Singleton):
             except asyncio.CancelledError:
                 logger_mqtt.debug("MQTT task cancelled")
                 self.__client = None
-                raise
+                return
             except Exception:
                 # self.inc_counter('SW_Exception')   # fixme
                 self.ctime = None
@@ -120,51 +117,47 @@ class Mqtt(metaclass=Singleton):
                     f"Exception:\n"
                     f"{traceback.format_exc()}")
 
-    async def _init_new_conn(self):
-        self.ctime = datetime.now()
-        self.published = 0
-        self.received = 0
-        if self.__cb_mqtt_is_up:
-            await self.__cb_mqtt_is_up()
-        for entry in self.topic_defs:
-            await self.__client.subscribe(entry['full_topic'])
-
     async def dispatch_msg(self, message):
         self.received += 1
 
-        for entry in self.topic_defs:
+        if message.topic.matches(self.ha_status_topic):
-            if message.topic.matches(entry['full_topic']) \
+            status = message.payload.decode("UTF-8")
-               and 'fnc' in entry:
+            logger_mqtt.info('Home-Assistant Status:'
-                fnc = entry['fnc']
+                             f' {status}')
-
+            if status == 'online':
-                if inspect.iscoroutinefunction(fnc):
+                self.ha_restarts += 1
-                    await entry['fnc'](message, *entry['args'])
-                elif callable(fnc):
-                    entry['fnc'](message, *entry['args'])
-
-    async def _ha_status(self, message):
-        status = message.payload.decode("UTF-8")
-        logger_mqtt.info('Home-Assistant Status:'
-                         f' {status}')
-        if status == 'online':
-            self.ha_restarts += 1
-            if self.__cb_mqtt_is_up:
                 await self.__cb_mqtt_is_up()
 
-    def _out_coeff(self, message):
+        if message.topic.matches(self.mb_rated_topic):
-        payload = message.payload.decode("UTF-8")
+            await self.modbus_cmd(message,
-        try:
+                                  Modbus.WRITE_SINGLE_REG,
-            val = round(float(payload) * 1024/100)
+                                  1, 0x2008)
-            if val < 0 or val > 1024:
+
-                logger_mqtt.error('out_coeff: value must be in'
+        if message.topic.matches(self.mb_out_coeff_topic):
-                                  'the range 0..100,'
+            payload = message.payload.decode("UTF-8")
-                                  f' got: {payload}')
+            try:
-            else:
+                val = round(float(payload) * 1024/100)
-                self._modbus_cmd(message,
+                if val < 0 or val > 1024:
-                                 Modbus.WRITE_SINGLE_REG,
+                    logger_mqtt.error('out_coeff: value must be in'
-                                 0, 0x202c, val)
+                                      'the range 0..100,'
-        except Exception:
+                                      f' got: {payload}')
-            pass
+                else:
+                    await self.modbus_cmd(message,
+                                          Modbus.WRITE_SINGLE_REG,
+                                          0, 0x202c, val)
+            except Exception:
+                pass
+
+        if message.topic.matches(self.mb_reads_topic):
+            await self.modbus_cmd(message,
+                                  Modbus.READ_REGS, 2)
+
+        if message.topic.matches(self.mb_inputs_topic):
+            await self.modbus_cmd(message,
+                                  Modbus.READ_INPUTS, 2)
+
+        if message.topic.matches(self.mb_at_cmd_topic):
+            await self.at_cmd(message)
 
     def each_inverter(self, message, func_name: str):
         topic = str(message.topic)
@@ -182,7 +175,7 @@ class Mqtt(metaclass=Singleton):
         else:
             logger_mqtt.warning(f'Node_id: {node_id} not found')
 
-    def _modbus_cmd(self, message, func, params=0, addr=0, val=0):
+    async def modbus_cmd(self, message, func, params=0, addr=0, val=0):
         payload = message.payload.decode("UTF-8")
         for fnc in self.each_inverter(message, "send_modbus_cmd"):
             res = payload.split(',')
@@ -195,24 +188,9 @@ class Mqtt(metaclass=Singleton):
             elif params == 2:
                 addr = int(res[0], base=16)
                 val = int(res[1])  # lenght
-            fnc(func, addr, val, logging.INFO)
+            await fnc(func, addr, val, logging.INFO)
 
-    async def _at_cmd(self, message):
+    async def at_cmd(self, message):
         payload = message.payload.decode("UTF-8")
         for fnc in self.each_inverter(message, "send_at_cmd"):
             await fnc(payload)
-
-    def _dcu_cmd(self, message):
-        payload = message.payload.decode("UTF-8")
-        try:
-            val = round(float(payload) * 10)
-            if val < 1000 or val > 8000:
-                logger_mqtt.error('dcu_power: value must be in'
-                                  'the range 100..800,'
-                                  f' got: {payload}')
-            else:
-                pdu = struct.pack('>BBBBBBH', 1, 1, 6, 1, 0, 1, val)
-                for fnc in self.each_inverter(message, "send_dcu_cmd"):
-                    fnc(pdu)
-        except Exception:
-            pass

app/src/scheduler.py

@@ -12,7 +12,7 @@ class Schedule:
     count = 0
 
     @classmethod
-    def start(cls) -> None:    # pragma: no cover
+    def start(cls) -> None:
         '''Start the scheduler and schedule the tasks (cron jobs)'''
         logging.debug("Scheduler init")
         cls.mqtt = Mqtt(None)
@@ -20,7 +20,7 @@ class Schedule:
         crontab('0 0 * * *', func=cls.atmidnight, start=True)
 
     @classmethod
-    async def atmidnight(cls) -> None:    # pragma: no cover
+    async def atmidnight(cls) -> None:
         '''Clear daily counters at midnight'''
         logging.info("Clear daily counters at midnight")
 

app/src/server.py

@@ -60,16 +60,7 @@ class Server():
 
         @app.context_processor
         def utility_processor():
-            var = {'version': self.version,
+            return dict(version=self.version)
-                   'slug': os.getenv("SLUG"),
-                   'hostname': os.getenv("HOSTNAME"),
-                   }
-            if var['slug']:
-                var['hassio'] = True
-                slug_len = len(var['slug'])
-                var['addonname'] = var['slug'] + '_' + \
-                    var['hostname'][slug_len+1:]
-            return var
 
     def parse_args(self, arg_list: list[str] | None):
         parser = argparse.ArgumentParser()
@@ -136,8 +127,7 @@ class Server():
     def build_config(self):
         # read config file
         Config.init(ConfigReadToml(self.src_dir + "cnf/default_config.toml"),
-                    log_path=self.log_path,
+                    log_path=self.log_path)
-                    cnf_path=self.config_path)
         ConfigReadEnv()
         ConfigReadJson(self.config_path + "config.json")
         ConfigReadToml(self.config_path + "config.toml")
@@ -218,7 +208,6 @@ app = Quart(__name__,
             static_folder='web/static')
 app.secret_key = 'JKLdks.dajlKKKdladkflKwolafallsdfl'
 app.jinja_env.globals.update(url_for=url_for)
-app.background_tasks = set()
 server = Server(app, __name__ == "__main__")
 Web(app, server.trans_path, server.rel_urls)
 
@@ -269,13 +258,9 @@ async def startup_app():    # pragma: no cover
 
     for inv_class, port in [(InverterG3, 5005), (InverterG3P, 10000)]:
         logging.info(f'listen on port: {port} for inverters')
-        task = loop.create_task(
+        loop.create_task(asyncio.start_server(lambda r, w, i=inv_class:
-            asyncio.start_server(lambda r, w, i=inv_class:
+                                              handle_client(r, w, i),
-                                 handle_client(r, w, i),
+                                              '0.0.0.0', port))
-                                 '0.0.0.0', port))
-        app.background_tasks.add(task)
-        task.add_done_callback(app.background_tasks.discard)
-
     ProxyState.set_up(True)
 
 
@@ -299,7 +284,6 @@ async def handle_shutdown():   # pragma: no cover
         await inverter.disc(True)
 
     logging.info('Proxy disconnecting done')
-    app.background_tasks.clear()
 
     await Proxy.class_close(loop)
 

app/src/web/conn_table.py

@@ -10,40 +10,39 @@ from .log_handler import LogHandler
 def _get_device_icon(client_mode: bool):
     '''returns the icon for the device conntection'''
     if client_mode:
-        return 'fa-download fa-rotate-180', 'Server Mode'
+        return 'fa-download fa-rotate-180'
 
-    return 'fa-upload fa-rotate-180', 'Client Mode'
+    return 'fa-upload fa-rotate-180'
 
 
 def _get_cloud_icon(emu_mode: bool):
     '''returns the icon for the cloud conntection'''
     if emu_mode:
-        return 'fa-cloud-arrow-up-alt', 'Emu Mode'
+        return 'fa-cloud-arrow-up-alt'
 
-    return 'fa-cloud', 'Proxy Mode'
+    return 'fa-cloud'
 
 
 def _get_row(inv: InverterBase):
     '''build one row for the connection table'''
     client_mode = inv.client_mode
     inv_serial = inv.local.stream.inv_serial
-    icon1, descr1 = _get_device_icon(client_mode)
+    icon1 = _get_device_icon(client_mode)
     ip1, port1 = inv.addr
     icon2 = ''
-    descr2 = ''
     ip2 = '--'
     port2 = '--'
 
     if inv.remote.ifc:
         ip2, port2 = inv.remote.ifc.r_addr
-        icon2, descr2 = _get_cloud_icon(client_mode)
+        icon2 = _get_cloud_icon(client_mode)
 
     row = []
-    row.append(f'<i class="fa {icon1}" title="{_(descr1)}"></i> {ip1}:{port1}')
+    row.append(f'<i class="fa {icon1}"></i> {ip1}:{port1}')
-    row.append(f'<i class="fa {icon1}" title="{_(descr1)}"></i> {ip1}')
+    row.append(f'<i class="fa {icon1}"></i> {ip1}')
     row.append(inv_serial)
-    row.append(f'<i class="fa {icon2}" title="{_(descr2)}"></i> {ip2}:{port2}')
+    row.append(f'<i class="fa {icon2}"></i> {ip2}:{port2}')
-    row.append(f'<i class="fa {icon2}" title="{_(descr2)}"></i> {ip2}')
+    row.append(f'<i class="fa {icon2}"></i> {ip2}')
     return row
 
 

app/src/web/i18n.py

@@ -29,9 +29,9 @@ def get_tz():
 
 @web.context_processor
 def utility_processor():
-    return {'lang': babel_get_locale(),
+    return dict(lang=babel_get_locale(),
-            'lang_str': LANGUAGES.get(str(babel_get_locale()), "English"),
+                lang_str=LANGUAGES.get(str(babel_get_locale()), "English"),
-            'languages': LANGUAGES}
+                languages=LANGUAGES)
 
 
 @web.route('/language/<language>')

app/src/web/log_files.py

@@ -1,58 +1,26 @@
 from quart import render_template
-from quart_babel import format_datetime, format_decimal, _
+from quart_babel import format_datetime, format_decimal
 from quart.helpers import send_from_directory
 from werkzeug.utils import secure_filename
 from cnf.config import Config
-from datetime import datetime
-from os import DirEntry
 import os
-from dateutil import tz
 
 from . import web
 
 
-def _get_birth_from_log(path: str) -> None | datetime:
+def _get_file(file):
-    '''read timestamp from the first line of a log file'''
-    dt = None
-    try:
-        with open(path) as f:
-            first_line = f.readline()
-            first_line = first_line.lstrip("'")
-            fmt = "%Y-%m-%d %H:%M:%S" if first_line[4] == '-' \
-                else "%d-%m-%Y %H:%M:%S"
-            dt = datetime.strptime(first_line[0:19], fmt). \
-                replace(tzinfo=tz.tzlocal())
-    except Exception:
-        pass
-    return dt
-
-
-def _get_file(file: DirEntry) -> dict:
     '''build one row for the connection table'''
     entry = {}
     entry['name'] = file.name
     stat = file.stat()
     entry['size'] = format_decimal(stat.st_size)
-    try:
+    entry['date'] = stat.st_mtime
-        dt = stat.st_birthtime
+    entry['created'] = format_datetime(stat.st_ctime, format="short")
-
-    except Exception:
-        dt = _get_birth_from_log(file.path)
-
-    if dt:
-        entry['created'] = format_datetime(dt, format="short")
-
-        # sort by creating date, if available
-        entry['date'] = dt if isinstance(dt, float) else dt.timestamp()
-    else:
-        entry['created'] = _('n/a')
-        entry['date'] = stat.st_mtime
-
     entry['modified'] = format_datetime(stat.st_mtime, format="short")
     return entry
 
 
-def get_list_data() -> list:
+def get_list_data():
     '''build the connection table'''
     file_list = []
     with os.scandir(Config.get_log_path()) as it:

app/src/web/log_handler.py

@@ -22,6 +22,3 @@ class LogHandler(Handler, metaclass=Singleton):
 
     def get_buffer(self, elms=0) -> list:
         return list(self.buffer)[-elms:]
-
-    def clear(self):
-        self.buffer.clear()

app/src/web/mqtt_table.py

@@ -46,13 +46,10 @@ def get_table_data():
 @web.route('/mqtt-fetch')
 async def mqtt_fetch():
     mqtt = Mqtt(None)
-    cdatetime = format_datetime(dt=mqtt.ctime, format='d.MM. HH:mm')
+    ctime = format_datetime(dt=mqtt.ctime, format='short')
     data = {
         "update-time": format_datetime(format="medium"),
-        "mqtt-ctime": f"""
+        "mqtt-ctime": f"<h3>{ctime}</h3>",
-<h3 class="w3-hide-small w3-hide-medium">{cdatetime}</h3>
-<h4 class="w3-hide-large">{cdatetime}</h4>
-""",
         "mqtt-tx": f"<h3>{mqtt.published}</h3>",
         "mqtt-rx": f"<h3>{mqtt.received}</h3>",
     }

app/src/web/static/font-awesome/css/all.min.css

@@ -7,4 +7,3 @@
 .fa-rotate-right:before{content:"\f01e"}
 .fa-cloud-arrow-down-alt:before{content:"\f381"}
 .fa-cloud-arrow-up-alt:before{content:"\f382"}
-.fa-gear:before{content:"\f013"}

app/src/web/templates/base.html.j2

@@ -57,13 +57,8 @@
         <button href="#" class="w3-bar-item w3-button w3-padding-16 w3-hide-large w3-dark-grey w3-hover-black" onclick="w3_close()" title="close menu"><i class="fa fa-remove fa-fw"></i>  Close Menu</button>
         <a href="{{ url_for('.index')}}" class="w3-bar-item w3-button w3-padding {% block menu1_class %}{% endblock %}"><i class="fa fa-network-wired fa-fw"></i>  {{_('Connections')}}</a>
         <a href="{{ url_for('.mqtt')}}" class="w3-bar-item w3-button w3-padding {% block menu2_class %}{% endblock %}"><i class="fa fa-database fa-fw"></i>  MQTT</a>
-        <a href="{{ url_for('.notes')}}" class="w3-bar-item w3-button w3-padding {% block menu3_class %}{% endblock %}"><i class="fa fa-info fa-fw"></i>  {{_('Important Messages')}}</a>
+        <a href="{{ url_for('.notes')}}" class="w3-bar-item w3-button w3-padding {% block menu3_class %}{% endblock %}"><i class="fa fa-exclamation-triangle fa-fw"></i>  {{_('Important Messages')}}</a>
         <a href="{{ url_for('.logging')}}" class="w3-bar-item w3-button w3-padding {% block menu4_class %}{% endblock %}"><i class="fa fa-file-export fa-fw"></i>  {{_('Log Files')}}</a>
-        {% if hassio is defined %}
-        <br>
-        <a href="/hassio/addon/{{addonname}}/config" target="_top" class="w3-bar-item w3-button w3-padding"><i class="fa fa-gear fa-fw"></i>  {{_('Add-on Config')}}</a>
-        <a href="/hassio/addon/{{addonname}}/logs" target="_top" class="w3-bar-item w3-button w3-padding"><i class="fa fa-file fa-fw"></i>  {{_('Add-on Log')}}</a>
-        {% endif %}
       </div>
     </nav>
   

app/src/web/templates/page_logging.html.j2

@@ -7,9 +7,9 @@
   <div id="id01" class="w3-modal">
     <div class="w3-modal-content" style="width:600px">
       <div class="w3-container w3-padding-24">
-        <h2>{{_('Do you really want to delete the log file: <br>%(file)s ?', file='<b><span id="id03"></span></b>')}}</h2>
+        <h2>{{_("Do you really want to delete the log file")}}:<br><b><span id="id03"></span></b> ?</h2>
         <div class="w3-bar">
-          <button id="id02" class="w3-button w3-red" onclick="deleteFile(); document.getElementById('id01').style.display='none'">{{_('Delete File')}}</button>
+          <button id="id02" class="w3-button w3-red" onclick="deleteFile(); document.getElementById('id01').style.display='none'">{{_('Delete File</button')}}>
           <button class="w3-button w3-grey w3-right" onclick="document.getElementById('id01').style.display='none'">{{_('Abort')}}</button>
         </div>
       </div>

app/src/web/templates/page_mqtt.html.j2

@@ -8,7 +8,7 @@
     <div class="w3-third">
       <div class="w3-card-4">
       <div class="w3-container w3-indigo w3-padding-16">
-        <div class="w3-left"><i class="fa fa-business-time w3-xxxlarge"></i></div>
+        <div class="w3-left"><i class="fa fa-link w3-xxxlarge"></i></div>
         <div id = "mqtt-ctime" class="w3-right">
           <h3>-</h3>
         </div>
@@ -21,7 +21,7 @@
     <div class="w3-third">
       <div class="w3-card-4">
       <div class="w3-container w3-purple w3-padding-16">
-        <div class="w3-left"><i class="fa fa-angle-double-right w3-xxxlarge"></i></div>
+        <div class="w3-left"><i class="fa fa-server w3-xxxlarge"></i></div>
         <div id = "mqtt-tx" class="w3-right">
           <h3>-</h3>
         </div>
@@ -34,7 +34,7 @@
     <div class="w3-third">
       <div class="w3-card-4">
       <div class="w3-container w3-orange w3-text-white w3-padding-16">
-        <div class="w3-left"><i class="fa fa-angle-double-left w3-xxxlarge"></i></div>
+        <div class="w3-left"><i class="fa fa-user w3-xxxlarge"></i></div>
         <div id = "mqtt-rx" class="w3-right">
           <h3>-</h3>
         </div>

app/src/web/templates/page_notes.html.j2

@@ -2,7 +2,7 @@
 
 {% block title %}{{_("TSUN Proxy - Important Messages")}}{% endblock title %}
 {% block menu3_class %}w3-blue{% endblock %}
-{% block headline %}<i class="fa fa-info fa-fw"></i>  {{_('Important Messages')}}{% endblock headline %}
+{% block headline %}<i class="fa fa-exclamation-triangle fa-fw"></i>  {{_('Important Messages')}}{% endblock headline %}
 {% block content %}
   <div id="notes-list"></div>
 {% endblock content%}

app/tests/log/test.txt

@@ -1,19 +1,19 @@
 2025-04-30 00:01:23  INFO | root | Server "proxy - unknown" will be started
-2025-04-30 00:01:24  INFO | root | current dir: /Users/sallius/tsun/tsun-gen3-proxy
+2025-04-30 00:01:23  INFO | root | current dir: /Users/sallius/tsun/tsun-gen3-proxy
-2025-04-30 00:01:25  INFO | root | config_path: ./config/
+2025-04-30 00:01:23  INFO | root | config_path: ./config/
-2025-04-30 00:01:26  INFO | root | json_config: None
+2025-04-30 00:01:23  INFO | root | json_config: None
-2025-04-30 00:01:27  INFO | root | toml_config: None
+2025-04-30 00:01:23  INFO | root | toml_config: None
-2025-04-30 00:01:28  INFO | root | trans_path:  ../translations/
+2025-04-30 00:01:23  INFO | root | trans_path:  ../translations/
-2025-04-30 00:01:29  INFO | root | rel_urls:    False
+2025-04-30 00:01:23  INFO | root | rel_urls:    False
-2025-04-30 00:01:30  INFO | root | log_path:    ./log/
+2025-04-30 00:01:23  INFO | root | log_path:    ./log/
-2025-04-30 00:01:31  INFO | root | log_backups: unlimited
+2025-04-30 00:01:23  INFO | root | log_backups: unlimited
-2025-04-30 00:01:32  INFO | root | LOG_LVL    : None
+2025-04-30 00:01:23  INFO | root | LOG_LVL    : None
-2025-04-30 00:01:33  INFO | root | ******
+2025-04-30 00:01:23  INFO | root | ******
-2025-04-30 00:01:34  INFO | root | Read from /Users/sallius/tsun/tsun-gen3-proxy/app/src/cnf/default_config.toml => ok
+2025-04-30 00:01:23  INFO | root | Read from /Users/sallius/tsun/tsun-gen3-proxy/app/src/cnf/default_config.toml => ok
-2025-04-30 00:01:35  INFO | root | Read from environment => ok
+2025-04-30 00:01:23  INFO | root | Read from environment => ok
-2025-04-30 00:01:36  INFO | root | Read from ./config/config.json => n/a
+2025-04-30 00:01:23  INFO | root | Read from ./config/config.json => n/a
-2025-04-30 00:01:37  INFO | root | Read from ./config/config.toml => n/a
+2025-04-30 00:01:23  INFO | root | Read from ./config/config.toml => n/a
-2025-04-30 00:01:38  INFO | root | ******
+2025-04-30 00:01:23  INFO | root | ******
-2025-04-30 00:01:39  INFO | root | listen on port: 5005 for inverters
+2025-04-30 00:01:23  INFO | root | listen on port: 5005 for inverters
-2025-04-30 00:01:40  INFO | root | listen on port: 10000 for inverters
+2025-04-30 00:01:23  INFO | root | listen on port: 10000 for inverters
-2025-04-30 00:01:41  INFO | root | Start Quart
+2025-04-30 00:01:23  INFO | root | Start Quart

app/tests/test_async_stream.py

@@ -82,7 +82,7 @@ def spy_inc_cnt():
         yield infos
 
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_close_cb():
     assert asyncio.get_running_loop()
     reader = FakeReader()
@@ -122,7 +122,7 @@ async def test_close_cb():
         cnt += 1
     assert cnt == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_read():
     assert asyncio.get_running_loop()
     reader = FakeReader()
@@ -161,7 +161,7 @@ async def test_read():
         cnt += 1
     assert cnt == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_write():
     assert asyncio.get_running_loop()
     reader = FakeReader()
@@ -204,7 +204,7 @@ async def test_write():
         cnt += 1
     assert cnt == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_publ_mqtt_cb():
     assert asyncio.get_running_loop()
     reader = FakeReader()
@@ -235,7 +235,7 @@ async def test_publ_mqtt_cb():
         cnt += 1
     assert cnt == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_create_remote_cb():
     assert asyncio.get_running_loop()
     reader = FakeReader()
@@ -268,7 +268,7 @@ async def test_create_remote_cb():
         cnt += 1
     assert cnt == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_sw_exception():
     assert asyncio.get_running_loop()
     reader = FakeReader()
@@ -300,7 +300,7 @@ async def test_sw_exception():
         cnt += 1
     assert cnt == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_os_error():
     assert asyncio.get_running_loop()
     reader = FakeReader()
@@ -371,7 +371,7 @@ def create_remote(remote, test_type, with_close_hdr:bool = False):
     remote.ifc.prot_set_init_new_client_conn_cb(callback)
     remote.stream = FakeProto(remote.ifc, False)
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_forward():
     assert asyncio.get_running_loop()
     remote = StreamPtr(None)
@@ -393,7 +393,7 @@ async def test_forward():
     assert cnt == 1
     del ifc
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_forward_with_conn():
     assert asyncio.get_running_loop()
     remote = StreamPtr(None)
@@ -411,7 +411,7 @@ async def test_forward_with_conn():
     assert cnt == 0
     del ifc
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_forward_no_conn():
     assert asyncio.get_running_loop()
     remote = StreamPtr(None)
@@ -428,7 +428,7 @@ async def test_forward_no_conn():
     assert cnt == 1
     del ifc
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_forward_sw_except():
     assert asyncio.get_running_loop()
     remote = StreamPtr(None)
@@ -446,7 +446,7 @@ async def test_forward_sw_except():
     assert cnt == 1
     del ifc
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_forward_os_error():
     assert asyncio.get_running_loop()
     remote = StreamPtr(None)
@@ -464,7 +464,7 @@ async def test_forward_os_error():
     assert cnt == 1
     del ifc
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_forward_os_error2():
     assert asyncio.get_running_loop()
     remote = StreamPtr(None)
@@ -482,7 +482,7 @@ async def test_forward_os_error2():
     assert cnt == 1
     del ifc
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_forward_os_error3():
     assert asyncio.get_running_loop()
     remote = StreamPtr(None)
@@ -500,7 +500,7 @@ async def test_forward_os_error3():
     assert cnt == 1
     del ifc
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_forward_runtime_error():
     assert asyncio.get_running_loop()
     remote = StreamPtr(None)
@@ -518,7 +518,7 @@ async def test_forward_runtime_error():
     assert cnt == 1
     del ifc
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_forward_runtime_error2():
     assert asyncio.get_running_loop()
     remote = StreamPtr(None)
@@ -536,7 +536,7 @@ async def test_forward_runtime_error2():
     assert cnt == 1
     del ifc
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_forward_runtime_error3(spy_inc_cnt):
     assert asyncio.get_running_loop()
     remote = StreamPtr(None)
@@ -558,7 +558,7 @@ async def test_forward_runtime_error3(spy_inc_cnt):
     assert cnt == 1
     del ifc
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_forward_resp(spy_inc_cnt):
     assert asyncio.get_running_loop()
     remote = StreamPtr(None)
@@ -581,7 +581,7 @@ async def test_forward_resp(spy_inc_cnt):
     del ifc
 
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_forward_resp2(spy_inc_cnt):
     assert asyncio.get_running_loop()
     remote = StreamPtr(None)

app/tests/test_infos.py

@@ -17,13 +17,13 @@ def test_statistic_counter():
     assert val == None or val == 0
 
     i.static_init()                # initialize counter
-    assert json.dumps(i.stat) == json.dumps({"proxy": {"Inverter_Cnt": 0, "Cloud_Conn_Cnt": 0, "Unknown_SNR": 0, "Unknown_Msg": 0, "Invalid_Data_Type": 0, "Internal_Error": 0,"Unknown_Ctrl": 0, "OTA_Start_Msg": 0, "SW_Exception": 0, "Invalid_Msg_Format": 0, "AT_Command": 0, "AT_Command_Blocked": 0, "DCU_Command": 0, "Modbus_Command": 0}})
+    assert json.dumps(i.stat) == json.dumps({"proxy": {"Inverter_Cnt": 0, "Cloud_Conn_Cnt": 0, "Unknown_SNR": 0, "Unknown_Msg": 0, "Invalid_Data_Type": 0, "Internal_Error": 0,"Unknown_Ctrl": 0, "OTA_Start_Msg": 0, "SW_Exception": 0, "Invalid_Msg_Format": 0, "AT_Command": 0, "AT_Command_Blocked": 0, "Modbus_Command": 0}})
                                             
     val = i.dev_value(Register.INVERTER_CNT)  # valid and initiliazed addr
     assert val == 0
 
     i.inc_counter('Inverter_Cnt')
-    assert json.dumps(i.stat) == json.dumps({"proxy": {"Inverter_Cnt": 1, "Cloud_Conn_Cnt": 0, "Unknown_SNR": 0, "Unknown_Msg": 0, "Invalid_Data_Type": 0, "Internal_Error": 0,"Unknown_Ctrl": 0, "OTA_Start_Msg": 0, "SW_Exception": 0, "Invalid_Msg_Format": 0, "AT_Command": 0, "AT_Command_Blocked": 0, "DCU_Command": 0, "Modbus_Command": 0}})
+    assert json.dumps(i.stat) == json.dumps({"proxy": {"Inverter_Cnt": 1, "Cloud_Conn_Cnt": 0, "Unknown_SNR": 0, "Unknown_Msg": 0, "Invalid_Data_Type": 0, "Internal_Error": 0,"Unknown_Ctrl": 0, "OTA_Start_Msg": 0, "SW_Exception": 0, "Invalid_Msg_Format": 0, "AT_Command": 0, "AT_Command_Blocked": 0, "Modbus_Command": 0}})
     val = i.dev_value(Register.INVERTER_CNT)
     assert val == 1
 

app/tests/test_infos_g3p.py

@@ -109,7 +109,7 @@ def test_default_db():
     i = InfosG3P(client_mode=False)
     
     assert json.dumps(i.db) == json.dumps({
-        "inverter": {"Manufacturer": "TSUN", "Equipment_Model": "TSOL-MSxx00", "No_Inputs": 2}, 
+        "inverter": {"Manufacturer": "TSUN", "Equipment_Model": "TSOL-MSxx00", "No_Inputs": 4}, 
         "collector": {"Chip_Type": "IGEN TECH"},
         })
 
@@ -271,7 +271,7 @@ def test_build_ha_conf1():
         elif id == 'inv_count_456':
             assert False
 
-    assert tests==5
+    assert tests==7
 
 def test_build_ha_conf2():
     i = InfosG3P(client_mode=False)
@@ -346,7 +346,7 @@ def test_build_ha_conf3():
         elif id == 'inv_count_456':
             assert False
 
-    assert tests==5
+    assert tests==7
 
 def test_build_ha_conf4():
     i = InfosG3P(client_mode=True)

app/tests/test_inverter_base.py

@@ -113,7 +113,7 @@ def patch_unhealthy_remote():
     with patch.object(AsyncStreamClient, 'healthy', new_healthy) as conn:
         yield conn
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_inverter_iter(my_loop):
     _ = my_loop
     InverterBase._registry.clear()
@@ -217,7 +217,7 @@ def test_unhealthy_remote(patch_unhealthy_remote):
         cnt += 1
     assert cnt == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_remote_conn(my_loop, config_conn, patch_open_connection):
     _ = my_loop
     _ = config_conn
@@ -244,7 +244,7 @@ async def test_remote_conn(my_loop, config_conn, patch_open_connection):
         cnt += 1
     assert cnt == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_remote_conn_to_private(my_loop, config_conn, patch_open_connection):
     '''check DNS resolving of the TSUN FQDN to a local address'''
     _ = my_loop
@@ -283,7 +283,7 @@ async def test_remote_conn_to_private(my_loop, config_conn, patch_open_connectio
     assert cnt == 0
 
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_remote_conn_to_loopback(my_loop, config_conn, patch_open_connection):
     '''check DNS resolving of the TSUN FQDN to the loopback address'''
     _ = my_loop
@@ -321,7 +321,7 @@ async def test_remote_conn_to_loopback(my_loop, config_conn, patch_open_connecti
         cnt += 1
     assert cnt == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_remote_conn_to_none(my_loop, config_conn, patch_open_connection):
     '''check if get_extra_info() return None in case of an error'''
     _ = my_loop
@@ -359,7 +359,7 @@ async def test_remote_conn_to_none(my_loop, config_conn, patch_open_connection):
         cnt += 1
     assert cnt == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_unhealthy_remote(my_loop, config_conn, patch_open_connection, patch_unhealthy_remote):
     _ = my_loop
     _ = config_conn
@@ -397,7 +397,7 @@ async def test_unhealthy_remote(my_loop, config_conn, patch_open_connection, pat
         cnt += 1
     assert cnt == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_remote_disc(my_loop, config_conn, patch_open_connection):
     _ = my_loop
     _ = config_conn

app/tests/test_inverter_g3.py

@@ -99,7 +99,7 @@ def patch_healthy():
     with patch.object(AsyncStream, 'healthy') as conn:
         yield conn
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_method_calls(my_loop, patch_healthy):
     spy = patch_healthy
     reader = FakeReader()
@@ -119,7 +119,7 @@ async def test_method_calls(my_loop, patch_healthy):
         cnt += 1
     assert cnt == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_remote_conn(my_loop, config_conn, patch_open_connection):
     _ = config_conn
     _ = patch_open_connection
@@ -137,7 +137,7 @@ async def test_remote_conn(my_loop, config_conn, patch_open_connection):
         cnt += 1
     assert cnt == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_remote_except(my_loop, config_conn, patch_open_connection):
     _ = config_conn
     _ = patch_open_connection
@@ -164,7 +164,7 @@ async def test_remote_except(my_loop, config_conn, patch_open_connection):
         cnt += 1
     assert cnt == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_mqtt_publish(my_loop, config_conn, patch_open_connection):
     _ = config_conn
     _ = patch_open_connection
@@ -191,7 +191,7 @@ async def test_mqtt_publish(my_loop, config_conn, patch_open_connection):
         await inverter.async_publ_mqtt()
         assert Infos.new_stat_data['proxy'] == False
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_mqtt_err(my_loop, config_conn, patch_open_connection, patch_mqtt_err):
     _ = config_conn
     _ = patch_open_connection
@@ -208,7 +208,7 @@ async def test_mqtt_err(my_loop, config_conn, patch_open_connection, patch_mqtt_
         await inverter.async_publ_mqtt()
         assert stream.new_data['inverter'] == True
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_mqtt_except(my_loop, config_conn, patch_open_connection, patch_mqtt_except):
     _ = config_conn
     _ = patch_open_connection

app/tests/test_inverter_g3p.py

@@ -94,7 +94,7 @@ def patch_open_connection():
     with patch.object(asyncio, 'open_connection', new_open) as conn:
         yield conn
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_method_calls(my_loop, config_conn):
     _ = config_conn
     reader = FakeReader()
@@ -105,7 +105,7 @@ async def test_method_calls(my_loop, config_conn):
         assert inverter.local.stream
         assert inverter.local.ifc
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_remote_conn(my_loop, config_conn, patch_open_connection):
     _ = config_conn
     _ = patch_open_connection
@@ -116,7 +116,7 @@ async def test_remote_conn(my_loop, config_conn, patch_open_connection):
         await asyncio.sleep(0)
         assert inverter.remote.stream
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_remote_except(my_loop, config_conn, patch_open_connection):
     _ = config_conn
     _ = patch_open_connection
@@ -138,7 +138,7 @@ async def test_remote_except(my_loop, config_conn, patch_open_connection):
     test = MockType.RD_TEST_0_BYTES
 
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_mqtt_publish(my_loop, config_conn, patch_open_connection):
     _ = config_conn
     _ = patch_open_connection
@@ -165,7 +165,7 @@ async def test_mqtt_publish(my_loop, config_conn, patch_open_connection):
         await inverter.async_publ_mqtt()
         assert Infos.new_stat_data['proxy'] == False
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_mqtt_err(my_loop, config_conn, patch_open_connection, patch_mqtt_err):
     _ = config_conn
     _ = patch_open_connection
@@ -182,7 +182,7 @@ async def test_mqtt_err(my_loop, config_conn, patch_open_connection, patch_mqtt_
         await inverter.async_publ_mqtt()
         assert stream.new_data['inverter'] == True
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_mqtt_except(my_loop, config_conn, patch_open_connection, patch_mqtt_except):
     _ = config_conn
     _ = patch_open_connection

app/tests/test_modbus.py

@@ -19,7 +19,7 @@ class ModbusTestHelper(Modbus):
     def resp_handler(self):
         self.recv_responses += 1
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_modbus_crc():
     '''Check CRC-16 calculation'''
     mb = Modbus(None)
@@ -38,7 +38,7 @@ async def test_modbus_crc():
     msg += b'\x00\x00\x00\x00\x00\x00\x00\xe6\xef'
     assert 0 == mb._Modbus__calc_crc(msg)
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_build_modbus_pdu():
     '''Check building and sending a MODBUS RTU'''
     mb = ModbusTestHelper()
@@ -51,7 +51,7 @@ async def test_build_modbus_pdu():
     assert mb.last_len == 18
     assert mb.err == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_recv_req():
     '''Receive a valid request, which must transmitted'''
     mb = ModbusTestHelper()
@@ -61,7 +61,7 @@ async def test_recv_req():
     assert mb.last_len == 0x12
     assert mb.err == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_recv_req_crc_err():
     '''Receive a request with invalid CRC, which must be dropped'''
     mb = ModbusTestHelper()
@@ -72,7 +72,7 @@ async def test_recv_req_crc_err():
     assert mb.last_len == 0
     assert mb.err == 1
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_recv_resp_crc_err():
     '''Receive a response with invalid CRC, which must be dropped'''
     mb = ModbusTestHelper()
@@ -94,7 +94,7 @@ async def test_recv_resp_crc_err():
     mb._Modbus__stop_timer()
     assert not mb.req_pend
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_recv_resp_invalid_addr():
     '''Receive a response with wrong server addr, which must be dropped'''
     mb = ModbusTestHelper()
@@ -119,7 +119,7 @@ async def test_recv_resp_invalid_addr():
     mb._Modbus__stop_timer()
     assert not mb.req_pend
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_recv_recv_fcode():
     '''Receive a response with wrong function code, which must be dropped'''
     mb = ModbusTestHelper()
@@ -142,7 +142,7 @@ async def test_recv_recv_fcode():
     mb._Modbus__stop_timer()
     assert not mb.req_pend
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_recv_resp_len():
     '''Receive a response with wrong data length, which must be dropped'''
     mb = ModbusTestHelper()
@@ -166,7 +166,7 @@ async def test_recv_resp_len():
     mb._Modbus__stop_timer()
     assert not mb.req_pend
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_recv_unexpect_resp():
     '''Receive a response when we havb't sent a request'''
     mb = ModbusTestHelper()
@@ -183,7 +183,7 @@ async def test_recv_unexpect_resp():
     assert mb.req_pend == False
     assert mb.que.qsize() == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_parse_resp():
     '''Receive matching response and parse the values'''
     mb = ModbusTestHelper()
@@ -210,7 +210,7 @@ async def test_parse_resp():
     assert mb.que.qsize() == 0
     assert not mb.req_pend
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_queue():
     mb = ModbusTestHelper()
     mb.build_msg(1,3,0x3022,4)
@@ -229,7 +229,7 @@ async def test_queue():
     mb._Modbus__stop_timer()
     assert not mb.req_pend
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_queue2():
     '''Check queue handling for build_msg() calls'''
     mb = ModbusTestHelper()
@@ -279,7 +279,7 @@ async def test_queue2():
     assert mb.que.qsize() == 0
     assert not mb.req_pend
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_queue3():
     '''Check queue handling for recv_req() calls'''
     mb = ModbusTestHelper()
@@ -336,7 +336,7 @@ async def test_queue3():
     assert mb.que.qsize() == 0
     assert not mb.req_pend
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_timeout(my_loop):
     '''Test MODBUS response timeout and RTU retransmitting'''
     assert asyncio.get_running_loop()
@@ -384,7 +384,7 @@ async def test_timeout(my_loop):
     assert mb.retry_cnt == 0
     assert mb.send_calls == 4
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_recv_unknown_data():
     '''Receive a response with an unknwon register'''
     mb = ModbusTestHelper()
@@ -404,7 +404,7 @@ async def test_recv_unknown_data():
 
     del mb.mb_reg_mapping[0x9000]
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_close():
     '''Check queue handling for build_msg() calls'''
     mb = ModbusTestHelper()

app/tests/test_modbus_tcp.py

@@ -189,7 +189,7 @@ def patch_mqtt_except():
     with patch.object(Mqtt, 'publish', new_publish) as conn:
         yield conn
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_modbus_conn(config_conn, patch_open):
     _ = config_conn
     _ = patch_open
@@ -209,7 +209,7 @@ async def test_modbus_conn(config_conn, patch_open):
 
     assert Infos.stat['proxy']['Inverter_Cnt'] == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_modbus_no_cnf():
     _ = config_conn
     assert Infos.stat['proxy']['Inverter_Cnt'] == 0
@@ -217,7 +217,7 @@ async def test_modbus_no_cnf():
     ModbusTcp(loop)
     assert Infos.stat['proxy']['Inverter_Cnt'] == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_modbus_timeout(config_conn, patch_open_timeout):
     _ = config_conn
     _ = patch_open_timeout
@@ -235,7 +235,7 @@ async def test_modbus_timeout(config_conn, patch_open_timeout):
     await asyncio.sleep(0.01)
     assert Infos.stat['proxy']['Inverter_Cnt'] == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_modbus_value_err(config_conn, patch_open_value_error):
     _ = config_conn
     _ = patch_open_value_error
@@ -253,7 +253,7 @@ async def test_modbus_value_err(config_conn, patch_open_value_error):
     await asyncio.sleep(0.01)
     assert Infos.stat['proxy']['Inverter_Cnt'] == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_modbus_conn_abort(config_conn, patch_open_conn_abort):
     _ = config_conn
     _ = patch_open_conn_abort
@@ -271,7 +271,7 @@ async def test_modbus_conn_abort(config_conn, patch_open_conn_abort):
     await asyncio.sleep(0.01)
     assert Infos.stat['proxy']['Inverter_Cnt'] == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_modbus_cnf2(config_conn, patch_no_mqtt, patch_open):
     _ = config_conn
     _ = patch_open
@@ -295,7 +295,7 @@ async def test_modbus_cnf2(config_conn, patch_no_mqtt, patch_open):
     await asyncio.sleep(0.01)
     assert Infos.stat['proxy']['Inverter_Cnt'] == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_modbus_cnf3(config_conn, patch_no_mqtt, patch_open):
     _ = config_conn
     _ = patch_open
@@ -326,7 +326,7 @@ async def test_modbus_cnf3(config_conn, patch_no_mqtt, patch_open):
     await asyncio.sleep(0.01)
     assert Infos.stat['proxy']['Inverter_Cnt'] == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_mqtt_err(config_conn, patch_mqtt_err, patch_open):
     _ = config_conn
     _ = patch_open
@@ -357,7 +357,7 @@ async def test_mqtt_err(config_conn, patch_mqtt_err, patch_open):
     await asyncio.sleep(0.01)
     assert Infos.stat['proxy']['Inverter_Cnt'] == 0
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_mqtt_except(config_conn, patch_mqtt_except, patch_open):
     _ = config_conn
     _ = patch_open

app/tests/test_mqtt.py

@@ -3,10 +3,8 @@ import pytest
 import asyncio
 import aiomqtt
 import logging
-from aiomqtt import MqttError, MessagesIterator
-from aiomqtt import Message as AiomqttMessage
-from mock import patch, Mock
 
+from mock import patch, Mock
 from async_stream import AsyncIfcImpl
 from singleton import Singleton
 from mqtt import Mqtt
@@ -19,7 +17,7 @@ NO_MOSQUITTO_TEST = False
 
 pytest_plugins = ('pytest_asyncio',)
 
-@pytest.fixture(scope="function", autouse=True)
+@pytest.fixture(scope="module", autouse=True)
 def module_init():
     Singleton._instances.clear()
     yield
@@ -35,26 +33,6 @@ def test_hostname():
     # else:
         return 'test.mosquitto.org'
 
-@pytest.fixture(scope="function")
-def aiomqtt_mock(monkeypatch):
-    recv_que = asyncio.Queue()
-        
-    async def my_aenter(self):
-        return self
-    async def my_subscribe(self, *arg):
-        return
-    async def my_anext(self):
-        return await recv_que.get()
-    async def my_receive(self, topic: str, payload: bytes):
-        msg = AiomqttMessage(topic, payload,qos=0, retain=False, mid=0, properties=None)
-        await recv_que.put(msg)
-        await asyncio.sleep(0)  # dispath the msg
-
-    monkeypatch.setattr(aiomqtt.Client, "__aenter__", my_aenter)
-    monkeypatch.setattr(aiomqtt.Client, "subscribe", my_subscribe)
-    monkeypatch.setattr(MessagesIterator, "__anext__", my_anext)
-    monkeypatch.setattr(Mqtt, "receive", my_receive, False)
-
 @pytest.fixture
 def config_mqtt_conn(test_hostname, test_port):
     Config.act_config = {'mqtt':{'host': test_hostname, 'port': test_port, 'user': '', 'passwd': ''},
@@ -66,14 +44,6 @@ def config_no_conn(test_port):
     Config.act_config = {'mqtt':{'host': "", 'port': test_port, 'user': '', 'passwd': ''},
                          'ha':{'auto_conf_prefix': 'homeassistant','discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun'}
                         }
-    Config.def_config = {}
-
-@pytest.fixture
-def config_def_conn(test_port):
-    Config.act_config = {'mqtt':{'host': "unknown_url", 'port': test_port, 'user': '', 'passwd': ''},
-                         'ha':{'auto_conf_prefix': 'homeassistant','discovery_prefix': 'homeassistant', 'entity_prefix': 'tsun'}
-                        }
-    Config.def_config = Config.act_config
 
 @pytest.fixture
 def spy_at_cmd():
@@ -99,14 +69,6 @@ def spy_modbus_cmd_client():
         yield wrapped_conn
     conn.close()
 
-@pytest.fixture
-def spy_dcu_cmd():
-    conn = SolarmanV5(None, ('test.local', 1234), server_side=True, client_mode= False, ifc=AsyncIfcImpl())
-    conn.node_id = 'inv_3/'
-    with patch.object(conn, 'send_dcu_cmd', wraps=conn.send_dcu_cmd) as wrapped_conn:
-        yield wrapped_conn
-    conn.close()
-
 def test_native_client(test_hostname, test_port):
     """Sanity check: Make sure the paho-mqtt client can connect to the test
     MQTT server. Otherwise the test set NO_MOSQUITTO_TEST to True and disable
@@ -132,7 +94,7 @@ def test_native_client(test_hostname, test_port):
     finally:
         c.loop_stop()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_mqtt_connection(config_mqtt_conn):
     if NO_MOSQUITTO_TEST:
         pytest.skip('skipping, since Mosquitto is not reliable at the moment')
@@ -157,7 +119,7 @@ async def test_mqtt_connection(config_mqtt_conn):
         await m.close()
         await m.publish('homeassistant/status', 'online')
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_ha_reconnect(config_mqtt_conn):
     if NO_MOSQUITTO_TEST:
         pytest.skip('skipping, since Mosquitto is not reliable at the moment')
@@ -181,18 +143,14 @@ async def test_ha_reconnect(config_mqtt_conn):
         assert m.received == 2
         await m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
-async def test_mqtt_no_config(config_no_conn, monkeypatch):
+async def test_mqtt_no_config(config_no_conn):
     _ = config_no_conn
     assert asyncio.get_running_loop()
 
     on_connect =  asyncio.Event()
     async def cb():
         on_connect.set()
-    async def my_publish(*args):
-        return
-
-    monkeypatch.setattr(aiomqtt.Client, "publish", my_publish)
 
     try:
         m = Mqtt(cb)
@@ -201,197 +159,78 @@ async def test_mqtt_no_config(config_no_conn, monkeypatch):
         assert not on_connect.is_set()
         try:
             await m.publish('homeassistant/status', 'online')
-            assert m.published == 1
+            assert False
         except Exception:
-            assert False          
+            pass          
     except TimeoutError:
         assert False
     finally:
         await m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
-async def test_mqtt_except_no_config(config_no_conn, monkeypatch, caplog):
+async def test_msg_dispatch(config_mqtt_conn, spy_modbus_cmd):
-    _ = config_no_conn
-
-    assert asyncio.get_running_loop()
-
-    async def my_aenter(self):
-        raise MqttError('TestException') from None
-    
-    monkeypatch.setattr(aiomqtt.Client, "__aenter__", my_aenter)
-
-    LOGGER = logging.getLogger("mqtt")
-    LOGGER.propagate = True
-    LOGGER.setLevel(logging.INFO)
-
-    with caplog.at_level(logging.INFO):
-        m = Mqtt(None)
-        assert m.task
-        await asyncio.sleep(0)
-        try:
-            await m.publish('homeassistant/status', 'online')
-            assert False
-        except MqttError:
-            pass
-        except Exception:
-            assert False          
-        finally:
-            await m.close()
-    assert 'Connection lost; Reconnecting in 5 seconds' in caplog.text
-
-@pytest.mark.asyncio(loop_scope="session")
-async def test_mqtt_except_def_config(config_def_conn, monkeypatch, caplog):
-    _ = config_def_conn
-
-    assert asyncio.get_running_loop()
-
-    on_connect =  asyncio.Event()
-    async def cb():
-        on_connect.set()
-
-    async def my_aenter(self):
-        raise MqttError('TestException') from None
-    
-    monkeypatch.setattr(aiomqtt.Client, "__aenter__", my_aenter)
-
-    LOGGER = logging.getLogger("mqtt")
-    LOGGER.propagate = True
-    LOGGER.setLevel(logging.INFO)
-
-    with caplog.at_level(logging.INFO):
-        m = Mqtt(cb)
-        assert m.task
-        await asyncio.sleep(0)
-        assert not on_connect.is_set()
-        try:
-            await m.publish('homeassistant/status', 'online')
-            assert False
-        except MqttError:
-            pass
-        except Exception:
-            assert False          
-        finally:
-            await m.close()
-    assert 'MQTT is unconfigured; Check your config.toml!' in caplog.text
-
-@pytest.mark.asyncio(loop_scope="session")
-async def test_mqtt_dispatch(config_mqtt_conn, aiomqtt_mock, spy_modbus_cmd):
     _ = config_mqtt_conn
-    _ = aiomqtt_mock
     spy = spy_modbus_cmd
     try:
         m = Mqtt(None)
-        assert m.ha_restarts == 0
+        msg = aiomqtt.Message(topic= 'tsun/inv_1/rated_load', payload= b'2', qos= 0, retain = False, mid= 0, properties= None)
-        await m.receive('homeassistant/status', b'online')  # send the message
+        await m.dispatch_msg(msg)
-        assert m.ha_restarts == 1
+        spy.assert_awaited_once_with(Modbus.WRITE_SINGLE_REG, 0x2008, 2, logging.INFO)
-
-        await m.receive(topic= 'tsun/inv_1/rated_load', payload= b'2')
-        spy.assert_called_once_with(Modbus.WRITE_SINGLE_REG, 0x2008, 2, logging.INFO)
-
-        spy.reset_mock()
-        await m.receive(topic= 'tsun/inv_1/out_coeff', payload= b'100')
-        spy.assert_called_once_with(Modbus.WRITE_SINGLE_REG, 0x202c, 1024, logging.INFO)
         
         spy.reset_mock()
-        await m.receive(topic= 'tsun/inv_1/out_coeff', payload= b'50')
+        msg = aiomqtt.Message(topic= 'tsun/inv_1/out_coeff', payload= b'100', qos= 0, retain = False, mid= 0, properties= None)
-        spy.assert_called_once_with(Modbus.WRITE_SINGLE_REG, 0x202c, 512, logging.INFO)
+        await m.dispatch_msg(msg)
+        spy.assert_awaited_once_with(Modbus.WRITE_SINGLE_REG, 0x202c, 1024, logging.INFO)
+        
+        spy.reset_mock()
+        msg = aiomqtt.Message(topic= 'tsun/inv_1/out_coeff', payload= b'50', qos= 0, retain = False, mid= 0, properties= None)
+        await m.dispatch_msg(msg)
+        spy.assert_awaited_once_with(Modbus.WRITE_SINGLE_REG, 0x202c, 512, logging.INFO)
     
         spy.reset_mock()
-        await m.receive(topic= 'tsun/inv_1/modbus_read_regs', payload= b'0x3000, 10')
+        msg = aiomqtt.Message(topic= 'tsun/inv_1/modbus_read_regs', payload= b'0x3000, 10', qos= 0, retain = False, mid= 0, properties= None)
-        spy.assert_called_once_with(Modbus.READ_REGS, 0x3000, 10, logging.INFO)
+        await m.dispatch_msg(msg)
+        spy.assert_awaited_once_with(Modbus.READ_REGS, 0x3000, 10, logging.INFO)
 
         spy.reset_mock()
-        await m.receive(topic= 'tsun/inv_1/modbus_read_inputs', payload= b'0x3000, 10')
+        msg = aiomqtt.Message(topic= 'tsun/inv_1/modbus_read_inputs', payload= b'0x3000, 10', qos= 0, retain = False, mid= 0, properties= None)
-        spy.assert_called_once_with(Modbus.READ_INPUTS, 0x3000, 10, logging.INFO)
+        await m.dispatch_msg(msg)
+        spy.assert_awaited_once_with(Modbus.READ_INPUTS, 0x3000, 10, logging.INFO)
 
-        # test dispatching with empty mapping table
-        m.topic_defs.clear()
-        spy.reset_mock()
-        await m.receive(topic= 'tsun/inv_1/modbus_read_inputs', payload= b'0x3000, 10')
-        spy.assert_not_called()
-
-        # test dispatching with incomplete mapping table - invalid fnc defined
-        m.topic_defs.append(
-            {'prefix': 'entity_prefix', 'topic': '/+/modbus_read_inputs',
-             'full_topic': 'tsun/+/modbus_read_inputs', 'fnc': 'addr'}
-        )
-        spy.reset_mock()
-        await m.receive(topic= 'tsun/inv_1/modbus_read_inputs', payload= b'0x3000, 10')
-        spy.assert_not_called()
-
-    except MqttError:
-        assert False
-    except Exception:
-        assert False          
     finally:
         await m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
-async def test_mqtt_dispatch_cb(config_mqtt_conn, aiomqtt_mock):
+async def test_msg_dispatch_err(config_mqtt_conn, spy_modbus_cmd):
     _ = config_mqtt_conn
-    _ = aiomqtt_mock
-
-    on_connect =  asyncio.Event()
-    async def cb():
-        on_connect.set()
-    try:
-        m = Mqtt(cb)
-        assert m.ha_restarts == 0
-        await m.receive('homeassistant/status', b'online')  # send the message
-        assert on_connect.is_set()
-        assert m.ha_restarts == 1
-
-    except MqttError:
-        assert False
-    except Exception:
-        assert False          
-    finally:
-        await m.close()
-
-@pytest.mark.asyncio(loop_scope="session")
-async def test_mqtt_dispatch_err(config_mqtt_conn, aiomqtt_mock, spy_modbus_cmd, caplog):
-    _ = config_mqtt_conn
-    _ = aiomqtt_mock
     spy = spy_modbus_cmd
-
-    LOGGER = logging.getLogger("mqtt")
-    LOGGER.propagate = True
-    LOGGER.setLevel(logging.INFO)
-
     try:
         m = Mqtt(None)
-
         # test out of range param
-        await m.receive(topic= 'tsun/inv_1/out_coeff', payload= b'-1')
+        msg = aiomqtt.Message(topic= 'tsun/inv_1/out_coeff', payload= b'-1', qos= 0, retain = False, mid= 0, properties= None)
+        await m.dispatch_msg(msg)
         spy.assert_not_called()
 
         # test unknown node_id
-        await m.receive(topic= 'tsun/inv_2/out_coeff', payload= b'2')
+        spy.reset_mock()
+        msg = aiomqtt.Message(topic= 'tsun/inv_2/out_coeff', payload= b'2', qos= 0, retain = False, mid= 0, properties= None)
+        await m.dispatch_msg(msg)
         spy.assert_not_called()
 
         # test invalid fload param
-        await m.receive(topic= 'tsun/inv_1/out_coeff', payload= b'2, 3')
+        spy.reset_mock()
-        spy.assert_not_called()
+        msg = aiomqtt.Message(topic= 'tsun/inv_1/out_coeff', payload= b'2, 3', qos= 0, retain = False, mid= 0, properties= None)
-    
+        await m.dispatch_msg(msg)
-        await m.receive(topic= 'tsun/inv_1/modbus_read_regs', payload= b'0x3000, 10, 7')
         spy.assert_not_called()
 
-        await m.receive(topic= 'tsun/inv_1/dcu_power', payload= b'100W')
+        spy.reset_mock()
+        msg = aiomqtt.Message(topic= 'tsun/inv_1/modbus_read_regs', payload= b'0x3000, 10, 7', qos= 0, retain = False, mid= 0, properties= None)
+        await m.dispatch_msg(msg)
         spy.assert_not_called()
-
-        with caplog.at_level(logging.INFO):
-            msg = aiomqtt.Message(topic= 'tsun/inv_1/out_coeff', payload= b'2', qos= 0, retain = False, mid= 0, properties= None)
-            for _ in m.each_inverter(msg, "addr"):
-                pass  # do nothing here
-        assert 'Cmd not supported by: inv_1/' in caplog.text
-    except MqttError:
-        assert False
-    except Exception:
-        assert False          
     finally:
         await m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_msg_ignore_client_conn(config_mqtt_conn, spy_modbus_cmd_client):
     '''don't call function if connnection is not in server mode'''
     _ = config_mqtt_conn
@@ -404,7 +243,7 @@ async def test_msg_ignore_client_conn(config_mqtt_conn, spy_modbus_cmd_client):
     finally:
         await m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_ignore_unknown_func(config_mqtt_conn):
     '''don't dispatch for unknwon function names'''
     _ = config_mqtt_conn
@@ -416,7 +255,7 @@ async def test_ignore_unknown_func(config_mqtt_conn):
     finally:
         await m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_at_cmd_dispatch(config_mqtt_conn, spy_at_cmd):
     _ = config_mqtt_conn
     spy = spy_at_cmd
@@ -428,31 +267,3 @@ async def test_at_cmd_dispatch(config_mqtt_conn, spy_at_cmd):
         
     finally:
         await m.close()
-
-@pytest.mark.asyncio(loop_scope="session")
-async def test_dcu_dispatch(config_mqtt_conn, spy_dcu_cmd):
-    _ = config_mqtt_conn
-    spy = spy_dcu_cmd
-    try:
-        m = Mqtt(None)
-        msg = aiomqtt.Message(topic= 'tsun/inv_3/dcu_power', payload= b'100.0', qos= 0, retain = False, mid= 0, properties= None)
-        await m.dispatch_msg(msg)
-        spy.assert_called_once_with(b'\x01\x01\x06\x01\x00\x01\x03\xe8')
-    finally:
-        await m.close()
-
-@pytest.mark.asyncio(loop_scope="session")
-async def test_dcu_inv_value(config_mqtt_conn, spy_dcu_cmd):
-    _ = config_mqtt_conn
-    spy = spy_dcu_cmd
-    try:
-        m = Mqtt(None)
-        msg = aiomqtt.Message(topic= 'tsun/inv_3/dcu_power', payload= b'99.9', qos= 0, retain = False, mid= 0, properties= None)
-        await m.dispatch_msg(msg)
-        spy.assert_not_called()
-
-        msg = aiomqtt.Message(topic= 'tsun/inv_3/dcu_power', payload= b'800.1', qos= 0, retain = False, mid= 0, properties= None)
-        await m.dispatch_msg(msg)
-        spy.assert_not_called()
-    finally:
-        await m.close()

app/tests/test_proxy.py

@@ -59,7 +59,7 @@ def config_conn(test_hostname, test_port):
                         }
     }
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_inverter_cb(config_conn):
     _ = config_conn
 
@@ -72,7 +72,7 @@ async def test_inverter_cb(config_conn):
         await Proxy._cb_mqtt_is_up()
         spy.assert_called_once()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_mqtt_is_up(config_conn):
     _ = config_conn
 
@@ -81,7 +81,7 @@ async def test_mqtt_is_up(config_conn):
         await Proxy._cb_mqtt_is_up()
         spy.assert_called()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_mqtt_proxy_statt_invalid(config_conn):
     _ = config_conn
 

app/tests/test_server.py

@@ -4,10 +4,6 @@ import logging
 import os
 from mock import patch
 from server import app, Server, ProxyState, HypercornLogHndl
-from inverter_base import InverterBase
-from gen3.talent import Talent
-
-from test_inverter_base import FakeReader, FakeWriter
 
 pytest_plugins = ('pytest_asyncio',)
 
@@ -112,20 +108,20 @@ class TestServerClass:
         assert logging.getLogger('hypercorn.access').level == logging.INFO
         assert logging.getLogger('hypercorn.error').level == logging.INFO
 
-        with patch.dict(os.environ, {'LOG_LVL': 'WARN'}):
+        os.environ["LOG_LVL"] = "WARN"
-            s.parse_args(['--log_backups', '3'])
+        s.parse_args(['--log_backups', '3'])
-            s.init_logging_system()
+        s.init_logging_system()
-            assert s.log_backups == 3
+        assert s.log_backups == 3
-            assert s.log_level == logging.WARNING
+        assert s.log_level == logging.WARNING
-            assert logging.handlers.log_backups == 3
+        assert logging.handlers.log_backups == 3
-            assert logging.getLogger().level == s.log_level
+        assert logging.getLogger().level == s.log_level
-            assert logging.getLogger('msg').level == s.log_level
+        assert logging.getLogger('msg').level == s.log_level
-            assert logging.getLogger('conn').level == s.log_level
+        assert logging.getLogger('conn').level == s.log_level
-            assert logging.getLogger('data').level == s.log_level
+        assert logging.getLogger('data').level == s.log_level
-            assert logging.getLogger('tracer').level == s.log_level
+        assert logging.getLogger('tracer').level == s.log_level
-            assert logging.getLogger('asyncio').level == s.log_level
+        assert logging.getLogger('asyncio').level == s.log_level
-            assert logging.getLogger('hypercorn.access').level == logging.INFO
+        assert logging.getLogger('hypercorn.access').level == logging.INFO
-            assert logging.getLogger('hypercorn.error').level == logging.INFO
+        assert logging.getLogger('hypercorn.error').level == logging.INFO
 
     def test_build_config_error(self, caplog):
         s = self.FakeServer()
@@ -186,12 +182,11 @@ class TestHypercornLogHndl:
 
 
 class TestApp:
-    @pytest.mark.asyncio(loop_scope="session")
+    @pytest.mark.asyncio
     async def test_ready(self):
         """Test the ready route."""
 
         ProxyState.set_up(False)
-        app.testing = True
         client = app.test_client()
         response = await client.get('/-/ready')
         assert response.status_code == 503
@@ -204,87 +199,20 @@ class TestApp:
         result = await response.get_data()
         assert result == b"Is ready"
 
-    @pytest.mark.asyncio(loop_scope="session")
+    @pytest.mark.asyncio
     async def test_healthy(self):
         """Test the healthy route."""
-        reader = FakeReader()
-        writer =  FakeWriter()
 
-        with InverterBase(reader, writer, 'tsun', Talent):
+        ProxyState.set_up(False)
-            ProxyState.set_up(False)
+        client = app.test_client()
-            app.testing = True
+        response = await client.get('/-/healthy')
-            client = app.test_client()
+        assert response.status_code == 200
-            response = await client.get('/-/healthy')
+        result = await response.get_data()
-            assert response.status_code == 200
+        assert result == b"I'm fine"
-            result = await response.get_data()
-            assert result == b"I'm fine"
 
-            ProxyState.set_up(True)
+        ProxyState.set_up(True)
-            response = await client.get('/-/healthy')
+        response = await client.get('/-/healthy')
-            assert response.status_code == 200
+        assert response.status_code == 200
-            result = await response.get_data()
+        result = await response.get_data()
-            assert result == b"I'm fine"
+        assert result == b"I'm fine"
 
-    @pytest.mark.asyncio(loop_scope="session")
-    async def test_unhealthy(self, monkeypatch, caplog):
-        """Test the healthy route."""
-        def result_false(self):
-            return False
-        
-        LOGGER = logging.getLogger("mqtt")
-        LOGGER.propagate = True
-        LOGGER.setLevel(logging.INFO)
-
-        monkeypatch.setattr(InverterBase, "healthy", result_false)
-        InverterBase._registry.clear()
-        reader = FakeReader()
-        writer = FakeWriter()
-
-        with caplog.at_level(logging.INFO) and InverterBase(reader, writer, 'tsun', Talent):
-            ProxyState.set_up(False)
-            app.testing = True
-            client = app.test_client()
-            response = await client.get('/-/healthy')
-            assert response.status_code == 200
-            result = await response.get_data()
-            assert result == b"I'm fine"
-            assert "" == caplog.text
-
-            ProxyState.set_up(True)
-            response = await client.get('/-/healthy')
-            assert response.status_code == 503
-            result = await response.get_data()
-            assert result == b"I have a problem"
-            assert "" == caplog.text
-
-    @pytest.mark.asyncio
-    async def test_healthy_exception(self, monkeypatch, caplog):
-        """Test the healthy route."""
-        def result_except(self):
-            raise ValueError
-        
-        LOGGER = logging.getLogger("mqtt")
-        LOGGER.propagate = True
-        LOGGER.setLevel(logging.INFO)
-
-        monkeypatch.setattr(InverterBase, "healthy", result_except)
-        InverterBase._registry.clear()
-        reader = FakeReader()
-        writer = FakeWriter()
-
-        with caplog.at_level(logging.INFO) and InverterBase(reader, writer, 'tsun', Talent):
-            ProxyState.set_up(False)
-            app.testing = True
-            client = app.test_client()
-            response = await client.get('/-/healthy')
-            assert response.status_code == 200
-            result = await response.get_data()
-            assert result == b"I'm fine"
-            assert "" == caplog.text
-
-            ProxyState.set_up(True)
-            response = await client.get('/-/healthy')
-            assert response.status_code == 200
-            result = await response.get_data()
-            assert result == b"I'm fine"
-            assert "Exception:" in caplog.text

app/tests/test_solarman.py

@@ -462,39 +462,6 @@ def inverter_ind_msg800():  # 0x4210 rated Power 800W
     msg += b'\x15'
     return msg
 
-@pytest.fixture
-def inverter_ind_msg900():  # 0x4210 rated Power 900W 
-    msg  = b'\xa5\x99\x01\x10\x42\xe6\x9e' +get_sn()  +b'\x01\xb0\x02\xbc\xc8'
-    msg += b'\x24\x32\x6c\x1f\x00\x00\xa0\x47\xe4\x33\x01\x00\x03\x08\x00\x00'
-    msg += b'\x59\x31\x37\x45\x37\x41\x30\x46\x30\x31\x30\x42\x30\x31\x33\x45'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x01\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg +=  b'\x40\x10\x08\xc8\x00\x49\x13\x8d\x00\x36\x00\x00\x03\x84\x06\x7a'
-    msg += b'\x01\x61\x00\xa8\x02\x54\x01\x5a\x00\x8a\x01\xe4\x01\x5a\x00\xbd'
-    msg += b'\x02\x8f\x00\x11\x00\x01\x00\x00\x00\x0b\x00\x00\x27\x98\x00\x04'
-    msg += b'\x00\x00\x0c\x04\x00\x03\x00\x00\x0a\xe7\x00\x05\x00\x00\x0c\x75'
-    msg += b'\x00\x00\x00\x00\x06\x16\x02\x00\x00\x00\x55\xaa\x00\x01\x00\x00'
-    msg +=  b'\x00\x00\x00\x00\xff\xff\x03\x84\x00\x03\x04\x00\x04\x00\x04\x00'
-    msg += b'\x04\x00\x00\x01\xff\xff\x00\x01\x00\x06\x00\x68\x00\x68\x05\x00'
-    msg += b'\x09\xcd\x07\xb6\x13\x9c\x13\x24\x00\x01\x07\xae\x04\x0f\x00\x41'
-    msg += b'\x00\x0f\x0a\x64\x0a\x64\x00\x06\x00\x06\x09\xf6\x12\x8c\x12\x8c'
-    msg += b'\x00\x10\x00\x10\x14\x52\x14\x52\x00\x10\x00\x10\x01\x51\x00\x05'
-    msg += b'\x04\x00\x00\x01\x13\x9c\x0f\xa0\x00\x4e\x00\x66\x03\xe8\x04\x00'
-    msg += b'\x09\xce\x07\xa8\x13\x9c\x13\x26\x00\x00\x00\x00\x00\x00\x00\x00'
-    msg += b'\x00\x00\x00\x00\x04\x00\x04\x00\x00\x00\x00\x00\xff\xff\x00\x00'
-    msg += b'\x00\x00\x00\x00'
-    msg += correct_checksum(msg)
-    msg += b'\x15'
-    return msg
-
 @pytest.fixture
 def inverter_ind_msg_81():  # 0x4210 fcode 0x81
     msg  = b'\xa5\x99\x01\x10\x42\x02\x03' +get_sn()  +b'\x81\xb0\x02\xbc\xc8'
@@ -709,19 +676,6 @@ def msg_modbus_rsp():  # 0x1510
     msg += b'\x15'
     return msg
 
-@pytest.fixture
-def msg_modbus_rsp_mb_4():  # 0x1510, MODBUS Type:4
-    msg  = b'\xa5\x3b\x00\x10\x15\x03\x03' +get_sn()  +b'\x02\x01'
-    msg += total()  
-    msg += hb()
-    msg += b'\x0a\xe2\xfa\x33\x01\x04\x28\x40\x10\x08\xd8'
-    msg += b'\x00\x00\x13\x87\x00\x31\x00\x68\x02\x58\x00\x00\x01\x53\x00\x02'
-    msg += b'\x00\x00\x01\x52\x00\x02\x00\x00\x01\x53\x00\x03\x00\x00\x00\x04'
-    msg += b'\x00\x01\x00\x00\x9e\xa4'
-    msg += correct_checksum(msg)
-    msg += b'\x15'
-    return msg
-
 @pytest.fixture
 def msg_modbus_interim_rsp():  # 0x0510
     msg  = b'\xa5\x3b\x00\x10\x15\x03\x03' +get_sn()  +b'\x02\x01'
@@ -858,26 +812,6 @@ def dcu_data_rsp_msg():  # 0x1210
     msg += b'\x15'
     return msg
 
-@pytest.fixture
-def dcu_command_ind_msg():  # 0x4510
-    msg  = b'\xa5\x17\x00\x10\x45\x94\x02' +get_dcu_sn() +b'\x05\x26\x30'
-    msg += b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'           
-    msg += b'\x01\x01\x06\x01\x00\x01\x03\xe8'
-    msg += correct_checksum(msg)
-    msg += b'\x15'
-    return msg
-
-@pytest.fixture
-def dcu_command_rsp_msg():  # 0x1510
-    msg  = b'\xa5\x11\x00\x10\x15\x94\x03' +get_dcu_sn()  +b'\x05\x01'
-    msg += total()  
-    msg += hb()
-    msg += b'\x00\x00\x00\x00'
-    msg += b'\x01\x01\x01'
-    msg += correct_checksum(msg)
-    msg += b'\x15'
-    return msg
-
 @pytest.fixture
 def config_tsun_allow_all():
     Config.act_config = {
@@ -920,19 +854,9 @@ def config_tsun_scan_dcu():
 
 @pytest.fixture
 def config_tsun_dcu1():
-    Config.act_config = {
+    Config.act_config = {'solarman':{'enabled': True},'batteries':{'4100000000000001':{'monitor_sn': 2070233888, 'node_id':'inv1/', 'modbus_polling': True, 'suggested_area':'roof', 'sensor_list': 0}}}
-        'ha':{
-            'auto_conf_prefix': 'homeassistant',
-            'discovery_prefix': 'homeassistant', 
-            'entity_prefix': 'tsun',
-            'proxy_node_id': 'test_1',
-            'proxy_unique_id': ''
-        },
-        'solarman':{'enabled': True, 'host': 'test_cloud.local', 'port': 1234},'batteries':{'4100000000000001':{'monitor_sn': 2070233888, 'node_id':'inv1/', 'modbus_polling': True, 'suggested_area':'roof', 'sensor_list': 0}}}
-    Proxy.class_init()
-    Proxy.mqtt = Mqtt()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_read_message(device_ind_msg):
     Config.act_config = {'solarman':{'enabled': True}}
     m = MemoryStream(device_ind_msg, (0,))
@@ -951,7 +875,7 @@ async def test_read_message(device_ind_msg):
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_invalid_start_byte(invalid_start_byte, device_ind_msg):
     # received a message with wrong start byte plus an valid message
     # the complete receive buffer must be cleared to 
@@ -974,7 +898,7 @@ async def test_invalid_start_byte(invalid_start_byte, device_ind_msg):
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 1
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_invalid_stop_byte(invalid_stop_byte):
     # received a message with wrong stop byte
     # the complete receive buffer must be cleared to 
@@ -996,7 +920,7 @@ async def test_invalid_stop_byte(invalid_stop_byte):
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 1
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_invalid_stop_byte2(invalid_stop_byte, device_ind_msg):
     # received a message with wrong stop byte plus an valid message
     # only the first message must be discarded
@@ -1023,7 +947,7 @@ async def test_invalid_stop_byte2(invalid_stop_byte, device_ind_msg):
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 1
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_invalid_stop_start_byte(invalid_stop_byte, invalid_start_byte):
     # received a message with wrong stop byte plus an invalid message
     # with fron start byte
@@ -1047,7 +971,7 @@ async def test_invalid_stop_start_byte(invalid_stop_byte, invalid_start_byte):
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 1
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_invalid_checksum(invalid_checksum, device_ind_msg):
     # received a message with wrong checksum plus an valid message
     # only the first message must be discarded
@@ -1073,7 +997,7 @@ async def test_invalid_checksum(invalid_checksum, device_ind_msg):
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 1
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_read_message_twice(config_no_tsun_inv1, device_ind_msg, device_rsp_msg):
     _ = config_no_tsun_inv1
     m = MemoryStream(device_ind_msg, (0,))
@@ -1095,7 +1019,7 @@ async def test_read_message_twice(config_no_tsun_inv1, device_ind_msg, device_rs
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_read_message_in_chunks(device_ind_msg):
     Config.act_config = {'solarman':{'enabled': True}}
     m = MemoryStream(device_ind_msg, (4,11,0))
@@ -1118,7 +1042,7 @@ async def test_read_message_in_chunks(device_ind_msg):
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_read_message_in_chunks2(my_loop, config_tsun_inv1, device_ind_msg):
     _ = config_tsun_inv1
     m = MemoryStream(device_ind_msg, (4,10,0))
@@ -1144,7 +1068,7 @@ async def test_read_message_in_chunks2(my_loop, config_tsun_inv1, device_ind_msg
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_read_two_messages(my_loop, config_tsun_allow_all, device_ind_msg, device_rsp_msg, inverter_ind_msg, inverter_rsp_msg):
     _ = config_tsun_allow_all
     m = MemoryStream(device_ind_msg, (0,))
@@ -1173,7 +1097,7 @@ async def test_read_two_messages(my_loop, config_tsun_allow_all, device_ind_msg,
     assert m.ifc.tx_fifo.get()==b''
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_read_two_messages2(my_loop, config_tsun_allow_all, inverter_ind_msg, inverter_ind_msg_81, inverter_rsp_msg, inverter_rsp_msg_81):
     _ = config_tsun_allow_all
     m = MemoryStream(inverter_ind_msg, (0,))
@@ -1199,7 +1123,7 @@ async def test_read_two_messages2(my_loop, config_tsun_allow_all, inverter_ind_m
     assert m.ifc.tx_fifo.get()==b''
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_read_two_messages3(my_loop, config_tsun_allow_all, device_ind_msg2, device_rsp_msg2, inverter_ind_msg, inverter_rsp_msg):
     # test device message received after the inverter masg
     _ = config_tsun_allow_all
@@ -1229,7 +1153,7 @@ async def test_read_two_messages3(my_loop, config_tsun_allow_all, device_ind_msg
     assert m.ifc.tx_fifo.get()==b''
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_read_two_messages4(my_loop, config_tsun_dcu1, dcu_dev_ind_msg, dcu_dev_rsp_msg, dcu_data_ind_msg, dcu_data_rsp_msg):
     _ = config_tsun_dcu1
     m = MemoryStream(dcu_dev_ind_msg, (0,))
@@ -1258,7 +1182,7 @@ async def test_read_two_messages4(my_loop, config_tsun_dcu1, dcu_dev_ind_msg, dc
     assert m.ifc.tx_fifo.get()==b''
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_unkown_frame_code(my_loop, config_tsun_inv1, inverter_ind_msg_81, inverter_rsp_msg_81):
     _ = config_tsun_inv1
     m = MemoryStream(inverter_ind_msg_81, (0,))
@@ -1277,7 +1201,7 @@ async def test_unkown_frame_code(my_loop, config_tsun_inv1, inverter_ind_msg_81,
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_unkown_message(my_loop, config_tsun_inv1, unknown_msg):
     _ = config_tsun_inv1
     m = MemoryStream(unknown_msg, (0,))
@@ -1296,7 +1220,7 @@ async def test_unkown_message(my_loop, config_tsun_inv1, unknown_msg):
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_device_rsp(my_loop, config_tsun_inv1, device_rsp_msg):
     _ = config_tsun_inv1
     m = MemoryStream(device_rsp_msg, (0,), False)
@@ -1315,7 +1239,7 @@ async def test_device_rsp(my_loop, config_tsun_inv1, device_rsp_msg):
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_inverter_rsp(my_loop, config_tsun_inv1, inverter_rsp_msg):
     _ = config_tsun_inv1
     m = MemoryStream(inverter_rsp_msg, (0,), False)
@@ -1334,7 +1258,7 @@ async def test_inverter_rsp(my_loop, config_tsun_inv1, inverter_rsp_msg):
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_heartbeat_ind(my_loop, config_tsun_inv1, heartbeat_ind_msg, heartbeat_rsp_msg):
     _ = config_tsun_inv1
     m = MemoryStream(heartbeat_ind_msg, (0,))
@@ -1352,7 +1276,7 @@ async def test_heartbeat_ind(my_loop, config_tsun_inv1, heartbeat_ind_msg, heart
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_heartbeat_ind2(my_loop, config_tsun_inv1, heartbeat_ind_msg, heartbeat_rsp_msg):
     _ = config_tsun_inv1
     m = MemoryStream(heartbeat_ind_msg, (0,))
@@ -1371,7 +1295,7 @@ async def test_heartbeat_ind2(my_loop, config_tsun_inv1, heartbeat_ind_msg, hear
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_heartbeat_rsp(my_loop, config_tsun_inv1, heartbeat_rsp_msg):
     _ = config_tsun_inv1
     m = MemoryStream(heartbeat_rsp_msg, (0,), False)
@@ -1390,7 +1314,7 @@ async def test_heartbeat_rsp(my_loop, config_tsun_inv1, heartbeat_rsp_msg):
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_sync_start_ind(my_loop, config_tsun_inv1, sync_start_ind_msg, sync_start_rsp_msg, sync_start_fwd_msg):
     _ = config_tsun_inv1
     m = MemoryStream(sync_start_ind_msg, (0,))
@@ -1414,7 +1338,7 @@ async def test_sync_start_ind(my_loop, config_tsun_inv1, sync_start_ind_msg, syn
 
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_sync_start_rsp(my_loop, config_tsun_inv1, sync_start_rsp_msg):
     _ = config_tsun_inv1
     m = MemoryStream(sync_start_rsp_msg, (0,), False)
@@ -1433,7 +1357,7 @@ async def test_sync_start_rsp(my_loop, config_tsun_inv1, sync_start_rsp_msg):
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_sync_end_ind(my_loop, config_tsun_inv1, sync_end_ind_msg, sync_end_rsp_msg):
     _ = config_tsun_inv1
     m = MemoryStream(sync_end_ind_msg, (0,))
@@ -1451,7 +1375,7 @@ async def test_sync_end_ind(my_loop, config_tsun_inv1, sync_end_ind_msg, sync_en
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_sync_end_rsp(my_loop, config_tsun_inv1, sync_end_rsp_msg):
     _ = config_tsun_inv1
     m = MemoryStream(sync_end_rsp_msg, (0,), False)
@@ -1470,7 +1394,7 @@ async def test_sync_end_rsp(my_loop, config_tsun_inv1, sync_end_rsp_msg):
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_build_modell_600(my_loop, config_tsun_allow_all, inverter_ind_msg):
     _ = config_tsun_allow_all
     m = MemoryStream(inverter_ind_msg, (0,))
@@ -1481,7 +1405,6 @@ async def test_build_modell_600(my_loop, config_tsun_allow_all, inverter_ind_msg
     m.read()         # read complete msg, and dispatch msg
     assert 2000 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
     assert 600 == m.db.get_db_value(Register.RATED_POWER, 0)
-    assert 4 == m.db.get_db_value(Register.NO_INPUTS, 0)
     assert 'TSOL-MS2000(600)' == m.db.get_db_value(Register.EQUIPMENT_MODEL, 0)
     assert '02b0' == m.db.get_db_value(Register.SENSOR_LIST, None)
     assert 0 == m.sensor_list   # must not been set by an inverter data ind
@@ -1491,7 +1414,7 @@ async def test_build_modell_600(my_loop, config_tsun_allow_all, inverter_ind_msg
     assert m.ifc.tx_fifo.get()==b''
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_build_modell_1600(my_loop, config_tsun_allow_all, inverter_ind_msg1600):
     _ = config_tsun_allow_all
     m = MemoryStream(inverter_ind_msg1600, (0,))
@@ -1501,11 +1424,10 @@ async def test_build_modell_1600(my_loop, config_tsun_allow_all, inverter_ind_ms
     m.read()         # read complete msg, and dispatch msg
     assert 1600 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
     assert 1600 == m.db.get_db_value(Register.RATED_POWER, 0)
-    assert 4 == m.db.get_db_value(Register.NO_INPUTS, 0)
     assert 'TSOL-MS1600' == m.db.get_db_value(Register.EQUIPMENT_MODEL, 0)
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_build_modell_1800(my_loop, config_tsun_allow_all, inverter_ind_msg1800):
     _ = config_tsun_allow_all
     m = MemoryStream(inverter_ind_msg1800, (0,))
@@ -1515,11 +1437,10 @@ async def test_build_modell_1800(my_loop, config_tsun_allow_all, inverter_ind_ms
     m.read()         # read complete msg, and dispatch msg
     assert 1800 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
     assert 1800 == m.db.get_db_value(Register.RATED_POWER, 0)
-    assert 4 == m.db.get_db_value(Register.NO_INPUTS, 0)
     assert 'TSOL-MS1800' == m.db.get_db_value(Register.EQUIPMENT_MODEL, 0)
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_build_modell_2000(my_loop, config_tsun_allow_all, inverter_ind_msg2000):
     _ = config_tsun_allow_all
     m = MemoryStream(inverter_ind_msg2000, (0,))
@@ -1529,11 +1450,10 @@ async def test_build_modell_2000(my_loop, config_tsun_allow_all, inverter_ind_ms
     m.read()         # read complete msg, and dispatch msg
     assert 2000 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
     assert 2000 == m.db.get_db_value(Register.RATED_POWER, 0)
-    assert 4 == m.db.get_db_value(Register.NO_INPUTS, 0)
     assert 'TSOL-MS2000' == m.db.get_db_value(Register.EQUIPMENT_MODEL, 0)
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_build_modell_800(my_loop, config_tsun_allow_all, inverter_ind_msg800):
     _ = config_tsun_allow_all
     m = MemoryStream(inverter_ind_msg800, (0,))
@@ -1543,25 +1463,10 @@ async def test_build_modell_800(my_loop, config_tsun_allow_all, inverter_ind_msg
     m.read()         # read complete msg, and dispatch msg
     assert 800 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
     assert 800 == m.db.get_db_value(Register.RATED_POWER, 0)
-    assert 2 == m.db.get_db_value(Register.NO_INPUTS, 0)
-    assert 'TSOL-MS800' == m.db.get_db_value(Register.EQUIPMENT_MODEL, 0)
-    m.close()
-
-@pytest.mark.asyncio(loop_scope="session")
-async def test_build_modell_900(my_loop, config_tsun_allow_all, inverter_ind_msg900):
-    _ = config_tsun_allow_all
-    m = MemoryStream(inverter_ind_msg900, (0,))
-    assert 0 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
-    assert None == m.db.get_db_value(Register.RATED_POWER, None)
-    assert None == m.db.get_db_value(Register.INVERTER_TEMP, None)
-    m.read()         # read complete msg, and dispatch msg
-    assert 900 == m.db.get_db_value(Register.MAX_DESIGNED_POWER, 0)
-    assert 900 == m.db.get_db_value(Register.RATED_POWER, 0)
-    assert 2 == m.db.get_db_value(Register.NO_INPUTS, 0)
     assert 'TSOL-MSxx00' == m.db.get_db_value(Register.EQUIPMENT_MODEL, 0)
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_build_logger_modell(my_loop, config_tsun_allow_all, device_ind_msg):
     _ = config_tsun_allow_all
     m = MemoryStream(device_ind_msg, (0,))
@@ -1573,7 +1478,7 @@ async def test_build_logger_modell(my_loop, config_tsun_allow_all, device_ind_ms
     assert 'V1.1.00.0B' == m.db.get_db_value(Register.COLLECTOR_FW_VERSION, 0).rstrip('\00')
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_msg_iterator(my_loop, config_tsun_inv1):
     Message._registry.clear()
     m1 = SolarmanV5(None, ('test1.local', 1234), ifc=AsyncIfcImpl(), server_side=True, client_mode=False)
@@ -1595,7 +1500,7 @@ async def test_msg_iterator(my_loop, config_tsun_inv1):
     assert test1 == 1
     assert test2 == 1
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_proxy_counter(my_loop, config_tsun_inv1):
     m = SolarmanV5(None, ('test.local', 1234), ifc=AsyncIfcImpl(), server_side=True, client_mode=False)
     assert m.new_data == {}
@@ -1614,7 +1519,7 @@ async def test_proxy_counter(my_loop, config_tsun_inv1):
     assert 0 == m.db.stat['proxy']['Unknown_Msg']
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_msg_build_modbus_req(my_loop, config_tsun_inv1, device_ind_msg, device_rsp_msg, inverter_ind_msg, inverter_rsp_msg, msg_modbus_cmd):
     _ = config_tsun_inv1
     m = MemoryStream(device_ind_msg, (0,), True)
@@ -1624,7 +1529,7 @@ async def test_msg_build_modbus_req(my_loop, config_tsun_inv1, device_ind_msg, d
     assert m.ifc.tx_fifo.get()==device_rsp_msg
     assert m.ifc.fwd_fifo.get()==device_ind_msg
 
-    m.send_modbus_cmd(Modbus.WRITE_SINGLE_REG, 0x2008, 0, logging.DEBUG)
+    await m.send_modbus_cmd(Modbus.WRITE_SINGLE_REG, 0x2008, 0, logging.DEBUG)
     assert 0 == m.send_msg_ofs
     assert m.ifc.fwd_fifo.get() == b''
     assert m.sent_pdu == b'' # modbus command must be ignore, cause connection is still not up
@@ -1642,14 +1547,14 @@ async def test_msg_build_modbus_req(my_loop, config_tsun_inv1, device_ind_msg, d
     assert m.ifc.tx_fifo.get()==inverter_rsp_msg
     assert m.ifc.fwd_fifo.get()==inverter_ind_msg
 
-    m.send_modbus_cmd(Modbus.WRITE_SINGLE_REG, 0x2008, 0, logging.DEBUG)
+    await m.send_modbus_cmd(Modbus.WRITE_SINGLE_REG, 0x2008, 0, logging.DEBUG)
     assert 0 == m.send_msg_ofs
     assert m.ifc.fwd_fifo.get() == b''
     assert m.sent_pdu == msg_modbus_cmd
     assert m.ifc.tx_fifo.get()== b''
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_at_cmd(my_loop, config_tsun_allow_all, device_ind_msg, device_rsp_msg, inverter_ind_msg, inverter_rsp_msg, at_command_ind_msg, at_command_rsp_msg):
     _ = config_tsun_allow_all
     m = MemoryStream(device_ind_msg, (0,), True)
@@ -1709,7 +1614,7 @@ async def test_at_cmd(my_loop, config_tsun_allow_all, device_ind_msg, device_rsp
     assert Proxy.mqtt.data == ""
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_at_cmd_blocked(my_loop, config_tsun_allow_all, device_ind_msg, device_rsp_msg, inverter_ind_msg, inverter_rsp_msg, at_command_ind_msg):
     _ = config_tsun_allow_all
     m = MemoryStream(device_ind_msg, (0,), True)
@@ -1744,7 +1649,7 @@ async def test_at_cmd_blocked(my_loop, config_tsun_allow_all, device_ind_msg, de
     assert Proxy.mqtt.data == "'AT+WEBU' is forbidden"
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_at_cmd_ind(my_loop, config_tsun_inv1, at_command_ind_msg, at_command_rsp_msg):
     _ = config_tsun_inv1
     m = MemoryStream(at_command_ind_msg, (0,), False)
@@ -1780,7 +1685,7 @@ async def test_at_cmd_ind(my_loop, config_tsun_inv1, at_command_ind_msg, at_comm
 
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_at_cmd_ind_block(my_loop, config_tsun_inv1, at_command_ind_msg_block):
     _ = config_tsun_inv1
     m = MemoryStream(at_command_ind_msg_block, (0,), False)
@@ -1809,7 +1714,7 @@ async def test_at_cmd_ind_block(my_loop, config_tsun_inv1, at_command_ind_msg_bl
     assert Proxy.mqtt.data == ""
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_msg_at_command_rsp1(my_loop, config_tsun_inv1, at_command_rsp_msg):
     _ = config_tsun_inv1
     m = MemoryStream(at_command_rsp_msg)
@@ -1829,7 +1734,7 @@ async def test_msg_at_command_rsp1(my_loop, config_tsun_inv1, at_command_rsp_msg
     assert m.db.stat['proxy']['Modbus_Command'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_msg_at_command_rsp2(my_loop, config_tsun_inv1, at_command_rsp_msg):
     _ = config_tsun_inv1
     m = MemoryStream(at_command_rsp_msg)
@@ -1851,7 +1756,7 @@ async def test_msg_at_command_rsp2(my_loop, config_tsun_inv1, at_command_rsp_msg
     assert Proxy.mqtt.data == "+ok"
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_msg_at_command_rsp3(my_loop, config_tsun_inv1, at_command_interim_rsp_msg):
     _ = config_tsun_inv1
     m = MemoryStream(at_command_interim_rsp_msg)
@@ -1877,7 +1782,7 @@ async def test_msg_at_command_rsp3(my_loop, config_tsun_inv1, at_command_interim
     assert Proxy.mqtt.data == ""
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_msg_modbus_req(my_loop, config_tsun_inv1, msg_modbus_cmd, msg_modbus_cmd_fwd):
     _ = config_tsun_inv1
     m = MemoryStream(b'')
@@ -1906,7 +1811,7 @@ async def test_msg_modbus_req(my_loop, config_tsun_inv1, msg_modbus_cmd, msg_mod
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_msg_modbus_req_seq(my_loop, config_tsun_inv1, msg_modbus_cmd_seq):
     _ = config_tsun_inv1
     m = MemoryStream(b'')
@@ -1935,7 +1840,7 @@ async def test_msg_modbus_req_seq(my_loop, config_tsun_inv1, msg_modbus_cmd_seq)
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_msg_modbus_req2(my_loop, config_tsun_inv1, msg_modbus_cmd_crc_err):
     _ = config_tsun_inv1
     m = MemoryStream(b'')
@@ -1963,7 +1868,7 @@ async def test_msg_modbus_req2(my_loop, config_tsun_inv1, msg_modbus_cmd_crc_err
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 1
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_msg_unknown_cmd_req(my_loop, config_tsun_inv1, msg_unknown_cmd):
     _ = config_tsun_inv1
     m = MemoryStream(msg_unknown_cmd, (0,), False)
@@ -1986,7 +1891,7 @@ async def test_msg_unknown_cmd_req(my_loop, config_tsun_inv1, msg_unknown_cmd):
     assert m.db.stat['proxy']['Invalid_Msg_Format'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_msg_modbus_rsp1(my_loop, config_tsun_inv1, msg_modbus_rsp):
     '''Modbus response without a valid Modbus request must be dropped'''
     _ = config_tsun_inv1
@@ -2006,7 +1911,7 @@ async def test_msg_modbus_rsp1(my_loop, config_tsun_inv1, msg_modbus_rsp):
     assert m.db.stat['proxy']['Modbus_Command'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_msg_modbus_rsp2(my_loop, config_tsun_inv1, msg_modbus_rsp):
     '''Modbus response with a valid Modbus request must be forwarded'''
     _ = config_tsun_inv1  # setup config structure
@@ -2044,7 +1949,7 @@ async def test_msg_modbus_rsp2(my_loop, config_tsun_inv1, msg_modbus_rsp):
 
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_msg_modbus_rsp3(my_loop, config_tsun_inv1, msg_modbus_rsp):
     '''Modbus response with a valid Modbus request must be forwarded'''
     _ = config_tsun_inv1
@@ -2081,7 +1986,7 @@ async def test_msg_modbus_rsp3(my_loop, config_tsun_inv1, msg_modbus_rsp):
 
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_msg_unknown_rsp(my_loop, config_tsun_inv1, msg_unknown_cmd_rsp):
     _ = config_tsun_inv1
     m = MemoryStream(msg_unknown_cmd_rsp)
@@ -2100,7 +2005,7 @@ async def test_msg_unknown_rsp(my_loop, config_tsun_inv1, msg_unknown_cmd_rsp):
     assert m.db.stat['proxy']['Modbus_Command'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_msg_modbus_invalid(my_loop, config_tsun_inv1, msg_modbus_invalid):
     _ = config_tsun_inv1
     m = MemoryStream(msg_modbus_invalid, (0,), False)
@@ -2115,7 +2020,7 @@ async def test_msg_modbus_invalid(my_loop, config_tsun_inv1, msg_modbus_invalid)
     assert m.db.stat['proxy']['Modbus_Command'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_msg_modbus_fragment(my_loop, config_tsun_inv1, msg_modbus_rsp):
     _ = config_tsun_inv1
     # receive more bytes than expected (7 bytes from the next msg)
@@ -2141,7 +2046,7 @@ async def test_msg_modbus_fragment(my_loop, config_tsun_inv1, msg_modbus_rsp):
     assert m.db.stat['proxy']['Modbus_Command'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_modbus_polling(my_loop, config_tsun_inv1, heartbeat_ind_msg, heartbeat_rsp_msg):
     _ = config_tsun_inv1
     assert asyncio.get_running_loop()
@@ -2181,7 +2086,7 @@ async def test_modbus_polling(my_loop, config_tsun_inv1, heartbeat_ind_msg, hear
     assert next(m.mb_timer.exp_count) == 4
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_modbus_scaning(config_tsun_scan, heartbeat_ind_msg, heartbeat_rsp_msg, msg_modbus_rsp, msg_modbus_rsp_inv_id2):
     _ = config_tsun_scan
     assert asyncio.get_running_loop()
@@ -2254,62 +2159,7 @@ async def test_modbus_scaning(config_tsun_scan, heartbeat_ind_msg, heartbeat_rsp
     assert next(m.mb_timer.exp_count) == 3
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
-async def test_modbus_scaning_inv_rsp(config_tsun_scan, heartbeat_ind_msg, heartbeat_rsp_msg, msg_modbus_rsp_mb_4):
-    _ = config_tsun_scan
-    assert asyncio.get_running_loop()
-
-    m = MemoryStream(heartbeat_ind_msg, (0x15,0x56,0))
-    m.append_msg(msg_modbus_rsp_mb_4)
-    assert m.mb_scan == False
-    assert asyncio.get_running_loop() == m.mb_timer.loop
-    m.db.stat['proxy']['Unknown_Ctrl'] = 0
-    assert m.mb_timer.tim == None
-    m.read()         # read complete msg, and dispatch msg
-    assert m.mb_scan == True
-    assert m.mb_start_reg == 0xff80
-    assert m.mb_step == 0x40
-    assert m.mb_bytes == 0x14
-    assert asyncio.get_running_loop() == m.mb_timer.loop
- 
-    assert not m.header_valid  # must be invalid, since msg was handled and buffer flushed
-    assert m.msg_count == 1
-    assert m.snr == 2070233889
-    assert m.control == 0x4710
-     
-    assert m.msg_recvd[0]['control']==0x4710
-    assert m.msg_recvd[0]['seq']=='84:11'
-    assert m.msg_recvd[0]['data_len']==0x1
-
-    assert m.ifc.tx_fifo.get()==heartbeat_rsp_msg
-    assert m.ifc.fwd_fifo.get()==heartbeat_ind_msg
-    assert m.db.stat['proxy']['Unknown_Ctrl'] == 0
-
-    m.ifc.tx_clear() # clear send buffer for next test
-    assert isclose(m.mb_timeout, 0.5)
-    assert next(m.mb_timer.exp_count) == 0
-    
-    await asyncio.sleep(0.5)
-    assert m.sent_pdu==b'\xa5\x17\x00\x10E\x12\x84!Ce{\x02\xb0\x02\x00\x00\x00\x00\x00\x00' \
-                       b'\x00\x00\x00\x00\x00\x00\x01\x03\xff\xc0\x00\x14\x75\xed\x33\x15'
-    assert m.ifc.tx_fifo.get()==b''
-
-    m.read()         # read complete msg, and dispatch msg
-    assert not m.header_valid  # must be invalid, since msg was handled and buffer flushed
-    assert m.msg_count == 2
-    assert m.msg_recvd[1]['control']==0x1510
-    assert m.msg_recvd[1]['seq']=='03:03'
-    assert m.msg_recvd[1]['data_len']==0x3b
-    assert m.mb.last_addr == 1
-    assert m.mb.last_fcode == 3   
-    assert m.mb.last_reg == 0xffc0   # mb_start_reg + mb_step
-    assert m.mb.last_len == 20
-    assert m.mb.err == 3
-
-    assert next(m.mb_timer.exp_count) == 2
-    m.close()
-
-@pytest.mark.asyncio(loop_scope="session")
 async def test_start_client_mode(my_loop, config_tsun_inv1, str_test_ip):
     _ = config_tsun_inv1
     assert asyncio.get_running_loop()
@@ -2318,7 +2168,7 @@ async def test_start_client_mode(my_loop, config_tsun_inv1, str_test_ip):
     assert m.no_forwarding == False
     assert m.mb_timer.tim == None
     assert asyncio.get_running_loop() == m.mb_timer.loop
-    m.send_start_cmd(get_sn_int(), str_test_ip, False, m.mb_first_timeout)
+    await m.send_start_cmd(get_sn_int(), str_test_ip, False, m.mb_first_timeout)
     assert m.sent_pdu==bytearray(b'\xa5\x17\x00\x10E\x01\x00!Ce{\x02\xb0\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x030\x00\x000J\xde\xf1\x15')
     assert m.db.get_db_value(Register.IP_ADDRESS) == str_test_ip
     assert isclose(m.db.get_db_value(Register.POLLING_INTERVAL), 0.5)
@@ -2341,7 +2191,7 @@ async def test_start_client_mode(my_loop, config_tsun_inv1, str_test_ip):
     assert next(m.mb_timer.exp_count) == 3
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_start_client_mode_scan(config_tsun_scan_dcu, str_test_ip, dcu_modbus_rsp):
     _ = config_tsun_scan_dcu
     assert asyncio.get_running_loop()
@@ -2351,7 +2201,7 @@ async def test_start_client_mode_scan(config_tsun_scan_dcu, str_test_ip, dcu_mod
     assert m.no_forwarding == False
     assert m.mb_timer.tim == None
     assert asyncio.get_running_loop() == m.mb_timer.loop
-    m.send_start_cmd(get_dcu_sn_int(), str_test_ip, False, m.mb_first_timeout)
+    await m.send_start_cmd(get_dcu_sn_int(), str_test_ip, False, m.mb_first_timeout)
     assert m.mb_start_reg == 0x0000
     assert m.mb_step == 0x100
     assert m.mb_bytes == 0x2d
@@ -2414,7 +2264,7 @@ async def test_start_client_mode_scan(config_tsun_scan_dcu, str_test_ip, dcu_mod
     
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_timeout(my_loop, config_tsun_inv1):
     _ = config_tsun_inv1
     m = MemoryStream(b'')
@@ -2428,7 +2278,7 @@ async def test_timeout(my_loop, config_tsun_inv1):
     m.state = State.closed
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_fnc_dispatch(my_loop, config_tsun_inv1):
     def msg():
         return
@@ -2450,7 +2300,7 @@ async def test_fnc_dispatch(my_loop, config_tsun_inv1):
     assert _obj == m.msg_unknown
     assert _str == "'msg_unknown'"
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_timestamp(my_loop, config_tsun_inv1):
     m = MemoryStream(b'')
     ts = m._timestamp()
@@ -2477,7 +2327,7 @@ class InverterTest(InverterBase):
         dst.ifc.tx_add(src.ifc.fwd_fifo.get())
 
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_proxy_at_cmd(my_loop, config_tsun_inv1, patch_open_connection, at_command_ind_msg, at_command_rsp_msg):
     _ = config_tsun_inv1
     _ = patch_open_connection
@@ -2515,7 +2365,7 @@ async def test_proxy_at_cmd(my_loop, config_tsun_inv1, patch_open_connection, at
         assert Proxy.mqtt.key == ''
         assert Proxy.mqtt.data == ""
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_proxy_at_blocked(my_loop, config_tsun_inv1, patch_open_connection, at_command_ind_msg_block, at_command_rsp_msg):
     _ = config_tsun_inv1
     _ = patch_open_connection
@@ -2552,124 +2402,3 @@ async def test_proxy_at_blocked(my_loop, config_tsun_inv1, patch_open_connection
 
         assert Proxy.mqtt.key == 'tsun/inv1/at_resp'
         assert Proxy.mqtt.data == "+ok"
-
-@pytest.mark.asyncio(loop_scope="session")
-async def test_dcu_cmd(my_loop, config_tsun_allow_all, dcu_dev_ind_msg, dcu_dev_rsp_msg, dcu_data_ind_msg, dcu_data_rsp_msg, dcu_command_ind_msg, dcu_command_rsp_msg):
-    '''test dcu_power command fpr a DCU device with sensor 0x3026'''
-    _ = config_tsun_allow_all
-    m = MemoryStream(dcu_dev_ind_msg, (0,), True)
-    m.read()   # read device ind
-    assert m.control == 0x4110
-    assert str(m.seq) == '01:92'
-    assert m.ifc.tx_fifo.get()==dcu_dev_rsp_msg
-    assert m.ifc.fwd_fifo.get()==dcu_dev_ind_msg
-
-    m.send_dcu_cmd(b'\x01\x01\x06\x01\x00\x01\x03\xe8')
-    assert m.ifc.tx_fifo.get()==b''
-    assert m.ifc.fwd_fifo.get()==b''
-    assert m.sent_pdu == b''
-    assert str(m.seq) == '01:92'
-    assert Proxy.mqtt.key == ''
-    assert Proxy.mqtt.data == ""
-
-    m.append_msg(dcu_data_ind_msg)
-    m.read() # read inverter ind
-    assert m.control == 0x4210
-    assert str(m.seq) == '02:93'
-    assert m.ifc.tx_fifo.get()==dcu_data_rsp_msg
-    assert m.ifc.fwd_fifo.get()==dcu_data_ind_msg
-    
-    m.send_dcu_cmd(b'\x01\x01\x06\x01\x00\x01\x03\xe8')
-    assert m.ifc.fwd_fifo.get() == b''
-    assert m.ifc.tx_fifo.get()== b''
-    assert m.sent_pdu == dcu_command_ind_msg
-    m.sent_pdu = bytearray()
-
-    assert str(m.seq) == '02:94'
-    assert Proxy.mqtt.key == ''
-    assert Proxy.mqtt.data == ""
-
-    m.append_msg(dcu_command_rsp_msg)
-    m.read() # read at resp
-    assert m.control == 0x1510
-    assert str(m.seq) == '03:94'
-    assert m.ifc.rx_get()==b''
-    assert m.ifc.tx_fifo.get()==b''
-    assert m.ifc.fwd_fifo.get()==b''
-    assert Proxy.mqtt.key == 'tsun/dcu_resp'
-    assert Proxy.mqtt.data == "+ok"
-    Proxy.mqtt.clear()  # clear last test result
-
-@pytest.mark.asyncio(loop_scope="session")
-async def test_dcu_cmd_not_supported(my_loop, config_tsun_allow_all, device_ind_msg, device_rsp_msg, inverter_ind_msg, inverter_rsp_msg):
-    '''test that an inverter don't accept the dcu_power command'''
-    _ = config_tsun_allow_all
-    m = MemoryStream(device_ind_msg, (0,), True)
-    m.read()   # read device ind
-    assert m.control == 0x4110
-    assert str(m.seq) == '01:01'
-    assert m.ifc.tx_fifo.get()==device_rsp_msg
-    assert m.ifc.fwd_fifo.get()==device_ind_msg
-
-    m.send_dcu_cmd(b'\x01\x01\x06\x01\x00\x01\x03\xe8')
-    assert m.ifc.tx_fifo.get()==b''
-    assert m.ifc.fwd_fifo.get()==b''
-    assert m.sent_pdu == b''
-    assert str(m.seq) == '01:01'
-    assert Proxy.mqtt.key == ''
-    assert Proxy.mqtt.data == ""
-
-    m.append_msg(inverter_ind_msg)
-    m.read() # read inverter ind
-    assert m.control == 0x4210
-    assert str(m.seq) == '02:02'
-    assert m.ifc.tx_fifo.get()==inverter_rsp_msg
-    assert m.ifc.fwd_fifo.get()==inverter_ind_msg
-    
-    m.send_dcu_cmd(b'\x01\x01\x06\x01\x00\x01\x03\xe8')
-    assert m.ifc.fwd_fifo.get() == b''
-    assert m.ifc.tx_fifo.get()== b''
-    assert m.sent_pdu == b''
-    Proxy.mqtt.clear()  # clear last test result
-
-@pytest.mark.asyncio(loop_scope="session")
-async def test_proxy_dcu_cmd(my_loop, config_tsun_dcu1, patch_open_connection, dcu_command_ind_msg, dcu_command_rsp_msg):
-    _ = config_tsun_inv1
-    _ = patch_open_connection
-    assert asyncio.get_running_loop()
-
-    with InverterTest(FakeReader(), FakeWriter(), client_mode=False) as inverter:
-        await inverter.create_remote()
-        await asyncio.sleep(0)
-        r = inverter.remote.stream
-        l = inverter.local.stream
-
-        l.db.stat['proxy']['DCU_Command'] = 0
-        l.db.stat['proxy']['AT_Command'] = 0
-        l.db.stat['proxy']['Unknown_Ctrl'] = 0
-        l.db.stat['proxy']['AT_Command_Blocked'] = 0
-        l.db.stat['proxy']['Modbus_Command'] = 0
-        inverter.forward_dcu_cmd_resp = False
-        r.append_msg(dcu_command_ind_msg)
-        r.read()         # read complete msg, and dispatch msg
-        assert inverter.forward_dcu_cmd_resp
-        inverter.forward(r,l)
-
-        assert l.ifc.tx_fifo.get()==dcu_command_ind_msg
-
-        assert l.db.stat['proxy']['Invalid_Msg_Format'] == 0
-        assert l.db.stat['proxy']['DCU_Command'] == 1
-        assert l.db.stat['proxy']['AT_Command'] == 0
-        assert l.db.stat['proxy']['AT_Command_Blocked'] == 0
-        assert l.db.stat['proxy']['Modbus_Command'] == 0
-        assert 2 == l.db.get_db_value(Register.NO_INPUTS, 0)
-
-        l.append_msg(dcu_command_rsp_msg)
-        l.read() # read at resp
-        assert l.ifc.fwd_fifo.peek()==dcu_command_rsp_msg
-        inverter.forward(l,r)
-        assert r.ifc.tx_fifo.get()==dcu_command_rsp_msg
-
-        assert Proxy.mqtt.key == ''
-        assert Proxy.mqtt.data == ""
-

app/tests/test_solarman_emu.py

@@ -128,7 +128,7 @@ def heartbeat_ind():
     msg  = b'\xa5\x01\x00\x10G\x00\x01\x00\x00\x00\x00\x00Y\x15'
     return msg
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_emu_init_close(my_loop, config_tsun_inv1):
     _ = config_tsun_inv1
     assert asyncio.get_running_loop()
@@ -137,14 +137,14 @@ async def test_emu_init_close(my_loop, config_tsun_inv1):
     cld.close()
 
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_emu_start(my_loop, config_tsun_inv1, msg_modbus_rsp, str_test_ip, device_ind_msg):
     _ = config_tsun_inv1
     assert asyncio.get_running_loop()
     inv = InvStream(msg_modbus_rsp)
 
     assert asyncio.get_running_loop() == inv.mb_timer.loop
-    inv.send_start_cmd(get_sn_int(), str_test_ip, True, inv.mb_first_timeout)
+    await inv.send_start_cmd(get_sn_int(), str_test_ip, True, inv.mb_first_timeout)
     inv.read()         # read complete msg, and dispatch msg
     assert not inv.header_valid  # must be invalid, since msg was handled and buffer flushed
     assert inv.msg_count == 1
@@ -155,18 +155,18 @@ async def test_emu_start(my_loop, config_tsun_inv1, msg_modbus_rsp, str_test_ip,
     assert inv.ifc.fwd_fifo.peek() == device_ind_msg
     cld.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_snd_hb(my_loop, config_tsun_inv1, heartbeat_ind):
     _ = config_tsun_inv1
     inv = InvStream()
     cld = CldStream(inv)
 
-    # inv.send_start_cmd(get_sn_int(), str_test_ip, False, inv.mb_first_timeout)
+    # await inv.send_start_cmd(get_sn_int(), str_test_ip, False, inv.mb_first_timeout)
     cld.send_heartbeat_cb(0)
     assert cld.ifc.tx_fifo.peek() == heartbeat_ind
     cld.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_snd_inv_data(my_loop, config_tsun_inv1, inverter_ind_msg, inverter_rsp_msg):
     _ = config_tsun_inv1
     inv = InvStream()
@@ -178,7 +178,7 @@ async def test_snd_inv_data(my_loop, config_tsun_inv1, inverter_ind_msg, inverte
     inv.db.set_db_def_value(Register.GRID_FREQUENCY, 50.05)
     inv.db.set_db_def_value(Register.PROD_COMPL_TYPE, 6)
     assert asyncio.get_running_loop() == inv.mb_timer.loop
-    inv.send_start_cmd(get_sn_int(), str_test_ip, False, inv.mb_first_timeout)
+    await inv.send_start_cmd(get_sn_int(), str_test_ip, False, inv.mb_first_timeout)
     inv.db.set_db_def_value(Register.DATA_UP_INTERVAL, 17)  # set test value
 
     cld = CldStream(inv)
@@ -208,12 +208,12 @@ async def test_snd_inv_data(my_loop, config_tsun_inv1, inverter_ind_msg, inverte
 
     cld.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_rcv_invalid(my_loop, config_tsun_inv1, inverter_ind_msg, inverter_rsp_msg):
     _ = config_tsun_inv1
     inv = InvStream()
     assert asyncio.get_running_loop() == inv.mb_timer.loop
-    inv.send_start_cmd(get_sn_int(), str_test_ip, False, inv.mb_first_timeout)
+    await inv.send_start_cmd(get_sn_int(), str_test_ip, False, inv.mb_first_timeout)
     inv.db.set_db_def_value(Register.DATA_UP_INTERVAL, 17)  # set test value
 
     cld = CldStream(inv)

app/tests/test_talent.py

@@ -1048,7 +1048,7 @@ def msg_inverter_ms3000_ind(): # Data indication from the controller
     msg +=  b'\x53\x00\x66'                                                      #  | S.f'
     return msg
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_read_message(msg_contact_info):
     Config.act_config = {'tsun':{'enabled': True}}
     m = MemoryStream(msg_contact_info, (0,))
@@ -2406,19 +2406,19 @@ def test_msg_modbus_fragment(config_tsun_inv1, msg_modbus_rsp20):
     assert m.db.stat['proxy']['Modbus_Command'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_msg_build_modbus_req(config_tsun_inv1, msg_modbus_cmd):
     _ = config_tsun_inv1
     m = MemoryStream(b'', (0,), True)
     m.id_str = b"R170000000000001" 
-    m.send_modbus_cmd(Modbus.WRITE_SINGLE_REG, 0x2008, 0, logging.DEBUG)
+    await m.send_modbus_cmd(Modbus.WRITE_SINGLE_REG, 0x2008, 0, logging.DEBUG)
     assert 0 == m.send_msg_ofs
     assert m.ifc.fwd_fifo.get() == b''
     assert m.ifc.tx_fifo.get() == b''
     assert m.sent_pdu == b''
 
     m.state = State.up
-    m.send_modbus_cmd(Modbus.WRITE_SINGLE_REG, 0x2008, 0, logging.DEBUG)
+    await m.send_modbus_cmd(Modbus.WRITE_SINGLE_REG, 0x2008, 0, logging.DEBUG)
     assert 0 == m.send_msg_ofs
     assert m.ifc.fwd_fifo.get() == b''
     assert m.ifc.tx_fifo.get() == b''
@@ -2445,7 +2445,7 @@ def test_modbus_no_polling(config_no_modbus_poll, msg_get_time):
     assert m.db.stat['proxy']['Unknown_Ctrl'] == 0
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_modbus_polling(config_tsun_inv1, msg_inverter_ind):
     _ = config_tsun_inv1
     assert asyncio.get_running_loop()
@@ -2486,7 +2486,7 @@ async def test_modbus_polling(config_tsun_inv1, msg_inverter_ind):
     assert next(m.mb_timer.exp_count) == 4
     m.close()
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_modbus_scaning(config_tsun_inv1, msg_inverter_ind, msg_modbus_rsp21):
     _ = config_tsun_inv1
     assert asyncio.get_running_loop()

app/tests/test_web_route.py

@@ -1,37 +1,20 @@
 # test_with_pytest.py
 import pytest
-import logging
+from server import app
-import os, errno
+from web import Web, web
-import datetime
-from os import DirEntry, stat_result
-from quart import current_app
-from mock import patch
-
-from server import app as my_app
-from server import Server
-from web import web
 from async_stream import AsyncStreamClient
 from gen3plus.inverter_g3p import InverterG3P
-from web.log_handler import LogHandler
 from test_inverter_g3p import FakeReader, FakeWriter, config_conn
 from cnf.config import Config
+from mock import patch
 from proxy import Proxy
-
+import os, errno
-
-class FakeServer(Server):
-    def __init__(self):
-        pass  # don't call the suoer(.__init__ for unit tests
-
 
 pytest_plugins = ('pytest_asyncio',)
-@pytest.fixture(scope="session")
-def app():
-    yield my_app
 
 @pytest.fixture(scope="session")
-def client(app):
+def client():
     app.secret_key = 'super secret key'
-    app.testing = True
     return app.test_client()
 
 @pytest.fixture
@@ -61,118 +44,112 @@ def create_inverter_client(config_conn):
 
     return inv
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_home(client):
     """Test the home route."""
     response = await client.get('/')
     assert response.status_code == 200
     assert response.mimetype == 'text/html'
-    assert b"<title>TSUN Proxy - Connections</title>" in await response.data
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_page(client):
     """Test the mqtt page route."""
     response = await client.get('/mqtt')
     assert response.status_code == 200
     assert response.mimetype == 'text/html'
-    assert b"<title>TSUN Proxy - MQTT Status</title>" in await response.data
-    assert b'fetch("/mqtt-fetch")' in await response.data
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_rel_page(client):
-    """Test the mqtt route with relative paths."""
+    """Test the mqtt route."""
     web.build_relative_urls = True
     response = await client.get('/mqtt')
     assert response.status_code == 200
     assert response.mimetype == 'text/html'
-    assert b'fetch("./mqtt-fetch")' in await response.data
     web.build_relative_urls = False
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_notes(client):
     """Test the notes page route."""
     response = await client.get('/notes')
     assert response.status_code == 200
     assert response.mimetype == 'text/html'
-    assert b"<title>TSUN Proxy - Important Messages</title>" in await response.data
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_logging(client):
     """Test the logging page route."""
     response = await client.get('/logging')
     assert response.status_code == 200
     assert response.mimetype == 'text/html'
-    assert b"<title>TSUN Proxy - Log Files</title>" in await response.data
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_favicon96(client):
     """Test the favicon-96x96.png route."""
     response = await client.get('/favicon-96x96.png')
     assert response.status_code == 200
     assert response.mimetype == 'image/png'
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_favicon(client):
     """Test the favicon.ico route."""
     response = await client.get('/favicon.ico')
     assert response.status_code == 200
     assert response.mimetype == 'image/x-icon'
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_favicon_svg(client):
     """Test the favicon.svg route."""
     response = await client.get('/favicon.svg')
     assert response.status_code == 200
     assert response.mimetype == 'image/svg+xml'
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_apple_touch_icon(client):
     """Test the apple-touch-icon.png route."""
     response = await client.get('/apple-touch-icon.png')
     assert response.status_code == 200
     assert response.mimetype == 'image/png'
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_manifest(client):
     """Test the site.webmanifest route."""
     response = await client.get('/site.webmanifest')
     assert response.status_code == 200
     assert response.mimetype == 'application/manifest+json'
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
-async def test_data_fetch(client, create_inverter):
+async def test_data_fetch(create_inverter):
     """Test the data-fetch route."""
     _ = create_inverter
+    client = app.test_client()
     response = await client.get('/data-fetch')
     assert response.status_code == 200
 
     response = await client.get('/data-fetch')
     assert response.status_code == 200
-    assert b'<h5>Connections</h5>' in await response.data
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
-async def test_data_fetch1(client, create_inverter_server):
+async def test_data_fetch1(create_inverter_server):
     """Test the data-fetch route with server connection."""
     _ = create_inverter_server
+    client = app.test_client()
     response = await client.get('/data-fetch')
     assert response.status_code == 200
 
     response = await client.get('/data-fetch')
     assert response.status_code == 200
-    assert b'<h5>Connections</h5>' in await response.data
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
-async def test_data_fetch2(client, create_inverter_client):
+async def test_data_fetch2(create_inverter_client):
     """Test the data-fetch route with client connection."""
     _ = create_inverter_client
+    client = app.test_client()
     response = await client.get('/data-fetch')
     assert response.status_code == 200
 
     response = await client.get('/data-fetch')
     assert response.status_code == 200
-    assert b'<h5>Connections</h5>' in await response.data
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_language_en(client):
     """Test the language/en route and cookie."""
     response = await client.get('/language/en', headers={'referer': '/index'})
@@ -180,60 +157,31 @@ async def test_language_en(client):
     assert response.content_language.pop() == 'en'
     assert response.location == '/index'
     assert response.mimetype == 'text/html'
-    assert b'<html lang=en' in await response.data
-    assert b'<title>Redirecting...</title>' in await response.data
 
     client.set_cookie('test', key='language', value='de')
-    response = await client.get('/')
+    response = await client.get('/mqtt')
     assert response.status_code == 200
     assert response.mimetype == 'text/html'
-    assert b'<html lang="en"' in await response.data
-    assert b'<title>TSUN Proxy - Connections</title>' in await response.data
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_language_de(client):
     """Test the language/de route."""
-
     response = await client.get('/language/de', headers={'referer': '/'})
     assert response.status_code == 302
     assert response.content_language.pop() == 'de'
     assert response.location == '/'
     assert response.mimetype == 'text/html'
-    assert b'<html lang=en>' in await response.data
-    assert b'<title>Redirecting...</title>' in await response.data
 
-    client.set_cookie('test', key='language', value='en')
-    response = await client.get('/')
-    assert response.status_code == 200
-    assert response.mimetype == 'text/html'
-    assert b'<html lang="de"' in await response.data
-    # the following assert fails on github runner, since the translation to german fails
-    # assert b'<title>TSUN Proxy - Verbindungen</title>' in await response.data 
 
-    """Switch back to english"""
+@pytest.mark.asyncio
-    response = await client.get('/language/en', headers={'referer': '/index'})
-    assert response.status_code == 302
-    assert response.content_language.pop() == 'en'
-    assert response.location == '/index'
-    assert response.mimetype == 'text/html'
-    assert b'<html lang=en>' in await response.data
-    assert b'<title>Redirecting...</title>' in await response.data
-
-@pytest.mark.asyncio(loop_scope="session")
 async def test_language_unknown(client):
     """Test the language/unknown route."""
     response = await client.get('/language/unknown')
     assert response.status_code == 404
     assert response.mimetype == 'text/html'
 
-    client.set_cookie('test', key='language', value='en')
-    response = await client.get('/')
-    assert response.status_code == 200
-    assert response.mimetype == 'text/html'
-    assert b'<title>TSUN Proxy - Connections</title>' in await response.data
 
-
+@pytest.mark.asyncio
-@pytest.mark.asyncio(loop_scope="session")
 async def test_mqtt_fetch(client, create_inverter):
     """Test the mqtt-fetch route."""
     _ = create_inverter
@@ -241,89 +189,36 @@ async def test_mqtt_fetch(client, create_inverter):
 
     response = await client.get('/mqtt-fetch')
     assert response.status_code == 200
-    assert b'<h5>MQTT devices</h5>' in await response.data
 
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_notes_fetch(client, config_conn):
     """Test the notes-fetch route."""
-    _ = config_conn
+    _ = create_inverter
 
-    s = FakeServer()
-    s.src_dir = 'app/src/'
-    s.init_logging_system()
-
-    # First clear log and test Well done message
-    logh = LogHandler()
-    logh.clear()
     response = await client.get('/notes-fetch')
     assert response.status_code == 200
-    assert b'<h2>Well done!</h2>' in await response.data
-
-    # Check info logs which must be ignored here
-    logging.info('config_info')
-    logh.flush()
-    response = await client.get('/notes-fetch')
-    assert response.status_code == 200
-    assert b'<h2>Well done!</h2>' in await response.data
-
-    # Check warning logs which must be added to the note list
-    logging.warning('config_warning')
-    logh.flush()
-    response = await client.get('/notes-fetch')
-    assert response.status_code == 200
-    assert b'WARNING' in await response.data
-    assert b'config_warning' in await response.data
-
-    # Check error logs which must be added to the note list
-    logging.error('config_err')
-    logh.flush()
-    response = await client.get('/notes-fetch')
-    assert response.status_code == 200
-    assert b'ERROR' in await response.data
-    assert b'config_err' in await response.data
 
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
-async def test_file_fetch(client, config_conn, monkeypatch):
+async def test_file_fetch(client, config_conn):
     """Test the data-fetch route."""
     _ = config_conn
     assert Config.log_path == 'app/tests/log/'
-    def my_stat1(*arg):
-        stat = stat_result
-        stat.st_size = 20
-        stat.st_birthtime = datetime.datetime(2024, 1, 31, 10, 30, 15)
-        stat.st_mtime = datetime.datetime(2024, 1, 1, 1, 30, 15).timestamp()
-        return stat
-
-    monkeypatch.setattr(DirEntry, "stat", my_stat1)
     response = await client.get('/file-fetch')
     assert response.status_code == 200
 
 
-    def my_stat2(*arg):
+@pytest.mark.asyncio
-        stat = stat_result
-        stat.st_size = 20
-        stat.st_mtime = datetime.datetime(2024, 1, 1, 1, 30, 15).timestamp()
-        return stat
-
-    monkeypatch.setattr(DirEntry, "stat", my_stat2)
-    monkeypatch.delattr(stat_result, "st_birthtime")
-    response = await client.get('/file-fetch')
-    assert response.status_code == 200
-    assert b'<h4>test.txt</h4>' in await response.data
-
-@pytest.mark.asyncio(loop_scope="session")
 async def test_send_file(client, config_conn):
     """Test the send-file route."""
     _ = config_conn
     assert Config.log_path == 'app/tests/log/'
     response = await client.get('/send-file/test.txt')
     assert response.status_code == 200
-    assert b'2025-04-30 00:01:23' in await response.data
 
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_missing_send_file(client, config_conn):
     """Test the send-file route (file not found)."""
     _ = config_conn
@@ -332,7 +227,7 @@ async def test_missing_send_file(client, config_conn):
     assert response.status_code == 404
 
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_invalid_send_file(client, config_conn):
     """Test the send-file route (invalid filename)."""
     _ = config_conn
@@ -357,7 +252,7 @@ def patch_os_remove_ok():
     with patch.object(os, 'remove', new_remove) as wrapped_os:
         yield wrapped_os
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_del_file_ok(client, config_conn, patch_os_remove_ok):
     """Test the del-file route with no error."""
     _ = config_conn
@@ -367,7 +262,7 @@ async def test_del_file_ok(client, config_conn, patch_os_remove_ok):
     assert response.status_code == 204
 
 
-@pytest.mark.asyncio(loop_scope="session")
+@pytest.mark.asyncio
 async def test_del_file_err(client, config_conn, patch_os_remove_err):
     """Test the send-file route with OSError."""
     _ = config_conn
@@ -375,20 +270,3 @@ async def test_del_file_err(client, config_conn, patch_os_remove_err):
     assert Config.log_path == 'app/tests/log/'
     response = await client.delete ('/del-file/test.txt')
     assert response.status_code == 404
-
-@pytest.mark.asyncio(loop_scope="session")
-async def test_addon_links(client):
-    """Test links to HA add-on config/log in UI"""
-    with patch.dict(os.environ, {'SLUG': 'c676133d', 'HOSTNAME': 'c676133d-tsun-proxy'}):
-        response = await client.get('/')
-        assert response.status_code == 200
-        assert response.mimetype == 'text/html'
-        assert b'Add-on Config' in await response.data
-        assert b'href="/hassio/addon/c676133d_tsun-proxy/logs' in await response.data
-        assert b'href="/hassio/addon/c676133d_tsun-proxy/config' in await response.data
-
-    # check that links are not available if env vars SLUG and HOSTNAME are not defined (docker version)    
-    response = await client.get('/')
-    assert response.status_code == 200
-    assert response.mimetype == 'text/html'
-    assert b'Add-on Config' not in await response.data

app/translations/de/LC_MESSAGES/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tsun-gen3-proxy 0.14.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2025-05-13 22:34+0200\n"
+"POT-Creation-Date: 2025-05-04 18:16+0200\n"
 "PO-Revision-Date: 2025-04-18 16:24+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: de\n"
@@ -19,34 +19,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.17.0\n"
 
-#: src/web/conn_table.py:53 src/web/templates/base.html.j2:58
+#: src/web/conn_table.py:52 src/web/templates/base.html.j2:58
 msgid "Connections"
 msgstr "Verbindungen"
 
-#: src/web/conn_table.py:60
+#: src/web/conn_table.py:59
 msgid "Device-IP:Port"
 msgstr "Geräte-IP:Port"
 
-#: src/web/conn_table.py:60
+#: src/web/conn_table.py:59
 msgid "Device-IP"
 msgstr "Geräte-IP"
 
-#: src/web/conn_table.py:61 src/web/mqtt_table.py:34
+#: src/web/conn_table.py:60 src/web/mqtt_table.py:34
 msgid "Serial-No"
 msgstr "Seriennummer"
 
-#: src/web/conn_table.py:62
+#: src/web/conn_table.py:61
 msgid "Cloud-IP:Port"
 msgstr "Cloud-IP:Port"
 
-#: src/web/conn_table.py:62
+#: src/web/conn_table.py:61
 msgid "Cloud-IP"
 msgstr "Cloud-IP"
 
-#: src/web/log_files.py:48
-msgid "n/a"
-msgstr "keine Angabe"
-
 #: src/web/mqtt_table.py:27
 msgid "MQTT devices"
 msgstr "MQTT Geräte"
@@ -75,14 +71,6 @@ msgstr "Wichtige Hinweise"
 msgid "Log Files"
 msgstr "Log Dateien"
 
-#: src/web/templates/base.html.j2:64
-msgid "Add-on Config"
-msgstr "Add-on Konfiguration"
-
-#: src/web/templates/base.html.j2:65
-msgid "Add-on Log"
-msgstr "Add-on Protokoll"
-
 #: src/web/templates/page_index.html.j2:3
 msgid "TSUN Proxy - Connections"
 msgstr "TSUN Proxy - Verbindungen"
@@ -128,13 +116,12 @@ msgid "TSUN Proxy - Log Files"
 msgstr "TSUN Proxy - Log Dateien"
 
 #: src/web/templates/page_logging.html.j2:10
-#, python-format
+msgid "Do you really want to delete the log file"
-msgid "Do you really want to delete the log file: <br>%(file)s ?"
+msgstr "Soll die Datei wirklich gelöscht werden"
-msgstr "Soll die Datei: <br>%(file)s<br>wirklich gelöscht werden?"
 
 #: src/web/templates/page_logging.html.j2:12
-msgid "Delete File"
+msgid "Delete File</button"
-msgstr "Datei löschen"
+msgstr "File löschen"
 
 #: src/web/templates/page_logging.html.j2:13
 msgid "Abort"

ha_addons/Makefile

@@ -192,7 +192,7 @@ $(repro_all_subdirs) :
 	mkdir -p $@
 
 $(repro_all_templates) : $(INST_BASE)/ha_addon_%/config.yaml: $(TEMPL)/config.jinja $(TEMPL)/%_data.json $(SRC)/.version FORCE
-	$(JINJA) --strict -D AppVersion=$(VERSION)-$*$(RC) -D BuildID=$(BUILD_ID) $< $(filter %.json,$^) -o $@
+	$(JINJA) --strict -D AppVersion=$(VERSION)-$* -D BuildID=$(BUILD_ID) $< $(filter %.json,$^) -o $@
 
 $(repro_all_apparmor) : $(INST_BASE)/ha_addon_%/apparmor.txt: $(TEMPL)/apparmor.jinja $(TEMPL)/%_data.json
 	$(JINJA) --strict $< $(filter %.json,$^) -o $@

ha_addons/docker-bake.hcl

@@ -29,23 +29,27 @@ target "_common" {
     "type =sbom,generator=docker/scout-sbom-indexer:latest"
   ]
   annotations = [
+    "index:io.hass.version=${VERSION}",
     "index:io.hass.type=addon",
-    "index:io.hass.arch=aarch64|amd64",
+    "index:io.hass.arch=armhf|aarch64|i386|amd64",
-    "index,manifest-descriptor:org.opencontainers.image.title=TSUN-Proxy",
+    "index:org.opencontainers.image.title=TSUN-Proxy",
-    "index,manifest-descriptor:org.opencontainers.image.authors=Stefan Allius",
+    "index:org.opencontainers.image.authors=Stefan Allius",
-    "index,manifest-descriptor:org.opencontainers.image.created=${BUILD_DATE}",
+    "index:org.opencontainers.image.created=${BUILD_DATE}",
-    "index,manifest-descriptor:org.opencontainers.image.version=${VERSION}",
+    "index:org.opencontainers.image.version=${VERSION}",
-    "index,manifest-descriptor:org.opencontainers.image.description=${DESCRIPTION}",
+    "index:org.opencontainers.image.revision=${BRANCH}",
+    "index:org.opencontainers.image.description=${DESCRIPTION}",
     "index:org.opencontainers.image.licenses=BSD-3-Clause",
-    "index:org.opencontainers.image.source=https://github.com/s-allius/tsun-gen3-proxy/ha_addons/ha_addon",
+    "index:org.opencontainers.image.source=https://github.com/s-allius/tsun-gen3-proxy/ha_addons/ha_addon"
   ]
   labels = {
+    "io.hass.version" = "${VERSION}"
     "io.hass.type" = "addon"
-    "io.hass.arch" = "aarch64|amd64"
+    "io.hass.arch" = "armhf|aarch64|i386|amd64"
     "org.opencontainers.image.title" = "TSUN-Proxy"
     "org.opencontainers.image.authors" = "Stefan Allius"
     "org.opencontainers.image.created" = "${BUILD_DATE}"
     "org.opencontainers.image.version" = "${VERSION}"
+    "org.opencontainers.image.revision" = "${BRANCH}"
     "org.opencontainers.image.description" = "${DESCRIPTION}"
     "org.opencontainers.image.licenses" = "BSD-3-Clause"
     "org.opencontainers.image.source" = "https://github.com/s-allius/tsun-gen3-proxy/ha_addonsha_addon"
@@ -55,7 +59,7 @@ target "_common" {
   ]
 
   no-cache = false
-  platforms = ["linux/amd64", "linux/arm64"]
+  platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7"]
 }
 
 target "_debug" {

ha_addons/ha_addon/Dockerfile

@@ -13,12 +13,12 @@
 # 1 Build Base Image #
 ######################
 
-ARG BUILD_FROM="ghcr.io/hassio-addons/base:18.1.4"
+ARG BUILD_FROM="ghcr.io/hassio-addons/base:17.2.4"
 # hadolint ignore=DL3006
 FROM $BUILD_FROM AS base
 
 # Installiere Python, pip und virtuelle Umgebungstools
-RUN apk add --no-cache python3=3.12.11-r0 py3-pip=25.1.1-r0 && \
+RUN apk add --no-cache python3=3.12.10-r0 py3-pip=24.3.1-r0 && \
     python -m venv /opt/venv && \
     . /opt/venv/bin/activate
 

ha_addons/ha_addon/rootfs/run.sh

@@ -1,46 +1,18 @@
 #!/usr/bin/with-contenv bashio
 
-bashio::log.blue "-----------------------------------------------------------"
+echo "Add-on environment started"
-bashio::log.blue "run.sh: info: setup Add-on environment"
-bashio::cache.flush_all
-MQTT_HOST=""
-SLUG=""
-HOSTNAME=""
-if bashio::supervisor.ping; then
-    bashio::log "run.sh: info: check Home Assistant bashio for config values"
-    if bashio::services.available mqtt; then
-        MQTT_HOST=$(bashio::services mqtt "host")
-        MQTT_PORT=$(bashio::services mqtt "port")
-        MQTT_USER=$(bashio::services mqtt "username")
-        MQTT_PASSWORD=$(bashio::services mqtt "password")
-    else
-        bashio::log.yellow "run.sh: info: Home Assistant MQTT service not available!"
-    fi
-    SLUG=$(bashio::addon.repository)
-    HOSTNAME=$(bashio::addon.hostname)
-else
-    bashio::log.red "run.sh: error: Home Assistant Supervisor API not available!"
-fi
 
-if [ -z "$SLUG" ]; then
+echo "check for Home Assistant MQTT"
-    bashio::log.yellow "run.sh: info: addon slug not found"
+MQTT_HOST=$(bashio::services mqtt "host")
-else
+MQTT_PORT=$(bashio::services mqtt "port")
-    bashio::log.green "run.sh: info: found addon slug: $SLUG"
+MQTT_USER=$(bashio::services mqtt "username")
-    export SLUG
+MQTT_PASSWORD=$(bashio::services mqtt "password")
-
-fi
-if [ -z "$HOSTNAME" ]; then
-    bashio::log.yellow "run.sh: info: addon hostname not found"
-else
-    bashio::log.green "run.sh: info: found addon hostname: $HOSTNAME"
-    export HOSTNAME
-fi
 
 # if a MQTT was/not found, drop a note
 if [ -z "$MQTT_HOST" ]; then
-    bashio::log.yellow "run.sh: info: MQTT config not found"
+    echo "MQTT not found"
 else
-    bashio::log.green "run.sh: info: found MQTT config"
+    echo "MQTT found"
     export MQTT_HOST
     export MQTT_PORT
     export MQTT_USER
@@ -57,6 +29,5 @@ cd /home/proxy || exit
 
 export VERSION=$(cat /proxy-version.txt)
 
-bashio::log.blue "run.sh: info: Start Proxyserver..."
+echo "Start Proxyserver..."
-bashio::log.blue "-----------------------------------------------------------"
 python3 server.py --rel_urls --json_config=/data/options.json  --log_path=/homeassistant/tsun-proxy/logs/ --config_path=/homeassistant/tsun-proxy/ --log_backups=2

ha_addons/templates/config.jinja

@@ -10,6 +10,8 @@ init: false
 arch:
   - aarch64
   - amd64
+  - armhf
+  - armv7
 startup: services
 homeassistant_api: true
 map:

ha_addons/templates/rc_data.json

@@ -2,6 +2,7 @@
 {
     "name": "TSUN-Proxy (Release Candidate)",
     "description": "MQTT Proxy for TSUN Photovoltaic Inverters",
+    "version": "rc",
     "image": "ghcr.io/s-allius/tsun-gen3-addon",
     "slug": "tsun-proxy-rc",
     "advanced": true,