Merge branch 'release/v4.1.0'

Author: jabesq

Pipfile.lock

@@ -459,6 +459,52 @@
                         }
                     }
                 ]
+            },
+            {
+                "_id": "12:34:56:1d:68:2e",
+                "date_setup": 1470935500,
+                "last_setup": 1470935500,
+                "type": "NAMain",
+                "last_status_store": 1588481399,
+                "module_name": "Basisstation",
+                "firmware": 177,
+                "last_upgrade": 1470935401,
+                "wifi_status": 13,
+                "reachable": true,
+                "co2_calibrating": false,
+                "data_type": [
+                    "Temperature",
+                    "CO2",
+                    "Humidity",
+                    "Noise",
+                    "Pressure"
+                ],
+                "place": {
+                    "altitude": 93,
+                    "city": "Gothenburg",
+                    "country": "SE",
+                    "timezone": "Europe/Stockholm",
+                    "location": [
+                        11.6136629,
+                        57.7006827
+                    ]
+                },
+                "dashboard_data": {
+                    "time_utc": 1588481387,
+                    "Temperature": 20.8,
+                    "CO2": 674,
+                    "Humidity": 41,
+                    "Noise": 34,
+                    "Pressure": 1012.1,
+                    "AbsolutePressure": 1001,
+                    "min_temp": 20.8,
+                    "max_temp": 22.2,
+                    "date_max_temp": 1588456859,
+                    "date_min_temp": 1588480176,
+                    "temp_trend": "stable",
+                    "pressure_trend": "up"
+                },
+                "modules": []
             }
         ],
         "user": {

fixtures/weatherstation_data_simple.json

@@ -5,7 +5,7 @@
 
 setup(
     name="pyatmo",
-    version="4.0.0",  # Should be updated with new versions
+    version="4.1.0",  # Should be updated with new versions
     author="Hugo Dupras",
     author_email="jabesq@gmail.com",
     packages=find_packages(exclude=["tests"], where="src"),

setup.py

@@ -101,7 +101,10 @@ def refresh_tokens(self) -> Dict[str, Union[str, int]]:
         return token
 
     def post_request(
-        self, url: str, params: Optional[Dict] = None, timeout: int = 5,
+        self,
+        url: str,
+        params: Optional[Dict] = None,
+        timeout: int = 5,
     ) -> Any:
         """Wrapper for post requests."""
         resp = None
@@ -171,12 +174,12 @@ def query(url: str, params: Dict, timeout: int, retries: int) -> Any:
                     f"when accessing '{url}'"
                 )
 
-            except JSONDecodeError:
+            except JSONDecodeError as exc:
                 raise ApiError(
                     f"{resp.status_code} - "
                     f"{ERRORS.get(resp.status_code, '')} - "
                     f"when accessing '{url}'"
-                )
+                ) from exc
 
         try:
             if "application/json" in resp.headers.get("content-type", []):
@@ -252,16 +255,16 @@ def __init__(
         password: str,
         scope="read_station",
     ):
-        # pylint: disable=super-init-not-called
-        self._client_id = client_id
-        self._client_secret = client_secret
+        super().__init__(client_id=client_id, client_secret=client_secret, scope=scope)
 
-        self._oauth = OAuth2Session(client=LegacyApplicationClient(client_id=client_id))
+        self._oauth = OAuth2Session(
+            client=LegacyApplicationClient(client_id=self.client_id)
+        )
         self._oauth.fetch_token(
             token_url=AUTH_REQ,
             username=username,
             password=password,
-            client_id=client_id,
-            client_secret=client_secret,
-            scope=scope,
+            client_id=self.client_id,
+            client_secret=self.client_secret,
+            scope=self.scope,
         )

src/pyatmo/auth.py

