add requested clean up after code review

For #dodal #1384

Author: CoePaul

src/dodal/devices/i19/access_controlled/attenuator_motor_squad.py

@@ -18,20 +18,16 @@ class AttenuatorMotorPositionDemands(BaseModel):
 
     @model_validator(mode="after")
     def no_keys_clash(self) -> Self:
-        common_key_filter = filter(
-            lambda k: k in self.continuous_demands, self.indexed_demands
-        )
-        common_key_count = sum(1 for _ in common_key_filter)
+        common_keys = set(self.continuous_demands).intersection(self.indexed_demands)
+        common_key_count = sum(1 for _ in common_keys)
         if common_key_count < 1:
             return self
         else:
             ks: str = "key" if common_key_count == 1 else "keys"
-            error_msg = (
-                f"{common_key_count} common {ks} found in distinct motor demands"
-            )
+            error_msg = f"Common {ks} found in distinct motor demands: {common_keys}"
             raise ValueError(error_msg)
 
-    def restful_format(self) -> dict[PermittedKeyStr, Any]:
+    def validated_complete_demand(self) -> dict[PermittedKeyStr, Any]:
         return self.continuous_demands | self.indexed_demands
 
 
@@ -56,9 +52,9 @@ async def set(self, value: AttenuatorMotorPositionDemands):
         request_params = {
             "name": "operate_motor_squad_plan",
             "params": {
-                "experiment_hutch": self._get_invoking_hutch(),
+                "experiment_hutch": self._invoking_hutch,
                 "access_device": ACCESS_DEVICE_NAME,
-                "attenuator_demands": value.restful_format(),
+                "attenuator_demands": value.validated_complete_demand(),
             },
             "instrument_session": self.instrument_session,
         }

src/dodal/devices/i19/access_controlled/blueapi_device.py

@@ -38,7 +38,8 @@ def __init__(
         self.headers = HEADERS
         super().__init__(name)
 
-    def _get_invoking_hutch(self) -> str:
+    @property
+    def _invoking_hutch(self) -> str:
         return self.hutch_request.value
 
     @AsyncStatus.wrap

src/dodal/devices/i19/access_controlled/shutter.py

@@ -43,7 +43,7 @@ async def set(self, value: ShutterDemand):
         request_params = {
             "name": "operate_shutter_plan",
             "params": {
-                "experiment_hutch": self._get_invoking_hutch(),
+                "experiment_hutch": self._invoking_hutch,
                 "access_device": ACCESS_DEVICE_NAME,
                 "shutter_demand": value.value,
             },

tests/devices/i19/access_controlled/test_attenuator_motor_squad.py

@@ -14,7 +14,7 @@
 def given_position_demands() -> AttenuatorMotorPositionDemands:
     position_demand = MagicMock()
     restful_payload = {"x": 54.3, "y": 72.1, "w": 4}
-    position_demand.restful_format = MagicMock(return_value=restful_payload)
+    position_demand.validated_complete_demand = MagicMock(return_value=restful_payload)
     return position_demand
 
 

tests/devices/i19/access_controlled/test_attenuator_position_demand.py

@@ -22,7 +22,7 @@ def test_that_attenuator_position_demand_with_only_one_wedge_provides_expected_r
         continuous_demands=wedge_position_demands,
         indexed_demands=wheel_position_demands,
     )
-    restful_payload = position_demand.restful_format()
+    restful_payload = position_demand.validated_complete_demand()
     assert restful_payload["y"] == 14.9
 
 
@@ -43,7 +43,7 @@ def test_that_attenuator_position_demand_with_only_one_wheel_provides_expected_r
         continuous_demands=wedge_position_demands,
         indexed_demands=wheel_position_demands,
     )
-    restful_payload = position_demand.restful_format()
+    restful_payload = position_demand.validated_complete_demand()
     assert restful_payload["w"] == 6
 
 
@@ -64,7 +64,7 @@ def test_that_empty_attenuator_position_demand_provides_empty_rest_format():
         continuous_demands=wedge_position_demands,
         indexed_demands=wheel_position_demands,
     )
-    restful_payload = position_demand.restful_format()
+    restful_payload = position_demand.validated_complete_demand()
     assert restful_payload == {}
 
 
@@ -85,7 +85,7 @@ def test_that_attenuator_position_demand_triplet_provides_expected_rest_format()
         continuous_demands=wedge_position_demands,
         indexed_demands=wheel_position_demands,
     )
-    restful_payload = position_demand.restful_format()
+    restful_payload = position_demand.validated_complete_demand()
     assert restful_payload == {"x": 0.1, "y": 90.1, "w": 6}
 
 
@@ -97,13 +97,8 @@ def test_that_attenuator_position_demand_triplet_provides_expected_rest_format()
 def test_that_attenuator_position_raises_error_when_discrete_and_continuous_demands_overload_axis_label():
     wedge_position_demands = {"x": 0.1, "v": 90.1}
     wheel_position_demands = {"w": 6, "v": 7}
-    preamble: str = (
-        "1 validation error for AttenuatorMotorPositionDemands\n  Value error,"
-    )
-    anticipated_message: str = (
-        f"{preamble} 1 common key found in distinct motor demands"
-    )
-    with pytest.raises(expected_exception=ValueError, match=anticipated_message):
+    anticipated_preamble: str = "1 validation error for AttenuatorMotorPositionDemands"
+    with pytest.raises(expected_exception=ValueError, match=anticipated_preamble):
         AttenuatorMotorPositionDemands(
             continuous_demands=wedge_position_demands,
             indexed_demands=wheel_position_demands,