Fix integration

Prevent duplicate accounts
Fix translation
Add brand icon
Update entry title to dsl/phone account

custom_components/ogero/config_flow.py

@@ -2,8 +2,9 @@
 from __future__ import annotations
 
 import voluptuous as vol
-from homeassistant import config_entries
+from homeassistant.config_entries import ConfigEntry, ConfigFlow, FlowResult
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import selector
 from homeassistant.helpers.aiohttp_client import async_create_clientsession
 from homeassistant.helpers.selector import (
@@ -18,13 +19,22 @@
     OgeroApiClientAuthenticationError,
     OgeroApiClientCommunicationError,
     OgeroApiClientError,
+    Account,
 )
 from .const import DOMAIN, LOGGER
 
 ACCOUNT = "account"
 
+@callback
+def configured_instances(hass: HomeAssistant) -> set[str]:
+    """Return a set of configured instances."""
+    entries = []
+    for entry in hass.config_entries.async_entries(DOMAIN):
+        entries.append(entry.data.get(ACCOUNT))
+    return set(entries)
 
-class OgeroFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
+
+class OgeroFlowHandler(ConfigFlow, domain=DOMAIN):
     """Config flow for Ogero."""
 
     VERSION = 1
@@ -35,7 +45,7 @@ class OgeroFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     async def async_step_user(
         self,
         user_input: dict | None = None,
-    ) -> config_entries.FlowResult:
+    ) -> FlowResult:
         """Handle a flow initialized by the user."""
         _errors = {}
         if user_input is not None:
@@ -82,14 +92,21 @@ async def async_step_user(
     async def async_step_account(
         self,
         user_input: dict | None = None,
-    ) -> config_entries.FlowResult:
+    ) -> FlowResult:
         """Handle a flow initialized by the user."""
         _errors = {}
         if user_input is not None:
-            return self.async_create_entry(
-                title=self._user_data[CONF_USERNAME],
-                data={**self._user_data, **user_input},
-            )
+            is_predefined = user_input[ACCOUNT] in configured_instances(self.hass)
+
+            if is_predefined:
+                _errors[ACCOUNT] = "account_already_configured"
+
+            if len(_errors) == 0:
+                account = Account.deserialize(user_input[ACCOUNT])
+                return self.async_create_entry(
+                    title=str(account),
+                    data={**self._user_data, **user_input},
+                )
 
         accounts = await self._get_accounts("", "")
 

custom_components/ogero/const.py

@@ -5,5 +5,5 @@
 
 NAME = "Ogero"
 DOMAIN = "ogero"
-VERSION = "0.2.0"
+VERSION = "0.3.0"
 ATTRIBUTION = "Data retrieved from https://ogero.gov.lb/"

custom_components/ogero/entity.py

@@ -12,6 +12,7 @@ class OgeroEntity(CoordinatorEntity[OgeroDataUpdateCoordinator]):
     """OgeroEntity class."""
 
     _attr_attribution = ATTRIBUTION
+    _attr_has_entity_name = True
 
     def __init__(self, coordinator: OgeroDataUpdateCoordinator, name: str) -> None:
         """Initialize."""

custom_components/ogero/manifest.json

@@ -11,5 +11,5 @@
   "requirements": [
     "pyogero==0.7.0"
   ],
-  "version": "0.2.0"
+  "version": "0.3.0"
 }

custom_components/ogero/sensor.py

@@ -28,47 +28,47 @@
 ENTITY_DESCRIPTIONS = (
     SensorEntityDescription(
         key=QUOTA,
-        name=QUOTA,
+        translation_key=QUOTA,
         native_unit_of_measurement="GB",
         suggested_display_precision=0,
         icon="mdi:format-quote-close",
     ),
     SensorEntityDescription(
         key=SPEED,
-        name=SPEED,
+        translation_key=SPEED,
         icon="mdi:speedometer",
     ),
     SensorEntityDescription(
         key=DOWNLOAD,
-        name=DOWNLOAD,
+        translation_key=DOWNLOAD,
         native_unit_of_measurement="GB",
         suggested_display_precision=1,
         icon="mdi:download",
     ),
     SensorEntityDescription(
         key=UPLOAD,
-        name=UPLOAD,
+        translation_key=UPLOAD,
         native_unit_of_measurement="GB",
         suggested_display_precision=1,
         icon="mdi:upload",
     ),
     SensorEntityDescription(
         key=TOTAL_CONSUMPTION,
-        name=TOTAL_CONSUMPTION,
+        translation_key=TOTAL_CONSUMPTION,
         native_unit_of_measurement="GB",
         suggested_display_precision=1,
         icon="mdi:sigma",
     ),
     SensorEntityDescription(
         key=EXTRA_CONSUMPTION,
-        name=EXTRA_CONSUMPTION,
+        translation_key=EXTRA_CONSUMPTION,
         native_unit_of_measurement="GB",
         suggested_display_precision=1,
         icon="mdi:alert",
     ),
     SensorEntityDescription(
         key=LAST_UPDATE,
-        name=LAST_UPDATE,
+        translation_key=LAST_UPDATE,
         device_class=SensorDeviceClass.TIMESTAMP,
         icon="mdi:update",
     ),
@@ -77,7 +77,7 @@
 EXTENDED_ENTITY_DESCRIPTIONS = (
     SensorEntityDescription(
         key=OUTSTANDING_BALANCE,
-        name=OUTSTANDING_BALANCE,
+        translation_key=OUTSTANDING_BALANCE,
         device_class=SensorDeviceClass.MONETARY,
         native_unit_of_measurement="LBP",
     ),
@@ -140,13 +140,3 @@ def native_value(self) -> str:
             self._attr_extra_state_attributes[key] = value
 
         return self.coordinator.data.get(self.entity_description.key)
-
-    # async def async_update(self):
-    #     attributes = self.coordinator.data.get("state_attributes").get(
-    #         self.entity_description.key
-    #     )
-
-    #     for attribute in attributes:
-    #         key, value = attribute
-    #         LOGGER.debug("attribute key: %s, value: %s", key, value)
-    #         self._attr_extra_state_attributes[key] = value

custom_components/ogero/translations/en.json

@@ -7,12 +7,20 @@
                     "username": "Username",
                     "password": "Password"
                 }
+            },
+            "account": {
+                "description": "If you need help with the configuration have a look here: https://github.com/oraad/ha-ogero",
+                "data": {
+                    "account": "Account"
+                }
             }
         },
+        "abort": {},
         "error": {
             "auth": "Username/Password is wrong.",
             "connection": "Unable to connect to the server.",
-            "unknown": "Unknown error occurred."
+            "unknown": "Unknown error occurred.",
+            "account_already_configured": "Account is already configured"
         }
     },
     "entity": {