@@ -19,4 +19,4 @@ def __init__(self, auth: NetatmoOAuth2) -> None:
         Raises:
             NoDevice: No devices found.
         """
-        super(HomeCoachData, self).__init__(auth, url_req=_GETHOMECOACHDATA_REQ)
+        super().__init__(auth, url_req=_GETHOMECOACHDATA_REQ)

src/pyatmo/home_coach.py

@@ -66,8 +66,8 @@ def __init__(
         resp = self.auth.post_request(url=_GETPUBLIC_DATA, params=post_params)
         try:
             self.raw_data = resp["body"]
-        except (KeyError, TypeError):
-            raise NoDevice("No public weather data returned by Netatmo server")
+        except (KeyError, TypeError) as exc:
+            raise NoDevice("No public weather data returned by Netatmo server") from exc
 
         self.status = resp["status"]
         self.time_exec = to_time_string(resp["time_exec"])

src/pyatmo/public_data.py

@@ -34,9 +34,11 @@ def __init__(self, auth: NetatmoOAuth2, url_req: str = None) -> None:
 
         try:
             self.raw_data = fix_id(resp["body"].get("devices"))
-        except KeyError:
+        except KeyError as exc:
             LOG.debug("No <body> in response %s", resp)
-            raise NoDevice("No weather station data returned by Netatmo server")
+            raise NoDevice(
+                "No weather station data returned by Netatmo server"
+            ) from exc
 
         if not self.raw_data:
             raise NoDevice("No weather station available")
@@ -84,15 +86,17 @@ def get_modules(self, station_id: str) -> Dict:
 
         res = {}
         for station in [self.stations[station_data["_id"]]]:
+            station_type = station.get("type")
+            station_name = station.get("station_name", station_type)
             res[station["_id"]] = {
-                "station_name": station["station_name"],
-                "module_name": station.get("module_name", station.get("type")),
+                "station_name": station_name,
+                "module_name": station.get("module_name", station_type),
                 "id": station["_id"],
             }
 
             for module in station["modules"]:
                 res[module["_id"]] = {
-                    "station_name": module.get("station_name", station["station_name"]),
+                    "station_name": module.get("station_name", station_name),
                     "module_name": module.get("module_name", module.get("type")),
                     "id": module["_id"],
                 }
@@ -141,6 +145,12 @@ def get_monitored_conditions(self, module_id: str) -> List:
         if module["type"] in ["NAMain", "NAModule1", "NAModule4", "NHC"]:
             conditions.extend(["min_temp", "max_temp"])
 
+        if module["type"] in ["NAMain", "NAModule1", "NAModule4"]:
+            conditions.extend(["temp_trend"])
+
+        if module["type"] == "NAMain":
+            conditions.extend(["pressure_trend"])
+
         if module["type"] in [
             "NAMain",
             "NAModule1",

src/pyatmo/weather_station.py

@@ -58,7 +58,8 @@ def test_post_request_binary(auth, requests_mock):
 
 
 @pytest.mark.parametrize(
-    "test_input,expected", [(200, None), (404, None), (401, None)],
+    "test_input,expected",
+    [(200, None), (404, None), (401, None)],
 )
 def test_post_request_fail(auth, requests_mock, test_input, expected):
     """Test failing requests against the Netatmo API."""

tests/test_pyatmo.py

@@ -112,7 +112,8 @@ def test_camera_data_camera_urls_disconnected(auth, requests_mock):
 
 
 @pytest.mark.parametrize(
-    "home_id, expected", [("91763b24c43d3e344f424e8b", ["Richard Doe"])],
+    "home_id, expected",
+    [("91763b24c43d3e344f424e8b", ["Richard Doe"])],
 )
 def test_camera_data_persons_at_home(camera_home_data, home_id, expected):
     assert camera_home_data.persons_at_home(home_id) == expected
@@ -321,7 +322,14 @@ def test_camera_data_get_smokedetector(camera_home_data, sid, expected):
             "camera_set_state_ok.json",
             True,
         ),
-        (None, "12:34:56:00:f1:62", None, "on", "camera_set_state_ok.json", True,),
+        (
+            None,
+            "12:34:56:00:f1:62",
+            None,
+            "on",
+            "camera_set_state_ok.json",
+            True,
+        ),
         (
             "91763b24c43d3e344f424e8b",
             "12:34:56:00:f1:62",

tests/test_pyatmo_camera.py

@@ -391,7 +391,13 @@ def test_home_status_boiler_status(home_status):
     ],
 )
 def test_home_status_set_thermmode(
-    home_status, requests_mock, mode, end_time, schedule_id, json_fixture, expected,
+    home_status,
+    requests_mock,
+    mode,
+    end_time,
+    schedule_id,
+    json_fixture,
+    expected,
 ):
     with open("fixtures/%s" % json_fixture) as json_file:
         json_fixture = json.load(json_file)
@@ -451,7 +457,14 @@ def test_home_status_set_thermmode(
     ],
 )
 def test_home_status_set_room_thermpoint(
-    home_status, requests_mock, room_id, mode, temp, end_time, json_fixture, expected,
+    home_status,
+    requests_mock,
+    room_id,
+    mode,
+    temp,
+    end_time,
+    json_fixture,
+    expected,
 ):
     with open("fixtures/%s" % json_fixture) as json_file:
         json_fixture = json.load(json_file)
@@ -506,7 +519,13 @@ def test_home_status_set_room_thermpoint(
     ],
 )
 def test_home_status_set_room_thermpoint_error(
-    home_status, requests_mock, room_id, mode, temp, json_fixture, expected,
+    home_status,
+    requests_mock,
+    room_id,
+    mode,
+    temp,
+    json_fixture,
+    expected,
 ):
     with open("fixtures/%s" % json_fixture) as json_file:
         json_fixture = json.load(json_file)