Compare commits
	
		
			23 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| eea79e28b9 | |||
| ecbf438889 | |||
| 9cd12e3234 | |||
| c2765fe953 | |||
| 9971fe95e2 | |||
| 9f130e2e85 | |||
| dfbc24452b | |||
| af4fbdd8cd | |||
| b5af81b744 | |||
| 22a98e1781 | |||
| 2feb3295e1 | |||
| d350d639cc | |||
| 81c202d730 | |||
| 022da71800 | |||
| 8e16b4a215 | |||
| 7bd3aac7c5 | |||
| 365a37b42d | |||
| 2bde6bb61c | |||
| ccff32e6c1 | |||
| 22cbd7474a | |||
| dd61b24eed | |||
| ea8f481b01 | |||
| 7dcb34559b | 
| @ -78,12 +78,7 @@ async def main(): | ||||
|                     ) | ||||
|                 ) | ||||
|             else: | ||||
|                 print(helper.pretty_print({"data": device.data})) | ||||
|                 print( | ||||
|                     helper.pretty_print( | ||||
|                         {"settings": helper.create_command(device.commands)} | ||||
|                     ) | ||||
|                 ) | ||||
|                 print(device.diagnose("  ")) | ||||
|  | ||||
|  | ||||
| def start(): | ||||
|  | ||||
| @ -1,6 +1,9 @@ | ||||
| import importlib | ||||
| import json | ||||
| import logging | ||||
| from contextlib import suppress | ||||
| from datetime import datetime, timedelta | ||||
| from pathlib import Path | ||||
| from typing import Optional, Dict, Any | ||||
| from typing import TYPE_CHECKING | ||||
|  | ||||
| @ -12,11 +15,12 @@ from pyhon.parameter.fixed import HonParameterFixed | ||||
| if TYPE_CHECKING: | ||||
|     from pyhon import HonAPI | ||||
|  | ||||
|  | ||||
| _LOGGER = logging.getLogger(__name__) | ||||
|  | ||||
|  | ||||
| class HonAppliance: | ||||
|     _MINIMAL_UPDATE_INTERVAL = 5  # seconds | ||||
|  | ||||
|     def __init__( | ||||
|         self, api: Optional["HonAPI"], info: Dict[str, Any], zone: int = 0 | ||||
|     ) -> None: | ||||
| @ -30,6 +34,9 @@ class HonAppliance: | ||||
|         self._statistics: Dict = {} | ||||
|         self._attributes: Dict = {} | ||||
|         self._zone: int = zone | ||||
|         self._additional_data: Dict[str, Any] = {} | ||||
|         self._last_update = None | ||||
|         self._default_setting = HonParameter("", {}, "") | ||||
|  | ||||
|         try: | ||||
|             self._extra = importlib.import_module( | ||||
| @ -92,8 +99,15 @@ class HonAppliance: | ||||
|         return self._check_name_zone("nickName") | ||||
|  | ||||
|     @property | ||||
|     def commands_options(self): | ||||
|         return self._appliance_model.get("options") | ||||
|     def code(self) -> str: | ||||
|         if code := self.info.get("code"): | ||||
|             return code | ||||
|         serial_number = self.info.get("serialNumber", "") | ||||
|         return serial_number[:8] if len(serial_number) < 18 else serial_number[:11] | ||||
|  | ||||
|     @property | ||||
|     def options(self): | ||||
|         return self._appliance_model.get("options", {}) | ||||
|  | ||||
|     @property | ||||
|     def commands(self): | ||||
| @ -111,13 +125,21 @@ class HonAppliance: | ||||
|     def info(self): | ||||
|         return self._info | ||||
|  | ||||
|     @property | ||||
|     def additional_data(self): | ||||
|         return self._additional_data | ||||
|  | ||||
|     @property | ||||
|     def zone(self) -> int: | ||||
|         return self._zone | ||||
|  | ||||
|     async def _recover_last_command_states(self, commands): | ||||
|         command_history = await self._api.command_history(self) | ||||
|         for name, command in commands.items(): | ||||
|     @property | ||||
|     def api(self) -> Optional["HonAPI"]: | ||||
|         return self._api | ||||
|  | ||||
|     async def _recover_last_command_states(self): | ||||
|         command_history = await self.api.command_history(self) | ||||
|         for name, command in self._commands.items(): | ||||
|             last = next( | ||||
|                 ( | ||||
|                     index | ||||
| @ -129,8 +151,13 @@ class HonAppliance: | ||||
|             if last is None: | ||||
|                 continue | ||||
|             parameters = command_history[last].get("command", {}).get("parameters", {}) | ||||
|             if command.programs and parameters.get("program"): | ||||
|                 command.program = parameters.pop("program").split(".")[-1].lower() | ||||
|             if command.categories and ( | ||||
|                 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] | ||||
|             for key, data in command.settings.items(): | ||||
|                 if ( | ||||
| @ -140,84 +167,161 @@ class HonAppliance: | ||||
|                     with suppress(ValueError): | ||||
|                         data.value = parameters.get(key) | ||||
|  | ||||
|     async def load_commands(self): | ||||
|         raw = await self._api.load_commands(self) | ||||
|         self._appliance_model = raw.pop("applianceModel") | ||||
|         for item in ["settings", "options", "dictionaryId"]: | ||||
|             raw.pop(item) | ||||
|         commands = {} | ||||
|         for command, attr in raw.items(): | ||||
|             if "parameters" in attr: | ||||
|                 commands[command] = HonCommand(command, attr, self._api, self) | ||||
|             elif "parameters" in attr[list(attr)[0]]: | ||||
|                 multi = {} | ||||
|                 for program, attr2 in attr.items(): | ||||
|                     program = program.split(".")[-1].lower() | ||||
|                     cmd = HonCommand( | ||||
|     def _get_categories(self, command, data): | ||||
|         categories = {} | ||||
|         for category, value in data.items(): | ||||
|             result = self._get_command(value, command, category, categories) | ||||
|             if result: | ||||
|                 if "PROGRAM" in category: | ||||
|                     category = category.split(".")[-1].lower() | ||||
|                 categories[category] = result[0] | ||||
|         if categories: | ||||
|             if "setParameters" in categories: | ||||
|                 return [categories["setParameters"]] | ||||
|             return [list(categories.values())[0]] | ||||
|         return [] | ||||
|  | ||||
|     def _get_commands(self, data): | ||||
|         commands = [] | ||||
|         for command, value in data.items(): | ||||
|             commands += self._get_command(value, command, "") | ||||
|         return {c.name: c for c in commands} | ||||
|  | ||||
|     def _get_command(self, data, command="", category="", categories=None): | ||||
|         commands = [] | ||||
|         if isinstance(data, dict): | ||||
|             if data.get("description") and data.get("protocolType", None): | ||||
|                 commands += [ | ||||
|                     HonCommand( | ||||
|                         command, | ||||
|                         attr2, | ||||
|                         self._api, | ||||
|                         data, | ||||
|                         self, | ||||
|                         programs=multi, | ||||
|                         program_name=program, | ||||
|                         category_name=category, | ||||
|                         categories=categories, | ||||
|                     ) | ||||
|                     multi[program] = cmd | ||||
|                     commands[command] = cmd | ||||
|         self._commands = commands | ||||
|         await self._recover_last_command_states(commands) | ||||
|                 ] | ||||
|             else: | ||||
|                 commands += self._get_categories(command, data) | ||||
|         elif category: | ||||
|             self._additional_data.setdefault(command, {})[category] = data | ||||
|         else: | ||||
|             self._additional_data[command] = data | ||||
|         return commands | ||||
|  | ||||
|     async def load_commands(self): | ||||
|         raw = await self.api.load_commands(self) | ||||
|         self._appliance_model = raw.pop("applianceModel") | ||||
|         raw.pop("dictionaryId", None) | ||||
|         self._commands = self._get_commands(raw) | ||||
|         await self._recover_last_command_states() | ||||
|  | ||||
|     async def load_attributes(self): | ||||
|         self._attributes = await self.api.load_attributes(self) | ||||
|         for name, values in self._attributes.pop("shadow").get("parameters").items(): | ||||
|             self._attributes.setdefault("parameters", {})[name] = values["parNewVal"] | ||||
|  | ||||
|     async def load_statistics(self): | ||||
|         self._statistics = await self.api.load_statistics(self) | ||||
|         self._statistics |= await self.api.load_maintenance(self) | ||||
|  | ||||
|     async def update(self): | ||||
|         now = datetime.now() | ||||
|         if not self._last_update or self._last_update < now - timedelta( | ||||
|             seconds=self._MINIMAL_UPDATE_INTERVAL | ||||
|         ): | ||||
|             self._last_update = now | ||||
|             await self.load_attributes() | ||||
|  | ||||
|     @property | ||||
|     def command_parameters(self): | ||||
|         return {n: c.parameter_value for n, c in self._commands.items()} | ||||
|  | ||||
|     @property | ||||
|     def settings(self): | ||||
|         result = {} | ||||
|         for name, command in self._commands.items(): | ||||
|             for key in command.setting_keys: | ||||
|                 setting = command.settings.get(key, HonParameter(key, {})) | ||||
|                 setting = command.settings.get(key, self._default_setting) | ||||
|                 result[f"{name}.{key}"] = setting | ||||
|         if self._extra: | ||||
|             return self._extra.settings(result) | ||||
|         return result | ||||
|  | ||||
|     @property | ||||
|     def parameters(self): | ||||
|         result = {} | ||||
|     def available_settings(self): | ||||
|         result = [] | ||||
|         for name, command in self._commands.items(): | ||||
|             for key, parameter in ( | ||||
|                 command.parameters | command.ancillary_parameters | ||||
|             ).items(): | ||||
|                 result.setdefault(name, {})[key] = parameter.value | ||||
|             for key in command.setting_keys: | ||||
|                 result.append(f"{name}.{key}") | ||||
|         return result | ||||
|  | ||||
|     async def load_attributes(self): | ||||
|         self._attributes = await self._api.load_attributes(self) | ||||
|         for name, values in self._attributes.pop("shadow").get("parameters").items(): | ||||
|             self._attributes.setdefault("parameters", {})[name] = values["parNewVal"] | ||||
|  | ||||
|     async def load_statistics(self): | ||||
|         self._statistics = await self._api.load_statistics(self) | ||||
|  | ||||
|     async def update(self): | ||||
|         await self.load_attributes() | ||||
|  | ||||
|     @property | ||||
|     def data(self): | ||||
|         result = { | ||||
|             "attributes": self.attributes, | ||||
|             "appliance": self.info, | ||||
|             "statistics": self.statistics, | ||||
|             **self.parameters, | ||||
|             "additional_data": self._additional_data, | ||||
|             **self.command_parameters, | ||||
|         } | ||||
|         if self._extra: | ||||
|             return self._extra.data(result) | ||||
|         return result | ||||
|  | ||||
|     @property | ||||
|     def diagnose(self): | ||||
|         data = self.data.copy() | ||||
|         for sensible in ["PK", "SK", "serialNumber", "code", "coords"]: | ||||
|             data["appliance"].pop(sensible, None) | ||||
|         result = helper.pretty_print({"data": self.data}, whitespace="\u200B \u200B ") | ||||
|     def diagnose(self, whitespace="  ", command_only=False): | ||||
|         data = { | ||||
|             "attributes": self.attributes.copy(), | ||||
|             "appliance": self.info, | ||||
|             "statistics": self.statistics, | ||||
|             "additional_data": self._additional_data, | ||||
|         } | ||||
|         if command_only: | ||||
|             data.pop("attributes") | ||||
|             data.pop("appliance") | ||||
|             data.pop("statistics") | ||||
|         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} | ||||
|         if extra: | ||||
|             data |= {"extra_command_data": extra} | ||||
|         for sensible in ["PK", "SK", "serialNumber", "coords", "device"]: | ||||
|             data.get("appliance", {}).pop(sensible, None) | ||||
|         result = helper.pretty_print({"data": data}, whitespace=whitespace) | ||||
|         result += helper.pretty_print( | ||||
|             {"commands": helper.create_command(self.commands)}, | ||||
|             whitespace="\u200B \u200B ", | ||||
|             { | ||||
|                 "commands": helper.create_command(self.commands), | ||||
|                 "rules": helper.create_rules(self.commands), | ||||
|             }, | ||||
|             whitespace=whitespace, | ||||
|         ) | ||||
|         return result.replace(self.mac_address, "xx-xx-xx-xx-xx-xx") | ||||
|  | ||||
|  | ||||
| class HonApplianceTest(HonAppliance): | ||||
|     def __init__(self, name): | ||||
|         super().__init__(None, {}) | ||||
|         self._name = name | ||||
|         self.load_commands() | ||||
|         self._info = self._appliance_model | ||||
|  | ||||
|     def load_commands(self): | ||||
|         device = Path(__file__).parent / "test_data" / f"{self._name}.json" | ||||
|         with open(str(device)) as f: | ||||
|             raw = json.loads(f.read()) | ||||
|         self._appliance_model = raw.pop("applianceModel") | ||||
|         raw.pop("dictionaryId", None) | ||||
|         self._commands = self._get_commands(raw) | ||||
|  | ||||
|     async def update(self): | ||||
|         return | ||||
|  | ||||
|     @property | ||||
|     def nick_name(self) -> str: | ||||
|         return self._name | ||||
|  | ||||
|     @property | ||||
|     def unique_id(self) -> str: | ||||
|         return self._name | ||||
|  | ||||
|     @property | ||||
|     def mac_address(self) -> str: | ||||
|         return "xx-xx-xx-xx-xx-xx" | ||||
|  | ||||
| @ -1,114 +1,157 @@ | ||||
| from typing import Optional, Dict, Any, List, TYPE_CHECKING | ||||
| import logging | ||||
| from typing import Optional, Dict, Any, List, TYPE_CHECKING, Union | ||||
|  | ||||
| from pyhon import exceptions | ||||
| from pyhon.parameter.base import HonParameter | ||||
| from pyhon.parameter.enum import HonParameterEnum | ||||
| from pyhon.parameter.fixed import HonParameterFixed | ||||
| from pyhon.parameter.program import HonParameterProgram | ||||
| from pyhon.parameter.range import HonParameterRange | ||||
| from pyhon.rules import HonRuleSet | ||||
|  | ||||
| if TYPE_CHECKING: | ||||
|     from pyhon import HonAPI | ||||
|     from pyhon.appliance import HonAppliance | ||||
|  | ||||
| _LOGGER = logging.getLogger(__name__) | ||||
|  | ||||
|  | ||||
| class HonCommand: | ||||
|     def __init__( | ||||
|         self, | ||||
|         name: str, | ||||
|         attributes: Dict[str, Any], | ||||
|         api: "HonAPI", | ||||
|         appliance: "HonAppliance", | ||||
|         programs: Optional[Dict[str, "HonCommand"]] = None, | ||||
|         program_name: str = "", | ||||
|         categories: Optional[Dict[str, "HonCommand"]] = None, | ||||
|         category_name: str = "", | ||||
|     ): | ||||
|         self._api: HonAPI = api | ||||
|         self._api: Optional[HonAPI] = appliance.api | ||||
|         self._appliance: "HonAppliance" = appliance | ||||
|         self._name: str = name | ||||
|         self._programs: Optional[Dict[str, "HonCommand"]] = programs | ||||
|         self._program_name: str = program_name | ||||
|         self._description: str = attributes.get("description", "") | ||||
|         self._parameters: Dict[str, HonParameter] = self._create_parameters( | ||||
|             attributes.get("parameters", {}) | ||||
|         ) | ||||
|         self._ancillary_parameters: Dict[str, HonParameter] = self._create_parameters( | ||||
|             attributes.get("ancillaryParameters", {}) | ||||
|         ) | ||||
|         self._categories: Optional[Dict[str, "HonCommand"]] = categories | ||||
|         self._category_name: str = category_name | ||||
|         self._description: str = attributes.pop("description", "") | ||||
|         self._protocol_type: str = attributes.pop("protocolType", "") | ||||
|         self._parameters: Dict[str, HonParameter] = {} | ||||
|         self._data: Dict[str, Any] = {} | ||||
|         self._available_settings: Dict[str, HonParameter] = {} | ||||
|         self._rules: List[HonRuleSet] = [] | ||||
|         self._load_parameters(attributes) | ||||
|  | ||||
|     def __repr__(self) -> str: | ||||
|         return f"{self._name} command" | ||||
|  | ||||
|     def _create_parameters(self, parameters: Dict) -> Dict[str, HonParameter]: | ||||
|         result: Dict[str, HonParameter] = {} | ||||
|         for parameter, attributes in parameters.items(): | ||||
|             if parameter == "zoneMap" and self._appliance.zone: | ||||
|                 attributes["default"] = self._appliance.zone | ||||
|             match attributes.get("typology"): | ||||
|                 case "range": | ||||
|                     result[parameter] = HonParameterRange(parameter, attributes) | ||||
|                 case "enum": | ||||
|                     result[parameter] = HonParameterEnum(parameter, attributes) | ||||
|                 case "fixed": | ||||
|                     result[parameter] = HonParameterFixed(parameter, attributes) | ||||
|         if self._programs: | ||||
|             result["program"] = HonParameterProgram("program", self) | ||||
|         return result | ||||
|     @property | ||||
|     def name(self): | ||||
|         return self._name | ||||
|  | ||||
|     @property | ||||
|     def api(self) -> "HonAPI": | ||||
|         if self._api is None: | ||||
|             raise exceptions.NoAuthenticationException | ||||
|         return self._api | ||||
|  | ||||
|     @property | ||||
|     def appliance(self) -> "HonAppliance": | ||||
|         return self._appliance | ||||
|  | ||||
|     @property | ||||
|     def data(self): | ||||
|         return self._data | ||||
|  | ||||
|     @property | ||||
|     def parameters(self) -> Dict[str, HonParameter]: | ||||
|         return self._parameters | ||||
|  | ||||
|     @property | ||||
|     def ancillary_parameters(self) -> Dict[str, HonParameter]: | ||||
|         return self._ancillary_parameters | ||||
|     def settings(self) -> Dict[str, HonParameter]: | ||||
|         return self._parameters | ||||
|  | ||||
|     @property | ||||
|     def parameter_groups(self) -> Dict[str, Dict[str, Union[str, float]]]: | ||||
|         result: Dict[str, Dict[str, Union[str, float]]] = {} | ||||
|         for name, parameter in self._parameters.items(): | ||||
|             result.setdefault(parameter.group, {})[name] = parameter.intern_value | ||||
|         return result | ||||
|  | ||||
|     @property | ||||
|     def parameter_value(self) -> Dict[str, Union[str, float]]: | ||||
|         return {n: p.value for n, p in self._parameters.items()} | ||||
|  | ||||
|     def _load_parameters(self, attributes): | ||||
|         for key, items in attributes.items(): | ||||
|             for name, data in items.items(): | ||||
|                 self._create_parameters(data, name, key) | ||||
|         for rule in self._rules: | ||||
|             rule.patch() | ||||
|  | ||||
|     def _create_parameters(self, data: Dict, name: str, parameter: str) -> None: | ||||
|         if name == "zoneMap" and self._appliance.zone: | ||||
|             data["default"] = self._appliance.zone | ||||
|         if data.get("category") == "rule": | ||||
|             if "fixedValue" not in data: | ||||
|                 _LOGGER.error("Rule not supported: %s", data) | ||||
|             else: | ||||
|                 self._rules.append(HonRuleSet(self, data["fixedValue"])) | ||||
|         match data.get("typology"): | ||||
|             case "range": | ||||
|                 self._parameters[name] = HonParameterRange(name, data, parameter) | ||||
|             case "enum": | ||||
|                 self._parameters[name] = HonParameterEnum(name, data, parameter) | ||||
|             case "fixed": | ||||
|                 self._parameters[name] = HonParameterFixed(name, data, parameter) | ||||
|             case _: | ||||
|                 self._data[name] = data | ||||
|                 return | ||||
|         if self._category_name: | ||||
|             name = "program" if "PROGRAM" in self._category_name else "category" | ||||
|             self._parameters[name] = HonParameterProgram(name, self, "custom") | ||||
|  | ||||
|     async def send(self) -> bool: | ||||
|         params = {k: v.value for k, v in self._parameters.items()} | ||||
|         ancillary_params = {k: v.value for k, v in self._ancillary_parameters.items()} | ||||
|         return await self._api.send_command( | ||||
|         params = self.parameter_groups.get("parameters", {}) | ||||
|         ancillary_params = self.parameter_groups.get("ancillaryParameters", {}) | ||||
|         return await self.api.send_command( | ||||
|             self._appliance, self._name, params, ancillary_params | ||||
|         ) | ||||
|  | ||||
|     @property | ||||
|     def programs(self) -> Dict[str, "HonCommand"]: | ||||
|         if self._programs is None: | ||||
|             return {} | ||||
|         return self._programs | ||||
|     def categories(self) -> Dict[str, "HonCommand"]: | ||||
|         if self._categories is None: | ||||
|             return {"_": self} | ||||
|         return self._categories | ||||
|  | ||||
|     @property | ||||
|     def program(self) -> str: | ||||
|         return self._program_name | ||||
|     def category(self) -> str: | ||||
|         return self._category_name | ||||
|  | ||||
|     @program.setter | ||||
|     def program(self, program: str) -> None: | ||||
|         self._appliance.commands[self._name] = self.programs[program] | ||||
|  | ||||
|     def _get_settings_keys(self, command: Optional["HonCommand"] = None) -> List[str]: | ||||
|         if command is None: | ||||
|             command = self | ||||
|         keys = [] | ||||
|         for key, parameter in ( | ||||
|             command._parameters | command._ancillary_parameters | ||||
|         ).items(): | ||||
|             if key not in keys: | ||||
|                 keys.append(key) | ||||
|         return keys | ||||
|     @category.setter | ||||
|     def category(self, category: str) -> None: | ||||
|         if category in self.categories: | ||||
|             self._appliance.commands[self._name] = self.categories[category] | ||||
|  | ||||
|     @property | ||||
|     def setting_keys(self) -> List[str]: | ||||
|         if not self._programs: | ||||
|             return self._get_settings_keys() | ||||
|         result = [ | ||||
|             key | ||||
|             for cmd in self._programs.values() | ||||
|             for key in self._get_settings_keys(cmd) | ||||
|         ] | ||||
|         return list(set(result + ["program"])) | ||||
|         return list( | ||||
|             {param for cmd in self.categories.values() for param in cmd.parameters} | ||||
|         ) | ||||
|  | ||||
|     @staticmethod | ||||
|     def _more_options(first: HonParameter, second: HonParameter): | ||||
|         if isinstance(first, HonParameterFixed) and not isinstance( | ||||
|             second, HonParameterFixed | ||||
|         ): | ||||
|             return second | ||||
|         if len(second.values) > len(first.values): | ||||
|             return second | ||||
|         return first | ||||
|  | ||||
|     @property | ||||
|     def settings(self) -> Dict[str, HonParameter]: | ||||
|         return { | ||||
|             s: param | ||||
|             for s in self.setting_keys | ||||
|             if (param := self._parameters.get(s)) is not None | ||||
|             or (param := self._ancillary_parameters.get(s)) is not None | ||||
|         } | ||||
|     def available_settings(self) -> Dict[str, HonParameter]: | ||||
|         result: Dict[str, HonParameter] = {} | ||||
|         for command in self.categories.values(): | ||||
|             for name, parameter in command.parameters.items(): | ||||
|                 if name in result: | ||||
|                     result[name] = self._more_options(result[name], parameter) | ||||
|                 else: | ||||
|                     result[name] = parameter | ||||
|         return result | ||||
|  | ||||
| @ -72,21 +72,23 @@ class HonAPI: | ||||
|     async def load_commands(self, appliance: HonAppliance) -> Dict: | ||||
|         params: Dict = { | ||||
|             "applianceType": appliance.appliance_type, | ||||
|             "code": appliance.info["code"], | ||||
|             "applianceModelId": appliance.appliance_model_id, | ||||
|             "macAddress": appliance.mac_address, | ||||
|             "os": const.OS, | ||||
|             "appVersion": const.APP_VERSION, | ||||
|             "series": appliance.info["series"], | ||||
|             "code": appliance.code, | ||||
|         } | ||||
|         if firmware_id := appliance.info.get("eepromId"): | ||||
|             params["firmwareId"] = firmware_id | ||||
|         if firmware_version := appliance.info.get("fwVersion"): | ||||
|             params["fwVersion"] = firmware_version | ||||
|         if series := appliance.info.get("series"): | ||||
|             params["series"] = series | ||||
|         url: str = f"{const.API_URL}/commands/v1/retrieve" | ||||
|         async with self._hon.get(url, params=params) as response: | ||||
|             result: Dict = (await response.json()).get("payload", {}) | ||||
|             if not result or result.pop("resultCode") != "0": | ||||
|                 _LOGGER.error(await response.json()) | ||||
|                 return {} | ||||
|             return result | ||||
|  | ||||
| @ -100,6 +102,16 @@ class HonAPI: | ||||
|                 return {} | ||||
|             return result["payload"]["history"] | ||||
|  | ||||
|     async def command_favourites(self, appliance: HonAppliance) -> Dict: | ||||
|         url: str = ( | ||||
|             f"{const.API_URL}/commands/v1/appliance/{appliance.mac_address}/favourite" | ||||
|         ) | ||||
|         async with self._hon.get(url) as response: | ||||
|             result: Dict = await response.json() | ||||
|             if not result or not result.get("payload"): | ||||
|                 return {} | ||||
|             return result["payload"]["favourites"] | ||||
|  | ||||
|     async def last_activity(self, appliance: HonAppliance) -> Dict: | ||||
|         url: str = f"{const.API_URL}/commands/v1/retrieve-last-activity" | ||||
|         params: Dict = {"macAddress": appliance.mac_address} | ||||
| @ -109,6 +121,18 @@ class HonAPI: | ||||
|                 return activity | ||||
|         return {} | ||||
|  | ||||
|     async def appliance_model(self, appliance: HonAppliance) -> Dict: | ||||
|         url: str = f"{const.API_URL}/commands/v1/appliance-model" | ||||
|         params: Dict = { | ||||
|             "code": appliance.info["code"], | ||||
|             "macAddress": appliance.mac_address, | ||||
|         } | ||||
|         async with self._hon.get(url, params=params) as response: | ||||
|             result: Dict = await response.json() | ||||
|             if result and (activity := result.get("attributes")): | ||||
|                 return activity | ||||
|         return {} | ||||
|  | ||||
|     async def load_attributes(self, appliance: HonAppliance) -> Dict: | ||||
|         params: Dict = { | ||||
|             "macAddress": appliance.mac_address, | ||||
| @ -128,6 +152,12 @@ class HonAPI: | ||||
|         async with self._hon.get(url, params=params) as response: | ||||
|             return (await response.json()).get("payload", {}) | ||||
|  | ||||
|     async def load_maintenance(self, appliance: HonAppliance): | ||||
|         url = f"{const.API_URL}/commands/v1/maintenance-cycle" | ||||
|         params = {"macAddress": appliance.mac_address} | ||||
|         async with self._hon.get(url, params=params) as response: | ||||
|             return (await response.json()).get("payload", {}) | ||||
|  | ||||
|     async def send_command( | ||||
|         self, | ||||
|         appliance: HonAppliance, | ||||
| @ -141,7 +171,7 @@ class HonAPI: | ||||
|             "timestamp": f"{now[:-3]}Z", | ||||
|             "commandName": command, | ||||
|             "transactionId": f"{appliance.mac_address}_{now[:-3]}Z", | ||||
|             "applianceOptions": appliance.commands_options, | ||||
|             "applianceOptions": appliance.options, | ||||
|             "device": self._hon.device.get(mobile=True), | ||||
|             "attributes": { | ||||
|                 "channel": "mobileApp", | ||||
| @ -161,7 +191,7 @@ class HonAPI: | ||||
|         return False | ||||
|  | ||||
|     async def appliance_configuration(self) -> Dict: | ||||
|         url: str = f"{const.API_URL}/config/v1/appliance-configuration" | ||||
|         url: str = f"{const.API_URL}/config/v1/program-list-rules" | ||||
|         async with self._hon_anonymous.get(url) as response: | ||||
|             result: Dict = await response.json() | ||||
|             if result and (data := result.get("payload")): | ||||
|  | ||||
| @ -182,13 +182,14 @@ class HonAuth: | ||||
|             await self._error_logger(response) | ||||
|             return "" | ||||
|  | ||||
|     def _parse_token_data(self, text: str) -> None: | ||||
|     def _parse_token_data(self, text: str) -> bool: | ||||
|         if access_token := re.findall("access_token=(.*?)&", text): | ||||
|             self._access_token = access_token[0] | ||||
|         if refresh_token := re.findall("refresh_token=(.*?)&", text): | ||||
|             self._refresh_token = refresh_token[0] | ||||
|         if id_token := re.findall("id_token=(.*?)&", text): | ||||
|             self._id_token = id_token[0] | ||||
|         return True if access_token and refresh_token and id_token else False | ||||
|  | ||||
|     async def _get_token(self, url: str) -> bool: | ||||
|         async with self._request.get(url) as response: | ||||
| @ -214,7 +215,9 @@ class HonAuth: | ||||
|             if response.status != 200: | ||||
|                 await self._error_logger(response) | ||||
|                 return False | ||||
|             self._parse_token_data(await response.text()) | ||||
|             if not self._parse_token_data(await response.text()): | ||||
|                 await self._error_logger(response) | ||||
|                 return False | ||||
|         return True | ||||
|  | ||||
|     async def _api_auth(self) -> bool: | ||||
|  | ||||
| @ -1,6 +1,3 @@ | ||||
| from pyhon.parameter.base import HonParameter | ||||
|  | ||||
|  | ||||
| def key_print(data, key="", start=True): | ||||
|     result = "" | ||||
|     if isinstance(data, list): | ||||
| @ -47,21 +44,10 @@ def pretty_print(data, key="", intend=0, is_list=False, whitespace="  "): | ||||
|     return result | ||||
|  | ||||
|  | ||||
| def get_parameter(command, parameter): | ||||
|     if programs := command.programs: | ||||
|         for program in programs.values(): | ||||
|             if data := program.settings.get(parameter): | ||||
|                 return data | ||||
|     return command.settings.get(parameter) | ||||
|  | ||||
|  | ||||
| def create_command(commands, concat=False): | ||||
|     result = {} | ||||
|     for name, command in commands.items(): | ||||
|         if not concat: | ||||
|             result[name] = {} | ||||
|         for parameter in command.setting_keys: | ||||
|             data = get_parameter(command, parameter) | ||||
|         for parameter, data in command.available_settings.items(): | ||||
|             if data.typology == "enum": | ||||
|                 value = data.values | ||||
|             elif data.typology == "range": | ||||
| @ -69,7 +55,21 @@ def create_command(commands, concat=False): | ||||
|             else: | ||||
|                 continue | ||||
|             if not concat: | ||||
|                 result[name][parameter] = value | ||||
|                 result.setdefault(name, {})[parameter] = value | ||||
|             else: | ||||
|                 result[f"{name}.{parameter}"] = value | ||||
|     return result | ||||
|  | ||||
|  | ||||
| def create_rules(commands, concat=False): | ||||
|     result = {} | ||||
|     for name, command in commands.items(): | ||||
|         for parameter, data in command.available_settings.items(): | ||||
|             value = data.triggers | ||||
|             if not value: | ||||
|                 continue | ||||
|             if not concat: | ||||
|                 result.setdefault(name, {})[parameter] = value | ||||
|             else: | ||||
|                 result[f"{name}.{parameter}"] = value | ||||
|     return result | ||||
|  | ||||
							
								
								
									
										50
									
								
								pyhon/hon.py
									
									
									
									
									
								
							
							
						
						
									
										50
									
								
								pyhon/hon.py
									
									
									
									
									
								
							| @ -1,4 +1,5 @@ | ||||
| import asyncio | ||||
| import logging | ||||
| from types import TracebackType | ||||
| from typing import List, Optional, Dict, Any, Type | ||||
|  | ||||
| @ -8,11 +9,18 @@ from typing_extensions import Self | ||||
| from pyhon import HonAPI, exceptions | ||||
| from pyhon.appliance import HonAppliance | ||||
|  | ||||
| _LOGGER = logging.getLogger(__name__) | ||||
|  | ||||
|  | ||||
| class Hon: | ||||
|     def __init__(self, email: str, password: str, session: ClientSession | None = None): | ||||
|         self._email: str = email | ||||
|         self._password: str = password | ||||
|     def __init__( | ||||
|         self, | ||||
|         email: Optional[str] = "", | ||||
|         password: Optional[str] = "", | ||||
|         session: Optional[ClientSession] = None, | ||||
|     ): | ||||
|         self._email: Optional[str] = email | ||||
|         self._password: Optional[str] = password | ||||
|         self._session: ClientSession | None = session | ||||
|         self._appliances: List[HonAppliance] = [] | ||||
|         self._api: Optional[HonAPI] = None | ||||
| @ -34,9 +42,21 @@ class Hon: | ||||
|             raise exceptions.NoAuthenticationException | ||||
|         return self._api | ||||
|  | ||||
|     @property | ||||
|     def email(self) -> str: | ||||
|         if not self._email: | ||||
|             raise ValueError("Missing email") | ||||
|         return self._email | ||||
|  | ||||
|     @property | ||||
|     def password(self) -> str: | ||||
|         if not self._password: | ||||
|             raise ValueError("Missing password") | ||||
|         return self._password | ||||
|  | ||||
|     async def create(self) -> Self: | ||||
|         self._api = await HonAPI( | ||||
|             self._email, self._password, session=self._session | ||||
|             self.email, self.password, session=self._session | ||||
|         ).create() | ||||
|         await self.setup() | ||||
|         return self | ||||
| @ -45,17 +65,25 @@ class Hon: | ||||
|     def appliances(self) -> List[HonAppliance]: | ||||
|         return self._appliances | ||||
|  | ||||
|     @appliances.setter | ||||
|     def appliances(self, appliances) -> None: | ||||
|         self._appliances = appliances | ||||
|  | ||||
|     async def _create_appliance(self, appliance_data: Dict[str, Any], zone=0) -> None: | ||||
|         appliance = HonAppliance(self._api, appliance_data, zone=zone) | ||||
|         if appliance.mac_address == "": | ||||
|             return | ||||
|         await asyncio.gather( | ||||
|             *[ | ||||
|                 appliance.load_attributes(), | ||||
|                 appliance.load_commands(), | ||||
|                 appliance.load_statistics(), | ||||
|             ] | ||||
|         ) | ||||
|         try: | ||||
|             await asyncio.gather( | ||||
|                 *[ | ||||
|                     appliance.load_attributes(), | ||||
|                     appliance.load_commands(), | ||||
|                     appliance.load_statistics(), | ||||
|                 ] | ||||
|             ) | ||||
|         except (KeyError, ValueError, IndexError) as error: | ||||
|             _LOGGER.exception(error) | ||||
|             _LOGGER.error("Device data - %s", appliance_data) | ||||
|         self._appliances.append(appliance) | ||||
|  | ||||
|     async def setup(self) -> None: | ||||
|  | ||||
| @ -1,13 +1,18 @@ | ||||
| from typing import Dict, Any, List | ||||
| from typing import Dict, Any, List, Tuple, Callable, TYPE_CHECKING | ||||
|  | ||||
| if TYPE_CHECKING: | ||||
|     from pyhon.rules import HonRule | ||||
|  | ||||
|  | ||||
| class HonParameter: | ||||
|     def __init__(self, key: str, attributes: Dict[str, Any]) -> None: | ||||
|     def __init__(self, key: str, attributes: Dict[str, Any], group: str) -> None: | ||||
|         self._key = key | ||||
|         self._category: str = attributes.get("category", "") | ||||
|         self._typology: str = attributes.get("typology", "") | ||||
|         self._mandatory: int = attributes.get("mandatory", 0) | ||||
|         self._value: str | float = "" | ||||
|         self._group: str = group | ||||
|         self._triggers: Dict[str, List[Tuple[Callable, "HonRule"]]] = {} | ||||
|  | ||||
|     @property | ||||
|     def key(self) -> str: | ||||
| @ -17,9 +22,13 @@ class HonParameter: | ||||
|     def value(self) -> str | float: | ||||
|         return self._value if self._value is not None else "0" | ||||
|  | ||||
|     @property | ||||
|     def intern_value(self) -> str | float: | ||||
|         return str(self._value) if self._value is not None else "" | ||||
|  | ||||
|     @property | ||||
|     def values(self) -> List[str]: | ||||
|         return list(str(self.value)) | ||||
|         return [str(self.value)] | ||||
|  | ||||
|     @property | ||||
|     def category(self) -> str: | ||||
| @ -32,3 +41,25 @@ class HonParameter: | ||||
|     @property | ||||
|     def mandatory(self) -> int: | ||||
|         return self._mandatory | ||||
|  | ||||
|     @property | ||||
|     def group(self) -> str: | ||||
|         return self._group | ||||
|  | ||||
|     def add_trigger(self, value, func, data): | ||||
|         if self._value == value: | ||||
|             func(data) | ||||
|         self._triggers.setdefault(value, []).append((func, data)) | ||||
|  | ||||
|     def check_trigger(self, value) -> None: | ||||
|         if str(value) in self._triggers: | ||||
|             for trigger in self._triggers[str(value)]: | ||||
|                 func, args = trigger | ||||
|                 func(args) | ||||
|  | ||||
|     @property | ||||
|     def triggers(self): | ||||
|         result = {} | ||||
|         for value, rules in self._triggers.items(): | ||||
|             result[value] = {rule.param_key: rule.param_value for _, rule in rules} | ||||
|         return result | ||||
|  | ||||
| @ -3,27 +3,38 @@ from typing import Dict, Any, List | ||||
| from pyhon.parameter.base import HonParameter | ||||
|  | ||||
|  | ||||
| def clean_value(value): | ||||
|     return str(value).strip("[]").replace("|", "_").lower() | ||||
|  | ||||
|  | ||||
| class HonParameterEnum(HonParameter): | ||||
|     def __init__(self, key: str, attributes: Dict[str, Any]) -> None: | ||||
|         super().__init__(key, attributes) | ||||
|     def __init__(self, key: str, attributes: Dict[str, Any], group: str) -> None: | ||||
|         super().__init__(key, attributes, group) | ||||
|         self._default = attributes.get("defaultValue") | ||||
|         self._value = self._default or "0" | ||||
|         self._values: List[str] = attributes.get("enumValues", []) | ||||
|         if self._default and clean_value(self._default.strip("[]")) not in self.values: | ||||
|             self._values.append(self._default) | ||||
|  | ||||
|     def __repr__(self) -> str: | ||||
|         return f"{self.__class__} (<{self.key}> {self.values})" | ||||
|  | ||||
|     @property | ||||
|     def values(self) -> List[str]: | ||||
|         return [str(value) for value in self._values] | ||||
|         return [clean_value(value) for value in self._values] | ||||
|  | ||||
|     @values.setter | ||||
|     def values(self, values) -> None: | ||||
|         self._values = values | ||||
|  | ||||
|     @property | ||||
|     def value(self) -> str | float: | ||||
|         return self._value if self._value is not None else self.values[0] | ||||
|         return clean_value(self._value) if self._value is not None else self.values[0] | ||||
|  | ||||
|     @value.setter | ||||
|     def value(self, value: str) -> None: | ||||
|         if value in self.values: | ||||
|             self._value = value | ||||
|             self.check_trigger(value) | ||||
|         else: | ||||
|             raise ValueError(f"Allowed values {self._value}") | ||||
|             raise ValueError(f"Allowed values {self._values}") | ||||
|  | ||||
| @ -4,8 +4,8 @@ from pyhon.parameter.base import HonParameter | ||||
|  | ||||
|  | ||||
| class HonParameterFixed(HonParameter): | ||||
|     def __init__(self, key: str, attributes: Dict[str, Any]) -> None: | ||||
|         super().__init__(key, attributes) | ||||
|     def __init__(self, key: str, attributes: Dict[str, Any], group: str) -> None: | ||||
|         super().__init__(key, attributes, group) | ||||
|         self._value = attributes.get("fixedValue", None) | ||||
|  | ||||
|     def __repr__(self) -> str: | ||||
| @ -19,3 +19,4 @@ class HonParameterFixed(HonParameter): | ||||
|     def value(self, value: str | float) -> None: | ||||
|         # Fixed values seems being not so fixed as thought | ||||
|         self._value = value | ||||
|         self.check_trigger(value) | ||||
|  | ||||
| @ -9,11 +9,14 @@ if TYPE_CHECKING: | ||||
| class HonParameterProgram(HonParameterEnum): | ||||
|     _FILTER = ["iot_recipe", "iot_guided"] | ||||
|  | ||||
|     def __init__(self, key: str, command: "HonCommand") -> None: | ||||
|         super().__init__(key, {}) | ||||
|     def __init__(self, key: str, command: "HonCommand", group: str) -> None: | ||||
|         super().__init__(key, {}, group) | ||||
|         self._command = command | ||||
|         self._value: str = command.program | ||||
|         self._programs: Dict[str, "HonCommand"] = command.programs | ||||
|         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._typology: str = "enum" | ||||
|  | ||||
|     @property | ||||
| @ -23,7 +26,7 @@ class HonParameterProgram(HonParameterEnum): | ||||
|     @value.setter | ||||
|     def value(self, value: str) -> None: | ||||
|         if value in self.values: | ||||
|             self._command.program = value | ||||
|             self._command.category = value | ||||
|         else: | ||||
|             raise ValueError(f"Allowed values {self.values}") | ||||
|  | ||||
| @ -32,8 +35,12 @@ class HonParameterProgram(HonParameterEnum): | ||||
|         values = [v for v in self._programs if all(f not in v for f in self._FILTER)] | ||||
|         return sorted(values) | ||||
|  | ||||
|     @values.setter | ||||
|     def values(self, values) -> None: | ||||
|         return | ||||
|  | ||||
|     @property | ||||
|     def ids(self): | ||||
|     def ids(self) -> Dict[int, str]: | ||||
|         values = { | ||||
|             int(p.parameters["prCode"].value): n | ||||
|             for i, (n, p) in enumerate(self._programs.items()) | ||||
|  | ||||
| @ -11,8 +11,8 @@ def str_to_float(string: str | float) -> float: | ||||
|  | ||||
|  | ||||
| class HonParameterRange(HonParameter): | ||||
|     def __init__(self, key: str, attributes: Dict[str, Any]) -> None: | ||||
|         super().__init__(key, attributes) | ||||
|     def __init__(self, key: str, attributes: Dict[str, Any], group: str) -> None: | ||||
|         super().__init__(key, attributes, group) | ||||
|         self._min: float = str_to_float(attributes["minimumValue"]) | ||||
|         self._max: float = str_to_float(attributes["maximumValue"]) | ||||
|         self._step: float = str_to_float(attributes["incrementValue"]) | ||||
| @ -32,6 +32,8 @@ class HonParameterRange(HonParameter): | ||||
|  | ||||
|     @property | ||||
|     def step(self) -> float: | ||||
|         if not self._step: | ||||
|             return 1 | ||||
|         return self._step | ||||
|  | ||||
|     @property | ||||
| @ -41,8 +43,9 @@ class HonParameterRange(HonParameter): | ||||
|     @value.setter | ||||
|     def value(self, value: float) -> None: | ||||
|         value = str_to_float(value) | ||||
|         if self._min <= value <= self._max and not value % self._step: | ||||
|         if self._min <= value <= self._max and not (value - self._min) % self._step: | ||||
|             self._value = value | ||||
|             self.check_trigger(value) | ||||
|         else: | ||||
|             raise ValueError( | ||||
|                 f"Allowed: min {self._min} max {self._max} step {self._step}" | ||||
|  | ||||
							
								
								
									
										62
									
								
								pyhon/rules.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										62
									
								
								pyhon/rules.py
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,62 @@ | ||||
| from dataclasses import dataclass | ||||
| from typing import List, Dict, TYPE_CHECKING | ||||
|  | ||||
| from pyhon.parameter.enum import HonParameterEnum | ||||
| from pyhon.parameter.range import HonParameterRange | ||||
|  | ||||
| if TYPE_CHECKING: | ||||
|     from pyhon.commands import HonCommand | ||||
|  | ||||
|  | ||||
| @dataclass | ||||
| class HonRule: | ||||
|     trigger_key: str | ||||
|     trigger_value: str | ||||
|     param_key: str | ||||
|     param_value: str | ||||
|  | ||||
|  | ||||
| class HonRuleSet: | ||||
|     def __init__(self, command: "HonCommand", rule): | ||||
|         self._command: "HonCommand" = command | ||||
|         self._rules: Dict[str, List[HonRule]] = {} | ||||
|         self._parse_rule(rule) | ||||
|  | ||||
|     def _parse_rule(self, rule): | ||||
|         for entity_key, params in rule.items(): | ||||
|             entity_key = self._command.appliance.options.get(entity_key, entity_key) | ||||
|             for trigger_key, values in params.items(): | ||||
|                 trigger_key = trigger_key.replace("@", "") | ||||
|                 trigger_key = self._command.appliance.options.get( | ||||
|                     trigger_key, trigger_key | ||||
|                 ) | ||||
|                 for trigger_value, entity_value in values.items(): | ||||
|                     if entity_value.get("fixedValue") == f"@{entity_key}": | ||||
|                         continue | ||||
|                     self._rules.setdefault(trigger_key, []).append( | ||||
|                         HonRule( | ||||
|                             trigger_key, | ||||
|                             trigger_value, | ||||
|                             entity_key, | ||||
|                             entity_value.get("fixedValue"), | ||||
|                         ) | ||||
|                     ) | ||||
|  | ||||
|     def patch(self): | ||||
|         for name, parameter in self._command.parameters.items(): | ||||
|             if name not in self._rules: | ||||
|                 continue | ||||
|             for data in self._rules.get(name): | ||||
|  | ||||
|                 def apply(rule): | ||||
|                     if param := self._command.parameters.get(rule.param_key): | ||||
|                         if isinstance(param, HonParameterEnum) and set( | ||||
|                             param.values | ||||
|                         ) != {str(rule.param_value)}: | ||||
|                             param.values = [str(rule.param_value)] | ||||
|                         elif isinstance(param, HonParameterRange): | ||||
|                             param.value = float(rule.param_value) | ||||
|                             return | ||||
|                         param.value = str(rule.param_value) | ||||
|  | ||||
|                 parameter.add_trigger(data.trigger_value, apply, data) | ||||
		Reference in New Issue
	
	Block a user
	