Client/Server framer as enum.

Author: janiversen

API_changes.rst

@@ -4,6 +4,7 @@ Versions (X.Y.Z) where Z > 0 e.g. 3.0.1 do NOT have API changes!
 
 API changes 3.6.0 (future)
 --------------------------
+- framer= is an enum: pymodbus.Framer, but still accept a framer class
 
 
 API changes 3.5.0

examples/client_custom_msg.py

@@ -14,14 +14,10 @@
 import logging
 import struct
 
+from pymodbus import Framer
 from pymodbus.bit_read_message import ReadCoilsRequest
 from pymodbus.client import AsyncModbusTcpClient as ModbusClient
-
-# --------------------------------------------------------------------------- #
-# import the various server implementations
-# --------------------------------------------------------------------------- #
 from pymodbus.pdu import ModbusExceptions, ModbusRequest, ModbusResponse
-from pymodbus.transaction import ModbusSocketFramer
 
 
 # --------------------------------------------------------------------------- #
@@ -130,7 +126,7 @@ def __init__(self, address, **kwargs):
 
 async def main(host="localhost", port=5020):
     """Run versions of read coil."""
-    with ModbusClient(host=host, port=port, framer=ModbusSocketFramer) as client:
+    with ModbusClient(host=host, port=port, framer_name=Framer.SOCKET) as client:
         await client.connect()
 
         # new modbus function code.

examples/client_performance.py

@@ -16,8 +16,8 @@
 import asyncio
 import time
 
+from pymodbus import Framer
 from pymodbus.client import AsyncModbusSerialClient, ModbusSerialClient
-from pymodbus.transaction import ModbusRtuFramer
 
 
 LOOP_COUNT = 1000
@@ -29,7 +29,7 @@ def run_sync_client_test():
     print("--- Testing sync client v3.4.1")
     client = ModbusSerialClient(
         "/dev/ttys007",
-        framer=ModbusRtuFramer,
+        framer_name=Framer.RTU,
         baudrate=9600,
     )
     client.connect()
@@ -56,7 +56,7 @@ async def run_async_client_test():
     print("--- Testing async client v3.4.1")
     client = AsyncModbusSerialClient(
         "/dev/ttys007",
-        framer=ModbusRtuFramer,
+        framer_name=Framer.RTU,
         baudrate=9600,
     )
     await client.connect()

examples/datastore_simulator.py

@@ -25,11 +25,10 @@
 import asyncio
 import logging
 
-from pymodbus import pymodbus_apply_logging_config
+from pymodbus import Framer, pymodbus_apply_logging_config
 from pymodbus.datastore import ModbusServerContext, ModbusSimulatorContext
 from pymodbus.device import ModbusDeviceIdentification
 from pymodbus.server import StartAsyncTcpServer
-from pymodbus.transaction import ModbusSocketFramer
 
 
 logging.basicConfig()
@@ -141,7 +140,7 @@ def setup_simulator(setup=None, actions=None, cmdline=None):
     args = get_commandline(cmdline=cmdline)
     pymodbus_apply_logging_config(args.log.upper())
     _logger.setLevel(args.log.upper())
-    args.framer = ModbusSocketFramer
+    args.framer = Framer.SOCKET
     args.port = int(args.port)
 
     _logger.info("### Create datastore")

examples/helper.py

@@ -9,30 +9,11 @@
 import os
 
 from pymodbus import pymodbus_apply_logging_config
-from pymodbus.transaction import (
-    ModbusAsciiFramer,
-    ModbusBinaryFramer,
-    ModbusRtuFramer,
-    ModbusSocketFramer,
-    ModbusTlsFramer,
-)
 
 
 _logger = logging.getLogger(__file__)
 
 
-def get_framer(framer):
-    """Convert framer name to framer class"""
-    framers = {
-        "ascii": ModbusAsciiFramer,
-        "binary": ModbusBinaryFramer,
-        "rtu": ModbusRtuFramer,
-        "socket": ModbusSocketFramer,
-        "tls": ModbusTlsFramer,
-    }
-    return framers[framer]
-
-
 def get_commandline(server=False, description=None, extras=None, cmdline=None):
     """Read and validate command line arguments"""
     parser = argparse.ArgumentParser(description=description)
@@ -123,7 +104,8 @@ def get_commandline(server=False, description=None, extras=None, cmdline=None):
     }
     pymodbus_apply_logging_config(args.log.upper())
     _logger.setLevel(args.log.upper())
-    args.framer = get_framer(args.framer or comm_defaults[args.comm][0])
+    if not args.framer:
+        args.framer = comm_defaults[args.comm][0]
     args.port = args.port or comm_defaults[args.comm][1]
     if args.comm != "serial" and args.port:
         args.port = int(args.port)

examples/server_hook.py

@@ -7,14 +7,13 @@
 import asyncio
 import logging
 
-from pymodbus import pymodbus_apply_logging_config
+from pymodbus import Framer, pymodbus_apply_logging_config
 from pymodbus.datastore import (
     ModbusSequentialDataBlock,
     ModbusServerContext,
     ModbusSlaveContext,
 )
 from pymodbus.server import ModbusTcpServer
-from pymodbus.transaction import ModbusSocketFramer
 
 
 class Manipulator:
