Skip to content

fix: add 'r' and 'w' entries for AttrRWs #347

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
shihab-dls merged 4 commits into from
Aug 13, 2026
Merged

fix: add 'r' and 'w' entries for AttrRWs #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a738b9e
fix: add 'r' and 'w' entries for AttrRWs
shihab-dls Apr 15, 2026
454fb46
tests: amend tests to expect RBV signals from PVI structure
shihab-dls Apr 15, 2026
4451d14
Merge branch 'main' into amend_pvi_structure
shihab-dls Aug 6, 2026
55de258
Merge branch 'main' into amend_pvi_structure
shihab-dls Aug 13, 2026
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
7 changes: 6 additions & 1 deletion src/fastcs/transports/epics/pva/pvi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,12 @@ def _make_p4p_raw_value(pv_prefix: str, controller_api: ControllerAPI) -> dict:
for pv_leaf, attribute in controller_api.attributes.items():
# Add attribute entry
pv = f"{pv_prefix}:{snake_to_pascal(pv_leaf)}"
p4p_raw_value[pv_leaf][attribute.access_mode] = pv
match attribute.access_mode:
case "rw":
entry = {"r": f"{pv}_RBV", "w": pv}
case access:
entry = {access: pv}
p4p_raw_value[pv_leaf].update(entry)
for pv_leaf, _ in controller_api.command_methods.items():
pv = f"{pv_prefix}:{snake_to_pascal(pv_leaf)}"
p4p_raw_value[pv_leaf]["x"] = pv
Expand Down
27 changes: 18 additions & 9 deletions tests/transports/epics/pva/test_p4p.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,12 @@ async def test_ioc(p4p_subprocess: tuple[str, Queue]):
assert all(f in parent_pvi for f in ("alarm", "display", "timeStamp", "value"))
assert parent_pvi["display"] == {"description": "some controller"}
assert parent_pvi["value"] == {
"a": {"rw": f"{pv_prefix}:A"},
"a": {"w": f"{pv_prefix}:A", "r": f"{pv_prefix}:A_RBV"},
"b": {"w": f"{pv_prefix}:B"},
"child": {"d": f"{pv_prefix}:Child:PVI"},
"table": {
"rw": f"{pv_prefix}:Table",
"r": f"{pv_prefix}:Table_RBV",
"w": f"{pv_prefix}:Table",
Comment thread
shihab-dls marked this conversation as resolved.
},
}

Expand All @@ -50,7 +51,9 @@ async def test_ioc(p4p_subprocess: tuple[str, Queue]):
)
assert _child_vector_pvi["display"] == {"description": "some child vector"}
assert _child_vector_pvi["value"] == {
"vector_attribute": {"r": f"{pv_prefix}:Child:VectorAttribute"},
"vector_attribute": {
"r": f"{pv_prefix}:Child:VectorAttribute",
},
"__1": {"d": f"{pv_prefix}:Child:1:PVI"},
"__2": {"d": f"{pv_prefix}:Child:2:PVI"},
}
Expand All @@ -65,9 +68,9 @@ async def test_ioc(p4p_subprocess: tuple[str, Queue]):
"c": {"w": f"{pv_prefix}:Child:1:C"},
"d": {"x": f"{pv_prefix}:Child:1:D"},
"e": {"r": f"{pv_prefix}:Child:1:E"},
"f": {"rw": f"{pv_prefix}:Child:1:F"},
"g": {"rw": f"{pv_prefix}:Child:1:G"},
"h": {"rw": f"{pv_prefix}:Child:1:H"},
"f": {"w": f"{pv_prefix}:Child:1:F", "r": f"{pv_prefix}:Child:1:F_RBV"},
"g": {"w": f"{pv_prefix}:Child:1:G", "r": f"{pv_prefix}:Child:1:G_RBV"},
"h": {"w": f"{pv_prefix}:Child:1:H", "r": f"{pv_prefix}:Child:1:H_RBV"},
"i": {"x": f"{pv_prefix}:Child:1:I"},
"j": {"r": f"{pv_prefix}:Child:1:J"},
}
Expand Down Expand Up @@ -383,10 +386,16 @@ class SomeController(Controller):
"value": {
"additional_child": {"d": f"{pv_prefix}:AdditionalChild:PVI"},
"another_child": {"d": f"{pv_prefix}:AnotherChild:PVI"},
"another_attr_0": {"rw": f"{pv_prefix}:AnotherAttr0"},
"another_attr_1000": {"rw": f"{pv_prefix}:AnotherAttr1000"},
"another_attr_0": {
"r": f"{pv_prefix}:AnotherAttr0_RBV",
"w": f"{pv_prefix}:AnotherAttr0",
},
"another_attr_1000": {
"w": f"{pv_prefix}:AnotherAttr1000",
"r": f"{pv_prefix}:AnotherAttr1000_RBV",
},
"a_third_attr": {"w": f"{pv_prefix}:AThirdAttr"},
"attr_1": {"rw": f"{pv_prefix}:Attr1"},
"attr_1": {"w": f"{pv_prefix}:Attr1", "r": f"{pv_prefix}:Attr1_RBV"},
"child": {"d": f"{pv_prefix}:Child:PVI"},
"child0": {"d": f"{pv_prefix}:Child0:PVI"},
"child1": {"d": f"{pv_prefix}:Child1:PVI"},
Expand Down
Loading