Refactor / improve python modbus

code-generation/language-python/src/main/java/org/apache/plc4x/language/python/PythonLanguageTemplateHelper.java

@@ -768,17 +768,18 @@ private String toTernaryTermExpression(Field field, TypeReference fieldType, Ter
             Term b = ternaryTerm.getB();
             Term c = ternaryTerm.getC();
             String castExpressionForTypeReference = getCastExpressionForTypeReference(fieldType);
-            String inlineIf = "utils.InlineIf(" + toExpression(field, new DefaultBooleanTypeReference(), a, parserArguments, serializerArguments, serialize, false) + ", " +
-                "func() any {return " + castExpressionForTypeReference + "(" + toExpression(field, fieldType, b, parserArguments, serializerArguments, serialize, false) + ")}, " +
-                "func() any {return " + castExpressionForTypeReference + "(" + toExpression(field, fieldType, c, parserArguments, serializerArguments, serialize, false) + ")})";
+            String inlineIf = castExpressionForTypeReference + "(" + toExpression(field, fieldType, b, parserArguments, serializerArguments, serialize, false) + ") if " +
+                toExpression(field, new DefaultBooleanTypeReference(), a, parserArguments, serializerArguments, serialize, false) + " else " +
+                castExpressionForTypeReference + "(" + toExpression(field, fieldType, c, parserArguments, serializerArguments, serialize, false) + ")";
+
             if (fieldType != null) {
                 if (fieldType instanceof ByteOrderTypeReference) {
                     return tracer.dive("byteordertypereference") + "(" + inlineIf + ").(binary.ByteOrder)";
                 }
                 if (fieldType.isNonSimpleTypeReference()) {
                     return tracer.dive("nonsimpletypereference") + castExpressionForTypeReference + "(" + inlineIf + ")";
                 }
-                return tracer + inlineIf + ".(" + castExpressionForTypeReference + ")";
+                return tracer + inlineIf;
             }
             return tracer + inlineIf;
         } else {
@@ -1289,7 +1290,7 @@ private String toCastVariableExpression(Field field, TypeReference typeReference
 
     private String toOptionalVariableExpression(Field field, TypeReference typeReference, VariableLiteral variableLiteral, List<Argument> parserArguments, List<Argument> serializerArguments, boolean suppressPointerAccess, Tracer tracer) {
         tracer = tracer.dive("optional fields");
-        return tracer + "(" + (suppressPointerAccess || (typeReference != null && typeReference.isComplexTypeReference()) ? "" : "*") + variableLiteral.getName() + ")" +
+        return tracer + "(" + (suppressPointerAccess || (typeReference != null && typeReference.isComplexTypeReference()) ? "" : "") + camelCaseToSnakeCase(variableLiteral.getName()) + ")" +
             variableLiteral.getChild().map(child -> "." + camelCaseToSnakeCase(toVariableExpression(field, typeReference, child, parserArguments, serializerArguments, false, suppressPointerAccess, true))).orElse("");
     }
 

plc4py/plc4py/drivers/modbus/ModbusConfiguration.py

@@ -27,11 +27,6 @@ class ModbusConfiguration(PlcConfiguration):
     def __init__(self, url):
         super().__init__(url)
 
-        if self.transport is None:
-            self.transport = "tcp"
-
-        if self.port is None:
-            self.port = 502
-
-        if "unit_identifier" not in self.parameters:
-            self.unit_identifier = 1
+        self.transport = self.transport or "tcp"
+        self.port = self.port or 502
+        self.unit_identifier = self.parameters.get("unit_identifier", 1)

plc4py/plc4py/drivers/modbus/ModbusConnection.py

@@ -61,24 +61,12 @@ def __init__(self, config: ModbusConfiguration, transport: Plc4xBaseTransport):
         self._transport: Plc4xBaseTransport = transport
 
     @staticmethod
-    async def create(url: str):
-        """
-        Static Factory to return an instance of a ModbusConnection.
-        It creates the TCP connection to the Modbus device before returning.
-
-        :param url: PLC4X connection string of the Modbus TCP connection
-        :return ModbusConnection instance using the configuration from the url provided
-        """
-        config = ModbusConfiguration(url)
-        loop = asyncio.get_running_loop()
-        connection_future = loop.create_future()
-        transport = await asyncio.wait_for(
-            TCPTransport.create(
-                protocol_factory=lambda: ModbusProtocol(connection_future),
-                host=config.host,
-                port=config.port,
-            ),
-            10,
+    async def create(connection_string: str) -> "ModbusConnection":
+        config = ModbusConfiguration(connection_string)
+        transport = await TCPTransport.create(
+            protocol_factory=lambda: ModbusProtocol(connection_future),
+            host=config.host,
+            port=config.port,
         )
         return ModbusConnection(config, transport)
 
@@ -108,22 +96,31 @@ def read_request_builder(self) -> ReadRequestBuilder:
 
     async def execute(self, request: PlcRequest) -> PlcResponse:
         """
-        Executes a PlcRequest as long as it's already connected
+        Executes a PlcRequest as long as it's already connected.
+
         :param request: Plc Request to execute
         :return: The response from the Plc/Device
         """
+        # Check if the connection is established
         if not self.is_connected():
+            # Return a default failed response if not connected
             return self._default_failed_request(PlcResponseCode.NOT_CONNECTED)
 
+        # Check the type of the request and execute the corresponding method
         if isinstance(request, PlcReadRequest):
+            # Execute a read request
             return await self._read(request)
         elif isinstance(request, PlcWriteRequest):
+            # Execute a write request
             return await self._write(request)
 
+        # Return a default failed response if the request type is not supported
         return self._default_failed_request(PlcResponseCode.NOT_CONNECTED)
 
-    def _check_connection(self) -> bool:
-        return self._device is None
+
+    def _connection_established(self) -> bool:
+        """Check if the connection to the PLC is established."""
+        return self._device is not None
 
     async def _read(self, request: PlcReadRequest) -> PlcReadResponse:
         """

plc4py/plc4py/drivers/umas/UmasDevice.py

@@ -87,8 +87,8 @@
 from plc4py.protocols.umas.readwrite.UmasUnlocatedVariableReference import (
     UmasUnlocatedVariableReference,
 )
-from plc4py.protocols.umas.readwrite.VariableRequestReference import (
-    VariableRequestReference,
+from plc4py.protocols.umas.readwrite.VariableReadRequestReference import (
+    VariableReadRequestReference,
 )
 from plc4py.spi.generation.ReadBuffer import ReadBufferByteBased
 from plc4py.spi.messages.utils.ResponseItem import ResponseItem
@@ -351,7 +351,7 @@ async def _send_read_variable_request(
     ):
         message_future = loop.create_future()
 
-        sorted_variable_list: List[VariableRequestReference] = [
+        sorted_variable_list: List[VariableReadRequestReference] = [
             variable_reference[1] for variable_reference in sorted_tags
         ]
         request_pdu = UmasPDUReadVariableRequestBuilder(
@@ -391,7 +391,7 @@ async def _send_read_variable_request(
         return response
 
     def _sort_tags_based_on_memory_address(self, request):
-        tag_list: List[List[Tuple[str, VariableRequestReference]]] = [[]]
+        tag_list: List[List[Tuple[str, VariableReadRequestReference]]] = [[]]
         current_list_index = 0
         current_list = tag_list[current_list_index]
         byte_count: int = 0
@@ -412,7 +412,8 @@ def _sort_tags_based_on_memory_address(self, request):
                     variable.get_variable_reference(umas_tag.tag_name),
                 )
             )
-        sorted_tag_lists: List[List[Tuple[str, VariableRequestReference]]] = []
+
+        sorted_tag_lists: List[List[Tuple[str, VariableReadRequestReference]]] = []
         for request in tag_list:
             sorted_tags = sorted(
                 request,

plc4py/plc4py/drivers/umas/UmasVariables.py

@@ -22,8 +22,8 @@
 
 from plc4py.protocols.umas.readwrite.UmasDataType import UmasDataType
 
-from plc4py.protocols.umas.readwrite.VariableRequestReference import (
-    VariableRequestReference,
+from plc4py.protocols.umas.readwrite.VariableReadRequestReference import (
+    VariableReadRequestReference,
 )
 
 from plc4py.api.exceptions.exceptions import PlcDataTypeNotFoundException
@@ -42,7 +42,7 @@ class UmasVariable:
     block_no: int
     offset: int
 
-    def get_variable_reference(self, address: str) -> VariableRequestReference:
+    def get_variable_reference(self, address: str) -> VariableReadRequestReference:
         raise NotImplementedError(
             f"UmasVariable subclass not implemented for variable {self.variable_name}"
         )
@@ -55,9 +55,9 @@ def get_byte_length(self) -> int:
 
 @dataclass
 class UmasElementryVariable(UmasVariable):
-    def get_variable_reference(self, address: str) -> VariableRequestReference:
+    def get_variable_reference(self, address: str) -> VariableReadRequestReference:
         if self.data_type == UmasDataType.STRING.value:
-            return VariableRequestReference(
+            return VariableReadRequestReference(
                 is_array=1,
                 data_size_index=UmasDataType(self.data_type).request_size,
                 block=self.block_no,
@@ -66,7 +66,7 @@ def get_variable_reference(self, address: str) -> VariableRequestReference:
                 array_length=16,
             )
         else:
-            return VariableRequestReference(
+            return VariableReadRequestReference(
                 is_array=0,
                 data_size_index=UmasDataType(self.data_type).request_size,
                 block=self.block_no,
@@ -83,7 +83,7 @@ def get_byte_length(self) -> int:
 class UmasCustomVariable(UmasVariable):
     children: Dict[str, UmasVariable]
 
-    def get_variable_reference(self, address: str) -> VariableRequestReference:
+    def get_variable_reference(self, address: str) -> VariableReadRequestReference:
         split_tag_address: List[str] = address.split(".")
         child_index = None
         if len(split_tag_address) > 1:
@@ -106,14 +106,14 @@ class UmasArrayVariable(UmasVariable):
     start_index: int
     end_index: int
 
-    def get_variable_reference(self, address: str) -> VariableRequestReference:
+    def get_variable_reference(self, address: str) -> VariableReadRequestReference:
         split_tag_address: List[str] = address.split(".")
         address_index = None
         if len(split_tag_address) > 1:
             address_index = int(split_tag_address[1])
         data_type_enum = UmasDataType(self.data_type)
         if address_index:
-            return VariableRequestReference(
+            return VariableReadRequestReference(
                 is_array=0,
                 data_size_index=data_type_enum.request_size,
                 block=self.block_no,
@@ -123,7 +123,7 @@ def get_variable_reference(self, address: str) -> VariableRequestReference:
                 array_length=None,
             )
         else:
-            return VariableRequestReference(
+            return VariableReadRequestReference(
                 is_array=1,
                 data_size_index=data_type_enum.request_size,
                 block=self.block_no,

plc4py/plc4py/protocols/umas/readwrite/UmasPDUItem.py

@@ -202,6 +202,16 @@ def static_parse_context(
             builder = UmasPDUReadVariableRequest.static_parse_builder(
                 read_buffer, umas_request_function_key, byte_length
             )
+        from plc4py.protocols.umas.readwrite.UmasPDUWriteVariableRequest import (
+            UmasPDUWriteVariableRequest,
+        )
+
+        if umas_function_key == int(0x23):
+
+            builder = UmasPDUWriteVariableRequest.static_parse_builder(
+                read_buffer, umas_request_function_key, byte_length
+            )
+
         from plc4py.protocols.umas.readwrite.UmasPDUReadUnlocatedVariableNamesRequest import (
             UmasPDUReadUnlocatedVariableNamesRequest,
         )
@@ -256,6 +266,15 @@ def static_parse_context(
             builder = UmasPDUReadVariableResponse.static_parse_builder(
                 read_buffer, umas_request_function_key, byte_length
             )
+        from plc4py.protocols.umas.readwrite.UmasPDUWriteVariableResponse import (
+            UmasPDUWriteVariableResponse,
+        )
+
+        if umas_function_key == int(0xFE) and umas_request_function_key == int(0x23):
+
+            builder = UmasPDUWriteVariableResponse.static_parse_builder(
+                read_buffer, umas_request_function_key, byte_length
+            )
         from plc4py.protocols.umas.readwrite.UmasPDUReadUnlocatedVariableResponse import (
             UmasPDUReadUnlocatedVariableResponse,
         )

plc4py/plc4py/protocols/umas/readwrite/UmasPDUReadVariableRequest.py

@@ -23,8 +23,8 @@
 from plc4py.api.exceptions.exceptions import SerializationException
 from plc4py.api.messages.PlcMessage import PlcMessage
 from plc4py.protocols.umas.readwrite.UmasPDUItem import UmasPDUItem
-from plc4py.protocols.umas.readwrite.VariableRequestReference import (
-    VariableRequestReference,
+from plc4py.protocols.umas.readwrite.VariableReadRequestReference import (
+    VariableReadRequestReference,
 )
 from plc4py.spi.generation.ReadBuffer import ReadBuffer
 from plc4py.spi.generation.WriteBuffer import WriteBuffer
@@ -39,7 +39,7 @@
 class UmasPDUReadVariableRequest(UmasPDUItem):
     crc: int
     variable_count: int
-    variables: List[VariableRequestReference]
+    variables: List[VariableReadRequestReference]
     # Arguments.
     byte_length: int
     # Accessors for discriminator values.
@@ -106,7 +106,7 @@ def static_parse_builder(
 
         variables: List[Any] = read_buffer.read_array_field(
             logical_name="variables",
-            read_function=VariableRequestReference.static_parse,
+            read_function=VariableReadRequestReference.static_parse,
             count=variable_count,
             byte_order=ByteOrder.LITTLE_ENDIAN,
             umas_request_function_key=umas_request_function_key,
@@ -151,7 +151,7 @@ def __str__(self) -> str:
 class UmasPDUReadVariableRequestBuilder:
     crc: int
     variable_count: int
-    variables: List[VariableRequestReference]
+    variables: List[VariableReadRequestReference]
 
     def build(self, byte_length: int, pairing_key) -> UmasPDUReadVariableRequest:
         umas_pdu_read_variable_request: UmasPDUReadVariableRequest = (