Skip to content

0.7.1 #291

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

Merged
nanomad merged 3 commits into from
Jan 2, 2025
Merged

0.7.1 #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fd9d79
#287: Gracefully handle cases where the messages api returns no data
nanomad Jan 2, 2025
6b43b4e
Merge pull request #290 from nanomad/develop
nanomad Jan 2, 2025
68d03d9
#287: Handle an empty message list correctly
nanomad Jan 2, 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
8 changes: 6 additions & 2 deletions handlers/message.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@ async def __polling(self):
await self.__read_message(message)

latest_message = self.__get_latest_message(all_messages)
if latest_message.messageId != self.last_message_id and latest_message.message_time > self.last_message_ts:
if (
latest_message is not None
and latest_message.messageId != self.last_message_id
and latest_message.message_time > self.last_message_ts
):
self.last_message_id = latest_message.messageId
self.last_message_ts = latest_message.message_time
LOG.info(
Expand Down Expand Up @@ -76,7 +80,7 @@ async def __get_all_alarm_messages(self) -> list[MessageEntity]:
while True:
try:
message_list = await self.saicapi.get_alarm_list(page_num=idx, page_size=1)
if message_list.messages and len(message_list.messages) > 0:
if message_list is not None and message_list.messages and len(message_list.messages) > 0:
all_messages.extend(message_list.messages)
else:
return all_messages
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
saic-ismart-client-ng==0.5.2
saic-ismart-client-ng==0.5.4
httpx~=0.27.0
gmqtt~=0.6.13
inflection~=0.5.1
Expand Down
Loading