Simplify pdu lookup.

pymodbus/pdu/bit_message.py

@@ -6,6 +6,7 @@
 from pymodbus.constants import ExcCodes, ModbusStatus
 from pymodbus.datastore import ModbusDeviceContext
 
+from .decoders import DecodePDU
 from .exceptionresponse import ExceptionResponse
 from .pdu import ModbusPDU, pack_bitstring, unpack_bitstring
 
@@ -163,3 +164,8 @@ def encode(self) -> bytes:
     def decode(self, data: bytes) -> None:
         """Decode a write coils response."""
         self.address, self.count = struct.unpack(">HH", data[:4])
+
+DecodePDU.add_pdu(ReadCoilsRequest, ReadCoilsResponse)
+DecodePDU.add_pdu(ReadDiscreteInputsRequest, ReadDiscreteInputsResponse)
+DecodePDU.add_pdu(WriteSingleCoilRequest, WriteSingleCoilResponse)
+DecodePDU.add_pdu(WriteMultipleCoilsRequest, WriteMultipleCoilsResponse)

pymodbus/pdu/decoders.py

@@ -1,119 +1,87 @@
 """Modbus Request/Response Decoders."""
 from __future__ import annotations
 
-import pymodbus.pdu.bit_message as bit_msg
-import pymodbus.pdu.diag_message as diag_msg
-import pymodbus.pdu.file_message as file_msg
-import pymodbus.pdu.mei_message as mei_msg
-import pymodbus.pdu.other_message as o_msg
-import pymodbus.pdu.pdu as base
-import pymodbus.pdu.register_message as reg_msg
 from pymodbus.exceptions import MessageRegisterException, ModbusException
 from pymodbus.logging import Log
 
+from .pdu import ExceptionResponse, ModbusPDU
+
 
 class DecodePDU:
     """Decode pdu requests/responses (server/client)."""
 
