3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

klippy_apis: handle invalid klippy responses 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2023-02-23 12:17:11 -05:00
parent 6d73c60a38
commit 244004136c
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
moonraker/components/klippy_apis.py
View File

@ -186,7 +186,9 @@ class KlippyAPI(Subscribable):
OBJ_LIST_ENDPOINT, {}, default) OBJ_LIST_ENDPOINT, {}, default)
if isinstance(result, dict) and 'objects' in result: if isinstance(result, dict) and 'objects' in result:
return result['objects'] return result['objects']
return result if default is not Sentinel.MISSING:
return default
raise self.server.error("Invalid response received from Klippy", 500)
async def query_objects(self, async def query_objects(self,
objects: Mapping[str, Optional[List[str]]], objects: Mapping[str, Optional[List[str]]],
@ -197,7 +199,9 @@ class KlippyAPI(Subscribable):
STATUS_ENDPOINT, params, default) STATUS_ENDPOINT, params, default)
if isinstance(result, dict) and 'status' in result: if isinstance(result, dict) and 'status' in result:
return result['status'] return result['status']
return result if default is not Sentinel.MISSING:
return default
raise self.server.error("Invalid response received from Klippy", 500)
async def subscribe_objects(self, async def subscribe_objects(self,
objects: Mapping[str, Optional[List[str]]], objects: Mapping[str, Optional[List[str]]],
@ -218,7 +222,9 @@ class KlippyAPI(Subscribable):
SUBSCRIPTION_ENDPOINT, params, default) SUBSCRIPTION_ENDPOINT, params, default)
if isinstance(result, dict) and 'status' in result: if isinstance(result, dict) and 'status' in result:
return result['status'] return result['status']
return result if default is not Sentinel.MISSING:
return default
raise self.server.error("Invalid response received from Klippy", 500)
async def subscribe_gcode_output(self) -> str: async def subscribe_gcode_output(self) -> str:
template = {'response_template': template = {'response_template':