Compare commits

..

6 Commits

Author SHA1 Message Date
022da71800 Fix none-type attributes 2023-05-08 02:23:48 +02:00
8e16b4a215 Fix some errors 2023-05-08 00:03:53 +02:00
7bd3aac7c5 Fix error for no category 2023-05-07 17:39:22 +02:00
365a37b42d Fix send command error 2023-05-07 01:17:02 +02:00
2bde6bb61c Fix mypy error 2023-05-07 00:48:42 +02:00
ccff32e6c1 Fix missing program 2023-05-07 00:47:08 +02:00
5 changed files with 27 additions and 11 deletions

View File

@ -7,6 +7,7 @@ from typing import TYPE_CHECKING
from pyhon import helper, exceptions from pyhon import helper, exceptions
from pyhon.commands import HonCommand from pyhon.commands import HonCommand
from pyhon.parameter.base import HonParameter
from pyhon.parameter.fixed import HonParameterFixed from pyhon.parameter.fixed import HonParameterFixed
if TYPE_CHECKING: if TYPE_CHECKING:
@ -33,6 +34,7 @@ class HonAppliance:
self._zone: int = zone self._zone: int = zone
self._additional_data: Dict[str, Any] = {} self._additional_data: Dict[str, Any] = {}
self._last_update = None self._last_update = None
self._default_setting = HonParameter("", {}, "")
try: try:
self._extra = importlib.import_module( self._extra = importlib.import_module(
@ -142,8 +144,13 @@ class HonAppliance:
if last is None: if last is None:
continue continue
parameters = command_history[last].get("command", {}).get("parameters", {}) parameters = command_history[last].get("command", {}).get("parameters", {})
if command.categories and parameters.get("category"): if command.categories and (
command.category = parameters.pop("category").split(".")[-1].lower() parameters.get("program") or parameters.get("category")
):
if parameters.get("program"):
command.category = parameters.pop("program").split(".")[-1].lower()
else:
command.category = parameters.pop("category")
command = self.commands[name] command = self.commands[name]
for key, data in command.settings.items(): for key, data in command.settings.items():
if ( if (
@ -195,7 +202,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()
@ -224,7 +231,7 @@ class HonAppliance:
result = {} result = {}
for name, command in self._commands.items(): for name, command in self._commands.items():
for key in command.setting_keys: for key in command.setting_keys:
setting = command.settings.get(key) setting = command.settings.get(key, self._default_setting)
result[f"{name}.{key}"] = setting result[f"{name}.{key}"] = setting
if self._extra: if self._extra:
return self._extra.settings(result) return self._extra.settings(result)
@ -251,18 +258,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

@ -85,8 +85,8 @@ class HonCommand:
self._parameters[name] = HonParameterProgram(name, self, "custom") self._parameters[name] = HonParameterProgram(name, self, "custom")
async def send(self) -> bool: async def send(self) -> bool:
params = self.parameter_groups["parameters"] params = self.parameter_groups.get("parameters", {})
ancillary_params = self.parameter_groups["ancillary_parameters"] ancillary_params = self.parameter_groups.get("ancillaryParameters", {})
return await self._api.send_command( return await self._api.send_command(
self._appliance, self._name, params, ancillary_params self._appliance, self._name, params, ancillary_params
) )
@ -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

@ -12,7 +12,10 @@ class HonParameterProgram(HonParameterEnum):
def __init__(self, key: str, command: "HonCommand", group: str) -> None: def __init__(self, key: str, command: "HonCommand", group: str) -> None:
super().__init__(key, {}, group) super().__init__(key, {}, group)
self._command = command self._command = command
self._value: str = command.category if "PROGRAM" in command.category:
self._value = command.category.split(".")[-1].lower()
else:
self._value = command.category
self._programs: Dict[str, "HonCommand"] = command.categories self._programs: Dict[str, "HonCommand"] = command.categories
self._typology: str = "enum" self._typology: str = "enum"

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.1", version="0.10.6",
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,