-    _pdu_class_table: set[tuple[type[base.ModbusPDU], type[base.ModbusPDU]]] = {
-        (reg_msg.ReadHoldingRegistersRequest, reg_msg.ReadHoldingRegistersResponse),
-        (bit_msg.ReadDiscreteInputsRequest, bit_msg.ReadDiscreteInputsResponse),
-        (reg_msg.ReadInputRegistersRequest, reg_msg.ReadInputRegistersResponse),
-        (bit_msg.ReadCoilsRequest, bit_msg.ReadCoilsResponse),
-        (bit_msg.WriteMultipleCoilsRequest, bit_msg.WriteMultipleCoilsResponse),
-        (reg_msg.WriteMultipleRegistersRequest, reg_msg.WriteMultipleRegistersResponse),
-        (reg_msg.WriteSingleRegisterRequest, reg_msg.WriteSingleRegisterResponse),
-        (bit_msg.WriteSingleCoilRequest, bit_msg.WriteSingleCoilResponse),
-        (reg_msg.ReadWriteMultipleRegistersRequest, reg_msg.ReadWriteMultipleRegistersResponse),
-        (diag_msg.DiagnosticBase, diag_msg.DiagnosticBase),
-        (o_msg.ReadExceptionStatusRequest, o_msg.ReadExceptionStatusResponse),
-        (o_msg.GetCommEventCounterRequest, o_msg.GetCommEventCounterResponse),
-        (o_msg.GetCommEventLogRequest, o_msg.GetCommEventLogResponse),
-        (o_msg.ReportDeviceIdRequest, o_msg.ReportDeviceIdResponse),
-        (file_msg.ReadFileRecordRequest, file_msg.ReadFileRecordResponse),
-        (file_msg.WriteFileRecordRequest, file_msg.WriteFileRecordResponse),
-        (reg_msg.MaskWriteRegisterRequest, reg_msg.MaskWriteRegisterResponse),
-        (file_msg.ReadFifoQueueRequest, file_msg.ReadFifoQueueResponse),
-        (mei_msg.ReadDeviceInformationRequest, mei_msg.ReadDeviceInformationResponse),
-    }
-
-    _pdu_sub_class_table: set[tuple[type[base.ModbusPDU], type[base.ModbusPDU]]] = {
-        (diag_msg.ReturnQueryDataRequest, diag_msg.ReturnQueryDataResponse),
-        (diag_msg.RestartCommunicationsOptionRequest, diag_msg.RestartCommunicationsOptionResponse),
-        (diag_msg.ReturnDiagnosticRegisterRequest, diag_msg.ReturnDiagnosticRegisterResponse),
-        (diag_msg.ChangeAsciiInputDelimiterRequest, diag_msg.ChangeAsciiInputDelimiterResponse),
-        (diag_msg.ForceListenOnlyModeRequest, diag_msg.ForceListenOnlyModeResponse),
-        (diag_msg.ClearCountersRequest, diag_msg.ClearCountersResponse),
-        (diag_msg.ReturnBusMessageCountRequest, diag_msg.ReturnBusMessageCountResponse),
-        (diag_msg.ReturnBusCommunicationErrorCountRequest, diag_msg.ReturnBusCommunicationErrorCountResponse),
-        (diag_msg.ReturnBusExceptionErrorCountRequest, diag_msg.ReturnBusExceptionErrorCountResponse),
-        (diag_msg.ReturnDeviceMessageCountRequest, diag_msg.ReturnDeviceMessageCountResponse),
-        (diag_msg.ReturnDeviceNoResponseCountRequest, diag_msg.ReturnDeviceNoResponseCountResponse),
-        (diag_msg.ReturnDeviceNAKCountRequest, diag_msg.ReturnDeviceNAKCountResponse),
-        (diag_msg.ReturnDeviceBusyCountRequest, diag_msg.ReturnDeviceBusyCountResponse),
-        (diag_msg.ReturnDeviceBusCharacterOverrunCountRequest, diag_msg.ReturnDeviceBusCharacterOverrunCountResponse),
-        (diag_msg.ReturnIopOverrunCountRequest, diag_msg.ReturnIopOverrunCountResponse),
-        (diag_msg.ClearOverrunCountRequest, diag_msg.ClearOverrunCountResponse),
-        (diag_msg.GetClearModbusPlusRequest, diag_msg.GetClearModbusPlusResponse),
-        (mei_msg.ReadDeviceInformationRequest, mei_msg.ReadDeviceInformationResponse),
-    }
+    pdu_class_table: dict[int, tuple[type[ModbusPDU], type[ModbusPDU]]] = {}
+    pdu_sub_class_table: dict[int, dict[int, tuple[type[ModbusPDU], type[ModbusPDU]]]] = {}
 
     def __init__(self, is_server: bool) -> None:
         """Initialize function_tables."""
-        inx = 0 if is_server else 1
-        self.lookup: dict[int, type[base.ModbusPDU]] = {cl[inx].function_code: cl[inx] for cl in self._pdu_class_table}
-        self.sub_lookup: dict[int, dict[int, type[base.ModbusPDU]]] = {}
-        for f in self._pdu_sub_class_table:
-            if (function_code := f[inx].function_code) not in self.sub_lookup:
-                self.sub_lookup[function_code] = {f[inx].sub_function_code: f[inx]}
-            else:
-                self.sub_lookup[function_code][f[inx].sub_function_code] = f[inx]
+        self.inx = 0 if is_server else 1
+        self.lookup = self.pdu_class_table
+
+    @classmethod
+    def add_pdu(cls, req: type[ModbusPDU], resp: type[ModbusPDU]):
+        """Register request/response."""
+        cls.pdu_class_table[req.function_code] = (req, resp)
 
-    def lookupPduClass(self, data: bytes) -> type[base.ModbusPDU] | None:
+    @classmethod
+    def add_sub_pdu(cls, req: type[ModbusPDU], resp: type[ModbusPDU]):
+        """Register request/response."""
+        if req.function_code not in cls.pdu_sub_class_table:
+            cls.pdu_sub_class_table[req.function_code] = {}
+        cls.pdu_sub_class_table[req.function_code][req.sub_function_code] = (req, resp)
+
+    def lookupPduClass(self, data: bytes) -> type[ModbusPDU] | None:
         """Use `function_code` to determine the class of the PDU."""
         func_code = int(data[1])
         if func_code & 0x80:
-            return base.ExceptionResponse
+            return ExceptionResponse
         if func_code == 0x2B:  # mei message, sub_function_code is 1 byte
             sub_func_code = int(data[2])
