call async datastore from modbus server execute flow #2144

ilkka-ollakka · 2024-04-02T11:32:36Z

Take into use of async_getValues and async_setValues in modbus-server message handling, allowing datastore (mainly remote datastore) to use async flow.

Originally split from #2127

ilkka-ollakka · 2024-04-02T11:34:25Z

Currently CI fails, as depending PR's are not yet in place. PR itself is currently edits from getValues -> await async_getValues and setValues -> await async_setValues to make it easier to review.

janiversen · 2024-04-05T17:29:50Z

A PR is independent, we do not merge/split PRs.

If a PR is depending on other PRs then please mark it as draft, so nobody wastes time.

janiversen · 2024-04-09T15:54:38Z

I have lost the overview...you have 3 open PR`s, is any of them ready to be merged (all comments resolved) ??

Seems you do not allow maintainers to update the PR, so I cannot rebase the 3 PRs, please do a rebase on the one where you want a final review.

ilkka-ollakka · 2024-04-09T19:12:55Z

I have lost the overview...you have 3 open PR`s, is any of them ready to be merged (all comments resolved) ??

This one is only one that depends on those 2 other PR's, to my understanding all comments have been reacted.

Seems you do not allow maintainers to update the PR, so I cannot rebase the 3 PRs, please do a rebase on the one where you want a final review.

All are now rebased

janiversen · 2024-04-23T07:53:10Z

Is this ready for review ?

janiversen

It might be that remote returns a value in setValues, but we do not expect a value !

Apart from that the code is currently flawed, because not all getValues() calls check for ExceptionResponse, but this is outside this PR.

janiversen · 2024-04-23T07:55:34Z

pymodbus/pdu/bit_write_message.py

            return self.doException(merror.IllegalAddress)

-        result = context.setValues(self.function_code, self.address, self.values)
+        result = await context.async_setValues(


setValues have no return value.

janiversen · 2024-04-23T07:57:52Z

pymodbus/pdu/register_read_message.py

        if not context.validate(self.function_code, self.read_address, self.read_count):
            return self.doException(merror.IllegalAddress)
-        result = context.setValues(
+        result = await context.async_setValues(


setValues do not have a return value.

janiversen · 2024-04-23T07:58:10Z

pymodbus/pdu/register_write_message.py

            return self.doException(merror.IllegalAddress)

-        result = context.setValues(self.function_code, self.address, [self.value])
+        result = await context.async_setValues(


setValues do not have a return value.

janiversen · 2024-04-23T07:58:28Z

pymodbus/pdu/register_write_message.py

            return self.doException(merror.IllegalAddress)

-        result = context.setValues(self.function_code, self.address, self.values)
+        result = await context.async_setValues(


setValues do not have a return value

janiversen · 2024-04-23T07:58:48Z

pymodbus/pdu/register_write_message.py

            return values
        values = (values & self.and_mask) | (self.or_mask & ~self.and_mask)
-        result = context.setValues(self.function_code, self.address, [values])
+        result = await context.async_setValues(


setValues do not have a return value.

allows datastore to implement async getValues/setValues to be used with modbus server

janiversen

LGTM, thanks

Looking forward to review the datastore you are planning.

* add _legacy_decoder to message rtu (#2119) * Add generate_ssl() to TLS client as helper. (#2120) * ASCII framer using message decode() (#2128) * SOCKET/TLS framer using message decode(). (#2129) * Fix decode for wrong mdap len. * Streamline message class. (#2133) * modbus_server: call execute in a way that those can be either coroutines or normal methods (#2139) * Clean datastore setValues. (#2145) * fixed kwargs not being expanded for actions on bit registers, adjusted tests to catch this issue (#2161) * datastore: add async_setValues/getValues methods (#2165) Co-authored-by: Ilkka Ollakka <[email protected]> * Request/Response: change execute to be async method (#2142) * Bump actions CI. (#2166) * Fix usage of AsyncModbusTcpClient in client docs page (#2169) * Sphinx: do not turn warnings into errors. * Add minimal devcontainer. (#2172) * Transaction id overrun. * call async datastore from modbus server (#2144) * Datastore will not return ExceptionResponse. (#2175) * Describe zero_mode in ModbusSlaveContext.__init__ (#2187) * Solve pylint error. * Show error if example is run without support files. (#2189) * Fix usage file names (#2194) * Update client.rst (#2199) * Transaction_id for serial == 0. (#2208) * Remember to remove serial writer. (#2209) * Fix writing to serial (rs485) on windows os. (#2191) Co-authored-by: jan iversen <[email protected]> * test convert registers with 1234.... (#2217) * Solve serial unrequested frame. (#2219) * Log comm retries. (#2220) * prepare v3.6.9. * pylint. * Remove python 3.8 from CI. --------- Co-authored-by: Ilkka Ollakka <[email protected]> Co-authored-by: sumguytho <[email protected]> Co-authored-by: Ilkka Ollakka <[email protected]> Co-authored-by: Yohrog <[email protected]> Co-authored-by: James Cameron <[email protected]> Co-authored-by: Qi Li <[email protected]> Co-authored-by: andrew-harness <[email protected]>

ilkka-ollakka mentioned this pull request Apr 2, 2024

Request/Response: change execute to be async method #2142

Merged

ilkka-ollakka force-pushed the feat/async_datastore_from_execute branch from 0a7868c to 75b9e05 Compare April 5, 2024 15:36

ilkka-ollakka marked this pull request as draft April 9, 2024 11:28

ilkka-ollakka force-pushed the feat/async_datastore_from_execute branch from 75b9e05 to 7ae8ad2 Compare April 9, 2024 19:09

ilkka-ollakka force-pushed the feat/async_datastore_from_execute branch 4 times, most recently from e89ae37 to 2701360 Compare April 16, 2024 09:40

ilkka-ollakka marked this pull request as ready for review April 16, 2024 10:24

ilkka-ollakka changed the title ~~call async datastore from execute~~ call async datastore from modbus server execute flow Apr 16, 2024

ilkka-ollakka force-pushed the feat/async_datastore_from_execute branch 3 times, most recently from 1b40ede to 981ba27 Compare April 23, 2024 07:41

janiversen requested changes Apr 23, 2024

View reviewed changes

ilkka-ollakka added 2 commits April 23, 2024 11:05

messages: change default to async-methods in datastore access

2890dc0

allows datastore to implement async getValues/setValues to be used with modbus server

*_write_messages: async_setValues returns only None

f6b404a

ilkka-ollakka force-pushed the feat/async_datastore_from_execute branch from 981ba27 to f6b404a Compare April 23, 2024 08:17

ilkka-ollakka requested a review from janiversen April 23, 2024 08:19

janiversen approved these changes Apr 23, 2024

View reviewed changes

janiversen merged commit bf3b21e into pymodbus-dev:dev Apr 23, 2024

janiversen pushed a commit that referenced this pull request Jun 18, 2024

call async datastore from modbus server (#2144)

d43bea3

call async datastore from modbus server execute flow #2144

call async datastore from modbus server execute flow #2144

Uh oh!

Conversation

ilkka-ollakka commented Apr 2, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ilkka-ollakka commented Apr 2, 2024

Uh oh!

janiversen commented Apr 5, 2024

Uh oh!

janiversen commented Apr 9, 2024

Uh oh!

ilkka-ollakka commented Apr 9, 2024

Uh oh!

janiversen commented Apr 23, 2024

Uh oh!

janiversen left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

janiversen left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ilkka-ollakka commented Apr 2, 2024 •

edited

Loading