Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extra logging and remove hardcoding #221

Merged
merged 2 commits into from
Oct 31, 2024
Merged

Extra logging and remove hardcoding #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6582953
Extra logging and remove hardcoding
ic-dev21 Oct 29, 2024
d9a1174
Remove comment
ic-dev21 Oct 31, 2024
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
18 changes: 14 additions & 4 deletions pyhilo/api.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,10 +364,11 @@ async def refresh_ws_token(self) -> None:
async def post_devicehub_negociate(self) -> tuple[str, str]:
LOG.debug("Getting websocket url")
url = f"{AUTOMATION_DEVICEHUB_ENDPOINT}/negotiate"
LOG.debug(f"devicehub URL is {url}")
resp = await self.async_request("post", url)
ws_url = resp.get("url")
ws_token = resp.get("accessToken")
LOG.debug("Calling set_state")
LOG.debug("Calling set_state devicehub_negotiate")
await set_state(
self._state_yaml,
"websocket",
Expand All @@ -381,6 +382,7 @@ async def post_devicehub_negociate(self) -> tuple[str, str]:
async def get_websocket_params(self) -> None:
uri = parse.urlparse(self.ws_url)
LOG.debug("Getting websocket params")
LOG.debug(f"Getting uri {uri}")
resp: dict[str, Any] = await self.async_request(
"post",
f"{uri.path}negotiate?{uri.query}",
Expand All @@ -391,6 +393,7 @@ async def get_websocket_params(self) -> None:
)
conn_id: str = resp.get("connectionId", "")
self.full_ws_url = f"{self.ws_url}&id={conn_id}&access_token={self.ws_token}"
LOG.debug(f"Getting full ws URL {self.full_ws_url}")
transport_dict: list[WebsocketTransportsDict] = resp.get(
"availableTransports", []
)
Expand All @@ -399,7 +402,7 @@ async def get_websocket_params(self) -> None:
"available_transports": transport_dict,
"full_ws_url": self.full_ws_url,
}
LOG.debug("Calling set_state")
LOG.debug("Calling set_state websocket_params")
await set_state(self._state_yaml, "websocket", websocket_dict)

async def fb_install(self, fb_id: str) -> None:
Expand All @@ -425,7 +428,7 @@ async def fb_install(self, fb_id: str) -> None:
raise RequestError(err) from err
LOG.debug(f"FB Install data: {resp}")
auth_token = resp.get("authToken", {})
LOG.debug("Calling set_state")
LOG.debug("Calling set_state fb_install")
await set_state(
self._state_yaml,
"firebase",
Expand Down Expand Up @@ -467,7 +470,7 @@ async def android_register(self) -> None:
LOG.error(f"Android registration error: {msg}")
raise RequestError
token = msg.split("=")[-1]
LOG.debug("Calling set_state")
LOG.debug("Calling set_state android_register")
await set_state(
self._state_yaml,
"android",
Expand All @@ -478,12 +481,14 @@ async def android_register(self) -> None:

async def get_location_id(self) -> int:
url = f"{API_AUTOMATION_ENDPOINT}/Locations"
LOG.debug(f"LocationId URL is {url}")
req: list[dict[str, Any]] = await self.async_request("get", url)
return int(req[0]["id"])

async def get_devices(self, location_id: int) -> list[dict[str, Any]]:
"""Get list of all devices"""
url = self._get_url("Devices", location_id)
LOG.debug(f"Devices URL is {url}")
devices: list[dict[str, Any]] = await self.async_request("get", url)
devices.append(await self.get_gateway(location_id))
# Now it's time to add devices coming from external sources like hass
Expand All @@ -499,6 +504,7 @@ async def _set_device_attribute(
value: Union[str, float, int, None],
) -> None:
url = self._get_url(f"Devices/{device.id}/Attributes", device.location_id)
LOG.debug(f"Device Attribute URL is {url}")
await self.async_request("put", url, json={key.hilo_attribute: value})

async def get_event_notifications(self, location_id: int) -> dict[str, Any]:
Expand Down Expand Up @@ -526,6 +532,7 @@ async def get_event_notifications(self, location_id: int) -> dict[str, Any]:
"viewed": false
}"""
url = self._get_url(None, location_id, events=True)
LOG.debug(f"Event Notifications URL is {url}")
return cast(dict[str, Any], await self.async_request("get", url))

async def get_gd_events(
Expand Down Expand Up @@ -597,6 +604,8 @@ async def get_gd_events(
url += "?active=true"
else:
url += f"/{event_id}"

LOG.debug(f"get_gd_events URL is {url}")
return cast(dict[str, Any], await self.async_request("get", url))

async def get_seasons(self, location_id: int) -> dict[str, Any]:
Expand Down Expand Up @@ -624,6 +633,7 @@ async def get_seasons(self, location_id: int) -> dict[str, Any]:

async def get_gateway(self, location_id: int) -> dict[str, Any]:
url = self._get_url("Gateways/Info", location_id)
LOG.debug(f"Gateway URL is {url}")
req = await self.async_request("get", url)
saved_attrs = [
"zigBeePairingActivated",
Expand Down
2 changes: 1 addition & 1 deletion pyhilo/websocket.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ async def async_connect(self) -> None:
try:
self._client = await self._api.session.ws_connect(
URL(
self._api.full_ws_url.replace("/DeviceHub", "%2FDeviceHub"),
self._api.full_ws_url,
encoded=True,
),
heartbeat=55,
Expand Down