fix: url and form data (firstof9#4)

* fix: url and form data

* fix tests

* formatting

Author: firstof9

openevsehttp/__init__.py

@@ -49,8 +49,8 @@ def __init__(self, host: str, user: str = None, pwd: str = None) -> None:
 
     def send_command(self, command: str) -> tuple | None:
         """Send a command via HTTP to the charger and prases the response."""
-        url = f"{self._url}/r?json=1"
-        data = {"rapi": command}
+        url = f"{self._url}/r"
+        data = {"json": 1, "rapi": command}
 
         _LOGGER.debug("Posting data: %s to %s", command, url)
         if self._user is not None:

setup.py

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

tests/__pycache__/__init__.cpython-38.pyc

@@ -91,9 +91,9 @@ def mock_config_v2(requests_mock):
 @pytest.fixture(name="send_command_mock")
 def mock_send_command(requests_mock):
     """Mock the command reply."""
-    value = {"cmd": "OK", "ret": "test"}
+    value = {"cmd": "OK", "ret": "$OK^20"}
     requests_mock.post(
-        "http://openevse.test.tld/r?json=1",
+        "http://openevse.test.tld/r",
         text=json.dumps(value),
     )
 
@@ -102,7 +102,7 @@ def mock_send_command(requests_mock):
 def mock_send_command_parse_err(requests_mock):
     """Mock the command reply parse err."""
     requests_mock.post(
-        "http://openevse.test.tld/r?json=1",
+        "http://openevse.test.tld/r",
         status_code=400,
     )
 
@@ -111,16 +111,26 @@ def mock_send_command_parse_err(requests_mock):
 def mock_send_command_auth_err(requests_mock):
     """Mock the command reply auth err."""
     requests_mock.post(
-        "http://openevse.test.tld/r?json=1",
+        "http://openevse.test.tld/r",
         status_code=401,
     )
 
 
 @pytest.fixture(name="send_command_mock_missing")
 def mock_send_command_missing(requests_mock):
     """Mock the command reply."""
-    value = {"cmd": "OK", "what": "test"}
+    value = {"cmd": "OK", "what": "$NK^21"}
     requests_mock.post(
-        "http://openevse.test.tld/r?json=1",
+        "http://openevse.test.tld/r",
+        text=json.dumps(value),
+    )
+
+
+@pytest.fixture(name="send_command_mock_failed")
+def mock_send_command_failed(requests_mock):
+    """Mock the command reply."""
+    value = {"cmd": "OK", "ret": "$NK^21"}
+    requests_mock.post(
+        "http://openevse.test.tld/r",
         text=json.dumps(value),
     )

tests/__pycache__/common.cpython-38.pyc

@@ -19,7 +19,13 @@ def test_get_status_auth_err(test_charger_auth_err):
 def test_send_command(test_charger, send_command_mock):
     """Test v4 Status reply"""
     status = test_charger.send_command("test")
-    assert status == (True, "test")
+    assert status == (True, "$OK^20")
+
+
+def test_send_command(test_charger, send_command_mock_failed):
+    """Test v4 Status reply"""
+    status = test_charger.send_command("test")
+    assert status == (True, "$NK^21")
 
 
 def test_send_command_missing(test_charger, send_command_mock_missing):
@@ -31,7 +37,7 @@ def test_send_command_missing(test_charger, send_command_mock_missing):
 def test_send_command_auth(test_charger_auth, send_command_mock):
     """Test v4 Status reply"""
     status = test_charger_auth.send_command("test")
-    assert status == (True, "test")
+    assert status == (True, "$OK^20")
 
 
 def test_send_command_parse_err(test_charger_auth, send_command_parse_err):