goodwe 0.4.7__py3-none-any.whl → 0.4.8__py3-none-any.whl

goodwe/dt.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import logging
 from typing import Tuple
 
-from .exceptions import InverterError, RequestRejectedException
+from .exceptions import InverterError, RequestFailedException, RequestRejectedException
 from .inverter import Inverter
 from .inverter import OperationMode
 from .inverter import SensorKind as Kind
@@ -69,7 +69,7 @@ class DT(Inverter):
                    lambda data: round(read_voltage(data, 30120) * read_current(data, 30123)),
                    "On-grid L3 Power", "W", Kind.AC),
         # 30127 reserved
-        PowerS("active_power", 30128, "Active Power", Kind.AC),
+        PowerS("total_inverter_power", 30128, "Total Power", Kind.AC),
         Integer("work_mode", 30129, "Work Mode code"),
         Enum2("work_mode_label", 30129, WORK_MODES, "Work Mode"),
         Long("error_codes", 30130, "Error Codes"),
@@ -78,7 +78,7 @@ class DT(Inverter):
         Reactive4("reactive_power", 30135, "Reactive Power", Kind.AC),
         # 30137 reserved
         # 30138 reserved
-        # 30139 reserved
+        Decimal("power_factor", 30139, 1000, "Power Factor", "", Kind.GRID),
         # 30140 reserved
         Temp("temperature", 30141, "Inverter Temperature", Kind.AC),
         # 30142 reserved
@@ -113,6 +113,12 @@ class DT(Inverter):
         # 30172 reserved
     )
 
