From 7337c6f762b9f6f1cf4da16fdf72203fdf818823 Mon Sep 17 00:00:00 2001 From: Eric Callahan Date: Sun, 5 Nov 2023 16:38:16 -0500 Subject: [PATCH] klippy_connection: fix error message from Klipper Signed-off-by: Eric Callahan --- moonraker/klippy_connection.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/moonraker/klippy_connection.py b/moonraker/klippy_connection.py index 81a48b3..b7400e6 100644 --- a/moonraker/klippy_connection.py +++ b/moonraker/klippy_connection.py @@ -26,7 +26,8 @@ from typing import ( Dict, List, Set, - Tuple + Tuple, + Union ) if TYPE_CHECKING: from .server import Server @@ -495,7 +496,10 @@ class KlippyConnection: result = "ok" request.set_result(result) else: + err: Union[str, Dict[str, str]] err = cmd.get('error', "Malformed Klippy Response") + if isinstance(err, dict): + err = err.get("message", "Malformed Klippy Response") request.set_exception(ServerError(err, 400)) async def _execute_method(self, method_name: str, **kwargs) -> None: