Small updates on python package (#37)

* Move json load to request function

* Change async timeout

* Small project change

pure_energie/models.py

@@ -1,7 +1,6 @@
 """Models for Pure Energie Meter."""
 from __future__ import annotations
 
-import json
 from dataclasses import dataclass
 from typing import Any
 
@@ -24,7 +23,6 @@ def from_dict(data: dict[str, Any]) -> SmartMeter:
         Returns:
             A SmartMeter object.
         """
-        data = json.loads(data)
         data = data["elec"]
 
         def convert(value):
@@ -65,7 +63,6 @@ def from_dict(data: dict[str, Any]) -> Device:
         Returns:
             A Device object.
         """
-        data = json.loads(data)
 
         return Device(
             pem_id=data.get("id"),

pure_energie/pure_energie.py

@@ -2,11 +2,12 @@
 from __future__ import annotations
 
 import asyncio
+import json
 from dataclasses import dataclass
 from typing import Any, Mapping
 
-import async_timeout
 from aiohttp.client import ClientError, ClientResponseError, ClientSession
+from async_timeout import timeout
 from yarl import URL
 
 from .exceptions import PureEnergieMeterConnectionError
@@ -28,7 +29,7 @@ def __init__(
             session: Optional, shared, aiohttp client session.
         """
         self._session = session
-        self._close_session = False
+        self._close_session: bool = False
 
         self.host = host
         self.request_timeout = request_timeout
@@ -64,7 +65,7 @@ async def request(
             self._close_session = True
 
         try:
-            with async_timeout.timeout(self.request_timeout):
+            async with timeout(self.request_timeout):
                 response = await self._session.request(
                     "GET",
                     url,
@@ -90,6 +91,7 @@ async def device(self) -> Device:
             A Device data object from the Pure Energie device API.
         """
         data = await self.request("info")
+        data = json.loads(data)
         return Device.from_dict(data)
 
     async def smartmeter(self) -> SmartMeter:
@@ -99,6 +101,7 @@ async def smartmeter(self) -> SmartMeter:
             A SmartMeter data object from the Pure Energie device API.
         """
         data = await self.request("meter/now")
+        data = json.loads(data)
         return SmartMeter.from_dict(data)
 
     async def close(self) -> None:

pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "pure_energie"
 version = "0.0.0"
-description = "Asynchronous Python client for the Pure Energy devices"
+description = "Asynchronous Python client for the Pure Energie Meter devices"
 authors = ["Klaas Schoute <[email protected]>"]
 maintainers = ["Klaas Schoute <[email protected]>"]
 license = "MIT"
@@ -63,7 +63,7 @@ bandit = "^1.7.1"
 Changelog = "https://github.com/klaasnicolaas/python-pem/releases"
 
 [tool.black]
-target-version = ['py37']
+target-version = ['py38']
 
 [tool.coverage.paths]
 source = ["pure_energie"]
@@ -120,5 +120,5 @@ paths = ["pure_energie"]
 verbose = true
 
 [build-system]
-requires = ["poetry-core>=1.0.0"]
+requires = ["setuptools", "poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"