conson-xp 1.51.0__py3-none-any.whl → 1.52.0__py3-none-any.whl

{conson_xp-1.51.0.dist-info → conson_xp-1.52.0.dist-info}/METADATA

@@ -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.dist-info → conson_xp-1.52.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
-conson_xp-1.51.0.dist-info/METADATA,sha256=8rmZ2V68vB3gZpx_sScMBXxKXqAei3GeqOOUHGe92mo,11432
-conson_xp-1.51.0.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
-conson_xp-1.51.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
-conson_xp-1.51.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
-xp/__init__.py,sha256=IbYggn-GNpmY-NkggNp_7SLbVaF6zPk0wENVaZeOIeE,182
+conson_xp-1.52.0.dist-info/METADATA,sha256=eOYsythIuuDYadskAlya_jpbvYD2Wu-6MymZA0encfg,11448
+conson_xp-1.52.0.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
+conson_xp-1.52.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
+conson_xp-1.52.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
+xp/__init__.py,sha256=wi3ok8DMPwweHsqxB5KwuT1FJynHp6v2d2Vt06prmpw,182
 xp/cli/__init__.py,sha256=QjnKB1KaI2aIyKlzrnvCwfbBuUj8HNgwNMvNJVQofbI,81
 xp/cli/__main__.py,sha256=l2iKwMdat5rTGd3JWs-uGksnYYDDffp_Npz05QdKEeU,117
 xp/cli/commands/__init__.py,sha256=G7A1KFRSV0CEeDTqr_khu-K9_sc01CTI2KSfkFcaBRM,4949
@@ -43,7 +43,7 @@ xp/cli/commands/telegram/telegram_parse_commands.py,sha256=xCDRRFgj41RtStvwROfi-
 xp/cli/commands/telegram/telegram_version_commands.py,sha256=hAMjSAa7zfMNfNFln63sKeNPcmW89bISkcVs6BgsqOg,1558
 xp/cli/commands/term/__init__.py,sha256=1NNST_8YJfj5LCujQISwQflK6LyEn7mDmZpMpvI9d-o,116
 xp/cli/commands/term/term.py,sha256=gjvsv2OE-F_KNWQrWi04fXQ5cGo0l8P-Ortbb5KTA-A,309
-xp/cli/commands/term/term_commands.py,sha256=ypJo9GL0eNwllgJJux2agJkcco6k9HMM-5f3aTbiQ2c,1216
+xp/cli/commands/term/term_commands.py,sha256=Z3pq_xzP0j5YfYFOwASaZUxXDkikSV_E4cFjMb69LUU,1796
 xp/cli/main.py,sha256=Wbtji5ddW3IEoAfecHrEPk8W_w1bGD20B-NqAWfI_F4,1968
 xp/cli/utils/__init__.py,sha256=gTGIj60Uai0iE7sr9_TtEpl04fD7krtTzbbigXUsUVU,46
 xp/cli/utils/click_tree.py,sha256=sr4l9RWTCnASkdvkJKnRRxWSQPlF1DbFdBNu9gL7Ekc,1693
@@ -84,7 +84,7 @@ xp/models/config/__init__.py,sha256=gEZnX9eE3DjFtLtF32riEjJQLypqQRbyPauBI4Cowbs,
 xp/models/config/conson_module_config.py,sha256=t1G0LnNNMnjs3ahhz4-Z_5SlEv2FCrcRq13OmvZ2pvA,3009
 xp/models/homekit/__init__.py,sha256=5HDSOClCu0ArK3IICn3_LDMMLBAzLjBxUUSF73bxSSk,34
 xp/models/homekit/homekit_accessory.py,sha256=ANjDWlFxeNTstl7lKdmf6vMOC0wc005vpiD6awRcptA,1052
-xp/models/homekit/homekit_config.py,sha256=OMq0eayAJ6NRr8PXANvQzgEYGW9RN_ycyEmnTlTlHrQ,2938
+xp/models/homekit/homekit_config.py,sha256=pgZOnocue60LjV8ce46MyJ3mo5CqLix6TmT64qxPOks,3267
 xp/models/log_entry.py,sha256=tAiNwouCP2d4jKiHJY9a-2iAi8LWTpG-TZsOPDIstlA,4423
 xp/models/protocol/__init__.py,sha256=TJ_CJKchA-xgQiv5vCo_ndBBZjrcaTmjT74bR0T-5Cw,38
 xp/models/protocol/conbus_protocol.py,sha256=hF78N5xvBzMiyWoKd8i_avA8kJ1As_9Pplkw1GMqKzk,9145