+    # Inverter's meter data
+    # Modbus registers from offset 0x75f4 (30196)
+    __all_sensors_meter: Tuple[Sensor, ...] = (
+        PowerS("active_power", 30196, "Active Power", Kind.GRID),
+    )
+
     # Modbus registers of inverter settings, offsets are modbus register addresses
     __all_settings: Tuple[Sensor, ...] = (
         Timestamp("time", 40313, "Inverter time"),
@@ -139,9 +145,12 @@ class DT(Inverter):
     def __init__(self, host: str, port: int, comm_addr: int = 0, timeout: int = 1, retries: int = 3):
         super().__init__(host, port, comm_addr if comm_addr else 0x7f, timeout, retries)
         self._READ_DEVICE_VERSION_INFO: ProtocolCommand = self._read_command(0x7531, 0x0028)
-        self._READ_DEVICE_RUNNING_DATA: ProtocolCommand = self._read_command(0x7594, 0x0049)
+        self._READ_RUNNING_DATA: ProtocolCommand = self._read_command(0x7594, 0x0049)
+        self._READ_METER_DATA: ProtocolCommand = self._read_command(0x75f4, 0x01)
         self._sensors = self.__all_sensors
+        self._sensors_meter = self.__all_sensors_meter
         self._settings: dict[str, Sensor] = {s.id_: s for s in self.__all_settings}
+        self._has_meter: bool = True
 
     @staticmethod
     def _single_phase_only(s: Sensor) -> bool:
@@ -160,10 +169,13 @@ class DT(Inverter):
             self.model_name = response[22:32].decode("ascii").rstrip()
         except:
             print("No model name sent from the inverter.")
-        self.serial_number = self._decode(response[6:22])
-        self.dsp1_version = read_unsigned_int(response, 66)
-        self.dsp2_version = read_unsigned_int(response, 68)
-        self.arm_version = read_unsigned_int(response, 70)
+        # Modbus registers from 30001 - 30040
+        self.serial_number = self._decode(response[6:22])  # 30004 - 30012
+        self.dsp1_version = read_unsigned_int(response, 66)  # 30034
+        self.dsp2_version = read_unsigned_int(response, 68)  # 30035
+        self.arm_version = read_unsigned_int(response, 70)  # 30036
+        self.dsp_svn_version = read_unsigned_int(response, 72)  # 35037
+        self.arm_svn_version = read_unsigned_int(response, 74)  # 35038
         self.firmware = "{}.{}.{:02x}".format(self.dsp1_version, self.dsp2_version, self.arm_version)
 
         if is_single_phase(self):
@@ -182,8 +194,17 @@ class DT(Inverter):
         pass
 
     async def read_runtime_data(self) -> Dict[str, Any]:
-        response = await self._read_from_socket(self._READ_DEVICE_RUNNING_DATA)
+        response = await self._read_from_socket(self._READ_RUNNING_DATA)
         data = self._map_response(response, self._sensors)
+
+        if self._has_meter:
+            try:
+                response = await self._read_from_socket(self._READ_METER_DATA)
+                data.update(self._map_response(response, self._sensors_meter))
+            except (RequestRejectedException, RequestFailedException):
+                logger.info("Meter values not supported, disabling further attempts.")
+                self._has_meter = False
+
         return data
 
     async def read_setting(self, setting_id: str) -> Any:
@@ -263,7 +284,10 @@ class DT(Inverter):
         raise InverterError("Operation not supported, inverter has no batteries.")
 
     def sensors(self) -> Tuple[Sensor, ...]:
-        return self._sensors
+        result = self._sensors
+        if self._has_meter:
+            result = result + self._sensors_meter
+        return result
 
     def settings(self) -> Tuple[Sensor, ...]:
         return tuple(self._settings.values())

goodwe/protocol.py

@@ -37,7 +37,7 @@ class InverterProtocol:
         self._timer: asyncio.TimerHandle | None = None
         self.timeout: int = timeout
         self.retries: int = retries
-        self.keep_alive: bool = True
+        self.keep_alive: bool = False
         self.protocol: asyncio.Protocol | None = None
         self.response_future: Future | None = None
         self.command: ProtocolCommand | None = None
@@ -62,6 +62,24 @@ class InverterProtocol:
             self._close_transport()
             return self._lock
 
+    def _max_retries_reached(self) -> Future:
+        logger.debug("Max number of retries (%d) reached, request %s failed.", self.retries, self.command)
+        self._close_transport()
+        self.response_future = asyncio.get_running_loop().create_future()
+        self.response_future.set_exception(MaxRetriesException)
+        return self.response_future
+
+    def _close_transport(self) -> None:
+        if self._transport:
+            try:
+                self._transport.close()
+            except RuntimeError:
+                logger.debug("Failed to close transport.")
+            self._transport = None
+        # Cancel Future on connection lost
+        if self.response_future and not self.response_future.done():
+            self.response_future.cancel()
+
     async def close(self) -> None:
         """Close the underlying transport/connection."""
         raise NotImplementedError()
@@ -133,15 +151,16 @@ class UdpInverterProtocol(InverterProtocol, asyncio.DatagramProtocol):
                 self._partial_missing = 0
             if self.command.validator(data):
                 logger.debug("Received: %s", data.hex())
+                self._retry = 0
                 self.response_future.set_result(data)
             else:
                 logger.debug("Received invalid response: %s", data.hex())
-                asyncio.get_running_loop().call_soon(self._retry_mechanism)
+                asyncio.get_running_loop().call_soon(self._timeout_mechanism)
         except PartialResponseException as ex:
             logger.debug("Received response fragment (%d of %d): %s", ex.length, ex.expected, data.hex())
             self._partial_data = data
             self._partial_missing = ex.expected - ex.length
-            self._timer = asyncio.get_running_loop().call_later(self.timeout, self._retry_mechanism)
+            self._timer = asyncio.get_running_loop().call_later(self.timeout, self._timeout_mechanism)
         except asyncio.InvalidStateError:
             logger.debug("Response already handled: %s", data.hex())
         except RequestRejectedException as ex:
@@ -158,13 +177,28 @@ class UdpInverterProtocol(InverterProtocol, asyncio.DatagramProtocol):
 
     async def send_request(self, command: ProtocolCommand) -> Future:
         """Send message via transport"""
-        async with self._ensure_lock():
+        await self._ensure_lock().acquire()
+        try:
             await self._connect()
             response_future = asyncio.get_running_loop().create_future()
-            self._retry = 0
             self._send_request(command, response_future)
             await response_future
             return response_future
+        except asyncio.CancelledError:
+            if self._retry < self.retries:
+                self._retry += 1
+                if self._lock and self._lock.locked():
+                    self._lock.release()
+                if not self.keep_alive:
+                    self._close_transport()
+                return await self.send_request(command)
+            else:
+                return self._max_retries_reached()
+        finally:
+            if self._lock and self._lock.locked():
+                self._lock.release()
+            if not self.keep_alive:
+                self._close_transport()
 
     def _send_request(self, command: ProtocolCommand, response_future: Future) -> None:
         """Send message via transport"""
@@ -178,32 +212,19 @@ class UdpInverterProtocol(InverterProtocol, asyncio.DatagramProtocol):
         else:
             logger.debug("Sending: %s", self.command)
         self._transport.sendto(payload)
-        self._timer = asyncio.get_running_loop().call_later(self.timeout, self._retry_mechanism)
+        self._timer = asyncio.get_running_loop().call_later(self.timeout, self._timeout_mechanism)
 
-    def _retry_mechanism(self) -> None:
-        """Retry mechanism to prevent hanging transport"""
-        if self.response_future.done():
+    def _timeout_mechanism(self) -> None:
+        """Timeout mechanism to prevent hanging transport"""
+        if self.response_future and self.response_future.done():
             logger.debug("Response already received.")
-        elif self._retry < self.retries:
+            self._retry = 0
+        else:
             if self._timer:
                 logger.debug("Failed to receive response to %s in time (%ds).", self.command, self.timeout)
-            self._retry += 1
-            self._send_request(self.command, self.response_future)
-        else:
-            logger.debug("Max number of retries (%d) reached, request %s failed.", self.retries, self.command)
-            self.response_future.set_exception(MaxRetriesException)
-            self._close_transport()
-
-    def _close_transport(self) -> None:
-        if self._transport:
-            try:
-                self._transport.close()
-            except RuntimeError:
-                logger.debug("Failed to close transport.")
-            self._transport = None
-        # Cancel Future on connection close
-        if self.response_future and not self.response_future.done():
-            self.response_future.cancel()
+                self._timer = None
+            if self.response_future and not self.response_future.done():
+                self.response_future.cancel()
 
     async def close(self):
         self._close_transport()
@@ -358,24 +379,6 @@ class TcpInverterProtocol(InverterProtocol, asyncio.Protocol):
                 self._timer = None
             self._close_transport()
 
-    def _max_retries_reached(self) -> Future:
-        logger.debug("Max number of retries (%d) reached, request %s failed.", self.retries, self.command)
-        self._close_transport()
-        self.response_future = asyncio.get_running_loop().create_future()
-        self.response_future.set_exception(MaxRetriesException)
-        return self.response_future
-
-    def _close_transport(self) -> None:
-        if self._transport:
-            try:
-                self._transport.close()
-            except RuntimeError:
-                logger.debug("Failed to close transport.")
-            self._transport = None
-        # Cancel Future on connection lost
-        if self.response_future and not self.response_future.done():
-            self.response_future.cancel()
-
     async def close(self):
         await self._ensure_lock().acquire()
         try:

{goodwe-0.4.7.dist-info → goodwe-0.4.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: goodwe
-Version: 0.4.7
+Version: 0.4.8
 Summary: Read data from GoodWe inverter via local network
 Home-page: https://github.com/marcelblijleven/goodwe
 Author: Martin Letenay, Marcel Blijleven

{goodwe-0.4.7.dist-info → goodwe-0.4.8.dist-info}/RECORD

@@ -1,16 +1,16 @@
 goodwe/__init__.py,sha256=8fFGBBvBpCo6Ew4puTtW0kYo2hVPKUx6z5A-TA4Tbvc,5795
 goodwe/const.py,sha256=yhWk56YV7k7-MbgfmWEMYNlqeRNLOfOpfTqEfRj6Hp8,7934
-goodwe/dt.py,sha256=TxjJ4iqvtRiHGKwlfLoYWblN-COVZ3i48PPk4z4xJcc,12482
+goodwe/dt.py,sha256=IJxLDajuu2psYE5ZpwA2HFJDFdK5JIST6kUqWyRVBko,13663
 goodwe/es.py,sha256=vvHmxcFykp8nhR1I8p7SF0YcYpvdCKBYacgcolbVHXI,23009
 goodwe/et.py,sha256=Sdgqj13DXIg36NptkHMKxuP78oo4aUQ_6zlToyt78qI,46002
 goodwe/exceptions.py,sha256=dKMLxotjoR1ic8OVlw1joIJ4mKWD6oFtUMZ86fNM5ZE,1403
 goodwe/inverter.py,sha256=86aMJzJjNOr1I_tCF5H6mBwzDTjLbGDKUL2hbi0XSxg,10459
 goodwe/modbus.py,sha256=Mg_s_v8kbZgqXZM6ZUUxkZx2boAG8LkuDG5OiFKK2X4,8402
 goodwe/model.py,sha256=OAKfw6ggClgLR9JIdNd7tQ4pnh_7o_UqVdm1KOVsm-Y,2200
-goodwe/protocol.py,sha256=gnQ1vV4U_lPpaNq5-jmzJO6ngJEDFVo0jWXVujSyu_0,30083
+goodwe/protocol.py,sha256=2xRo1H53G6T0ANSuYKPK_KTNfCVTctIU2ZHVu-CvMPk,30163
 goodwe/sensor.py,sha256=xeDZIwjJ_176ULrRXVCTYvVXx6o2_pWgS0KuR3PPQdg,38435
-goodwe-0.4.7.dist-info/LICENSE,sha256=aZAhk3lRdYT1YZV-IKRHISEcc_KNUmgfuNO3QhRamNM,1073
-goodwe-0.4.7.dist-info/METADATA,sha256=qzKMdlhzJDyLdHfqp5_x7jFZMI2B15mTnBhN_UksJzM,3376
-goodwe-0.4.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-goodwe-0.4.7.dist-info/top_level.txt,sha256=kKoiqiVvAxDaDJYMZZQLgHQj9cuWT1MXLfXElTDuf8s,7
-goodwe-0.4.7.dist-info/RECORD,,
+goodwe-0.4.8.dist-info/LICENSE,sha256=aZAhk3lRdYT1YZV-IKRHISEcc_KNUmgfuNO3QhRamNM,1073
+goodwe-0.4.8.dist-info/METADATA,sha256=kla7IF_7dMZl-uEdQnGqMBXOkOyNlKt9Inwmi4BWCWQ,3376
+goodwe-0.4.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+goodwe-0.4.8.dist-info/top_level.txt,sha256=kKoiqiVvAxDaDJYMZZQLgHQj9cuWT1MXLfXElTDuf8s,7
+goodwe-0.4.8.dist-info/RECORD,,