version 0.14.0

.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

.python-version

@@ -1 +1 @@
-3.13.5
+3.13.2

CHANGELOG.md

@@ -7,16 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
-- 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

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

app/.version

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

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

@@ -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.1
+    pytest==8.3.5
-    pytest-asyncio==1.0.0
+    pytest-asyncio==0.26.0
-    pytest-cov==6.2.1
+    pytest-cov==6.1.1
     python-dotenv==1.1.0
     mock==5.2.0
-    coverage==7.9.1
+    coverage==7.8.2
     jinja2-cli==0.8.2

app/src/gen3plus/solarman_v5.py

@@ -341,9 +341,9 @@ class SolarmanV5(SolarmanBase):
         self.log_lvl.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

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

@@ -66,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

@@ -112,7 +112,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
@@ -151,7 +151,7 @@ class Mqtt(metaclass=Singleton):
             if self.__cb_mqtt_is_up:
                 await self.__cb_mqtt_is_up()
 
-    def _out_coeff(self, message):
+    async def _out_coeff(self, message):
         payload = message.payload.decode("UTF-8")
         try:
             val = round(float(payload) * 1024/100)
@@ -160,9 +160,9 @@ class Mqtt(metaclass=Singleton):
                                   'the range 0..100,'
                                   f' got: {payload}')
             else:
-                self._modbus_cmd(message,
+                await self._modbus_cmd(message,
-                                 Modbus.WRITE_SINGLE_REG,
+                                       Modbus.WRITE_SINGLE_REG,
-                                 0, 0x202c, val)
+                                       0, 0x202c, val)
         except Exception:
             pass
 
@@ -182,7 +182,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,7 +195,7 @@ 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):
         payload = message.payload.decode("UTF-8")

app/src/server.py

@@ -60,7 +60,7 @@ class Server():
 
         @app.context_processor
         def utility_processor():
-            return {'version': self.version}
+            return dict(version=self.version)
 
     def parse_args(self, arg_list: list[str] | None):
         parser = argparse.ArgumentParser()

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/tests/test_mqtt.py

@@ -286,23 +286,23 @@ async def test_mqtt_dispatch(config_mqtt_conn, aiomqtt_mock, spy_modbus_cmd):
         assert m.ha_restarts == 1
 
         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.assert_awaited_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.assert_awaited_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')
-        spy.assert_called_once_with(Modbus.WRITE_SINGLE_REG, 0x202c, 512, logging.INFO)
+        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')
-        spy.assert_called_once_with(Modbus.READ_REGS, 0x3000, 10, logging.INFO)
+        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')
-        spy.assert_called_once_with(Modbus.READ_INPUTS, 0x3000, 10, logging.INFO)
+        spy.assert_awaited_once_with(Modbus.READ_INPUTS, 0x3000, 10, logging.INFO)
 
         # test dispatching with empty mapping table
         m.topic_defs.clear()

app/tests/test_solarman.py

@@ -1624,7 +1624,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,7 +1642,7 @@ 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
@@ -2318,7 +2318,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)
@@ -2351,7 +2351,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

app/tests/test_solarman_emu.py

@@ -144,7 +144,7 @@ async def test_emu_start(my_loop, config_tsun_inv1, msg_modbus_rsp, str_test_ip,
     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
@@ -161,7 +161,7 @@ async def test_snd_hb(my_loop, config_tsun_inv1, heartbeat_ind):
     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()
@@ -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)
@@ -213,7 +213,7 @@ async def test_rcv_invalid(my_loop, config_tsun_inv1, inverter_ind_msg, inverter
     _ = 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

@@ -2411,14 +2411,14 @@ 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''

app/translations/de/LC_MESSAGES/messages.po

@@ -120,7 +120,6 @@ 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: <br>%(file)s ?"
 msgstr "Soll die Datei: <br>%(file)s<br>wirklich gelöscht werden?"
 

ha_addons/docker-bake.hcl

@@ -59,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/rootfs/run.sh

@@ -1,28 +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
+echo "check for Home Assistant MQTT"
-MQTT_HOST=""
+MQTT_HOST=$(bashio::services mqtt "host")
-if bashio::supervisor.ping; then
+MQTT_PORT=$(bashio::services mqtt "port")
-    bashio::log "run.sh: info: check for Home Assistant MQTT service"
+MQTT_USER=$(bashio::services mqtt "username")
-    if bashio::services.available mqtt; then
+MQTT_PASSWORD=$(bashio::services mqtt "password")
-        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
-else
-    bashio::log.red "run.sh: error: Home Assistant Supervisor API not available!"
-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: MQTT config found"
+    echo "MQTT found"
     export MQTT_HOST
     export MQTT_PORT
     export MQTT_USER
@@ -39,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