@@ -105,7 +105,8 @@ xp/models/telegram/system_telegram.py,sha256=064AlFi_WghoYlVDUtIIbvwtZyUEZj7_auK
 xp/models/telegram/telegram.py,sha256=-kNloBlwMJ5w1-FAMSLzBPnyOGUNEBG3SG2d0eTi2PY,847
 xp/models/telegram/telegram_type.py,sha256=IjGEosbs7IDqYT7ktn-FcKS-kAJ4eXW-KJGkkoAGysw,428
 xp/models/telegram/timeparam_type.py,sha256=z5EQ32SQjDi7zKshtkvDzqaMfPMUeXCWKEGI5VgvBvU,1142
-xp/models/term/__init__.py,sha256=aFvzGZHr_dI6USb8MJuYLSLMvxi_ZWMVtokHDt8428s,263
+xp/models/term/__init__.py,sha256=VVZsEyXBEr-TnBlrFFifZ6PjJHUl2kwnRUZx_kC2Ljg,343
+xp/models/term/accessory_state.py,sha256=GcMtCxOeHpc3IPDO1F9j2I6rdhaNV75iQ2md--XY6jo,1650
 xp/models/term/connection_state.py,sha256=oYcst01uH35kO541jGuXMqvJ2iduiHYryUsMK0d89pQ,1807
 xp/models/term/module_state.py,sha256=i7u8y_B5ScMRULQb_kMSD_wwKzbrLHlkECsTgNS46PQ,939
 xp/models/term/protocol_keys_config.py,sha256=tSlkxEwgQuVRYLTaUNd569osQsNCdb9ED4InNgX9rKo,1223
@@ -145,7 +146,7 @@ xp/services/conbus/write_config_service.py,sha256=BCfmLNPRDpwSwRMRYJvx2FXA8IZsdg
 xp/services/homekit/__init__.py,sha256=xAMKmln_AmEFdOOJGKWYi96seRlKDQpKx3-hm7XbdIo,36
 xp/services/homekit/homekit_cache_service.py,sha256=z1TB6icEqd1paoilVTewuFL0lXVCQbvrOJkJvvQECJY,11060
 xp/services/homekit/homekit_conbus_service.py,sha256=XPKv7Mit1rn7XLaQZcKmlMMUlyj-o0J2z8XBH3NaEIM,3390
-xp/services/homekit/homekit_config_validator.py,sha256=bLDOY8dbXvqvrDLtn4PijZA38qNmQWcQFWIY6hjLrl0,10875
+xp/services/homekit/homekit_config_validator.py,sha256=jf09jHIFbZg7YpDbGsGHT1p4a1vpUED2xR6iZN19cfM,10875
 xp/services/homekit/homekit_conson_validator.py,sha256=tmUxBzytX9FbUWTR1XdbAi_qb_whAdGPSaml98Czszg,3858
 xp/services/homekit/homekit_dimminglight.py,sha256=EzfGhy3zZkbFPfN72Dh_eSb5mJQOpxGi6ZwnyEOSHxU,5819
 xp/services/homekit/homekit_dimminglight_service.py,sha256=0Ve6cXtY7v7JCv7gibOBWjPfCU7KK4Lk6GjIu9_GhyE,5282
@@ -184,9 +185,13 @@ xp/services/telegram/telegram_output_service.py,sha256=9deqtcPndRqJ-3XQUWlJhXaVc
 xp/services/telegram/telegram_service.py,sha256=jPu0Xrh3IpvqPLyuQT5Vf8HHw00vBingONHdxf_9TkI,13315
 xp/services/telegram/telegram_version_service.py,sha256=oXnZ_K7OQ7xD-GEj3zDYp52KlkqVuHpO4bf7gMlC_w4,10574
 xp/services/term/__init__.py,sha256=BIeOK042bMR-0l6MA80wdW5VuHlpWOXtRER9IG5ilQA,245