@@ -64,7 +63,7 @@ async def setup(self):
         )
         self.server = ModbusTcpServer(
             context,
-            ModbusSocketFramer,
+            Framer.SOCKET,
             None,
             ("127.0.0.1", 5020),
             request_tracer=self.server_request_tracer,

examples/simple_async_client.py

@@ -11,11 +11,7 @@
 """
 import asyncio
 
-from pymodbus import pymodbus_apply_logging_config
-
-# --------------------------------------------------------------------------- #
-# import the various client implementations
-# --------------------------------------------------------------------------- #
+from pymodbus import Framer, pymodbus_apply_logging_config
 from pymodbus.client import (
     AsyncModbusSerialClient,
     AsyncModbusTcpClient,
@@ -24,16 +20,9 @@
 )
 from pymodbus.exceptions import ModbusException
 from pymodbus.pdu import ExceptionResponse
-from pymodbus.transaction import (
-    #    ModbusAsciiFramer,
-    #    ModbusBinaryFramer,
-    ModbusRtuFramer,
-    ModbusSocketFramer,
-    ModbusTlsFramer,
-)
 
 
-async def run_async_simple_client(comm, host, port, framer=ModbusSocketFramer):
+async def run_async_simple_client(comm, host, port, framer=Framer.SOCKET):
     """Run async client."""
 
     # activate debugging
@@ -56,7 +45,7 @@ async def run_async_simple_client(comm, host, port, framer=ModbusSocketFramer):
         client = AsyncModbusUdpClient(
             host,
             port=port,
-            framer=ModbusSocketFramer,
+            framer=framer,
             # timeout=10,
             # retries=3,
             # retry_on_empty=False,
@@ -67,7 +56,7 @@ async def run_async_simple_client(comm, host, port, framer=ModbusSocketFramer):
     elif comm == "serial":
         client = AsyncModbusSerialClient(
             port,
-            framer=ModbusRtuFramer,
+            framer=framer,
             # timeout=10,
             # retries=3,
             # retry_on_empty=False,
@@ -83,7 +72,7 @@ async def run_async_simple_client(comm, host, port, framer=ModbusSocketFramer):
         client = AsyncModbusTlsClient(
             host,
             port=port,
-            framer=ModbusTlsFramer,
+            framer=Framer.TLS,
             # timeout=10,
             # retries=3,
             # retry_on_empty=False,

examples/simple_sync_client.py

@@ -13,7 +13,7 @@
 # --------------------------------------------------------------------------- #
 # import the various client implementations
 # --------------------------------------------------------------------------- #
-from pymodbus import pymodbus_apply_logging_config
+from pymodbus import Framer, pymodbus_apply_logging_config
 from pymodbus.client import (
     ModbusSerialClient,
     ModbusTcpClient,
@@ -22,16 +22,9 @@
 )
 from pymodbus.exceptions import ModbusException
 from pymodbus.pdu import ExceptionResponse
-from pymodbus.transaction import (
-    #    ModbusAsciiFramer,
-    #    ModbusBinaryFramer,
-    ModbusRtuFramer,
-    ModbusSocketFramer,
-    ModbusTlsFramer,
-)
 
 
-def run_sync_simple_client(comm, host, port, framer=ModbusSocketFramer):
+def run_sync_simple_client(comm, host, port, framer=Framer.SOCKET):
     """Run sync client."""
 
     # activate debugging
@@ -54,7 +47,7 @@ def run_sync_simple_client(comm, host, port, framer=ModbusSocketFramer):
         client = ModbusUdpClient(
             host,
             port=port,
-            framer=ModbusSocketFramer,
+            framer=framer,
             # timeout=10,
             # retries=3,
             # retry_on_empty=False,
@@ -65,7 +58,7 @@ def run_sync_simple_client(comm, host, port, framer=ModbusSocketFramer):
     elif comm == "serial":
         client = ModbusSerialClient(
             port,
-            framer=ModbusRtuFramer,
+            framer=framer,
             # timeout=10,
             # retries=3,
             # retry_on_empty=False,
@@ -81,7 +74,7 @@ def run_sync_simple_client(comm, host, port, framer=ModbusSocketFramer):
         client = ModbusTlsClient(
             host,
             port=port,
-            framer=ModbusTlsFramer,
+            framer=Framer.TLS,
             # timeout=10,
             # retries=3,
             # retry_on_empty=False,

examples/simulator.py

@@ -10,10 +10,10 @@
 import asyncio
 import logging
 
+from pymodbus import Framer
 from pymodbus.client import AsyncModbusTcpClient
 from pymodbus.datastore import ModbusSimulatorContext
 from pymodbus.server import ModbusSimulatorServer, get_simulator_commandline
-from pymodbus.transaction import ModbusSocketFramer
 
 
 logging.basicConfig()
@@ -75,7 +75,7 @@ async def run_simulator():
     client = AsyncModbusTcpClient(
         "127.0.0.1",
         port=5020,
-        framer=ModbusSocketFramer,
+        framer=Framer.SOCKET,
     )
     await client.connect()
     assert client.connected

pymodbus/__init__.py

@@ -4,11 +4,13 @@
 """
 
 __all__ = [
+    "Framer",
     "pymodbus_apply_logging_config",
     "__version__",
     "__version_full__",
 ]
 
+from pymodbus.framer import Framer
 from pymodbus.logging import pymodbus_apply_logging_config