-            return self.sub_lookup[func_code].get(sub_func_code, None)
+            if not (type_class := self.pdu_sub_class_table[func_code].get(sub_func_code, None)):
+                return None
+            return type_class[self.inx]
+
         if func_code == 0x08:  # diag message,  sub_function_code is 2 bytes
             sub_func_code = int(data[3])
-            return self.sub_lookup[func_code].get(sub_func_code, None)
-        return self.lookup.get(func_code, None)
+            if not (type_class := self.pdu_sub_class_table[func_code].get(sub_func_code, None)):
+                return None
+            return type_class[self.inx]
+        if not (type_class := self.lookup.get(func_code, None)):
+            return None
+        return type_class[self.inx]
 
-    def register(self, custom_class: type[base.ModbusPDU]) -> None:
+    def register(self, custom_class: type[ModbusPDU]) -> None:
         """Register a function and sub function class with the decoder."""
-        if not issubclass(custom_class, base.ModbusPDU):
+        if not issubclass(custom_class, ModbusPDU):
             raise MessageRegisterException(
                 f'"{custom_class.__class__.__name__}" is Not a valid Modbus Message'
                 ". Class needs to be derived from "
                 "`pymodbus.pdu.ModbusPDU` "
             )
-        self.lookup[custom_class.function_code] = custom_class
+        self.lookup[custom_class.function_code] = (custom_class, custom_class)
         if custom_class.sub_function_code >= 0:
-            if custom_class.function_code not in self.sub_lookup:
-                self.sub_lookup[custom_class.function_code] = {}
-            self.sub_lookup[custom_class.function_code][
+            if custom_class.function_code not in self.pdu_sub_class_table:
+                self.pdu_sub_class_table[custom_class.function_code] = {}
+            self.pdu_sub_class_table[custom_class.function_code][
                 custom_class.sub_function_code
-            ] = custom_class
+            ] = (custom_class, custom_class)
 
-    def decode(self, frame: bytes) -> base.ModbusPDU | None:
+    def decode(self, frame: bytes) -> ModbusPDU | None:
         """Decode a frame."""
         try:
             if (function_code := int(frame[0])) > 0x80:
-                pdu_exp = base.ExceptionResponse(function_code & 0x7F)
+                pdu_exp = ExceptionResponse(function_code & 0x7F)
                 pdu_exp.decode(frame[1:])
                 return pdu_exp
             if not (pdu_class := self.lookup.get(function_code, None)):
                 Log.debug("decode PDU failed for function code {}", function_code)
                 raise ModbusException(f"Unknown response {function_code}")
-            pdu = pdu_class()
+            pdu = pdu_class[self.inx]()
             pdu.decode(frame[1:])
             if pdu.sub_function_code >= 0:
-                lookup = self.sub_lookup.get(pdu.function_code, {})
-                if sub_class := lookup.get(pdu.sub_function_code, None):
-                    pdu = sub_class()
+                lookup = self.pdu_sub_class_table.get(pdu.function_code, {})
+                if type_class := lookup.get(pdu.sub_function_code, None):
+                    pdu = type_class[self.inx]()
                     pdu.decode(frame[1:])
             Log.debug("decoded PDU function_code({} sub {}) -> {} ", pdu.function_code, pdu.sub_function_code, str(pdu))
             return pdu

pymodbus/pdu/diag_message.py

@@ -7,6 +7,7 @@
 from pymodbus.constants import ModbusPlusOperation
 from pymodbus.datastore import ModbusDeviceContext
 
+from .decoders import DecodePDU
 from .device import ModbusControlBlock
 from .pdu import ModbusPDU, pack_bitstring
 
@@ -381,3 +382,22 @@ class GetClearModbusPlusResponse(DiagnosticBase):
     """GetClearModbusPlusResponse."""
 
     sub_function_code = 0x0015
