Skip to content

Commit e436a91

Browse files
committed
remove logger
1 parent 836be90 commit e436a91

4 files changed

Lines changed: 45 additions & 21 deletions

File tree

blueconnect/__init__.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"""Unofficial python library for the Blue Riiot Blue Connect API."""
22

33
import asyncio
4-
import logging
54
from typing import List
65

76
from .api import BlueConnectApi
@@ -13,8 +12,6 @@
1312
TemperatureUnit,
1413
)
1514

16-
LOGGER = logging.getLogger()
17-
1815

1916
class BlueConnectSimpleAPI:
2017
"""Class that provides a common structure around the Blue Connect API for a single/main swimming pool."""
@@ -39,12 +36,17 @@ async def fetch_data(self) -> None:
3936
main_pool_id = user_info.user_preferences.main_swimming_pool_id
4037
self._temperature_unit = user_info.user_preferences.display_temperature_unit
4138
self._pool_info = await self._api.get_swimming_pool(main_pool_id)
42-
self._pool_feed_message = (await self._api.get_swimming_pool_feed(main_pool_id, self._language)).current_message
39+
self._pool_feed_message = (
40+
await self._api.get_swimming_pool_feed(main_pool_id, self._language)
41+
).current_message
4342
blue_devices = await self._api.get_swimming_pool_blue_devices(main_pool_id)
4443
self._pool_blue_device = blue_devices[0] if blue_devices else None
4544
if self._pool_blue_device:
46-
self._pool_measurements = (await self._api.get_last_measurements(
47-
main_pool_id, self._pool_blue_device.serial)).measurements
45+
self._pool_measurements = (
46+
await self._api.get_last_measurements(
47+
main_pool_id, self._pool_blue_device.serial
48+
)
49+
).measurements
4850

4951
@property
5052
def pool(self) -> SwimmingPool:

blueconnect/api.py

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"""Unofficial python library for the Blue Riiot Blue Connect API."""
22

33
import asyncio
4-
import logging
54
import time
65
from typing import List, Optional
76

@@ -25,7 +24,6 @@
2524
"Accept": "*/*",
2625
}
2726
BASE_URL = "https://api.riiotlabs.com/prod/"
28-
LOGGER = logging.getLogger()
2927

3028

3129
class BlueConnectApi:
@@ -35,9 +33,7 @@ def __init__(self, username: str, password: str) -> None:
3533
"""Inititialize the api connection, a valid username and password must be provided."""
3634
self._username = username
3735
self._password = password
38-
self._http_session = aiohttp.ClientSession(
39-
connector=aiohttp.TCPConnector()
40-
)
36+
self._http_session = aiohttp.ClientSession(connector=aiohttp.TCPConnector())
4137
self._token_info = {}
4238

4339
def close(self) -> None:
@@ -71,12 +67,16 @@ async def get_swimming_pool(self, swimming_pool_id: str) -> SwimmingPool:
7167
data = await self.__get_data(f"swimming_pool/{swimming_pool_id}")
7268
return SwimmingPool.from_json(data)
7369

74-
async def get_swimming_pool_status(self, swimming_pool_id: str) -> SwimmingPoolStatus:
70+
async def get_swimming_pool_status(
71+
self, swimming_pool_id: str
72+
) -> SwimmingPoolStatus:
7573
"""Retrieve status for a specific swimming pool."""
7674
data = await self.__get_data(f"swimming_pool/{swimming_pool_id}/status")
7775
return SwimmingPoolStatus.from_json(data)
7876

