solarlog-cli 0.6.0__tar.gz → 0.6.1__tar.gz

{solarlog_cli-0.6.0 → solarlog_cli-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: solarlog_cli
-Version: 0.6.0
+Version: 0.6.1
 Summary: Python library to access the Solar-Log
 Project-URL: Repository, https://github.com/dontinelli/solarlog_cli.git
 Project-URL: Issues, https://github.com/dontinelli/solarlog_cli/issues

{solarlog_cli-0.6.0 → solarlog_cli-0.6.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "solarlog_cli"
-version = "0.6.0"
+version = "0.6.1"
 authors = [
   { name="dontinelli", email="73341522+dontinelli@users.noreply.github.com" },
 ]

{solarlog_cli-0.6.0 → solarlog_cli-0.6.1}/src/solarlog_cli/solarlog_client.py

@@ -22,6 +22,7 @@ from .solarlog_models import SolarlogData
 SOLARLOG_REQUEST_PAYLOAD = '{ "801": { "170": null } }'
 _LOGGER = logging.getLogger(__name__)
 
+
 class Client:
     """Client class to access Solar-Log."""
 
@@ -30,7 +31,6 @@ class Client:
     def __init__(self, host: str, session: ClientSession | None, password: str = "") -> None:
         self.host: str = host
         self.password: str = password
-        self.token: str = ""
 
         self.request_timeout = 30
 
@@ -39,9 +39,9 @@ class Client:
         else:
             self.session = session
 
+        self._hashed_pwd: bool = False
         self._close_session: bool = True
 
-
     async def test_connection(self) -> bool:
         """Test the connection to Solar-Log."""
         if self.session is None:
@@ -68,12 +68,12 @@ class Client:
 
         payload: str = f"u=user&p={self.password}"
 
-        response = await self.execute_http_request(payload,"login")
+        response = await self.execute_http_request(payload, "login")
 
         text = await response.text()
-        _LOGGER.debug("Response: %s",text)
+        _LOGGER.debug("Response: %s", text)
         if text.count("FAILED - User was wrong"):
-            #Response means, that no password is required
+            # Response means, that no password is required
             self.password = ""
             return False
 
@@ -87,19 +87,21 @@ class Client:
             response = await self.execute_http_request(payload)
 
             text = await response.text()
-            _LOGGER.debug("Response to request for user salts: %s",text)
+            _LOGGER.debug("Response to request for user salts: %s", text)
             r_dict: dict[str, Any] = json.loads(text)
 
-            salt: str = r_dict.get('550',{}).get('104')
-            _LOGGER.debug("Salt to hash pwd: %s",salt)
+            salt: str = r_dict.get('550', {}).get('104')
+            _LOGGER.debug("Salt to hash pwd: %s", salt)
 
             try:
                 if salt != 'QUERY IMPOSSIBLE 000' and salt is not None:
-                    hashed_password = bcrypt.hashpw(self.password.encode(), salt.encode())
+                    hashed_password = bcrypt.hashpw(
+                        self.password.encode(), salt.encode())
                     payload = f"u=user&p={hashed_password.decode('utf-8')}"
-                    response = await self.execute_http_request(payload,"login")
+                    response = await self.execute_http_request(payload, "login")
                     text = await response.text()
-                    _LOGGER.debug("Response of login with hashed pwd: %s",text)
+                    _LOGGER.debug(
+                        "Response of login with hashed pwd: %s", text)
                     if text.count("FAILED - Password was wrong"):
                         _LOGGER.debug("Wrong password (hashed)")
                         raise SolarLogAuthenticationError
@@ -107,11 +109,13 @@ class Client:
             except Exception as exception:
                 raise SolarLogAuthenticationError from exception
 
-        self.token = response.cookies["SolarLog"].value
+            self._hashed_pwd = True
+
+        self.session.cookie_jar.update_cookies({"SolarLog": response.cookies["SolarLog"].value})
 
-        _LOGGER.debug("response: %s",text)
-        _LOGGER.debug("cookies: %s",response.cookies)
-        _LOGGER.debug("Login successful, token: %s",self.token)
+        _LOGGER.debug("response: %s", text)
+        _LOGGER.debug("cookies: %s", response.cookies)
+        _LOGGER.debug("Login successful, token: %s", response.cookies["SolarLog"].value)
 
         return True
 
@@ -124,11 +128,8 @@ class Client:
         url = f"{self.host}/{path}"
 
         header = {"Content-Type": "text/html", "X-SL-CSRF-PROTECTION": "1"}
-        if self.token != "":
-            header |= {"Cookie": f"SolarLog={self.token}"}
-            body = f"token={self.token}; " + body
 
-        _LOGGER.debug("HTTP-request header: %s",header)
+        _LOGGER.debug("HTTP-request header: %s", header)
         _LOGGER.debug("HTTP-request body: %s", body)
 
         try:
@@ -153,14 +154,14 @@ class Client:
                 {"Content-Type": content_type, "response": text},
             )
 
-        _LOGGER.debug("HTTP-request successful: %s",response)
+        _LOGGER.debug("HTTP-request successful: %s", response)
         return response
 
     async def parse_http_response(self, response: ClientResponse) -> dict[str, Any]:
         """Helper function to parse the HTTP response."""
 
-        text = await response.text()
-        _LOGGER.debug("Parsing http response: %s",text)
+        text = await response.text(errors="replace")
+        _LOGGER.debug("Parsing http response: %s", text)
 
         if text.count('{"QUERY IMPOSSIBLE 000"}'):
             raise SolarLogUpdateError(f"Server response: {text}")
@@ -188,29 +189,30 @@ class Client:
         raw_data = raw_data["801"]["170"]
 
         data = SolarlogData(
-            last_updated = datetime.strptime(raw_data["100"], "%d.%m.%y %H:%M:%S"),
-            power_ac = raw_data["101"],
-            power_dc = raw_data["102"],
-            voltage_ac = raw_data["103"],
-            voltage_dc = raw_data["104"],
-            yield_day = raw_data["105"],
-            yield_yesterday = raw_data["106"],
-            yield_month = raw_data["107"],
-            yield_year = raw_data["108"],
-            yield_total = raw_data["109"],
-            consumption_ac = raw_data["110"],
-            consumption_day = raw_data["111"],
-            consumption_yesterday = raw_data["112"],
-            consumption_month = raw_data["113"],
-            consumption_year = raw_data["114"],
-            consumption_total = raw_data["115"],
-            total_power = raw_data["116"],
+            last_updated=datetime.strptime(
+                raw_data["100"], "%d.%m.%y %H:%M:%S"),
+            power_ac=raw_data["101"],
+            power_dc=raw_data["102"],
+            voltage_ac=raw_data["103"],
+            voltage_dc=raw_data["104"],
+            yield_day=raw_data["105"],
+            yield_yesterday=raw_data["106"],
+            yield_month=raw_data["107"],
+            yield_year=raw_data["108"],
+            yield_total=raw_data["109"],
+            consumption_ac=raw_data["110"],
+            consumption_day=raw_data["111"],
+            consumption_yesterday=raw_data["112"],
+            consumption_month=raw_data["113"],
+            consumption_year=raw_data["114"],
+            consumption_total=raw_data["115"],
+            total_power=raw_data["116"],
         )
 
         return data
 
     async def get_battery_data(self) -> list[float]:
-        """Get power data from Solar-Log"""
+        """Get battery data from Solar-Log"""
 
         raw_data: dict = await self.parse_http_response(
             await self.execute_http_request('{ "858": null }')
@@ -227,7 +229,8 @@ class Client:
             await self.execute_http_request('{ "782": null }')
         )
 
-        data = {int(key): val for key, val in raw_data["782"].items() if val != "0"}
+        data = {int(key): val for key,
+                val in raw_data["782"].items() if val != "0"}
 
         return data
 

{solarlog_cli-0.6.0 → solarlog_cli-0.6.1}/tests/test_solarlog_cli.py

@@ -144,7 +144,6 @@ async def test_login_and_data_retreival(responses: aioresponses) -> None:
         "http://solarlog.com", password="pwd")
 
     assert await solarlog_connector.login()
-    assert solarlog_connector.client.token == "token"
 
     responses.post(
         "http://solarlog.com/getjp",
@@ -176,7 +175,6 @@ async def test_login_hashed_pwd(responses: aioresponses) -> None:
         "http://solarlog.com", password="pwd")
 
     assert await solarlog_connector.login()
-    assert solarlog_connector.client.token == "token"
 
     await solarlog_connector.client.close()
     assert solarlog_connector.client.session.closed