fix circular import and rearrange events as statusEvents must be the first one

Author: edenhaus

deebotozmo/events.py

@@ -6,7 +6,6 @@
 from typing import List, TypeVar, Generic, Callable, Awaitable, Optional
 
 from deebotozmo.models import Room, VacuumState
-from deebotozmo.vacuum_bot import VacuumBot
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -134,7 +133,7 @@ def request_refresh(self):
 
 class PollingEventEmitter(EventEmitter[T]):
 
-    def __init__(self, refresh_interval: int, refresh_function: Callable[[], Awaitable[None]], vacuum_bot: VacuumBot):
+    def __init__(self, refresh_interval: int, refresh_function: Callable[[], Awaitable[None]], vacuum_bot: "VacuumBot"):
         super().__init__(refresh_function)
         self._refresh_task: Optional[Task] = None
         self._refresh_interval: int = refresh_interval

deebotozmo/util.py

@@ -5,7 +5,6 @@
 
 from deebotozmo.commands import Command
 from deebotozmo.events import PollingEventEmitter, EventEmitter
-from deebotozmo.vacuum_bot import VacuumBot
 
 
 def str_to_bool_or_cert(s: Union[bool, str]) -> Union[bool, str]:
@@ -54,7 +53,7 @@ def get_EventEmitter(event_type: Type[T], commands: [Command],
 
 
 def get_PollingEventEmitter(event_type: Type[T], refresh_interval: int, commands: [Command],
-                            execute_command: Callable[[Command], Awaitable[None]], vacuum_bot: VacuumBot) -> \
+                            execute_command: Callable[[Command], Awaitable[None]], vacuum_bot: "VacuumBot") -> \
         PollingEventEmitter[T]:
     return PollingEventEmitter[event_type](refresh_interval, get_refresh_function(commands, execute_command),
                                            vacuum_bot)

deebotozmo/vacuum_bot.py

@@ -1,12 +1,15 @@
-from typing import Union
+import asyncio
+import logging
+from typing import Union, Optional, List
 
 import aiohttp
 
 from deebotozmo.commands import *
 from deebotozmo.constants import ERROR_CODES, FAN_SPEED_FROM_ECOVACS, COMPONENT_FROM_ECOVACS, WATER_LEVEL_FROM_ECOVACS
 from deebotozmo.ecovacs_api import EcovacsAPI
 from deebotozmo.ecovacs_json import EcovacsJSON
-from deebotozmo.events import *
+from deebotozmo.events import EventEmitter, ErrorEvent, PollingEventEmitter, LifeSpanEvent, FanSpeedEvent, \
+    CleanLogEvent, WaterInfoEvent, BatteryEvent, StatusEvent, StatsEvent, CleanLogEntry
 from deebotozmo.map import Map
 from deebotozmo.models import *
 from deebotozmo.util import get_PollingEventEmitter, get_EventEmitter
@@ -46,10 +49,10 @@ def __init__(
 
         self._map = Map(self.execute_command)
 
-        self.errorEvents: EventEmitter[ErrorEvent] = get_EventEmitter(ErrorEvent, [GetError()], self.execute_command)
+        self.statusEvents: EventEmitter[StatusEvent] = \
+            get_EventEmitter(StatusEvent, [GetChargeState(), GetCleanInfo(self.vacuum)], self.execute_command)
 
-        self.lifespanEvents: PollingEventEmitter[LifeSpanEvent] = \
-            get_PollingEventEmitter(LifeSpanEvent, 60, [GetLifeSpan()], self.execute_command, self)
+        self.errorEvents: EventEmitter[ErrorEvent] = get_EventEmitter(ErrorEvent, [GetError()], self.execute_command)
 
         self.fanSpeedEvents: EventEmitter[FanSpeedEvent] = \
             get_EventEmitter(FanSpeedEvent, [GetFanSpeed()], self.execute_command)
@@ -63,12 +66,12 @@ def __init__(
         self.batteryEvents: EventEmitter[BatteryEvent] = \
             get_EventEmitter(BatteryEvent, [GetBattery()], self.execute_command)
 
-        self.statusEvents: EventEmitter[StatusEvent] = \
-            get_EventEmitter(StatusEvent, [GetChargeState(), GetCleanInfo(self.vacuum)], self.execute_command)
-
         self.statsEvents: EventEmitter[StatsEvent] = \
             get_EventEmitter(StatsEvent, [GetStats()], self.execute_command)
 
+        self.lifespanEvents: PollingEventEmitter[LifeSpanEvent] = \
+            get_PollingEventEmitter(LifeSpanEvent, 60, [GetLifeSpan()], self.execute_command, self)
+
     @property
     def map(self) -> Map:
         return self._map