Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "tadoasync"
version = "0.1.17"
version = "0.1.18"
authors = ["Erwin Douna <e.douna@gmail.com>"]
classifiers = [
"Development Status :: 5 - Production/Stable",
Expand Down
38 changes: 29 additions & 9 deletions src/tadoasync/tadoasync.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def __init__(

self._access_token: str | None = None
self._token_expiry: float | None = None
self._refesh_token: str | None = None
self._refresh_token: str | None = None
self._access_headers: dict[str, str] | None = None
self._home_id: int | None = None
self._me: GetMe | None = None
Expand Down Expand Up @@ -147,7 +147,7 @@ async def login(self) -> None:
response = await request.json()
self._access_token = response["access_token"]
self._token_expiry = time.time() + float(response["expires_in"])
self._refesh_token = response["refresh_token"]
self._refresh_token = response["refresh_token"]

get_me = await self.get_me()
self._home_id = get_me.homes[0].id
Expand Down Expand Up @@ -194,7 +194,7 @@ async def _refresh_auth(self) -> None:
"client_secret": CLIENT_SECRET,
"grant_type": "refresh_token",
"scope": "home.user",
"refresh_token": self._refesh_token,
"refresh_token": self._refresh_token,
}

if self._session is None:
Expand All @@ -215,7 +215,7 @@ async def _refresh_auth(self) -> None:
response = await request.json()
self._access_token = response["access_token"]
self._token_expiry = time.time() + float(response["expires_in"])
self._refesh_token = response["refresh_token"]
self._refresh_token = response["refresh_token"]

async def get_me(self) -> GetMe:
"""Get the user information."""
Expand Down Expand Up @@ -290,11 +290,17 @@ async def reset_zone_overlay(self, zone: int) -> None:

async def set_presence(self, presence: str) -> None:
"""Set the presence."""
await self._request(
f"homes/{self._home_id}/presenceLock",
data={"homePresence": presence},
method=HttpMethod.PUT,
)
if presence.upper() == "AUTO":
await self._request(
f"homes/{self._home_id}/presenceLock",
method=HttpMethod.DELETE,
)
else:
await self._request(
f"homes/{self._home_id}/presenceLock",
data={"homePresence": presence},
method=HttpMethod.PUT,
)

async def set_zone_overlay(
self,
Expand All @@ -306,6 +312,9 @@ async def set_zone_overlay(
power: str = "ON",
mode: str | None = None,
fan_speed: str | None = None,
fan_level: str | None = None,
vertical_swing: str | None = None,
horizontal_swing: str | None = None,
swing: str | None = None,
) -> None:
"""Set the zone overlay."""
Expand All @@ -323,11 +332,22 @@ async def set_zone_overlay(
if fan_speed is not None and set_temp is not None
else {}
),
**({"fanLevel": fan_level} if fan_level is not None else {}),
**(
{"swing": swing}
if swing is not None and set_temp is not None
else {}
),
**(
{"verticalSwing": vertical_swing}
if vertical_swing is not None
else {}
),
**(
{"horizontalSwing": horizontal_swing}
if horizontal_swing is not None
else {}
),
**({"mode": mode} if mode is not None else {}),
},
"termination": {
Expand Down
30 changes: 24 additions & 6 deletions tests/test_tado.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ async def test_login_success(responses: aioresponses) -> None:
assert tado._access_token == "test_access_token"
assert tado._token_expiry is not None
assert tado._token_expiry > time.time()
assert tado._refesh_token == "test_refresh_token"
assert tado._refresh_token == "test_refresh_token"


async def test_login_success_no_session(responses: aioresponses) -> None:
Expand All @@ -80,7 +80,7 @@ async def test_login_success_no_session(responses: aioresponses) -> None:
assert tado._access_token == "test_access_token"
assert tado._token_expiry is not None
assert tado._token_expiry > time.time()
assert tado._refesh_token == "test_refresh_token"
assert tado._refresh_token == "test_refresh_token"


async def test_login_timeout(python_tado: Tado, responses: aioresponses) -> None:
Expand Down Expand Up @@ -143,11 +143,11 @@ async def test_refresh_auth_success(responses: aioresponses) -> None:
tado = Tado(username="username", password="password", session=session)
tado._access_token = "old_test_access_token"
tado._token_expiry = time.time() - 10 # make sure the token is expired
tado._refesh_token = "old_test_refresh_token"
tado._refresh_token = "old_test_refresh_token"
await tado._refresh_auth()
assert tado._access_token == "test_access_token"
assert tado._token_expiry > time.time()
assert tado._refesh_token == "test_refresh_token"
assert tado._refresh_token == "test_refresh_token"


async def test_refresh_auth_timeout(python_tado: Tado, responses: aioresponses) -> None:
Expand All @@ -159,7 +159,7 @@ async def test_refresh_auth_timeout(python_tado: Tado, responses: aioresponses)
async with aiohttp.ClientSession():
python_tado._access_token = "old_test_access_token"
python_tado._token_expiry = time.time() - 10 # make sure the token is expired
python_tado._refesh_token = "old_test_refresh_token"
python_tado._refresh_token = "old_test_refresh_token"
with pytest.raises(TadoConnectionError):
await python_tado._refresh_auth()

Expand All @@ -180,7 +180,7 @@ async def mock_post(*args: Any, **kwargs: Any) -> ClientResponse: # noqa: ARG00
with patch("aiohttp.ClientSession.post", new=mock_post):
python_tado._access_token = "old_test_access_token"
python_tado._token_expiry = time.time() - 10 # make sure the token is expired
python_tado._refesh_token = "old_test_refresh_token"
python_tado._refresh_token = "old_test_refresh_token"
with pytest.raises(TadoBadRequestError):
await python_tado._refresh_auth()

Expand Down Expand Up @@ -327,6 +327,24 @@ async def test_set_presence_success(python_tado: Tado, responses: aioresponses)
await python_tado.set_presence(presence)


# Add this test to cover the DELETE request when presence is AUTO
async def test_set_presence_auto_delete(
python_tado: Tado, responses: aioresponses
) -> None:
"""Test DELETE request when setting presence to AUTO."""
presence = "AUTO"
responses.put(
f"{TADO_API_URL}/homes/{python_tado._home_id}/presenceLock",
status=204,
payload={"homePresence": presence},
)
responses.delete(
f"{TADO_API_URL}/homes/{python_tado._home_id}/presenceLock",
status=204,
)
await python_tado.set_presence(presence)


async def test_get_device_info(
python_tado: Tado, responses: aioresponses, snapshot: SnapshotAssertion
) -> None:
Expand Down