fix: prefer grid sensor if available (#261)

* fix: prefer grid sensor if available

* change logging message level

* version bump

Author: firstof9

openevsehttp/__main__.py

@@ -583,22 +583,33 @@ def _version_check(self, min_version: str, max_version: str = "") -> bool:
 
     # Self production HTTP Posting
 
-    async def self_production(self, grid: int, solar: int, invert: bool = True) -> None:
+    async def self_production(
+        self, grid: int | None = None, solar: int | None = None, invert: bool = True
+    ) -> None:
         """Send pushed sensor data to self-prodcution."""
         if not self._version_check("4.0.0"):
             _LOGGER.debug("Feature not supported for older firmware.")
             raise UnsupportedFeature
 
         # Invert the sensor -import/+export
-        if invert:
+        if invert and grid is not None:
             grid = grid * -1
 
         url = f"{self.url}status"
-        data = {"solar": solar, "grid_ie": grid}
+        data = {}
+
+        # Prefer grid sensor data
+        if grid is not None:
+            data = {"grid_ie": grid}
+        elif solar is not None:
+            data = {"solar": solar}
 
-        _LOGGER.debug("Posting self-production: %s", data)
-        response = await self.process_request(url=url, method="post", data=data)
-        _LOGGER.debug("Self-production response: %s", response)
+        if not data:
+            _LOGGER.info("No sensor data to send to device.")
+        else:
+            _LOGGER.debug("Posting self-production: %s", data)
+            response = await self.process_request(url=url, method="post", data=data)
+            _LOGGER.debug("Self-production response: %s", response)
 
     @property
     def hostname(self) -> str:

setup.py

@@ -5,7 +5,7 @@
 
 PROJECT_DIR = Path(__file__).parent.resolve()
 README_FILE = PROJECT_DIR / "README.md"
-VERSION = "0.1.54"
+VERSION = "0.1.55"
 
 setup(
     name="python-openevse-http",

tests/test_main.py

@@ -1510,16 +1510,21 @@ async def test_self_production(test_charger, test_charger_v2, mock_aioclient, ca
         TEST_URL_STATUS,
         status=200,
         body='{"grid_ie": 3000, "solar": 1000}',
+        repeat=True,
     )
     with caplog.at_level(logging.DEBUG):
         await test_charger.self_production(-3000, 1000)
-        assert (
-            "Posting self-production: {'solar': 1000, 'grid_ie': 3000}" in caplog.text
-        )
+        assert "Posting self-production: {'grid_ie': 3000}" in caplog.text
         assert (
             "Self-production response: {'grid_ie': 3000, 'solar': 1000}" in caplog.text
         )
 
+        await test_charger.self_production(None, 1000)
+        assert "Posting self-production: {'solar': 1000}" in caplog.text
+
+        await test_charger.self_production(None, None)
+        assert "No sensor data to send to device." in caplog.text
+
     with pytest.raises(UnsupportedFeature):
         with caplog.at_level(logging.DEBUG):
             await test_charger_v2.self_production(-3000, 1000)