+
+DecodePDU.add_pdu(DiagnosticBase, DiagnosticBase)
+DecodePDU.add_sub_pdu(ReturnQueryDataRequest, ReturnQueryDataResponse)
+DecodePDU.add_sub_pdu(RestartCommunicationsOptionRequest, RestartCommunicationsOptionResponse)
+DecodePDU.add_sub_pdu(ReturnDiagnosticRegisterRequest, ReturnDiagnosticRegisterResponse)
+DecodePDU.add_sub_pdu(ChangeAsciiInputDelimiterRequest, ChangeAsciiInputDelimiterResponse)
+DecodePDU.add_sub_pdu(ForceListenOnlyModeRequest, ForceListenOnlyModeResponse)
+DecodePDU.add_sub_pdu(ClearCountersRequest, ClearCountersResponse)
+DecodePDU.add_sub_pdu(ReturnBusMessageCountRequest, ReturnBusMessageCountResponse)
+DecodePDU.add_sub_pdu(ReturnBusCommunicationErrorCountRequest, ReturnBusCommunicationErrorCountResponse)
+DecodePDU.add_sub_pdu(ReturnBusExceptionErrorCountRequest, ReturnBusExceptionErrorCountResponse)
+DecodePDU.add_sub_pdu(ReturnDeviceMessageCountRequest, ReturnDeviceMessageCountResponse)
+DecodePDU.add_sub_pdu(ReturnDeviceNoResponseCountRequest, ReturnDeviceNoResponseCountResponse)
+DecodePDU.add_sub_pdu(ReturnDeviceNAKCountRequest, ReturnDeviceNAKCountResponse)
+DecodePDU.add_sub_pdu(ReturnDeviceBusyCountRequest, ReturnDeviceBusyCountResponse)
+DecodePDU.add_sub_pdu(ReturnDeviceBusCharacterOverrunCountRequest, ReturnDeviceBusCharacterOverrunCountResponse)
+DecodePDU.add_sub_pdu(ReturnIopOverrunCountRequest, ReturnIopOverrunCountResponse)
+DecodePDU.add_sub_pdu(ClearOverrunCountRequest, ClearOverrunCountResponse)
+DecodePDU.add_sub_pdu(GetClearModbusPlusRequest, GetClearModbusPlusResponse)

pymodbus/pdu/file_message.py

@@ -7,6 +7,7 @@
 from pymodbus.datastore import ModbusDeviceContext
 from pymodbus.exceptions import ModbusException
 
+from .decoders import DecodePDU
 from .pdu import ModbusPDU
 
 
@@ -276,3 +277,7 @@ def decode(self, data: bytes) -> None:
         for index in range(0, count - 4):
             idx = 4 + index * 2
             self.values.append(struct.unpack(">H", data[idx : idx + 2])[0])
+
+DecodePDU.add_pdu(ReadFileRecordRequest, ReadFileRecordResponse)
+DecodePDU.add_pdu(WriteFileRecordRequest, WriteFileRecordResponse)
+DecodePDU.add_pdu(ReadFifoQueueRequest, ReadFifoQueueResponse)

pymodbus/pdu/mei_message.py

@@ -6,6 +6,7 @@
 from pymodbus.constants import DeviceInformation, ExcCodes, MoreData
 from pymodbus.datastore import ModbusDeviceContext
 
+from .decoders import DecodePDU
 from .device import DeviceInformationFactory, ModbusControlBlock
 from .exceptionresponse import ExceptionResponse
 from .pdu import ModbusPDU
@@ -153,3 +154,6 @@ def decode(self, data: bytes) -> None:
                     self.information[object_id],
                     data[count - object_length : count],
                 ]
+
+DecodePDU.add_pdu(ReadDeviceInformationRequest, ReadDeviceInformationResponse)
+DecodePDU.add_sub_pdu(ReadDeviceInformationRequest, ReadDeviceInformationResponse)

pymodbus/pdu/other_message.py

@@ -6,6 +6,7 @@
 from pymodbus.constants import ModbusStatus
 from pymodbus.datastore import ModbusDeviceContext
 
+from .decoders import DecodePDU
 from .device import DeviceInformationFactory, ModbusControlBlock
 from .pdu import ModbusPDU
 
@@ -208,3 +209,8 @@ def decode(self, data: bytes) -> None:
         self.identifier = data[1 : self.byte_count + 1]
         status = int(data[-1])
         self.status = status == ID_ON
