feedback from PR comments

Author: Alexj9837

src/blueapi/cli/cli.py

@@ -241,8 +241,6 @@ def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
             raise ClickException(
                 "Access denied. Please check your login status and try again."
             ) from e
-        except BlueskyRemoteControlError as e:
-            raise e
 
     return wrapper
 

src/blueapi/client/client.py

@@ -105,9 +105,8 @@ def __getitem__(self, name: str) -> "DeviceRef":
             self._cache[name] = device
             setattr(self, model.name, device)
             return device
-        except NotFoundError:
-            pass
-        raise AttributeError(f"No device named '{name}' available")
+        except NotFoundError as e:
+            raise AttributeError(f"No device named '{name}' available") from e
 
     def __getattr__(self, name: str) -> "DeviceRef":
         if name.startswith("_"):

src/blueapi/service/main.py

@@ -501,7 +501,10 @@ def set_state(
             except TransitionError as e:
                 raise HTTPException(
                     status.HTTP_400_BAD_REQUEST,
-                    detail=(f"Cannot transition from {current_state} to {new_state}"),
+                    detail=(
+                        f"Error while transitioning from {current_state} "
+                        f"to {new_state} - {e}"
+                    ),
                 ) from e
     else:
         raise HTTPException(

tests/system_tests/test_blueapi_system.py

@@ -18,6 +18,7 @@
     NotFoundError,
     ServiceUnavailableError,
     UnauthorisedAccessError,
+    UnknownPlanError,
 )
 from blueapi.config import (
     ApplicationConfig,
@@ -245,7 +246,7 @@ def test_get_plans_by_name(client: BlueapiClient, expected_plans: PlanResponse):
 
 
 def test_get_non_existent_plan(rest_client: BlueapiRestClient):
-    with pytest.raises(NotFoundError, match=r"Item not found"):
+    with pytest.raises(UnknownPlanError, match=r"Item not found"):
         rest_client.get_plan("Not exists")
 
 

tests/unit_tests/service/test_rest_api.py

@@ -644,7 +644,7 @@ def test_set_state_transition_error(mock_runner: Mock, client: TestClient):
 
     assert response.status_code == status.HTTP_400_BAD_REQUEST
     assert response.json() == {
-        "detail": f"Cannot transition from {current_state} to {final_state}"
+        "detail": f"Error while transitioning from {current_state} to {final_state} - "
     }