Merge pull request #233 from loopj/rename-base-controller

Rename BaseController to Controller

Author: loopj

src/aiovantage/__init__.py

@@ -15,10 +15,10 @@
     AnemoSensorsController,
     AreasController,
     BackBoxesController,
-    BaseController,
     BlindGroupsController,
     BlindsController,
     ButtonsController,
+    Controller,
     DryContactsController,
     GMemController,
     LightSensorsController,
@@ -43,7 +43,7 @@
 ]
 
 T = TypeVar("T")
-ControllerT = TypeVar("ControllerT", bound=BaseController[Any])
+ControllerT = TypeVar("ControllerT", bound=Controller[Any])
 
 
 class Vantage:
@@ -110,7 +110,7 @@ def add_controller(controller_cls: type[ControllerT]) -> ControllerT:
             self._controllers.add(controller)
             return controller
 
-        self._controllers: set[BaseController[Any]] = set()
+        self._controllers: set[Controller[Any]] = set()
         self._anemo_sensors = add_controller(AnemoSensorsController)
         self._areas = add_controller(AreasController)
         self._back_boxes = add_controller(BackBoxesController)

src/aiovantage/_controllers/anemo_sensors.py

@@ -1,9 +1,9 @@
 from aiovantage.objects import AnemoSensor
 
-from .base import BaseController
+from .base import Controller
 
 
-class AnemoSensorsController(BaseController[AnemoSensor]):
+class AnemoSensorsController(Controller[AnemoSensor]):
     """Anemo sensors (wind speed sensors) controller."""
 
     vantage_types = ("AnemoSensor",)

src/aiovantage/_controllers/areas.py

@@ -1,9 +1,9 @@
 from aiovantage.objects import Area
 
-from .base import BaseController
+from .base import Controller
 
 
-class AreasController(BaseController[Area]):
+class AreasController(Controller[Area]):
     """Areas controller."""
 
     vantage_types = ("Area",)

src/aiovantage/_controllers/back_boxes.py

@@ -1,9 +1,9 @@
 from aiovantage.objects import BackBox
 
-from .base import BaseController
+from .base import Controller
 
 
-class BackBoxesController(BaseController[BackBox]):
+class BackBoxesController(Controller[BackBox]):
     """Back boxes controller.
 
     Back boxes typically represent a "gang box" in a wall which may contain

src/aiovantage/_controllers/base.py

@@ -25,7 +25,7 @@
 T = TypeVar("T", bound=SystemObject)
 
 
-class BaseController(QuerySet[T], EventDispatcher):
+class Controller(QuerySet[T], EventDispatcher):
     """Base controller for managing collections of Vantage objects."""
 
     vantage_types: tuple[str, ...]

src/aiovantage/_controllers/blind_groups.py

@@ -1,12 +1,12 @@
 from aiovantage.objects import BlindGroup, SomfyRS485GroupChild, SomfyURTSI2GroupChild
 
-from .base import BaseController
+from .base import Controller
 
 BlindGroupTypes = BlindGroup | SomfyRS485GroupChild | SomfyURTSI2GroupChild
 """Types managed by the blind groups controller."""
 
 
-class BlindGroupsController(BaseController[BlindGroupTypes]):
+class BlindGroupsController(Controller[BlindGroupTypes]):
     """Blind groups controller."""
 
     vantage_types = (

src/aiovantage/_controllers/blinds.py

@@ -7,7 +7,7 @@
     SomfyURTSI2ShadeChild,
 )
 
-from .base import BaseController
+from .base import Controller
 from .query import QuerySet
 
 BlindTypes = (
@@ -16,7 +16,7 @@
 """Types managed by the blinds controller."""
 
 
-class BlindsController(BaseController[BlindTypes]):
+class BlindsController(Controller[BlindTypes]):
     """Blinds controller."""
 
     vantage_types = (

src/aiovantage/_controllers/buttons.py

@@ -1,9 +1,9 @@
 from aiovantage.objects import Button
 
-from .base import BaseController
+from .base import Controller
 
 
-class ButtonsController(BaseController[Button]):
+class ButtonsController(Controller[Button]):
     """Buttons controller."""
 
     vantage_types = ("Button",)

src/aiovantage/_controllers/dry_contacts.py

@@ -1,9 +1,9 @@
 from aiovantage.objects import DryContact
 
-from .base import BaseController
+from .base import Controller
 
 
-class DryContactsController(BaseController[DryContact]):
+class DryContactsController(Controller[DryContact]):
     """Dry contacts controller."""
 
     vantage_types = ("DryContact",)

src/aiovantage/_controllers/gmem.py

@@ -1,9 +1,9 @@
 from aiovantage.objects import GMem
 
-from .base import BaseController
+from .base import Controller
 
 
-class GMemController(BaseController[GMem]):
+class GMemController(Controller[GMem]):
     """GMem (variables) controller."""
 
     vantage_types = ("GMem",)

src/aiovantage/_controllers/light_sensors.py

@@ -1,9 +1,9 @@
 from aiovantage.objects import LightSensor
 
-from .base import BaseController
+from .base import Controller
 
 
-class LightSensorsController(BaseController[LightSensor]):
+class LightSensorsController(Controller[LightSensor]):
     """Light sensors controller."""
 
     vantage_types = ("LightSensor",)

src/aiovantage/_controllers/load_groups.py

@@ -1,9 +1,9 @@
 from aiovantage.objects import LoadGroup
 
-from .base import BaseController
+from .base import Controller
 
 
-class LoadGroupsController(BaseController[LoadGroup]):
+class LoadGroupsController(Controller[LoadGroup]):
     """Load groups controller."""
 
     vantage_types = ("LoadGroup",)

src/aiovantage/_controllers/loads.py

@@ -1,10 +1,10 @@
 from aiovantage.objects import Load, LoadGroup
 
-from .base import BaseController
+from .base import Controller
 from .query import QuerySet
 
 
-class LoadsController(BaseController[Load]):
+class LoadsController(Controller[Load]):
     """Loads controller."""
 
     vantage_types = ("Load",)

src/aiovantage/_controllers/masters.py

@@ -1,9 +1,9 @@
 from aiovantage.objects import Master
 
-from .base import BaseController
+from .base import Controller
 
 
-class MastersController(BaseController[Master]):
+class MastersController(Controller[Master]):
     """Masters (InFusion Controllers) controller."""
 
     vantage_types = ("Master",)

src/aiovantage/_controllers/modules.py

@@ -1,9 +1,9 @@
 from aiovantage.objects import SystemObject
 
-from .base import BaseController
+from .base import Controller
 
 
-class ModulesController(BaseController[SystemObject]):
+class ModulesController(Controller[SystemObject]):
     """Modules controller.
 
     Modules are relay or dimming modules connected to the Vantage system.

