fiex imports

Author: toreamun

custom_components/amshan/__init__.py

@@ -5,21 +5,20 @@
 import typing
 from typing import Any, Dict, Mapping, NamedTuple, Union
 
-import serial_asyncio
 from amshan import obis_map
 from amshan.meter_connection import (
     AsyncConnectionFactory,
     ConnectionManager,
     MeterTransportProtocol,
     SmartMeterFrameContentProtocol,
 )
-import voluptuous as vol
-
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import callback
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.typing import ConfigType, EventType, HomeAssistantType
+import serial_asyncio
+import voluptuous as vol
 
 from .const import (
     CONF_SERIAL_BAUDRATE,
@@ -32,9 +31,9 @@
     CONF_SERIAL_XONXOFF,
     CONF_TCP_HOST,
     CONF_TCP_PORT,
+    DOMAIN,
     ENTRY_DATA_MEASURE_CONNECTION,
     ENTRY_DATA_MEASURE_QUEUE,
-    DOMAIN,
     HOSTNAME_IP4_IP6_REGEX,
 )
 
@@ -87,7 +86,7 @@ async def async_setup(hass: HomeAssistantType, config: ConfigType) -> bool:
 
 async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool:
     """Set up amshan from a config entry."""
-    measure_queue: "Queue[bytearray]" = Queue(loop=hass.loop)
+    measure_queue: "Queue[bytes]" = Queue(loop=hass.loop)
     connection = setup_meter_connection(hass.loop, entry.data, measure_queue)
 
     hass.data[DOMAIN][entry.entry_id] = {
@@ -128,7 +127,7 @@ async def async_unload_entry(hass: HomeAssistantType, entry: ConfigEntry) -> boo
 
 
 async def async_close(
-    measure_queue: "Queue[bytearray]", connection: ConnectionManager
+    measure_queue: "Queue[bytes]", connection: ConnectionManager
 ) -> None:
     """Close meter connection and measure processor."""
     connection.close()
@@ -138,19 +137,15 @@ async def async_close(
 
 
 def setup_meter_connection(
-    loop: AbstractEventLoop,
-    config: Mapping[str, Any],
-    measure_queue: "Queue[bytearray]",
+    loop: AbstractEventLoop, config: Mapping[str, Any], measure_queue: "Queue[bytes]",
 ) -> ConnectionManager:
     """Initialize ConnectionManager using configured connection type."""
     connection_factory = get_connection_factory(loop, config, measure_queue)
     return ConnectionManager(connection_factory)
 
 
 def get_connection_factory(
-    loop: AbstractEventLoop,
-    config: Mapping[str, Any],
-    measure_queue: "Queue[bytearray]",
+    loop: AbstractEventLoop, config: Mapping[str, Any], measure_queue: "Queue[bytes]",
 ) -> AsyncConnectionFactory:
     """Get connection factory based on configured connection type."""
 

custom_components/amshan/config_flow.py

@@ -8,10 +8,11 @@
 from typing import Any, Dict, Optional
 
 from amshan import autodecoder, obis_map
+from homeassistant import config_entries, core, exceptions
+from homeassistant.helpers.typing import HomeAssistantType
 import voluptuous as vol
 
-from homeassistant import config_entries, core, exceptions
-from homeassistant.components.amshan import (
+from . import (
     CONF_SERIAL_BAUDRATE,
     CONF_SERIAL_BYTESIZE,
     CONF_SERIAL_DSRDTR,
@@ -27,8 +28,6 @@
     MeterInfo,
     get_connection_factory,
 )
-from homeassistant.helpers.typing import HomeAssistantType
-
 from .const import DOMAIN  # pylint:disable=unused-import
 
 _LOGGER = logging.getLogger(__name__)
@@ -224,7 +223,7 @@ async def _async_validate_connection(
         self, loop: AbstractEventLoop, user_input: Dict[str, Any]
     ) -> Optional[MeterInfo]:
         """Try to connect an get meter information to validate connection data."""
-        measure_queue: "Queue[bytearray]" = Queue()
+        measure_queue: "Queue[bytes]" = Queue()
         connection_factory = get_connection_factory(loop, user_input, measure_queue)
 
         transport = None

custom_components/amshan/sensor.py

@@ -18,8 +18,6 @@
 
 from amshan.autodecoder import AutoDecoder
 import amshan.obis_map as obis_map
-
-from homeassistant.components.amshan import MeterInfo
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import DEVICE_CLASS_POWER, ENERGY_KILO_WATT_HOUR, POWER_WATT
 from homeassistant.core import callback
@@ -30,6 +28,7 @@
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.typing import HomeAssistantType
 
+from . import MeterInfo
 from .const import (
     DOMAIN,
     ENTRY_DATA_MEASURE_QUEUE,