refactor: add a shared channel osw_id lookup - #8
Merged
Conversation
- add short_osw_id() and DataToolMixin.get_channel_by_osw_id() - use them at the four call sites that derived the bare id inline - replaces the copy in opensemantic.lab
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Adds
short_osw_id()andDataToolMixin.get_channel_by_osw_id()to_controller_mixin.py, and uses them at the four sites that previouslyinlined
osw_id.split("#")[-1].The same lookup existed in
opensemantic.labas anOpcUaServerMixinmethod. It is not OPC-UA specific, so it belongs next to
get_channel_by_nameinDataToolMixin. A companion PR inopensemantic.labdrops the duplicate and calls this one.Why
Channel references stored in the backend carry a page-qualified id
(
Item:OSWx#OSWy), whilechannel.osw_idis the bare subobject id.Every consumer had to know to strip the prefix.
load_channel_dataalsobuilt its own throwaway id-to-channel map for the same purpose.
Test
pytest tests/green locally. Exercised end to end invac-station-opcua-client, where subchannel aggregation resolves thestored references through this lookup across 90 channels.