conson-xp 1.51.1__py3-none-any.whl → 2.0.0__py3-none-any.whl

xp/services/homekit/homekit_lightbulb_service.py

@@ -1,91 +0,0 @@
-"""
-HomeKit Light Bulb Service.
-
-This module provides service implementation for light bulb accessories.
-"""
-
-import logging
-
-from bubus import EventBus
-
-from xp.models.protocol.conbus_protocol import (
-    LightBulbGetOnEvent,
-    LightBulbSetOnEvent,
-    ReadDatapointEvent,
-    SendActionEvent,
-)
-from xp.models.telegram.datapoint_type import DataPointType
-
-
-class HomeKitLightbulbService:
-    """
-    Lightbulb service for HomeKit.
-
-    Attributes:
-        event_bus: Event bus for inter-service communication.
-        logger: Logger instance.
-    """
-
-    event_bus: EventBus
-
-    def __init__(self, event_bus: EventBus):
-        """
-        Initialize the lightbulb service.
-
-        Args:
-            event_bus: Event bus instance.
-        """
-        self.event_bus = event_bus
-        self.logger = logging.getLogger(__name__)
-
-        # Register event handlers
-        self.event_bus.on(LightBulbGetOnEvent, self.handle_lightbulb_get_on)
-        self.event_bus.on(LightBulbSetOnEvent, self.handle_lightbulb_set_on)
-
-    def handle_lightbulb_get_on(self, event: LightBulbGetOnEvent) -> None:
-        """
-        Handle lightbulb get on event.
-
-        Args:
-            event: Lightbulb get on event.
-        """
-        self.logger.info(
-            f"Getting lightbulb state for serial {event.serial_number}, output {event.output_number}"
-        )
-        self.logger.debug(f"lightbulb_get_on {event}")
-
-        datapoint_type = DataPointType.MODULE_OUTPUT_STATE
-        read_datapoint = ReadDatapointEvent(
-            serial_number=event.serial_number, datapoint_type=datapoint_type
-        )
-
-        self.logger.debug(f"Dispatching ReadDatapointEvent for {event.serial_number}")
-        self.event_bus.dispatch(read_datapoint)
-        self.logger.debug(f"Dispatched ReadDatapointEvent for {event.serial_number}")
-
-    def handle_lightbulb_set_on(self, event: LightBulbSetOnEvent) -> None:
-        """
-        Handle lightbulb set on event.
-
-        Args:
-            event: Lightbulb set on event.
-        """
-        self.logger.info(
-            f"Setting lightbulb "
-            f"for serial {event.serial_number}, "
-            f"output {event.output_number} "
-            f"to {'ON' if event.value else 'OFF'}"
-        )
-        self.logger.debug(f"lightbulb_set_on {event}")
-
-        send_action = SendActionEvent(
-            serial_number=event.serial_number,
-            output_number=event.output_number,
-            value=event.value,
-            on_action=event.accessory.on_action,
-            off_action=event.accessory.off_action,
-        )
-
-        self.logger.debug(f"Dispatching SendActionEvent for {event.serial_number}")
-        self.event_bus.dispatch(send_action)
-        self.logger.debug(f"Dispatched SendActionEvent for {event.serial_number}")

xp/services/homekit/homekit_module_service.py

@@ -1,60 +0,0 @@
-"""
-HomeKit Module Service.
-
-This module provides service implementation for HomeKit module management.
-"""
-
-import logging
-from typing import Optional
-
-from xp.models.config.conson_module_config import (
-    ConsonModuleConfig,
-    ConsonModuleListConfig,
-)
-
-
-class HomekitModuleService:
-    """
-    Service for managing HomeKit module configurations.
-
-    Attributes:
-        logger: Logger instance.
-        conson_modules_config: Conson module list configuration.
-    """
-
-    def __init__(
-        self,
-        conson_modules_config: ConsonModuleListConfig,
-    ):
-        """
-        Initialize the HomeKit module service.
-
-        Args:
-            conson_modules_config: Conson module list configuration.
-        """
-        # Set up logging
-        self.logger = logging.getLogger(__name__)
-        self.conson_modules_config = conson_modules_config
-
-    def get_module_by_serial(self, serial_number: str) -> Optional[ConsonModuleConfig]:
-        """
-        Get a module by its serial number.
-
-        Args:
-            serial_number: Serial number of the module to find.
-
-        Returns:
-            Module configuration if found, None otherwise.
-        """
-        module = next(
-            (
-                module
-                for module in self.conson_modules_config.root
-                if module.serial_number == serial_number
-            ),
-            None,
-        )
-        self.logger.debug(
-            f"Module search by serial '{serial_number}': {'found' if module else 'not found'}"
-        )
-        return module

