conson-xp 1.51.1__tar.gz → 2.0.0__tar.gz

{conson_xp-1.51.1 → conson_xp-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conson-xp
-Version: 1.51.1
+Version: 2.0.0
 Summary: XP Protocol Communication Tools
 Author-Email: ldvchosal <ldvchosal@github.com>
 License: MIT License
@@ -46,7 +46,6 @@ Requires-Dist: pydantic>=2.11
 Requires-Dist: HAP-python[QRCode]>=5.0.0
 Requires-Dist: punq>=0.7.0
 Requires-Dist: twisted>=25.5.0
-Requires-Dist: bubus>=1.5.6
 Requires-Dist: psygnal>=0.15.0
 Requires-Dist: textual>=1.0.0
 Requires-Dist: python-statemachine>=2.5.0
@@ -399,15 +398,6 @@ xp file validate
 
 xp help
 
-xp homekit
-
-xp homekit config
-xp homekit config show
-xp homekit config validate
-
-xp homekit start
-
-
 xp module
 xp module categories
 xp module info

{conson_xp-1.51.1 → conson_xp-2.0.0}/README.md

@@ -345,15 +345,6 @@ xp file validate
 
 xp help
 
-xp homekit
-
-xp homekit config
-xp homekit config show
-xp homekit config validate
-
-xp homekit start
-
-
 xp module
 xp module categories
 xp module info

{conson_xp-1.51.1 → conson_xp-2.0.0}/pyproject.toml

@@ -16,14 +16,13 @@ dependencies = [
     "HAP-python[QRCode]>=5.0.0",
     "punq>=0.7.0",
     "twisted>=25.5.0",
-    "bubus>=1.5.6",
     "psygnal>=0.15.0",
     "textual>=1.0.0",
     "python-statemachine>=2.5.0",
 ]
 requires-python = ">=3.11"
 readme = "README.md"
-version = "1.51.1"
+version = "2.0.0"
 
 [project.license]
 file = "LICENSE"

{conson_xp-1.51.1 → conson_xp-2.0.0}/src/xp/__init__.py

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

{conson_xp-1.51.1 → conson_xp-2.0.0}/src/xp/cli/commands/__init__.py

@@ -66,8 +66,6 @@ from xp.cli.commands.conbus.conbus_raw_commands import send_raw_telegrams
 from xp.cli.commands.conbus.conbus_receive_commands import receive_telegrams
 from xp.cli.commands.conbus.conbus_scan_commands import scan_module
 from xp.cli.commands.file_commands import file
-from xp.cli.commands.homekit.homekit import homekit
-from xp.cli.commands.homekit.homekit_start_commands import homekit_start
 from xp.cli.commands.module_commands import module
 from xp.cli.commands.reverse_proxy_commands import reverse_proxy
 from xp.cli.commands.server.server_commands import server
@@ -111,8 +109,6 @@ __all__ = [
     "linknumber",
     "blink",
     "checksum",
-    "homekit",
-    "homekit_start",
     "term",
     # Individual command functions
     "protocol_monitor",

{conson_xp-1.51.1 → conson_xp-2.0.0}/src/xp/cli/commands/term/term_commands.py

@@ -57,7 +57,7 @@ def homekit_monitor(ctx: Context) -> None:
     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
+    in an interactive terminal interface. Press action keys (a-z0-9) to
     toggle accessories.
 
     Args:

{conson_xp-1.51.1 → conson_xp-2.0.0}/src/xp/cli/main.py

@@ -3,8 +3,6 @@
 import click
 from click_help_colors import HelpColorsGroup
 
-from xp.cli.commands import homekit
-
 # Import all conbus command modules to register their commands
 from xp.cli.commands.conbus import conbus_discover_commands  # noqa: F401
 from xp.cli.commands.conbus import conbus_export_commands  # noqa: F401
@@ -47,7 +45,6 @@ def cli(ctx: click.Context) -> None:
 
 # Register all command groups
 cli.add_command(conbus)
-cli.add_command(homekit)
 cli.add_command(telegram)
 cli.add_command(module)
 cli.add_command(file)

{conson_xp-1.51.1 → conson_xp-2.0.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):

{conson_xp-1.51.1 → conson_xp-2.0.0}/src/xp/models/protocol/conbus_protocol.py

@@ -2,10 +2,9 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import TYPE_CHECKING
 
-from bubus import BaseEvent
-from pydantic import Field
+from pydantic import BaseModel, Field
 
 from xp.models.config.conson_module_config import ConsonModuleConfig
 from xp.models.homekit.homekit_config import HomekitAccessoryConfig
@@ -13,23 +12,25 @@ from xp.models.telegram.datapoint_type import DataPointType
 
 if TYPE_CHECKING:
     from xp.services.protocol.conbus_event_protocol import ConbusEventProtocol
-    from xp.services.protocol.telegram_protocol import TelegramProtocol
 
 
-class ConnectionMadeEvent(BaseEvent):
+class ConnectionMadeEvent(BaseModel):
     """
     Event dispatched when TCP connection is established.
 
     Attributes:
-        protocol: Reference to the TelegramProtocol instance.
+        model_config: Pydantic model configuration.
+        protocol: Reference to the ConbusEventProtocol instance.
     """
 
-    protocol: TelegramProtocol = Field(
-        description="Reference to the TelegramProtocol instance"
+    model_config = {"arbitrary_types_allowed": True}
+
+    protocol: ConbusEventProtocol = Field(
+        description="Reference to the ConbusEventProtocol instance"
     )
 
 
-class ConnectionFailedEvent(BaseEvent):
+class ConnectionFailedEvent(BaseModel):
     """
     Event dispatched when TCP connection fails.
 
@@ -40,7 +41,7 @@ class ConnectionFailedEvent(BaseEvent):
     reason: str = Field(description="Failure reason")
 
 
-class SendWriteConfigEvent(BaseEvent):
+class SendWriteConfigEvent(BaseModel):
     """
     Event for sending write config commands.
 
@@ -57,7 +58,7 @@ class SendWriteConfigEvent(BaseEvent):
     value: int = Field(description="Set brightness value")
 
 
-class SendActionEvent(BaseEvent):
+class SendActionEvent(BaseModel):
     """
     Event for sending action commands.
 
@@ -76,7 +77,7 @@ class SendActionEvent(BaseEvent):
     off_action: str = Field(description="off action")
 
 
-class DatapointEvent(BaseEvent):
+class DatapointEvent(BaseModel):
     """
     Base event for datapoint operations.
 
@@ -131,7 +132,7 @@ class ReadDatapointFromProtocolEvent(DatapointEvent):
     pass
 
 
-class ModuleEvent(BaseEvent):
+class ModuleEvent(BaseModel):
     """
     Event dispatched when light bulb set is on.
 
@@ -163,7 +164,7 @@ class LightBulbSetOnEvent(ModuleEvent):
     value: bool = Field(description="On or Off the light bulb set")
 
 
-class LightBulbGetOnEvent(ModuleEvent, BaseEvent[bool]):
+class LightBulbGetOnEvent(ModuleEvent):
     """Event dispatched when getting light bulb on state."""
 
     pass
@@ -192,7 +193,7 @@ class OutletGetInUseEvent(ModuleEvent):
     pass
 
 
-class OutletSetInUseEvent(ModuleEvent, BaseEvent[bool]):
+class OutletSetInUseEvent(ModuleEvent):
     """
     Event dispatched when outlet set is on.
 
@@ -239,7 +240,7 @@ class DimmingLightGetBrightnessEvent(ModuleEvent):
     pass
 
 
-class ConnectionLostEvent(BaseEvent):
+class ConnectionLostEvent(BaseModel):
     """
     Event dispatched when TCP connection is lost.
 
@@ -250,12 +251,13 @@ class ConnectionLostEvent(BaseEvent):
     reason: str = Field(description="Disconnection reason")
 
 
-class TelegramEvent(BaseEvent):
+class TelegramEvent(BaseModel):
     """
     Event for telegram operations.
 
     Attributes:
-        protocol: TelegramProtocol instance.
+        model_config: Pydantic model configuration.
+        protocol: ConbusEventProtocol instance.
         frame: Frame <S0123450001F02D12FK>.
         telegram: Telegram S0123450001F02D12FK.
         payload: Payload S0123450001F02D12.
@@ -265,9 +267,9 @@ class TelegramEvent(BaseEvent):
         checksum_valid: Checksum valid true or false.
     """
 
-    protocol: Union[TelegramProtocol, ConbusEventProtocol] = Field(
-        description="TelegramProtocol instance"
-    )
+    model_config = {"arbitrary_types_allowed": True}
+
+    protocol: ConbusEventProtocol = Field(description="ConbusEventProtocol instance")
     frame: str = Field(description="Frame <S0123450001F02D12FK>")
     telegram: str = Field(description="Telegram: S0123450001F02D12FK")
     payload: str = Field(description="Payload: S0123450001F02D12")
@@ -279,7 +281,7 @@ class TelegramEvent(BaseEvent):
     )
 
 
-class ModuleStateChangedEvent(BaseEvent):
+class ModuleStateChangedEvent(BaseModel):
     """
     Event dispatched when a module's state changes (from event telegram).
 
@@ -314,16 +316,19 @@ class TelegramReceivedEvent(TelegramEvent):
     pass
 
 
-class InvalidTelegramReceivedEvent(BaseEvent):
+class InvalidTelegramReceivedEvent(BaseModel):
     """
     Event dispatched when an invalid telegram frame is received.
 
     Attributes:
-        protocol: TelegramProtocol instance.
+        model_config: Pydantic model configuration.
+        protocol: ConbusEventProtocol instance.
         frame: Frame <S0123450001F02D12FK>.
         error: Error with the received telegram.
     """
 
-    protocol: TelegramProtocol = Field(description="TelegramProtocol instance")
+    model_config = {"arbitrary_types_allowed": True}
+
+    protocol: ConbusEventProtocol = Field(description="ConbusEventProtocol instance")
     frame: str = Field(description="Frame <S0123450001F02D12FK>")
     error: str = Field(description="Error with the received telegram")

{conson_xp-1.51.1 → conson_xp-2.0.0}/src/xp/models/term/accessory_state.py

@@ -13,7 +13,7 @@ class AccessoryState:
     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.
+        action: Action key (a-z0-9) 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").

{conson_xp-1.51.1 → conson_xp-2.0.0}/src/xp/services/protocol/__init__.py

@@ -8,11 +8,10 @@ from xp.models.protocol.conbus_protocol import (
     TelegramReceivedEvent,
 )
 from xp.services.protocol.conbus_event_protocol import ConbusEventProtocol
-from xp.services.protocol.telegram_protocol import TelegramProtocol
 
-__all__ = ["TelegramProtocol", "ConbusEventProtocol"]
+__all__ = ["ConbusEventProtocol"]
 
-# Rebuild models after TelegramProtocol and ConbusEventProtocol are imported to resolve forward references
+# Rebuild models after ConbusEventProtocol is imported to resolve forward references
 ConnectionMadeEvent.model_rebuild()
 InvalidTelegramReceivedEvent.model_rebuild()
 ModuleDiscoveredEvent.model_rebuild()

{conson_xp-1.51.1 → conson_xp-2.0.0}/src/xp/services/protocol/conbus_event_protocol.py

@@ -169,7 +169,7 @@ class ConbusEventProtocol(protocol.Protocol, protocol.ClientFactory):
             payload = telegram[:-2]  # S0123450001F02D12
             checksum = telegram[-2:].decode()  # FK
             serial_number = (
-                telegram[1:11] if telegram_type in ("S", "R") else b""
+                telegram[1:11].decode("latin-1") if telegram_type in ("S", "R") else ""
             )  # 0123450001
             calculated_checksum = calculate_checksum(payload.decode(encoding="latin-1"))
 
@@ -391,12 +391,12 @@ class ConbusEventProtocol(protocol.Protocol, protocol.ClientFactory):
         self.logger.debug(f"buildProtocol: {addr}")
         return self
 
-    def clientConnectionFailed(self, connector: IConnector, reason: Failure) -> None:
+    def clientConnectionFailed(self, _connector: IConnector, reason: Failure) -> None:
         """
         Handle client connection failure.
 
         Args:
-            connector: Connection connector instance.
+            _connector: Connection connector instance (unused, required by Twisted).
             reason: Failure reason details.
         """
         self.logger.debug(f"clientConnectionFailed: {reason}")
@@ -404,12 +404,12 @@ class ConbusEventProtocol(protocol.Protocol, protocol.ClientFactory):
         self.connection_failed(reason)
         self._cancel_timeout()
 
-    def clientConnectionLost(self, connector: IConnector, reason: Failure) -> None:
+    def clientConnectionLost(self, _connector: IConnector, reason: Failure) -> None:
         """
         Handle client connection lost event.
 
         Args:
-            connector: Connection connector instance.
+            _connector: Connection connector instance (unused, required by Twisted).
             reason: Reason for connection loss.
         """
         self.logger.debug(f"clientConnectionLost: {reason}")

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

@@ -0,0 +1,171 @@
+"""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,
+        display_name: str,
+        service_type: str,
+        aid: int,
+    ) -> None:
+        """
+        Initialize the XP accessory.
+
+        Args:
+            driver: HomekitAccessoryDriver instance.
+            name: Accessory name (unique identifier for internal tracking).
+            display_name: Display name shown in HomeKit (from config description).
+            service_type: Service type ('light', 'outlet', 'dimminglight').
+            aid: Accessory ID for HomeKit.
+        """
+        super().__init__(driver._driver, display_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,
+                display_name=acc_config.description,
+                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}")