Fix some errors

This commit is contained in:
Andre Basche 2023-05-08 00:03:29 +02:00
parent 7bd3aac7c5
commit 8e16b4a215
4 changed files with 11 additions and 5 deletions

View file

@ -200,7 +200,7 @@ class HonAppliance:
async def load_commands(self): async def load_commands(self):
raw = await self.api.load_commands(self) raw = await self.api.load_commands(self)
self._appliance_model = raw.pop("applianceModel") self._appliance_model = raw.pop("applianceModel")
raw.pop("dictionaryId") raw.pop("dictionaryId", None)
self._commands = self._get_commands(raw) self._commands = self._get_commands(raw)
await self._recover_last_command_states() await self._recover_last_command_states()
@ -256,18 +256,21 @@ class HonAppliance:
return self._extra.data(result) return self._extra.data(result)
return result return result
def diagnose(self, whitespace="\u200B \u200B "): def diagnose(self, whitespace="\u200B \u200B ", command_only=False):
data = { data = {
"attributes": self.attributes.copy(), "attributes": self.attributes.copy(),
"appliance": self.info, "appliance": self.info,
"additional_data": self._additional_data, "additional_data": self._additional_data,
} }
if command_only:
data.pop("attributes")
data.pop("appliance")
data |= {n: c.parameter_groups for n, c in self._commands.items()} data |= {n: c.parameter_groups for n, c in self._commands.items()}
extra = {n: c.data for n, c in self._commands.items() if c.data} extra = {n: c.data for n, c in self._commands.items() if c.data}
if extra: if extra:
data |= {"extra_command_data": extra} data |= {"extra_command_data": extra}
for sensible in ["PK", "SK", "serialNumber", "code", "coords"]: for sensible in ["PK", "SK", "serialNumber", "code", "coords"]:
data["appliance"].pop(sensible, None) data.get("appliance", {}).pop(sensible, None)
result = helper.pretty_print({"data": data}, whitespace=whitespace) result = helper.pretty_print({"data": data}, whitespace=whitespace)
result += helper.pretty_print( result += helper.pretty_print(
{"commands": helper.create_command(self.commands)}, {"commands": helper.create_command(self.commands)},

View file

@ -103,6 +103,7 @@ class HonCommand:
@category.setter @category.setter
def category(self, category: str) -> None: def category(self, category: str) -> None:
if category in self.categories:
self._appliance.commands[self._name] = self.categories[category] self._appliance.commands[self._name] = self.categories[category]
@property @property

View file

@ -32,6 +32,8 @@ class HonParameterRange(HonParameter):
@property @property
def step(self) -> float: def step(self) -> float:
if not self._step:
return 1
return self._step return self._step
@property @property

View file

@ -7,7 +7,7 @@ with open("README.md", "r") as f:
setup( setup(
name="pyhOn", name="pyhOn",
version="0.10.4", version="0.10.5",
author="Andre Basche", author="Andre Basche",
description="Control hOn devices with python", description="Control hOn devices with python",
long_description=long_description, long_description=long_description,