xp/services/homekit/homekit_outlet.py

@@ -1,175 +0,0 @@
-"""
-HomeKit Outlet Accessory.
-
-This module provides an outlet accessory for HomeKit integration.
-"""
-
-import logging
-
-from bubus import EventBus
-from pyhap.accessory import Accessory
-from pyhap.accessory_driver import AccessoryDriver
-from pyhap.const import CATEGORY_OUTLET
-
-from xp.models.config.conson_module_config import ConsonModuleConfig
-from xp.models.homekit.homekit_config import HomekitAccessoryConfig
-from xp.models.protocol.conbus_protocol import (
-    OutletGetInUseEvent,
-    OutletGetOnEvent,
-    OutletSetInUseEvent,
-    OutletSetOnEvent,
-)
-
-
-class Outlet(Accessory):
-    """
-    HomeKit outlet accessory.
-
-    Attributes:
-        category: HomeKit category (CATEGORY_OUTLET).
-        event_bus: Event bus for inter-service communication.
-        logger: Logger instance.
-        identifier: Unique identifier for the accessory.
-        accessory: Accessory configuration.
-        module: Module configuration.
-        is_on: Current on/off state.
-        is_in_use: Current in-use state.
-        char_on: On characteristic.
-        char_outlet_in_use: Outlet in-use characteristic.
-    """
-
-    category = CATEGORY_OUTLET
-    event_bus: EventBus
-
-    def __init__(
-        self,
-        driver: AccessoryDriver,
-        module: ConsonModuleConfig,
-        accessory: HomekitAccessoryConfig,
-        event_bus: EventBus,
-    ):
-        """
-        Initialize the outlet accessory.
-
-        Args:
-            driver: HAP accessory driver.
-            module: Module configuration.
-            accessory: Accessory configuration.
-            event_bus: Event bus for inter-service communication.
-        """
-        super().__init__(driver=driver, display_name=accessory.description)
-
-        self.logger = logging.getLogger(__name__)
-
-        identifier = f"{module.serial_number}.{accessory.output_number:02d}"
-        version = accessory.id
-        manufacturer = "Conson"
-        model = ("XP24_outlet",)
-
-        self.identifier = identifier
-        self.accessory = accessory
-        self.module = module
-
-        self.event_bus = event_bus
-        self.logger.info(
-            "Creating Outlet { serial_number : %s, output_number: %s }",
-            module.serial_number,
-            accessory.output_number,
-        )
-        self.is_on = False
-        self.is_in_use = False
-
-        serv_outlet = self.add_preload_service("Outlet")
-        self.set_info_service(version, manufacturer, model, identifier)
-        self.char_on = serv_outlet.configure_char(
-            "On", setter_callback=self.set_on, getter_callback=self.get_on
-        )
-        self.char_outlet_in_use = serv_outlet.configure_char(
-            "OutletInUse",
-            setter_callback=self.set_outlet_in_use,
-            getter_callback=self.get_outlet_in_use,
-        )
-
-    def set_outlet_in_use(self, value: bool) -> None:
-        """
-        Set the in-use state of the outlet.
-
-        Args:
-            value: True if in use, False otherwise.
-        """
-        self.logger.debug(f"set_outlet_in_use {value}")
-
-        self.is_in_use = value
-        self.event_bus.dispatch(
-            OutletSetInUseEvent(
-                serial_number=self.accessory.serial_number,
-                output_number=self.accessory.output_number,
-                module=self.module,
-                accessory=self.accessory,
-                value=value,
-            )
-        )
-        self.logger.debug(f"set_outlet_in_use {value} end")
-
-    def get_outlet_in_use(self) -> bool:
-        """
-        Get the in-use state of the outlet.
-
-        Returns:
-            True if in use, False otherwise.
-        """
-        # Emit event and get response
-        self.logger.debug("get_outlet_in_use")
-
-        # Dispatch event from HAP thread (thread-safe)
-        self.event_bus.dispatch(
-            OutletGetInUseEvent(
-                serial_number=self.accessory.serial_number,
-                output_number=self.accessory.output_number,
-                module=self.module,
-                accessory=self.accessory,
-            )
-        )
-        return self.is_in_use
-
-    def set_on(self, value: bool) -> None:
-        """
-        Set the on/off state of the outlet.
-
-        Args:
-            value: True to turn on, False to turn off.
-        """
-        # Emit set event
-        self.logger.debug(f"set_on {value} {self.is_on}")
-
-        self.is_on = value
-        self.event_bus.dispatch(
-            OutletSetOnEvent(
-                serial_number=self.accessory.serial_number,
-                output_number=self.accessory.output_number,
-                module=self.module,
-                accessory=self.accessory,
-                value=value,
-            )
-        )
-
-    def get_on(self) -> bool:
-        """
-        Get the on/off state of the outlet.
-
-        Returns:
-            True if on, False if off.
-        """
-        # Emit event and get response
-        self.logger.debug("get_on")
-
-        # Dispatch event from HAP thread (thread-safe)
-        self.event_bus.dispatch(
-            OutletGetOnEvent(
-                serial_number=self.accessory.serial_number,
-                output_number=self.accessory.output_number,
-                module=self.module,
-                accessory=self.accessory,
-            )
-        )
-        return self.is_on

