Feature/ctek pypi

homeassistant/components/nanogrid_air/config_flow.py

@@ -2,15 +2,14 @@
 
 from __future__ import annotations
 
+from ctek import NanogridAir
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_URL
 
-from .api import fetch_mac, get_ip
 from .const import DOMAIN
 
-API_DEFAULT = "http://ctek-ng-air.local/meter/"
 TITLE = "Nanogrid Air"
 USER_DESC = "description"
 
@@ -20,32 +19,29 @@ class NanogridAirConfigFlow(ConfigFlow, domain=DOMAIN):
 
     VERSION = 1
 
-    def __init__(self) -> None:
-        """Initialize flow."""
-        self._url = API_DEFAULT
-
     async def async_step_user(self, user_input=None) -> ConfigFlowResult:
         """Handle a flow initiated by the user."""
         self._async_abort_entries_match()
 
         errors = {}
 
         data_schema = vol.Schema(
-            {vol.Required(CONF_URL, default=self._url, description=USER_DESC): str}
+            {vol.Required(CONF_URL, default="", description=USER_DESC): str}
         )
 
         # Attempt to automatically detect the device
         if user_input is None:
             try:
-                if await get_ip():
-                    mac_address = await fetch_mac()
+                if await NanogridAir().get_ip():
+                    status = await NanogridAir().fetch_status()
+                    mac_address = status.device_info.mac
                     if mac_address:
                         unique_id = mac_address
                         await self.async_set_unique_id(unique_id)
                         self._abort_if_unique_id_configured()
                         return self.async_create_entry(
                             title=TITLE,
-                            data={CONF_URL: self._url},
+                            data={CONF_URL: ""},
                         )
                     errors["base"] = "invalid_auth"
                 else:
@@ -61,8 +57,9 @@ async def async_step_user(self, user_input=None) -> ConfigFlowResult:
 
         # Handle user input
         try:
-            if await get_ip(user_input[CONF_URL]):
-                mac_address = await fetch_mac()
+            if await NanogridAir(device_ip=user_input[CONF_URL]).get_ip():
+                status = await NanogridAir().fetch_status()
+                mac_address = status.device_info.mac
                 if mac_address:
                     unique_id = mac_address
                     await self.async_set_unique_id(unique_id)

homeassistant/components/nanogrid_air/manifest.json

@@ -5,5 +5,6 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/nanogrid_air",
   "integration_type": "device",
-  "iot_class": "local_polling"
+  "iot_class": "local_polling",
+  "requirements": ["ctek==0.2.0"]
 }

homeassistant/components/nanogrid_air/sensor.py

@@ -2,6 +2,8 @@
 
 from datetime import timedelta
 
+from ctek import NanogridAir
+
 from homeassistant.components.sensor import (
     SensorDeviceClass,
     SensorEntity,
@@ -24,8 +26,6 @@
     DataUpdateCoordinator,
 )
 
-from .api import fetch_meter_data
-
 SENSOR = {
     "current_0": SensorEntityDescription(
         key="current_0",
@@ -106,7 +106,7 @@ async def async_setup_entry(
     """Set up sensor entities for the integration entry."""
 
     async def update_data():
-        return await fetch_meter_data()
+        return await NanogridAir().fetch_meter_data()
 
     coordinator = DataUpdateCoordinator(
         hass,
@@ -149,23 +149,23 @@ def __init__(
     def native_value(self) -> str | None:
         """Return the state of the sensor."""
         data = self.coordinator.data
-        if data is None:
+        if data is None or isinstance(data, dict):
             return None
 
         if self._sensor_id.startswith("current_"):
             index = int(self._sensor_id.split("_")[-1])
-            return data.get("current", [None, None, None])[index]
+            return getattr(data, "current", [None])[index]
         if self._sensor_id.startswith("voltage_"):
             index = int(self._sensor_id.split("_")[-1])
-            return data.get("voltage", [None, None, None])[index]
+            return getattr(data, "voltage", [None])[index]
         if self._sensor_id == "power_in":
-            return data.get("activePowerIn", None)
+            return getattr(data, "active_power_in", None)
         if self._sensor_id == "power_out":
-            return data.get("activePowerOut", None)
+            return getattr(data, "active_power_out", None)
         if self._sensor_id == "total_energy_import":
-            return data.get("totalEnergyActiveImport", None)
+            return getattr(data, "total_energy_active_import", None)
         if self._sensor_id == "total_energy_export":
-            return data.get("totalEnergyActiveExport", None)
+            return getattr(data, "total_energy_active_export", None)
         return None
 
     @property

requirements_all.txt

@@ -678,6 +678,9 @@ crownstone-sse==2.0.4
 # homeassistant.components.crownstone
 crownstone-uart==2.1.0
 
+# homeassistant.components.nanogrid_air
+ctek==0.2.0
+
 # homeassistant.components.datadog
 datadog==0.15.0
 

requirements_test_all.txt

@@ -562,6 +562,9 @@ crownstone-sse==2.0.4
 # homeassistant.components.crownstone
 crownstone-uart==2.1.0
 
+# homeassistant.components.nanogrid_air
+ctek==0.2.0
+
 # homeassistant.components.datadog
 datadog==0.15.0