Merge pull request #6 from azogue/chore/fix-bugs

🐛 Fix bugs for new price sensors
azogue · May 29, 2023 · a400977 · a400977
2 parents 4dfd226 + 8310541
commit a400977
Show file tree

Hide file tree

Showing 8 changed files with 308 additions and 298 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.263
+    rev: v0.0.270
     hooks:
       - id: ruff
         args:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [v1.1.0](https://github.com/azogue/ha-pvpc-custom/tree/v1.1.0) 🐛 Fixes for new extra price sensors (2023-05-29)
+
+- 🐛 Fix all integration sensors going unavailable when any sensor lacks data for the current day (usually the 'OMIE price')
+- 🐛 Fix 'max_price_at' and 'min_price_at' for injection price sensor (were swapped), by updating to [`aiopvpc` v4.2.1](https://github.com/azogue/aiopvpc/releases/tag/v4.2.1), and set 'integration_type' to 'service' in `manifest.json`
+- 🎨 pre-commit autoupdate
+
 ## [v1.0.0](https://github.com/azogue/ha-pvpc-custom/tree/v1.0.0) ✨ API Token support + extra price sensors (2023-04-02)
 
 Mirror of [official HA-Core integration 'pvpc_hourly_pricing'](https://www.home-assistant.io/integrations/pvpc_hourly_pricing), with proposed changes to

diff --git a/custom_components/pvpc_hourly_pricing/__init__.py b/custom_components/pvpc_hourly_pricing/__init__.py
@@ -102,7 +102,7 @@ async def _async_update_data(self) -> EsiosApiData:
         if (
             not api_data
             or not api_data.sensors
-            or not all(api_data.availability.values())
+            or not any(api_data.availability.values())
         ):
             raise UpdateFailed
         return api_data
diff --git a/custom_components/pvpc_hourly_pricing/manifest.json b/custom_components/pvpc_hourly_pricing/manifest.json
@@ -4,10 +4,11 @@
   "codeowners": ["@azogue"],
   "config_flow": true,
   "documentation": "https://github.com/azogue/ha-pvpc-custom",
+  "integration_type": "service",
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/azogue/ha-pvpc-custom/issues",
   "loggers": ["aiopvpc"],
   "quality_scale": "platinum",
-  "requirements": ["aiopvpc==4.1.0"],
-  "version": "1.0.0"
+  "requirements": ["aiopvpc==4.2.1"],
+  "version": "1.1.0"
 }
diff --git a/custom_components/pvpc_hourly_pricing/sensor.py b/custom_components/pvpc_hourly_pricing/sensor.py
@@ -193,6 +193,13 @@ def __init__(
             )
         )
 
+    @property
+    def available(self) -> bool:
+        """Return if entity is available."""
+        return self.coordinator.data.availability.get(
+            self.entity_description.key, False
+        )
+
     async def async_added_to_hass(self) -> None:
         """Handle entity which will be added."""
         await super().async_added_to_hass()

diff --git a/hacs.json b/hacs.json
@@ -1,7 +1,6 @@
 {
   "name": "Spain electricity hourly pricing (PVPC)",
   "content_in_root": false,
-  "zip_release": false,
   "render_readme": true,
   "country": "ES",
   "homeassistant": "2023.3.0"

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ha-pvpc-custom"
-version = "1.0.0"
+version = "1.1.0"
 description = "HomeAssistant custom integration for Spain electricity hourly pricing (PVPC)"
 authors = ["Eugenio Panadero <eugenio.panadero@gmail.com>"]
 license = "MIT"
@@ -10,7 +10,7 @@ repository = "https://github.com/azogue/ha-pvpc-custom"
 [tool.poetry.dependencies]
 python = ">=3.10,<3.12"
 homeassistant = ">=2023.3.0"
-aiopvpc = ">=4.1.0"
+aiopvpc = ">=4.2.1"
 
 [tool.poetry.dev-dependencies]
 pre-commit = ">=2.2.0"