+
+DecodePDU.add_pdu(ReadExceptionStatusRequest, ReadExceptionStatusResponse)
+DecodePDU.add_pdu(GetCommEventCounterRequest, GetCommEventCounterResponse)
+DecodePDU.add_pdu(GetCommEventLogRequest, GetCommEventLogResponse)
+DecodePDU.add_pdu(ReportDeviceIdRequest, ReportDeviceIdResponse)

pymodbus/pdu/register_message.py

@@ -10,6 +10,7 @@
 from pymodbus.datastore import ModbusDeviceContext
 from pymodbus.exceptions import ModbusIOException
 
+from .decoders import DecodePDU
 from .exceptionresponse import ExceptionResponse
 from .pdu import ModbusPDU
 
@@ -381,3 +382,10 @@ def encode(self) -> bytes:
     def decode(self, data: bytes) -> None:
         """Decode a the response."""
         self.address, self.and_mask, self.or_mask = struct.unpack(">HHH", data[:6])
+
+DecodePDU.add_pdu(ReadHoldingRegistersRequest, ReadHoldingRegistersResponse)
+DecodePDU.add_pdu(ReadInputRegistersRequest, ReadInputRegistersResponse)
+DecodePDU.add_pdu(WriteMultipleRegistersRequest, WriteMultipleRegistersResponse)
+DecodePDU.add_pdu(WriteSingleRegisterRequest, WriteSingleRegisterResponse)
+DecodePDU.add_pdu(ReadWriteMultipleRegistersRequest, ReadWriteMultipleRegistersResponse)
+DecodePDU.add_pdu(MaskWriteRegisterRequest, MaskWriteRegisterResponse)

pymodbus/server/simulator/http_server.py

@@ -71,7 +71,7 @@ class CallTypeResponse:
     clear_after: int = 1
 
 
-class ModbusSimulatorServer:  # pylint: disable=too-many-instance-attributes
+class ModbusSimulatorServer:
     """**ModbusSimulatorServer**.
 
     :param modbus_server: Server name in json file (default: "server")
@@ -201,7 +201,6 @@ def __init__(
         self.refresh_rate = 0
         self.register_filter: list[int] = []
         self.call_list: list[CallTracer] = []
-        self.request_lookup = DecodePDU(True).lookup
         self.call_monitor = CallTypeMonitor()
         self.call_response = CallTypeResponse()
         app_key = getattr(web, 'AppKey', str)  # fall back to str for aiohttp < 3.9.0
@@ -376,13 +375,13 @@ def build_html_calls(self, params: dict, html: str) -> str:
             else ""
         )
         function_codes = ""
-        for function in self.request_lookup.values():
+        for (req, _resp) in DecodePDU.pdu_class_table.values():
             selected = (
                 "selected"
-                if function.function_code == self.call_monitor.function
+                if req.function_code == self.call_monitor.function
                 else ""
             )
-            function_codes += f"<option value={function.function_code} {selected}>function code name</option>"
+            function_codes += f"<option value={req.function_code} {selected}>function code name</option>"
         simulation_action = (
             "ACTIVE" if self.call_response.active != RESPONSE_INACTIVE else ""
         )
@@ -392,9 +391,7 @@ def build_html_calls(self, params: dict, html: str) -> str:
             del self.call_list[0]
         call_rows = ""
         for entry in reversed(self.call_list):
-            # req_obj = self.request_lookup[entry[1]]
             call_rows += f"<tr><td>{entry.call} - {entry.fc}</td><td>{entry.address}</td><td>{entry.count}</td><td>{entry.data.decode()}</td></tr>"
-            # line += req_obj.funcion_code_name
         new_html = (
             html.replace("<!--SIMULATION_ACTIVE-->", simulation_action)
             .replace("FUNCTION_RANGE_START", range_start_html)
@@ -543,11 +540,11 @@ def build_json_calls(self, params: dict) -> dict:
         )
 
         function_codes = []
-        for function in self.request_lookup.values():
+        for (req, _resp) in DecodePDU.pdu_class_table.values():
             function_codes.append({
-                "value": function.function_code,
+                "value": req.function_code,
                 "text": "function code name",
-                "selected": function.function_code == self.call_monitor.function
+                "selected": req.function_code == self.call_monitor.function
             })
 
         simulation_action = "ACTIVE" if self.call_response.active != RESPONSE_INACTIVE else ""