+xp/services/term/homekit_accessory_driver.py,sha256=vCkeXHwIBwUIuUGoTdflbIOm8EQhT33pX8j4Smhr1co,5759
+xp/services/term/homekit_service.py,sha256=QZnAzgOVIZ8vlfa1ehIp4Q1zZyIAj2f0SB1W8wdmemo,21895
 xp/services/term/protocol_monitor_service.py,sha256=5YBI0Nu7B7gMhaTbUhL6k9LSRfnCIj6CwrCYHiMHavA,10067
-xp/services/term/state_monitor_service.py,sha256=4CmeHf5k9mf67AleOB7byM7_g5WwbAOnmgxl6I2vBwg,17116
+xp/services/term/state_monitor_service.py,sha256=EK9tNBfamAIV0z0EMsXDYWC-rXv6l6k_bHsC8xyEFSo,17116
 xp/term/__init__.py,sha256=Xg2DhBeI3xQJLfc7_BPWI1por-rUXemyer5OtOt9Cus,51
+xp/term/homekit.py,sha256=xN2BiMHHF3tPR96ixg_qO5y6fDNTkjEzau3YDTNuk1U,3711
+xp/term/homekit.tcss,sha256=qeR_OV8D_9Mxb-aPNz-MH0ZJOsdCk-fJ-zv6CQV5ihw,1382
 xp/term/protocol.py,sha256=6MX3mduLei-AgLGaIe8lfOSu4Hi0y3KGePFFM2ssstc,3475
 xp/term/protocol.tcss,sha256=r_KfxrbpycGHLVXqZc6INBBcUJME0hLrAZkF1oqnab4,2126
 xp/term/state.py,sha256=FBpYV_bWYJh9o17qcMx6sHgUARQS-uNOtUt6G7Vs1n8,3274
@@ -195,13 +200,14 @@ xp/term/widgets/__init__.py,sha256=ftWmN_fmjxy2E8Qfm-YSRmzKfgL0KTBCTpgvYWCPbUY,2
 xp/term/widgets/help_menu.py,sha256=KLkdIXfhARLFNEs2lv1u0sYBz9LzOCcDLxbMGzc7e5Y,1812
 xp/term/widgets/modules_list.py,sha256=qAG-n0nK0YdNE9v4C3-sHgxLvF1i1FR7v_GArdaoUQw,7831
 xp/term/widgets/protocol_log.py,sha256=E68QmSMpOFrvrPTo_gOQVfyiDqY5c_y8fkNKnQw6Vwo,2650
-xp/term/widgets/status_footer.py,sha256=YYAT0431p6jmrzzpVgaPhu7yGkRroWGv4e99t2XlkHI,3297
+xp/term/widgets/room_list.py,sha256=3q3otusnQn4qFRbTY0-QbpMP3vPmywM0izYRA_KjXn0,7871
+xp/term/widgets/status_footer.py,sha256=biV3EzfVSgm1T7Ofi88LXsTFCkD5mI_6Cpe-RpuOSxA,3429
 xp/utils/__init__.py,sha256=_avMF_UOkfR3tNeDIPqQ5odmbq5raKkaq1rZ9Cn1CJs,332
 xp/utils/checksum.py,sha256=Px1S3dFGA-_plavBxrq3IqmprNlgtNDunE3whg6Otwg,1722
-xp/utils/dependencies.py,sha256=I8Z89_iTCeR-7adpae3GVQUGZ-1gY6wg0OGKmdJGg3w,24536
+xp/utils/dependencies.py,sha256=McCgnBrg0Jw98_bFQv3uPG0bYkGKHC-mFJPmILlvv5k,25754
 xp/utils/event_helper.py,sha256=zD0K3TPfGEThU9vUNlDtglTai3Cmm30727iwjDZy6Dk,1007
 xp/utils/logging.py,sha256=wJ1d-yg97NiZUrt2F8iDMcmnHVwC-PErcI-7dpyiRDc,3777
 xp/utils/serialization.py,sha256=TS1OwpTOemSvXsCGw3js4JkYYFEqkzrPe8V9QYQefdw,4684
 xp/utils/state_machine.py,sha256=W9AY4ntRZnFeHAa5d43hm37j53uJPlqkRvWTPiBhJ_0,2464
 xp/utils/time_utils.py,sha256=K17godWpL18VEypbTlvNOEDG6R3huYnf29yjkcnwRpU,3796
-conson_xp-1.51.0.dist-info/RECORD,,
+conson_xp-1.52.0.dist-info/RECORD,,

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"

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()

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
 
 

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",

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")

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,

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}")