Skip to content

Fix OPC UA DataValue StatusCode compatibility #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
genishernandez wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Fix OPC UA DataValue StatusCode compatibility #193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions core/src/drivers/plugins/python/opcua/synchronization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,17 @@

from asyncua import Server, ua

# asyncua compatibility between 1.x and 2.x
def _make_data_value(**kwargs):
try:
return ua.DataValue(**kwargs)
except TypeError as exc:
if "unexpected keyword argument 'StatusCode'" not in str(exc):
raise
kwargs["StatusCode_"] = kwargs.pop("StatusCode")
return ua.DataValue(**kwargs)


# Import local modules (handle both package and direct loading)
try:
from .opcua_logging import log_debug, log_error, log_info, log_warn
Expand Down Expand Up @@ -259,16 +270,16 @@ def callback(nodeid: Any, attr: Any) -> ua.DataValue:
v = self._get_default_value(datatype)
variant = ua.Variant(convert_value_for_opcua(datatype, v), expected_type)
now = datetime.now(timezone.utc)
return ua.DataValue(
return _make_data_value(
Value=variant,
StatusCode_=ua.StatusCode(ua.StatusCodes.Good),
StatusCode=ua.StatusCode(ua.StatusCodes.Good),
SourceTimestamp=now,
ServerTimestamp=now,
)
except Exception as e:
log_error(f"Read callback ({base_arr},{base_elem}) failed: {e}")
return ua.DataValue(
StatusCode_=ua.StatusCode(ua.StatusCodes.BadInternalError)
return _make_data_value(
StatusCode=ua.StatusCode(ua.StatusCodes.BadInternalError)
)

return callback
Expand Down Expand Up @@ -413,9 +424,9 @@ def _has_subscribers(self, node: VariableNode) -> bool:
async def _push_value(self, node: VariableNode, variant: ua.Variant) -> None:
"""Push one variant via write_attribute_value, tagging the DataValue
so our own value_setter ignores it."""
data_value = ua.DataValue(
data_value = _make_data_value(
Value=variant,
StatusCode_=ua.StatusCode(ua.StatusCodes.Good),
StatusCode=ua.StatusCode(ua.StatusCodes.Good),
SourceTimestamp=self._cycle_timestamp,
ServerTimestamp=datetime.now(timezone.utc),
)
Expand Down