79-
async def get_swimming_pool_blue_devices(self, swimming_pool_id: str) -> List[BlueDevice]:
77+
async def get_swimming_pool_blue_devices(
78+
self, swimming_pool_id: str
79+
) -> List[BlueDevice]:
8080
"""Retrieve Blue devices for a specific swimming pool."""
8181
data = await self.__get_data(f"swimming_pool/{swimming_pool_id}/blue")
8282
result = []
@@ -85,14 +85,18 @@ async def get_swimming_pool_blue_devices(self, swimming_pool_id: str) -> List[Bl
8585
result.append(blue_device)
8686
return result
8787

88-
async def get_swimming_pool_feed(self, swimming_pool_id: str, language: str = "en") -> SwimmingPoolFeed:
88+
async def get_swimming_pool_feed(
89+
self, swimming_pool_id: str, language: str = "en"
90+
) -> SwimmingPoolFeed:
8991
"""Retrieve feed for a specific swimming pool."""
9092
data = await self.__get_data(
9193
f"swimming_pool/{swimming_pool_id}/feed?lang={language}"
9294
)
9395
return SwimmingPoolFeed.from_json(data)
9496

95-
async def get_last_measurements(self, swimming_pool_id: str, blue_device_serial: str) -> SwimmingPoolLastMeasurements:
97+
async def get_last_measurements(
98+
self, swimming_pool_id: str, blue_device_serial: str
99+
) -> SwimmingPoolLastMeasurements:
96100
"""Retrieve last measurements for a specific swimming pool."""
97101
data = await self.__get_data(
98102
f"swimming_pool/{swimming_pool_id}/blue/{blue_device_serial}/lastMeasurements?mode=blue_and_strip"
@@ -135,5 +139,8 @@ async def __get_data(self, endpoint: str, params: dict = None) -> Optional[dict]
135139
) as response:
136140
if response.status != 200:
137141
error_msg = await response.text()
138-
raise Exception("Error while retrieving data for endpoint %s: %s" % (endpoint, error_msg))
142+
raise Exception(
143+
"Error while retrieving data for endpoint %s: %s"
144+
% (endpoint, error_msg)
145+
)
139146
return await response.json()

blueconnect/models.py

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def transform_value(value, value_type):
1919
if isinstance(value, list):
2020
item_type = value_type.__args__[0]
2121
return [transform_value(item, item_type) for item in value]
22-
if hasattr(value_type, 'from_json'):
22+
if hasattr(value_type, "from_json"):
2323
return value_type.from_json(value)
2424
return value_type(value)
2525

@@ -48,6 +48,7 @@ def from_json(cls, json_obj):
4848
@dataclass
4949
class BlueDevice(ModelBase):
5050
"""Model for a Blue Connect device."""
51+
5152
serial: str
5253
hw_generation: int
5354
hw_product_type: str
@@ -59,6 +60,7 @@ class BlueDevice(ModelBase):
5960

6061
class MeasurementTrend(Enum):
6162
"""Enum for a measurement trend."""
63+
6264
STABLE = "stable"
6365
INCREASE = "increase"
6466
DECREASE = "decrease"
@@ -67,6 +69,7 @@ class MeasurementTrend(Enum):
6769
@dataclass
6870
class SwimmingPoolMeasurement(ModelBase):
6971
"""Model for a swimming pool measurement."""
72+
7073
name: str
7174
priority: int
7275
timestamp: datetime
@@ -85,10 +88,11 @@ class SwimmingPoolMeasurement(ModelBase):
8588
@dataclass
8689
class SwimmingPoolLastMeasurements(ModelBase):
8790
"""Model for swimming pool last measurements data."""
91+
8892
status: str
8993
swimming_pool_id: str
9094
data: List[SwimmingPoolMeasurement]
91-
blue_device_serial: str = ''
95+
blue_device_serial: str = ""
9296
last_blue_measure_timestamp: datetime = None
9397
last_strip_timestamp: datetime = None
9498

@@ -101,6 +105,7 @@ def measurements(self):
101105
@dataclass
102106
class UserInfo(ModelBase):
103107
"""Model for UserInfo."""
108+
104109
user_id: str
105110
first_name: str
106111
last_name: str
@@ -110,13 +115,15 @@ class UserInfo(ModelBase):
110115

111116
class TemperatureUnit(Enum):
112117
"""Enum for TemperatureUnit."""
118+
113119
CELSIUS = "celsius"
114120
FAHRENHEIT = "fahrenheit"
115121

116122

117123
@dataclass
118124
class UserPreferences(ModelBase):
119125
"""Model for UserPreferences."""
126+
120127
display_temperature_unit: TemperatureUnit
121128
display_unit_system: str
122129
main_swimming_pool_id: str
@@ -125,13 +132,15 @@ class UserPreferences(ModelBase):
125132
@dataclass
126133
class User(ModelBase):
127134
"""Model for a User."""
135+
128136
user_info: UserInfo
129137
user_preferences: UserPreferences
130138

131139

132140
@dataclass
133141
class SwimmingPool(ModelBase):
134142
"""Model for a SwimmingPool."""
143+
135144
updated: datetime
136145
swimming_pool_id: str
137146
created: datetime
@@ -142,6 +151,7 @@ class SwimmingPool(ModelBase):
142151
@dataclass
143152
class SwimmingPoolStatusTask(ModelBase):
144153
"""Model for a SwimmingPoolStatusTask."""
154+
145155
status_id: str
146156
since: datetime
147157
data: dict
@@ -155,6 +165,7 @@ class SwimmingPoolStatusTask(ModelBase):
155165
@dataclass
156166
class SwimmingPoolStatus(ModelBase):
157167
"""Model for SwimmingPoolStatus."""
168+
158169
since: datetime
159170
status_id: str
160171
global_status_code: str
@@ -170,6 +181,7 @@ class SwimmingPoolStatus(ModelBase):
170181
@dataclass
171182
class SwimmingPoolFeedMessage(ModelBase):
172183
"""Model for a SwimmingPoolFeedMessage."""
184+
173185
id: str
174186
title: str
175187
message: str
@@ -178,6 +190,7 @@ class SwimmingPoolFeedMessage(ModelBase):
178190
@dataclass
179191
class SwimmingPoolFeed(ModelBase):
180192
"""Model for a SwimmingPoolFeedMessage."""
193+
181194
swimming_pool_id: str
182195
timestamp: datetime
183196
data: List[SwimmingPoolFeedMessage]

test/test_base.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
"""Tests for Blue Connect api library."""
22

3-
from ..blueconnect import BlueConnectSimpleAPI
43
import pytest
54

6-
api = BlueConnectSimpleAPI("test", "test", "nl")
5+
from blueconnect import BlueConnectSimpleAPI
76

87
# TODO TODO TODO
98

109
@pytest.mark.asyncio
1110
async def test_base():
12-
print(api.measurements)
11+
# api = BlueConnectSimpleAPI("test", "test", "nl")
12+
# print(api.measurements)
13+
14+
pass

0 commit comments

Comments
 (0)