Repository navigation
chore: Update device and plans to use model name - #1697
oliwenmandiamond wants to merge 30 commits into
Conversation
…ghtSource/blueapi into Split_client_devices_and_plans
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #1697 +/- ##
==========================================
- Coverage 96.42% 96.42% -0.01%
==========================================
Files 49 49
Lines 3749 3745 -4
==========================================
- Hits 3615 3611 -4
Misses 134 134 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
Co-authored-by: Zoheb Shaikh <zoheb.shaikh@diamond.ac.uk>
Co-authored-by: Zoheb Shaikh <zoheb.shaikh@diamond.ac.uk>
Co-authored-by: Zoheb Shaikh <zoheb.shaikh@diamond.ac.uk>
3d0d15a to
6314ac0
Compare
…github.com:DiamondLightSource/blueapi into Remove_outdated_name_from_client_plans_and_devices
6314ac0 to
f6553fd
Compare
…github.com:DiamondLightSource/blueapi into Remove_outdated_name_from_client_plans_and_devices
6586ab6 to
6be2823
Compare
…github.com:DiamondLightSource/blueapi into Remove_outdated_name_from_client_plans_and_devices
|
@ZohebShaikh, I had a look at your integration test and also tested it myself locally I now understand why we have a name for the model and the name for the cache. The issue is the name being used is So the options are
I and I think others would prefer option 2. It would be too painful to update ophyd-async plus dodal plus all plan repos to account for this. It is simpler to make blueapi to look up devices using the actual name given to them. |
|
Blocked by #1700 |
|
From many past conversations, 1 is not an option. Happy to discuss 2. |
f17053e to
6146e62
Compare
fajinyuan
left a comment
There was a problem hiding this comment.
Please mark this a breaking API change, and ensure change log records this for release.
|
@fajinyuan I think this can't be merged yet. This change focuses on the client, simplifying the name. However, the server still uses the old name which is different and will cause the client to fail. #1700 is needed first which hasn't been done yet. I think once #1699 is merged which adds more system tests for client, it will demonstrate the issue and cause this to fail system tests |
6146e62 to
e6b19b4
Compare
…github.com:DiamondLightSource/blueapi into Remove_outdated_name_from_client_plans_and_devices
This is a draft and shouldn't be approved yet. In addition we still need to decide some things about it. |
This is still a draft and depends on other work before it is viable.
As requested by @ZohebShaikh , this is done in a separate PR. The only logic that has changed is to remove the redundant name for
PlanandDeviceRefas themodel.nameattribute shares the exact same one. The previous logic duplicated the name. Instead, we remove the name attribute and just delegate to the model for the name.