Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
cf137dd176 | |||
ab18e45f97 | |||
e44b9b6773 | |||
5c650d722b | |||
6ae40481e3 | |||
ff8ae160bb | |||
658e80a8f4 |
2
.github/workflows/python-check.yml
vendored
2
.github/workflows/python-check.yml
vendored
@ -13,7 +13,7 @@ jobs:
|
|||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
python-version: ["3.10", "3.11"]
|
python-version: ["3.10", "3.11", "3.12"]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
|
@ -94,15 +94,15 @@ class HonAppliance:
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def appliance_model_id(self) -> str:
|
def appliance_model_id(self) -> str:
|
||||||
return self._info.get("applianceModelId", "")
|
return str(self._info.get("applianceModelId", ""))
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def appliance_type(self) -> str:
|
def appliance_type(self) -> str:
|
||||||
return self._info.get("applianceTypeName", "")
|
return str(self._info.get("applianceTypeName", ""))
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def mac_address(self) -> str:
|
def mac_address(self) -> str:
|
||||||
return self.info.get("macAddress", "")
|
return str(self.info.get("macAddress", ""))
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def unique_id(self) -> str:
|
def unique_id(self) -> str:
|
||||||
@ -138,11 +138,11 @@ class HonAppliance:
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def model_id(self) -> int:
|
def model_id(self) -> int:
|
||||||
return self._info.get("applianceModelId", 0)
|
return int(self._info.get("applianceModelId", 0))
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def options(self) -> Dict[str, Any]:
|
def options(self) -> Dict[str, Any]:
|
||||||
return self._appliance_model.get("options", {})
|
return dict(self._appliance_model.get("options", {}))
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def commands(self) -> Dict[str, HonCommand]:
|
def commands(self) -> Dict[str, HonCommand]:
|
||||||
@ -277,7 +277,12 @@ class HonAppliance:
|
|||||||
_LOGGER.info("Can't set %s - %s", key, error)
|
_LOGGER.info("Can't set %s - %s", key, error)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
def sync_command(self, main: str, target: Optional[List[str] | str] = None) -> None:
|
def sync_command(
|
||||||
|
self,
|
||||||
|
main: str,
|
||||||
|
target: Optional[List[str] | str] = None,
|
||||||
|
to_sync: Optional[List[str] | bool] = None,
|
||||||
|
) -> None:
|
||||||
base: Optional[HonCommand] = self.commands.get(main)
|
base: Optional[HonCommand] = self.commands.get(main)
|
||||||
if not base:
|
if not base:
|
||||||
return
|
return
|
||||||
@ -287,7 +292,12 @@ class HonAppliance:
|
|||||||
|
|
||||||
for name, target_param in data.parameters.items():
|
for name, target_param in data.parameters.items():
|
||||||
if not (base_param := base.parameters.get(name)):
|
if not (base_param := base.parameters.get(name)):
|
||||||
return
|
continue
|
||||||
|
if to_sync and (
|
||||||
|
(isinstance(to_sync, list) and name not in to_sync)
|
||||||
|
or not base_param.mandatory
|
||||||
|
):
|
||||||
|
continue
|
||||||
self.sync_parameter(base_param, target_param)
|
self.sync_parameter(base_param, target_param)
|
||||||
|
|
||||||
def sync_parameter(self, main: Parameter, target: Parameter) -> None:
|
def sync_parameter(self, main: Parameter, target: Parameter) -> None:
|
||||||
|
@ -1,11 +1,16 @@
|
|||||||
from typing import Any, Dict
|
from typing import Any, Dict
|
||||||
|
|
||||||
from pyhon.appliances.base import ApplianceBase
|
from pyhon.appliances.base import ApplianceBase
|
||||||
|
from pyhon.parameter.base import HonParameter
|
||||||
|
|
||||||
|
|
||||||
class Appliance(ApplianceBase):
|
class Appliance(ApplianceBase):
|
||||||
def attributes(self, data: Dict[str, Any]) -> Dict[str, Any]:
|
def attributes(self, data: Dict[str, Any]) -> Dict[str, Any]:
|
||||||
data = super().attributes(data)
|
data = super().attributes(data)
|
||||||
data["active"] = data["parameters"]["onOffStatus"] == "1"
|
parameter = data["parameters"]["onOffStatus"]
|
||||||
|
is_class = isinstance(parameter, HonParameter)
|
||||||
|
data["active"] = parameter.value == 1 if is_class else parameter == 1
|
||||||
return data
|
return data
|
||||||
|
|
||||||
|
def settings(self, settings: Dict[str, Any]) -> Dict[str, Any]:
|
||||||
|
return settings
|
||||||
|
@ -132,13 +132,15 @@ class HonCommand:
|
|||||||
async def send_specific(self, param_names: List[str]) -> bool:
|
async def send_specific(self, param_names: List[str]) -> bool:
|
||||||
params: Dict[str, str | float] = {}
|
params: Dict[str, str | float] = {}
|
||||||
for key, parameter in self._parameters.items():
|
for key, parameter in self._parameters.items():
|
||||||
if key in param_names:
|
if key in param_names or parameter.mandatory:
|
||||||
params[key] = parameter.value
|
params[key] = parameter.value
|
||||||
return await self.send_parameters(params)
|
return await self.send_parameters(params)
|
||||||
|
|
||||||
async def send_parameters(self, params: Dict[str, str | float]) -> bool:
|
async def send_parameters(self, params: Dict[str, str | float]) -> bool:
|
||||||
ancillary_params = self.parameter_groups.get("ancillaryParameters", {})
|
ancillary_params = self.parameter_groups.get("ancillaryParameters", {})
|
||||||
ancillary_params.pop("programRules", None)
|
ancillary_params.pop("programRules", None)
|
||||||
|
if "prStr" in params:
|
||||||
|
params["prStr"] = self._category_name.upper()
|
||||||
self.appliance.sync_command_to_params(self.name)
|
self.appliance.sync_command_to_params(self.name)
|
||||||
try:
|
try:
|
||||||
result = await self.api.send_command(
|
result = await self.api.send_command(
|
||||||
|
@ -6,7 +6,7 @@ CLIENT_ID = (
|
|||||||
"3MVG9QDx8IX8nP5T2Ha8ofvlmjLZl5L_gvfbT9."
|
"3MVG9QDx8IX8nP5T2Ha8ofvlmjLZl5L_gvfbT9."
|
||||||
"HJvpHGKoAS_dcMN8LYpTSYeVFCraUnV.2Ag1Ki7m4znVO6"
|
"HJvpHGKoAS_dcMN8LYpTSYeVFCraUnV.2Ag1Ki7m4znVO6"
|
||||||
)
|
)
|
||||||
APP_VERSION = "2.1.2"
|
APP_VERSION = "2.3.5"
|
||||||
OS_VERSION = 31
|
OS_VERSION = 31
|
||||||
OS = "android"
|
OS = "android"
|
||||||
DEVICE_MODEL = "exynos9820"
|
DEVICE_MODEL = "exynos9820"
|
||||||
|
@ -18,7 +18,7 @@ class HonParameterFixed(HonParameter):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def value(self) -> str | float:
|
def value(self) -> str | float:
|
||||||
return self._value if self._value is not None else "0"
|
return self._value if self._value != "" else "0"
|
||||||
|
|
||||||
@value.setter
|
@value.setter
|
||||||
def value(self, value: str | float) -> None:
|
def value(self, value: str | float) -> None:
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
aiohttp~=3.8.5
|
aiohttp>=3.8
|
||||||
yarl~=1.9.2
|
yarl>=1.8
|
||||||
typing-extensions~=4.7.1
|
typing-extensions>=4.8
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
black==23.7.0
|
black>=23.11
|
||||||
flake8==6.0.0
|
flake8>=6.1
|
||||||
mypy==1.4.1
|
mypy>=1.7
|
||||||
pylint==2.17.4
|
pylint>=3.0
|
||||||
|
setuptools>=68.2
|
||||||
|
5
setup.py
5
setup.py
@ -7,7 +7,7 @@ with open("README.md", "r", encoding="utf-8") as f:
|
|||||||
|
|
||||||
setup(
|
setup(
|
||||||
name="pyhOn",
|
name="pyhOn",
|
||||||
version="0.15.7",
|
version="0.15.12",
|
||||||
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,
|
||||||
@ -21,7 +21,7 @@ setup(
|
|||||||
packages=find_packages(),
|
packages=find_packages(),
|
||||||
include_package_data=True,
|
include_package_data=True,
|
||||||
python_requires=">=3.10",
|
python_requires=">=3.10",
|
||||||
install_requires=["aiohttp~=3.8.5", "typing-extensions~=4.7.1", "yarl~=1.9.2"],
|
install_requires=["aiohttp>=3.8", "typing-extensions>=4.8", "yarl>=1.8"],
|
||||||
classifiers=[
|
classifiers=[
|
||||||
"Development Status :: 4 - Beta",
|
"Development Status :: 4 - Beta",
|
||||||
"Environment :: Console",
|
"Environment :: Console",
|
||||||
@ -30,6 +30,7 @@ setup(
|
|||||||
"Operating System :: OS Independent",
|
"Operating System :: OS Independent",
|
||||||
"Programming Language :: Python :: 3.10",
|
"Programming Language :: Python :: 3.10",
|
||||||
"Programming Language :: Python :: 3.11",
|
"Programming Language :: Python :: 3.11",
|
||||||
|
"Programming Language :: Python :: 3.12",
|
||||||
"Topic :: Software Development :: Libraries :: Python Modules",
|
"Topic :: Software Development :: Libraries :: Python Modules",
|
||||||
],
|
],
|
||||||
entry_points={
|
entry_points={
|
||||||
|
Reference in New Issue
Block a user