xp/services/homekit/homekit_outlet_service.py

@@ -1,127 +0,0 @@
-"""
-HomeKit Outlet Service.
-
-This module provides service implementation for outlet accessories.
-"""
-
-import logging
-
-from bubus import EventBus
-
-from xp.models.protocol.conbus_protocol import (
-    OutletGetInUseEvent,
-    OutletGetOnEvent,
-    OutletSetOnEvent,
-    ReadDatapointEvent,
-    SendActionEvent,
-)
-from xp.models.telegram.datapoint_type import DataPointType
-
-
-class HomeKitOutletService:
-    """
-    Outlet service for HomeKit.
-
-    Attributes:
-        event_bus: Event bus for inter-service communication.
-        logger: Logger instance.
-    """
-
-    event_bus: EventBus
-
-    def __init__(self, event_bus: EventBus):
-        """
-        Initialize the outlet service.
-
-        Args:
-            event_bus: Event bus instance.
-        """
-        self.event_bus = event_bus
-        self.logger = logging.getLogger(__name__)
-
-        # Register event handlers
-        self.event_bus.on(OutletGetOnEvent, self.handle_outlet_get_on)
-        self.event_bus.on(OutletSetOnEvent, self.handle_outlet_set_on)
-        self.event_bus.on(OutletGetInUseEvent, self.handle_outlet_get_in_use)
-
-    def handle_outlet_get_on(self, event: OutletGetOnEvent) -> bool:
-        """
-        Handle outlet get on event.
-
-        Args:
-            event: Outlet get on event.
-
-        Returns:
-            True if request was dispatched successfully.
-        """
-        self.logger.debug(
-            f"Getting outlet state for serial {event.serial_number}, output {event.output_number}"
-        )
-
-        datapoint_type = DataPointType.MODULE_OUTPUT_STATE
-        read_datapoint = ReadDatapointEvent(
-            serial_number=event.serial_number, datapoint_type=datapoint_type
-        )
-
-        self.logger.debug(f"Dispatching ReadDatapointEvent for {event.serial_number}")
-        self.event_bus.dispatch(read_datapoint)
-        self.logger.debug(f"Dispatched ReadDatapointEvent for {event.serial_number}")
-        return True
-
-    def handle_outlet_set_on(self, event: OutletSetOnEvent) -> bool:
-        """
-        Handle outlet set on event.
-
-        Args:
-            event: Outlet set on event.
-
-        Returns:
-            True if command was sent successfully.
-        """
-        self.logger.info(
-            f"Setting outlet "
-            f"for serial {event.serial_number}, "
-            f"output {event.output_number} "
-            f"to {'ON' if event.value else 'OFF'}"
-        )
-        self.logger.debug(f"outlet_set_on {event}")
-
-        send_action = SendActionEvent(
-            serial_number=event.serial_number,
-            output_number=event.output_number,
-            value=event.value,
-            on_action=event.accessory.on_action,
-            off_action=event.accessory.off_action,
-        )
-
-        self.logger.debug(f"Dispatching SendActionEvent for {event.serial_number}")
-        self.event_bus.dispatch(send_action)
-        self.logger.info(
-            f"Outlet set command sent successfully for {event.serial_number}"
-        )
-        return True
-
-    def handle_outlet_get_in_use(self, event: OutletGetInUseEvent) -> bool:
-        """
-        Handle outlet get in-use event.
-
-        Args:
-            event: Outlet get in-use event.
-
-        Returns:
-            True if request was dispatched successfully.
-        """
-        self.logger.info(
-            f"Getting outlet in-use status for serial {event.serial_number}"
-        )
-        self.logger.debug(f"outlet_get_in_use {event}")
-
-        datapoint_type = DataPointType.MODULE_STATE
-        read_datapoint = ReadDatapointEvent(
-            serial_number=event.serial_number, datapoint_type=datapoint_type
-        )
-
-        self.logger.debug(f"Dispatching ReadDatapointEvent for {event.serial_number}")
-        self.event_bus.dispatch(read_datapoint)
-        self.logger.debug("Dispatching ReadDatapointEvent (timeout: 2s)")
-        return True