python-openevse-http 0.2.0__tar.gz → 0.2.2__tar.gz

{python_openevse_http-0.2.0/python_openevse_http.egg-info → python_openevse_http-0.2.2}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: python_openevse_http
-Version: 0.2.0
+Version: 0.2.2
 Summary: Python wrapper for OpenEVSE HTTP API
 Home-page: https://github.com/firstof9/python-openevse-http
 Download-URL: https://github.com/firstof9/python-openevse-http
 Author: firstof9
 Author-email: firstof9@gmail.com
+License: Apache-2.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Natural Language :: English
@@ -14,11 +15,11 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp
-Requires-Dist: requests
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -26,6 +27,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: download-url
 Dynamic: home-page
+Dynamic: license
 Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python

{python_openevse_http-0.2.0 → python_openevse_http-0.2.2}/openevsehttp/__main__.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import asyncio
-import datetime
+from datetime import datetime, timedelta, timezone
 import json
 import logging
 import re
@@ -1144,9 +1144,16 @@ class OpenEVSE:
         return None
 
     @property
-    def time(self) -> datetime.datetime | None:
+    def time(self) -> datetime | None:
         """Get the RTC time."""
-        return self._status.get("time", None)
+        value = self._status.get("time")
+
+        if value:
+            try:
+                return datetime.fromisoformat(value.replace("Z", "+00:00"))
+            except (ValueError, AttributeError):
+                return None
+        return None
 
     @property
     def usage_session(self) -> float:
@@ -1308,11 +1315,14 @@ class OpenEVSE:
         )
 
     @property
-    def vehicle_eta(self) -> int | None:
+    def vehicle_eta(self) -> datetime | None:
         """Return time to full charge."""
