Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
2fcddde
refactor: remove unused GraphQL code and clean up device mapping logic
AbigailAsselin-Hilo Mar 16, 2025
3c59967
add missing import
AbigailAsselin-Hilo Mar 24, 2025
0112791
Merge branch 'dvd-dev:main' into add_graphql_subscription
AbigailAsselin-Hilo Mar 24, 2025
5b5756f
Merge branch 'add_graphql_subscription' of https://github.com/Abigail…
AbigailAsselin-Hilo Mar 24, 2025
78b9f10
Some linting
ic-dev21 Mar 24, 2025
bef8e54
change to use callback and add location subscription
AbigailAsselin-Hilo Mar 24, 2025
13814e6
Merge branch 'add_graphql_subscription' of https://github.com/Abigail…
AbigailAsselin-Hilo Mar 24, 2025
eccb32e
Remove some unused imports
ic-dev21 Mar 24, 2025
b696639
Merge branch 'add_graphql_subscription' of https://github.com/Abigail…
ic-dev21 Mar 24, 2025
5a1fd93
Linting, adding missing import
ic-dev21 Mar 25, 2025
5ed178e
Linting whitespace
ic-dev21 Mar 25, 2025
34937ce
fix erreur
AbigailAsselin-Hilo Mar 25, 2025
3d922fe
Merge branch 'add_graphql_subscription' of https://github.com/Abigail…
AbigailAsselin-Hilo Mar 25, 2025
f92a4d7
add lowvoltage mapping
AbigailAsselin-Hilo Mar 26, 2025
098041c
fix mapping
AbigailAsselin-Hilo Mar 27, 2025
b33c4e4
fix more mapping
AbigailAsselin-Hilo Mar 27, 2025
c46961c
Merge branch 'dvd-dev:main' into add_graphql_subscription
AbigailAsselin-Hilo Mar 28, 2025
2dad623
cleanup and fix last mapping
AbigailAsselin-Hilo Mar 28, 2025
cf663f5
Merge branch 'add_graphql_subscription' of https://github.com/Abigail…
AbigailAsselin-Hilo Mar 28, 2025
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
21 changes: 1 addition & 20 deletions pyhilo/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@
import random
import string
import sys
from typing import Any, Callable, Dict, Union, cast
from typing import Any, Callable, Union, cast
from urllib import parse

from aiohttp import ClientSession
from aiohttp.client_exceptions import ClientResponseError
import backoff
from gql import Client, gql
from gql.transport.aiohttp import AIOHTTPTransport

from pyhilo.const import (
ANDROID_CLIENT_ENDPOINT,
Expand Down Expand Up @@ -45,7 +43,6 @@
)
from pyhilo.device import DeviceAttribute, HiloDevice, get_device_attributes
from pyhilo.exceptions import InvalidCredentialsError, RequestError
from pyhilo.graphql import GraphQlHelper
from pyhilo.util.state import (
StateDict,
WebsocketDict,
Expand Down Expand Up @@ -513,22 +510,6 @@ async def get_devices(self, location_id: int) -> list[dict[str, Any]]:
devices.append(callback())
return devices

async def call_get_location_query(self, location_hilo_id: string) -> Dict[str, Any]:
access_token = await self.async_get_access_token()
transport = AIOHTTPTransport(
url="https://platform.hiloenergie.com/api/digital-twin/v3/graphql",
headers={"Authorization": f"Bearer {access_token}"},
)
client = Client(transport=transport, fetch_schema_from_transport=True)
query = gql(GraphQlHelper.query_get_location())

async with client as session:
result = await session.execute(
query, variable_values={"locationHiloId": location_hilo_id}
)
LOG.info(result)
return result

async def _set_device_attribute(
self,
device: HiloDevice,
Expand Down
8 changes: 2 additions & 6 deletions pyhilo/device/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,7 @@ def update(self, **kwargs: Dict[str, Union[str, int, Dict]]) -> None:
new_val.append(DeviceAttribute("Disconnected", "null"))
elif att == "provider":
att = "manufacturer"
new_val = HILO_PROVIDERS.get(
int(val), f"Unknown ({val})"
) # type: ignore
new_val = HILO_PROVIDERS.get(int(val), f"Unknown ({val})") # type: ignore
else:
if att == "serial":
att = "identifier"
Expand Down Expand Up @@ -234,9 +232,7 @@ def __init__(self, **kwargs: Dict[str, Any]):
# attr='intensity',
# value_type='%')
# }
kwargs["timeStamp"] = from_utc_timestamp(
kwargs.pop("timeStampUTC", "")
) # type: ignore
kwargs["timeStamp"] = from_utc_timestamp(kwargs.pop("timeStampUTC", "")) # type: ignore
self.id = 0
self.value: Union[int, bool, str] = 0
self.device_id = 0
Expand Down
Loading
Loading