conson-xp 1.51.0__tar.gz → 1.52.0__tar.gz

{conson_xp-1.51.0 → conson_xp-1.52.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conson-xp
-Version: 1.51.0
+Version: 1.52.0
 Summary: XP Protocol Communication Tools
 Author-Email: ldvchosal <ldvchosal@github.com>
 License: MIT License
@@ -450,6 +450,7 @@ xp telegram version
 
 
 xp term
+xp term homekit
 xp term protocol
 xp term state
 

{conson_xp-1.51.0 → conson_xp-1.52.0}/README.md

@@ -396,6 +396,7 @@ xp telegram version
 
 
 xp term
+xp term homekit
 xp term protocol
 xp term state
 

{conson_xp-1.51.0 → conson_xp-1.52.0}/pyproject.toml

@@ -23,7 +23,7 @@ dependencies = [
 ]
 requires-python = ">=3.11"
 readme = "README.md"
-version = "1.51.0"
+version = "1.52.0"
 
 [project.license]
 file = "LICENSE"

{conson_xp-1.51.0 → conson_xp-1.52.0}/src/xp/__init__.py

@@ -4,7 +4,7 @@ XP CLI tool for remote console bus operations.
 conson-xp package.
 """
 
-__version__ = "1.51.0"
+__version__ = "1.52.0"
 __manufacturer__ = "salchichon"
 __model__ = "xp.cli"
 __serial__ = "2025.09.23.000"

{conson_xp-1.51.0 → conson_xp-1.52.0}/src/xp/cli/commands/term/term_commands.py

@@ -48,3 +48,26 @@ def state_monitor(ctx: Context) -> None:
 
     # Resolve StateMonitorApp from container and run
     ctx.obj.get("container").get_container().resolve(StateMonitorApp).run()
+
+
+@term.command("homekit")
+@click.pass_context
+def homekit_monitor(ctx: Context) -> None:
+    r"""
+    Start TUI for HomeKit accessory monitoring.
+
+    Displays HomeKit rooms and accessories with real-time state updates
+    in an interactive terminal interface. Press action keys (a-z) to
+    toggle accessories.
+
+    Args:
+        ctx: Click context object.
+
+    Examples:
+        \b
+        xp term homekit
+    """
+    from xp.term.homekit import HomekitApp
+
+    # Resolve HomekitApp from container and run
+    ctx.obj.get("container").get_container().resolve(HomekitApp).run()

{conson_xp-1.51.0 → conson_xp-1.52.0}/src/xp/models/homekit/homekit_config.py

@@ -16,10 +16,14 @@ class NetworkConfig(BaseModel):
     Attributes:
         ip: IP address for the network connection.
         port: Port number for the network connection.
+        pincode: HomeKit pairing code (format: XXX-XX-XXX).
+        accessory_state_file: Path to file for persisting accessory state.
     """
 
     ip: Union[IPvAnyAddress, IPv4Address, IPv6Address, str] = "127.0.0.1"
     port: int = 51826
+    pincode: str = "031-45-154"
+    accessory_state_file: str = "./accessory.state"
 
 
 class RoomConfig(BaseModel):
@@ -61,6 +65,7 @@ class HomekitAccessoryConfig(BaseModel):
         service: Service type for the accessory.
         on_action: on code for the accessory.
         off_action: off code for the accessory.
+        toggle_action: Optional toggle action code for the accessory.
         hap_accessory: Optional HAP accessory identifier.
     """
 
@@ -72,6 +77,7 @@ class HomekitAccessoryConfig(BaseModel):
     service: str
     on_action: str
     off_action: str
+    toggle_action: Optional[str] = None
     hap_accessory: Optional[int] = None
 
 

{conson_xp-1.51.0 → conson_xp-1.52.0}/src/xp/models/term/__init__.py

@@ -1,5 +1,6 @@
 """Terminal UI models."""
 
+from xp.models.term.accessory_state import AccessoryState
 from xp.models.term.module_state import ModuleState
 from xp.models.term.protocol_keys_config import (
     ProtocolKeyConfig,
@@ -7,6 +8,7 @@ from xp.models.term.protocol_keys_config import (
 )
 
 __all__ = [
+    "AccessoryState",
     "ModuleState",
     "ProtocolKeyConfig",
     "ProtocolKeysConfig",

conson_xp-1.52.0/src/xp/models/term/accessory_state.py

@@ -0,0 +1,50 @@
+"""Accessory state data model for Homekit TUI."""
+
+from dataclasses import dataclass
+from datetime import datetime
+from typing import Optional
+
+
+@dataclass
+class AccessoryState:
+    """
+    State of a HomeKit accessory for TUI display.
+
+    Attributes:
+        room_name: Room containing the accessory (e.g., "Salon").
+        accessory_name: Accessory display name (e.g., "Variateur salon").
+        action: Action key (a-z) for toggle control.
+        output_state: Output state ("ON", "OFF", "?").
+        dimming_state: Dimming percentage for dimmable modules, "-" if OFF, empty otherwise.
+        module_name: Module identifier (e.g., "A12").
+        serial_number: Module serial number.
+        module_type: Module type (e.g., "XP24", "XP33LED").
+        error_status: Status code ("OK" or error like "E10").
+        output: Module output number (1-based for display).
+        sort: Sort accessories according to homekit.yml configuration.
+        last_update: Last communication timestamp. None if never updated.
+        toggle_action: Raw toggle action telegram (e.g., "E02L12I02").
+    """
+
+    room_name: str
+    accessory_name: str
+    action: str
+    output_state: str
+    dimming_state: str
+    module_name: str
+    serial_number: str
+    module_type: str
+    error_status: str
+    output: int
+    sort: int
+    last_update: Optional[datetime] = None
+    toggle_action: Optional[str] = None
+
+    def is_dimmable(self) -> bool:
+        """
+        Check if accessory is dimmable.
+
+        Returns:
+            True if module type is XP33LR or XP33LED, False otherwise.
+        """
+        return self.module_type in ("XP33LR", "XP33LED")

{conson_xp-1.51.0 → conson_xp-1.52.0}/src/xp/services/homekit/homekit_config_validator.py

@@ -221,7 +221,7 @@ class CrossReferenceValidator:
                 # Define output limits by module type
                 output_limits = {
                     "XP130": 0,  # Example limits
-                    "XP20": 0,
+                    "XP20": 8,
                     "XP24": 4,
                     "XP33": 3,
                     "XP33LR": 3,

conson_xp-1.52.0/src/xp/services/term/homekit_accessory_driver.py

@@ -0,0 +1,168 @@
+"""HomeKit Accessory Driver for pyhap integration."""
+
+import asyncio
+import logging
+from typing import Callable, Dict, Optional
+
+from pyhap.accessory import Accessory, Bridge
+from pyhap.accessory_driver import AccessoryDriver
+from pyhap.const import CATEGORY_LIGHTBULB, CATEGORY_OUTLET
+
+from xp.models.homekit.homekit_config import HomekitConfig
+
+
+class XPAccessory(Accessory):
+    """Single accessory wrapping a Conbus output."""
+
+    def __init__(
+        self,
+        driver: "HomekitAccessoryDriver",
+        name: str,
+        service_type: str,
+        aid: int,
+    ) -> None:
+        """
+        Initialize the XP accessory.
+
+        Args:
+            driver: HomekitAccessoryDriver instance.
+            name: Accessory name (unique identifier and display name).
+            service_type: Service type ('light', 'outlet', 'dimminglight').
+            aid: Accessory ID for HomeKit.
+        """
+        super().__init__(driver._driver, name, aid=aid)
+        self._hk_driver = driver
+        self._accessory_id = name
+        self.logger = logging.getLogger(__name__)
+
+        if service_type == "dimminglight":
+            self.category = CATEGORY_LIGHTBULB
+            serv = self.add_preload_service("Lightbulb", chars=["On", "Brightness"])
+            # Note: Brightness setter_callback deferred to future update
+        elif service_type == "outlet":
+            self.category = CATEGORY_OUTLET
+            serv = self.add_preload_service("Outlet")
+        else:
+            self.category = CATEGORY_LIGHTBULB
+            serv = self.add_preload_service("Lightbulb")
+
+        self._char_on = serv.configure_char("On", setter_callback=self._set_on)
+
+    def _set_on(self, value: bool) -> None:
+        """
+        Handle HomeKit set on/off request.
+
+        Args:
+            value: True for on, False for off.
+        """
+        if self._hk_driver._on_set:
+            self._hk_driver._on_set(self._accessory_id, value)
+
+    def update_state(self, is_on: bool) -> None:
+        """
+        Update accessory state from Conbus event.
+
+        Args:
+            is_on: True if accessory is on, False otherwise.
+        """
+        self._char_on.set_value(is_on)
+
+
+class HomekitAccessoryDriver:
+    """Wrapper around pyhap AccessoryDriver."""
+
+    def __init__(self, homekit_config: HomekitConfig) -> None:
+        """
+        Initialize the HomeKit accessory driver.
+
+        Args:
+            homekit_config: HomekitConfig with network and accessory settings.
+        """
+        self.logger = logging.getLogger(__name__)
+        self._homekit_config = homekit_config
+        self._driver: Optional[AccessoryDriver] = None
+        self._accessories: Dict[str, XPAccessory] = {}
+        self._on_set: Optional[Callable[[str, bool], None]] = None
+
+    def set_callback(self, on_set: Callable[[str, bool], None]) -> None:
+        """
+        Set callback for HomeKit set events.
+
+        Args:
+            on_set: Callback(accessory_name, is_on) called when HomeKit app toggles.
+        """
+        self._on_set = on_set
+
+    def _setup_bridge(self, config: HomekitConfig) -> None:
+        """
+        Set up HomeKit bridge with accessories.
+
+        Args:
+            config: HomekitConfig with accessory definitions.
+        """
+        assert self._driver is not None
+        bridge = Bridge(self._driver, config.bridge.name)
+        aid = 2  # Bridge is 1
+
+        for acc_config in config.accessories:
+            accessory = XPAccessory(
+                driver=self,
+                name=acc_config.name,
+                service_type=acc_config.service,
+                aid=aid,
+            )
+            bridge.add_accessory(accessory)
+            self._accessories[acc_config.name] = accessory
+            aid += 1
+
+        self._driver.add_accessory(bridge)
+
+    async def start(self) -> None:
+        """Start the AccessoryDriver (non-blocking)."""
+        try:
+            # Enable pyhap debug logging
+            pyhap_logger = logging.getLogger("pyhap")
+            pyhap_logger.setLevel(logging.DEBUG)
+
+            # Create driver with the running event loop
+            loop = asyncio.get_running_loop()
+            config = self._homekit_config
+            pincode = config.homekit.pincode.encode()
+            self.logger.info(
+                f"Starting HAP driver on {config.homekit.ip}:{config.homekit.port} with pincode {config.homekit.pincode}"
+            )
+            self._driver = AccessoryDriver(
+                loop=loop,
+                address=str(config.homekit.ip),
+                port=config.homekit.port,
+                pincode=pincode,
+                persist_file=config.homekit.accessory_state_file,
+            )
+            self._setup_bridge(config)
+            await self._driver.async_start()
+            self.logger.info("AccessoryDriver started successfully")
+        except Exception as e:
+            self.logger.error(f"Error starting AccessoryDriver: {e}", exc_info=True)
+
+    async def stop(self) -> None:
+        """Stop the AccessoryDriver."""
+        if not self._driver:
+            return
+        try:
+            await self._driver.async_stop()
+            self.logger.info("AccessoryDriver stopped successfully")
+        except Exception as e:
+            self.logger.error(f"Error stopping AccessoryDriver: {e}", exc_info=True)
+
+    def update_state(self, accessory_name: str, is_on: bool) -> None:
+        """
+        Update accessory state from Conbus event.
+
+        Args:
+            accessory_name: Accessory name to update.
+            is_on: True if accessory is on, False otherwise.
+        """
+        if acc := self._accessories.get(accessory_name):
+            acc.update_state(is_on)
+        else:
+            self.logger.warning(f"Unknown accessory name: {accessory_name}")