src/aiovantage/_controllers/omni_sensors.py

@@ -1,9 +1,9 @@
 from aiovantage.objects import OmniSensor
 
-from .base import BaseController
+from .base import Controller
 
 
-class OmniSensorsController(BaseController[OmniSensor]):
+class OmniSensorsController(Controller[OmniSensor]):
     """Omni sensors controller.
 
     Omni sensors are generic sensors objects which specify which methods to use

src/aiovantage/_controllers/port_devices.py

@@ -1,9 +1,9 @@
 from aiovantage.objects import PortDevice
 
-from .base import BaseController
+from .base import Controller
 
 
-class PortDevicesController(BaseController[PortDevice]):
+class PortDevicesController(Controller[PortDevice]):
     """Port devices controller.
 
     Port devices are typically "hubs" that communicate with other devices such

src/aiovantage/_controllers/power_profiles.py

@@ -1,9 +1,9 @@
 from aiovantage.objects import PowerProfile
 
-from .base import BaseController
+from .base import Controller
 
 
-class PowerProfilesController(BaseController[PowerProfile]):
+class PowerProfilesController(Controller[PowerProfile]):
     """Power profiles controller."""
 
     vantage_types = ("PowerProfile", "DCPowerProfile", "PWMPowerProfile")

src/aiovantage/_controllers/rgb_loads.py

@@ -1,13 +1,13 @@
 from aiovantage.objects import VantageDDGColorLoad, VantageDGColorLoad
 
-from .base import BaseController
+from .base import Controller
 from .query import QuerySet
 
 RGBLoadTypes = VantageDDGColorLoad | VantageDGColorLoad
 """Types managed by the RGB loads controller."""
 
 
-class RGBLoadsController(BaseController[RGBLoadTypes]):
+class RGBLoadsController(Controller[RGBLoadTypes]):
     """RGB loads controller."""
 
     vantage_types = ("Vantage.DGColorLoad", "Vantage.DDGColorLoad")

src/aiovantage/_controllers/stations.py

@@ -1,9 +1,9 @@
 from aiovantage.objects import StationObject
 
-from .base import BaseController
+from .base import Controller
 
 
-class StationsController(BaseController[StationObject]):
+class StationsController(Controller[StationObject]):
     """Stations controller.
 
     Stations typically represent keypads or remote relays. It is mostly useful

src/aiovantage/_controllers/tasks.py

@@ -1,9 +1,9 @@
 from aiovantage.objects import Task
 
-from .base import BaseController
+from .base import Controller
 
 
-class TasksController(BaseController[Task]):
+class TasksController(Controller[Task]):
     """Tasks controller."""
 
     vantage_types = ("Task",)

src/aiovantage/_controllers/temperatures.py

@@ -1,9 +1,9 @@
 from aiovantage.objects import Temperature
 
-from .base import BaseController
+from .base import Controller
 
 
-class TemperaturesController(BaseController[Temperature]):
+class TemperaturesController(Controller[Temperature]):
     """Temperature device controller.
 
     Temperature devices are device that measure or control temperature.

src/aiovantage/_controllers/thermostats.py

@@ -6,7 +6,7 @@
     VantageVirtualThermostatPort,
 )
 
-from .base import BaseController
+from .base import Controller
 
 ThermostatTypes = (
     Thermostat
@@ -18,7 +18,7 @@
 """Types managed by the thermostats controller."""
 
 
-class ThermostatsController(BaseController[ThermostatTypes]):
+class ThermostatsController(Controller[ThermostatTypes]):
     """Thermostats controller."""
 
     vantage_types = (

src/aiovantage/controllers.py

@@ -30,7 +30,7 @@
 from ._controllers.anemo_sensors import AnemoSensorsController
 from ._controllers.areas import AreasController
 from ._controllers.back_boxes import BackBoxesController
-from ._controllers.base import BaseController
+from ._controllers.base import Controller
 from ._controllers.blind_groups import BlindGroupsController, BlindGroupTypes
 from ._controllers.blinds import BlindsController, BlindTypes
 from ._controllers.buttons import ButtonsController
@@ -55,7 +55,7 @@
     "AnemoSensorsController",
     "AreasController",
     "BackBoxesController",
-    "BaseController",
+    "Controller",
     "BlindGroupsController",
     "BlindGroupTypes",
     "BlindsController",