clean up old requests usage (#11)

* remove requests calls
* handle missing websocket data

Author: firstof9

README.md

@@ -2,3 +2,10 @@
 Python Library for OpenEVSE HTTP API
 
 A python library for communicating with the ESP8266- and ESP32-based wifi module from OpenEVSE. This library uses the HTTP API commands to query the OpenEVSE charger.
+
+TODO:
+- [ ] Fix tests
+- [ ] Finish HTTP API functions
+- [X] Setup webosocket listener for value updates
+- [X] Convert to aiohttp from requests
+- [X] Expose values as properties

openevsehttp/__init__.py

@@ -7,10 +7,9 @@
 from typing import Any, Callable, Optional
 
 import aiohttp  # type: ignore
-import requests  # type: ignore
 
 from .const import MAX_AMPS, MIN_AMPS
-from .exceptions import AuthenticationError, ParseJSONError, HTTPError
+from .exceptions import AuthenticationError, ParseJSONError
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -33,6 +32,7 @@
 ERROR_AUTH_FAILURE = "Authorization failure"
 ERROR_TOO_MANY_RETRIES = "Too many retries"
 ERROR_UNKNOWN = "Unknown"
+ERROR_TIMEOUT = "Timeout while updating "
 
 MAX_FAILED_ATTEMPTS = 5
 
@@ -190,7 +190,7 @@ async def send_command(self, command: str) -> tuple | None:
                     _LOGGER.debug("JSON error: %s", await resp.text())
                     raise ParseJSONError
                 if resp.status == 401:
-                    _LOGGER.debug("Authentication error: %s", await resp)
+                    _LOGGER.debug("Authentication error: %s", await resp.text())
                     raise AuthenticationError
 
                 value = await resp.json()
@@ -215,15 +215,21 @@ async def update(self) -> None:
                 _LOGGER.debug("Updating data from %s", url)
                 async with session.get(url, auth=auth) as resp:
                     if resp.status == 401:
-                        _LOGGER.debug("Authentication error: %s", resp)
+                        _LOGGER.debug("Authentication error: %s", resp.text())
                         raise AuthenticationError
 
                     if "/status" in url:
-                        self._status = await resp.json()
-                        _LOGGER.debug("Status update: %s", self._status)
+                        try:
+                            self._status = await resp.json()
+                            _LOGGER.debug("Status update: %s", self._status)
+                        except TimeoutError:
+                            _LOGGER.error("%s status.", ERROR_TIMEOUT)
                     else:
-                        self._config = await resp.json()
-                        _LOGGER.debug("Config update: %s", self._config)
+                        try:
+                            self._config = await resp.json()
+                            _LOGGER.debug("Config update: %s", self._config)
+                        except TimeoutError:
+                            _LOGGER.error("%s config.", ERROR_TIMEOUT)
 
         if not self.websocket:
             # Start Websocket listening
@@ -272,6 +278,8 @@ def _update_status(self, msgtype, data, error):
 
         elif msgtype == "data":
             _LOGGER.debug("ws_data: %s", data)
+            if "wh" in data.keys():
+                data["watthour"] = data.pop("wh")
             self._status.update(data)
 
             if self.callback is not None:
@@ -289,23 +297,30 @@ def ws_state(self) -> Any:
         assert self.websocket
         return self.websocket.state
 
-    def get_override(self) -> None:
+    async def get_override(self) -> None:
         """Get the manual override status."""
-        url = f"{self.url}/overrride"
+        url = f"{self.url}override"
 
-        _LOGGER.debug("Geting data from %s", url)
-        if self._user is not None:
-            value = requests.get(url, auth=(self._user, self._pwd))
-        else:
-            value = requests.get(url)
+        if self._user and self._pwd:
+            auth = aiohttp.BasicAuth(self._user, self._pwd)
 
-        if value.status_code == 401:
-            _LOGGER.debug("Authentication error: %s", value)
-            raise AuthenticationError
+        _LOGGER.debug("Geting data from %s", url)
+        async with aiohttp.ClientSession() as session:
+            async with session.get(url, auth=auth) as resp:
+                if resp.status == 400:
+                    _LOGGER.debug("JSON error: %s", await resp.text())
+                    raise ParseJSONError
+                if resp.status == 401:
+                    _LOGGER.debug("Authentication error: %s", await resp.text())
+                    raise AuthenticationError
+                if resp.status == 404:
+                    error = await resp.json()
+                    _LOGGER.error("Error getting override status: %s", error["msg"])
 
-        self._override = value.json()
+                value = await resp.json()
+                return value
 
-    def set_override(
+    async def set_override(
         self,
         state: str,
         charge_current: int,
@@ -315,7 +330,10 @@ def set_override(
         auto_release: bool = True,
     ) -> str:
         """Set the manual override status."""
-        url = f"{self.url}/overrride"
+        url = f"{self.url}override"
+
+        if self._user and self._pwd:
+            auth = aiohttp.BasicAuth(self._user, self._pwd)
 
         if state not in ["active", "disabled"]:
             raise ValueError
@@ -330,52 +348,56 @@ def set_override(
         }
 
         _LOGGER.debug("Setting override config on %s", url)
-        if self._user is not None:
-            value = requests.post(url, data=data, auth=(self._user, self._pwd))
-        else:
-            value = requests.post(url, data=data)
-
-        if value.status_code == 401:
-            _LOGGER.debug("Authentication error: %s", value)
-            raise AuthenticationError
+        async with aiohttp.ClientSession() as session:
+            async with session.post(url, data=data, auth=auth) as resp:
+                if resp.status == 400:
+                    _LOGGER.debug("JSON error: %s", await resp.text())
+                    raise ParseJSONError
+                if resp.status == 401:
+                    _LOGGER.debug("Authentication error: %s", await resp.text())
+                    raise AuthenticationError
 
-        return value["msg"]
+                value = await resp.json()
+                _LOGGER.debug("Override set response: %s", value["msg"])
+                return value
 
-    def toggle_override(self) -> None:
+    async def toggle_override(self) -> None:
         """Toggle the manual override status."""
-        url = f"{self.url}/overrride"
+        url = f"{self.url}override"
 
-        _LOGGER.debug("Toggling manual override %s", url)
-        if self._user is not None:
-            value = requests.patch(url, auth=(self._user, self._pwd))
-        else:
-            value = requests.patch(url)
+        if self._user and self._pwd:
+            auth = aiohttp.BasicAuth(self._user, self._pwd)
 
-        if value.status_code == 401:
-            _LOGGER.debug("Authentication error: %s", value)
-            raise AuthenticationError
+        _LOGGER.debug("Toggling manual override %s", url)
+        async with aiohttp.ClientSession() as session:
+            async with session.patch(url, auth=auth) as resp:
+                if resp.status == 400:
+                    _LOGGER.debug("JSON error: %s", await resp.text())
+                    raise ParseJSONError
+                if resp.status == 401:
+                    _LOGGER.debug("Authentication error: %s", await resp.text())
+                    raise AuthenticationError
 
-        if value.status_code != 200:
-            _LOGGER.error("Problem handling request: %s", value)
-            raise HTTPError
+                _LOGGER.debug("Toggle response: %s", resp.status)
 
-    def clear_override(self) -> None:
+    async def clear_override(self) -> None:
         """Clear the manual override status."""
-        url = f"{self.url}/overrride"
+        url = f"{self.url}overrride"
 
-        _LOGGER.debug("Clearing manual overrride %s", url)
-        if self._user is not None:
-            value = requests.delete(url, auth=(self._user, self._pwd))
-        else:
-            value = requests.delete(url)
+        if self._user and self._pwd:
+            auth = aiohttp.BasicAuth(self._user, self._pwd)
 
-        if value.status_code == 401:
-            _LOGGER.debug("Authentication error: %s", value)
-            raise AuthenticationError
+        _LOGGER.debug("Clearing manual overrride %s", url)
+        async with aiohttp.ClientSession() as session:
+            async with session.delete(url, auth=auth) as resp:
+                if resp.status == 400:
+                    _LOGGER.debug("JSON error: %s", await resp.text())
+                    raise ParseJSONError
+                if resp.status == 401:
+                    _LOGGER.debug("Authentication error: %s", await resp.text())
+                    raise AuthenticationError
 
-        if value.status_code != 200:
-            _LOGGER.error("Problem handling request: %s", value)
-            raise HTTPError
+                _LOGGER.debug("Toggle response: %s", resp.status)
 
     @property
     def hostname(self) -> str:

openevsehttp/exceptions.py

@@ -7,7 +7,3 @@ class AuthenticationError(Exception):
 
 class ParseJSONError(Exception):
     """Exception for JSON parsing errors."""
-
-
-class HTTPError(Exception):
-    """Exception for HTTP errors."""

setup.py

@@ -5,7 +5,7 @@
 
 PROJECT_DIR = Path(__file__).parent.resolve()
 README_FILE = PROJECT_DIR / "README.md"
-VERSION = "0.1.9"
+VERSION = "0.1.10"
 
 
 setup(

tests/conftest.py

@@ -64,27 +64,27 @@ def test_charger_v2(status_mock_v2, config_mock_v2):
 @pytest.fixture(name="status_mock")
 def mock_status():
     """Mock the status reply."""
-    with aioresponses() as client_mock:
-        client_mock.get(
+    with aioresponses() as mock_status:
+        mock_status.get(
             TEST_URL_STATUS,
             status=200,
             body=load_fixture("v4_json/status.json"),
         )
 
-        yield client_mock
+        yield mock_status
 
 
 @pytest.fixture(name="config_mock")
 def mock_config():
     """Mock the config reply."""
-    with aioresponses() as client_mock:
-        client_mock.get(
+    with aioresponses() as mock_config:
+        mock_config.get(
             TEST_URL_CONFIG,
             status=200,
             body=load_fixture("v4_json/config.json"),
         )
 
-        yield client_mock
+        yield mock_config
 
 
 @pytest.fixture(name="status_mock_v2")

tests/test_init.py

@@ -5,14 +5,14 @@
 pytestmark = pytest.mark.asyncio
 
 
-async def test_get_status_auth(test_charger_auth, aioclient_mock):
+async def test_get_status_auth(test_charger_auth):
     """Test v4 Status reply"""
     await test_charger_auth.update()
     status = test_charger_auth.status
     assert status == "sleeping"
 
 
-async def test_get_status_auth_err(test_charger_auth_err, aioclient_mock):
+async def test_get_status_auth_err(test_charger_auth_err):
     """Test v4 Status reply"""
     with pytest.raises(openevsehttp.AuthenticationError):
         await test_charger_auth_err.update()