Skip to content

44 update pvrecipe to allow initialisation of custom rules using the yaml config parser #45

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

Merged
kurup merged 6 commits into from
Nov 27, 2025
Merged

44 update pvrecipe to allow initialisation of custom rules using the yaml config parser #45

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4a59ef5
Updated pvrecipe and config_reader to allow using custom rule configs
kurup Oct 14, 2025
03613e5
Added post option to server.put_pv_value
kurup Oct 15, 2025
6f392f2
Fixed linting issue
kurup Oct 15, 2025
d7f56ca
Bug fix for calc rule
kurup Oct 29, 2025
58f89fa
Fixed rule_configs to remove cps _write tag.
kurup Nov 4, 2025
590d43c
Fixed linting.
kurup Nov 4, 2025
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
14 changes: 10 additions & 4 deletions p4pillon/config_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,18 @@ def process_config(pvname: str, pvdetails: dict[str, Any]) -> BasePVRecipe:
else:
pvrecipe = PVScalarRecipe(PVTypes[pvdetails["type"]], pvdetails["description"], initial)

supported_configs = [("read_only", bool), ("calc", dict)]
for config, config_type in supported_configs:
# Process variables in the configuration that are attributes of the pvrecipe class
# Set read only
temp_config = pvdetails.get("read_only")
if temp_config is not None and isinstance(temp_config, bool):
pvrecipe.read_only = temp_config

# Process configuration in the yaml specific to a supported rule
# and add this to pvrecipe.rule_configs
rule_configs = [("calc", dict), ("cps_write", dict)]
Copy link
Contributor

@Monarda Monarda Oct 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There shouldn't be references to rules which don't exist in p4pillon in the p4pillon code! This indicates that there needs to be an alternate way to handle this, which isn't a growing list of special cases.

Copy link
Contributor

@Monarda Monarda Oct 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You may wish to consider entrypoints as a potential generic solution? (https://packaging.python.org/en/latest/specifications/entry-points/) I've not used them myself, so they may not be suitable. @MatInGit has used them and has this example.

Copy link
Contributor Author

@kurup kurup Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I agree! I think this can be done in a similar way to how registered_handlers are defined in SharedNT (as a class member) so that external rules can be added to rule_configs.

for config, config_type in rule_configs:
temp_config = pvdetails.get(config)
if temp_config is not None and isinstance(temp_config, config_type):
setattr(pvrecipe, config, temp_config)
pvrecipe.rule_configs[config] = temp_config

if "control" in pvdetails:
pvrecipe.set_control_limits(**get_field_config(pvdetails, "control"))
Expand Down
7 changes: 5 additions & 2 deletions p4pillon/pvrecipe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ def __post_init__(self):
self.construct_settings = {}
self.config_settings = {}

# Rule specific configs to be passed to SharedNT
self.rule_configs = {}

self.construct_settings["valtype"] = self.pvtype.value
self.construct_settings["extra"] = [("descriptor", "s")]
self.config_settings["descriptor"] = self.description
Expand Down Expand Up @@ -132,8 +135,8 @@ def build_pv(
)

kwargs = {}
if hasattr(self, "calc"):
kwargs["calc"] = self.calc
for name, config in self.rule_configs.items():
kwargs[name] = config

logger.debug(debug_str)

Expand Down
9 changes: 7 additions & 2 deletions p4pillon/server/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,5 +146,10 @@ def put_pv_value(self, pv_name: str, value):
"""
Put the value to a PV using the server Context member self._ctxt
"""
logger.debug("Trying putting value %r to pv %s", value, pv_name)
self._ctxt.put(pv_name, value)
shared_pv = self[pv_name]
if shared_pv:
logger.debug("Trying SharedNT post to pv %s with value %r ", pv_name, value)
shared_pv.post(value)
else:
logger.debug("Trying Context put to pv %s with value %r ", pv_name, value)
self._ctxt.put(pv_name, value)