-        return self._status.get(
-            "vehicle_eta", self._status.get("time_to_full_charge", None)
+        value = self._status.get(
+            "time_to_full_charge", self._status.get("vehicle_eta", None)
         )
+        if value is not None:
+            return datetime.now(timezone.utc) + timedelta(seconds=value)
+        return value
 
     # There is currently no min/max amps JSON data
     # available via HTTP API methods

{python_openevse_http-0.2.0 → python_openevse_http-0.2.2/python_openevse_http.egg-info}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: python_openevse_http
-Version: 0.2.0
+Version: 0.2.2
 Summary: Python wrapper for OpenEVSE HTTP API
 Home-page: https://github.com/firstof9/python-openevse-http
 Download-URL: https://github.com/firstof9/python-openevse-http
 Author: firstof9
 Author-email: firstof9@gmail.com
+License: Apache-2.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Natural Language :: English
@@ -14,11 +15,11 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp
-Requires-Dist: requests
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -26,6 +27,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: download-url
 Dynamic: home-page
+Dynamic: license
 Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python

python_openevse_http-0.2.2/python_openevse_http.egg-info/requires.txt

@@ -0,0 +1 @@
+aiohttp

{python_openevse_http-0.2.0 → python_openevse_http-0.2.2}/setup.py

@@ -6,7 +6,7 @@ from setuptools import find_packages, setup
 
 PROJECT_DIR = Path(__file__).parent.resolve()
 README_FILE = PROJECT_DIR / "README.md"
-VERSION = "0.2.0"
+VERSION = "0.2.2"
 
 setup(
     name="python_openevse_http",
@@ -20,7 +20,8 @@ setup(
     long_description_content_type="text/markdown",
     packages=find_packages(exclude=["test.*", "tests"]),
     python_requires=">=3.10",
-    install_requires=["aiohttp", "requests"],
+    install_requires=["aiohttp"],
+    license="Apache-2.0",
     entry_points={},
     include_package_data=True,
     zip_safe=False,
@@ -33,5 +34,6 @@ setup(
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: 3.13",
+        "License :: OSI Approved :: Apache Software License",
     ],
 )

{python_openevse_http-0.2.0 → python_openevse_http-0.2.2}/tests/test_main.py

@@ -8,6 +8,8 @@ from unittest.mock import AsyncMock, MagicMock, patch
 
 import aiohttp
 import pytest
+from datetime import datetime, timezone, timedelta
+from freezegun import freeze_time
 from aiohttp.client_exceptions import ContentTypeError, ServerTimeoutError
 from aiohttp.client_reqrep import ConnectionKey
 from awesomeversion.exceptions import AwesomeVersionCompareException
@@ -488,18 +490,42 @@ async def test_get_esp_temperature(fixture, expected, request):
 
 
 @pytest.mark.parametrize(
-    "fixture, expected",
+    "fixture, expected_str",
     [("test_charger", "2021-08-10T23:00:11Z"), ("test_charger_v2", None)],
 )
-async def test_get_time(fixture, expected, request):
+async def test_get_time(fixture, expected_str, request):
     """Test v4 Status reply."""
     charger = request.getfixturevalue(fixture)
     await charger.update()
-    status = charger.time
-    assert status == expected
+
+    result = charger.time
+
+    if expected_str:
+        expected_dt = datetime(2021, 8, 10, 23, 0, 11, tzinfo=timezone.utc)
+        assert result == expected_dt
+        assert isinstance(result, datetime)
+    else:
+        assert result is None
+
     await charger.ws_disconnect()
 
 
+@pytest.mark.parametrize(
+    "bad_value",
+    [
+        "not-a-timestamp",
+        123456789,
+        True,
+        {"some": "dict"},
+    ],
+)
+async def test_time_parsing_errors(test_charger, bad_value):
+    """Test that ValueError and AttributeError are caught and return None."""
+    test_charger._status["time"] = bad_value
+    result = test_charger.time
+    assert result is None
+
+
 @pytest.mark.parametrize(
     "fixture, expected",
     [
@@ -1266,14 +1292,25 @@ async def test_vehicle_range(fixture, expected, request):
 
 
 @pytest.mark.parametrize(
-    "fixture, expected", [("test_charger", 18000), ("test_charger_v2", None)]
+    "fixture, expected_seconds", [("test_charger", 18000), ("test_charger_v2", None)]
 )
-async def test_vehicle_eta(fixture, expected, request):
+@freeze_time("2026-01-09 12:00:00+00:00")
+async def test_vehicle_eta(fixture, expected_seconds, request):
     """Test vehicle_eta reply."""
     charger = request.getfixturevalue(fixture)
     await charger.update()
-    status = charger.vehicle_eta
-    assert status == expected
+
+    result = charger.vehicle_eta
+
+    if expected_seconds is not None:
+        # Calculate what the expected datetime should be based on our frozen time
+        expected_datetime = datetime(
+            2026, 1, 9, 12, 0, 0, tzinfo=timezone.utc
+        ) + timedelta(seconds=expected_seconds)
+        assert result == expected_datetime
+    else:
+        assert result is None
+
     await charger.ws_disconnect()
 
 
@@ -2235,10 +2272,10 @@ async def test_main_auth_instantiation():
     # Ensure session.get() returns the request context
     mock_session.get.return_value = mock_request_ctx
 
-    with patch("aiohttp.ClientSession", return_value=mock_session), patch(
-        "aiohttp.BasicAuth"
-    ) as mock_basic_auth:
-
+    with (
+        patch("aiohttp.ClientSession", return_value=mock_session),
+        patch("aiohttp.BasicAuth") as mock_basic_auth,
+    ):
         await charger.update()
 
         # Verify BasicAuth was instantiated

{python_openevse_http-0.2.0 → python_openevse_http-0.2.2}/tests/test_main_edge_cases.py

@@ -33,8 +33,9 @@ async def test_process_request_decode_error(charger, caplog):
     mock_resp.__aenter__.return_value = mock_resp
     mock_resp.__aexit__.return_value = None
 
-    with patch("aiohttp.ClientSession.get", return_value=mock_resp), caplog.at_level(
-        logging.DEBUG
+    with (
+        patch("aiohttp.ClientSession.get", return_value=mock_resp),
+        caplog.at_level(logging.DEBUG),
     ):
         data = await charger.process_request("http://url", method="get")
 
@@ -53,8 +54,9 @@ async def test_process_request_http_warnings(charger, caplog):
     mock_resp.__aenter__.return_value = mock_resp
     mock_resp.__aexit__.return_value = None
 
-    with patch("aiohttp.ClientSession.get", return_value=mock_resp), caplog.at_level(
-        logging.WARNING
+    with (
+        patch("aiohttp.ClientSession.get", return_value=mock_resp),
+        caplog.at_level(logging.WARNING),
     ):
         await charger.process_request("http://url", method="get")
         # Verify the 404 response body was logged as a warning

{python_openevse_http-0.2.0 → python_openevse_http-0.2.2}/tests/test_websocket.py

@@ -97,9 +97,10 @@ async def test_connection_error_retry(ws_client, mock_callback):
     """Test connection retry logic."""
     error = aiohttp.ClientConnectionError("Connection lost")
 
-    with patch("aiohttp.ClientSession.ws_connect", side_effect=error), patch(
-        "asyncio.sleep", new_callable=AsyncMock
-    ) as mock_sleep:
+    with (
+        patch("aiohttp.ClientSession.ws_connect", side_effect=error),
+        patch("asyncio.sleep", new_callable=AsyncMock) as mock_sleep,
+    ):
         # Simulate one run of 'running' which catches the error and triggers sleep
         await ws_client.running()
 

python_openevse_http-0.2.0/python_openevse_http.egg-info/requires.txt

@@ -1,2 +0,0 @@
-aiohttp
-requests