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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conson-xp
-Version: 1.52.0
+Version: 2.0.1
 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.52.0 → conson_xp-2.0.1}/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.52.0 → conson_xp-2.0.1}/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.52.0"
+version = "2.0.1"
 
 [project.license]
 file = "LICENSE"

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

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

{conson_xp-1.52.0 → conson_xp-2.0.1}/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.52.0 → conson_xp-2.0.1}/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.52.0 → conson_xp-2.0.1}/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
@@ -26,17 +24,36 @@ from xp.utils.logging import LoggerService
     cls=HelpColorsGroup, help_headers_color="yellow", help_options_color="green"
 )
 @click.version_option()
+@click.option(
+    "--cli-config",
+    "-c",
+    default="cli.yml",
+    help="Path to the CLI configuration file (default: cli.yml)",
+    type=click.Path(exists=False),
+)
+@click.option(
+    "--log-config",
+    "-l",
+    default="logger.yml",
+    help="Path to the logger configuration file (default: logger.yml)",
+    type=click.Path(exists=False),
+)
 @click.pass_context
-def cli(ctx: click.Context) -> None:
+def cli(ctx: click.Context, cli_config: str, log_config: str) -> None:
     """
     XP CLI tool for remote console bus operations.
 
     Args:
         ctx: Click context object for passing state between commands.
+        cli_config: Path to the CLI configuration file.
+        log_config: Path to the logger configuration file.
     """
-    container = ServiceContainer()
-    logger_config = container.get_container().resolve(LoggerService)
-    logger_config.setup()
+    container = ServiceContainer(
+        client_config_path=cli_config,
+        logger_config_path=log_config,
+    )
+    logger_service = container.get_container().resolve(LoggerService)
+    logger_service.setup()
 
     # Initialize the service container and store it in the context
     ctx.ensure_object(dict)
@@ -47,7 +64,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.52.0 → conson_xp-2.0.1}/src/xp/models/conbus/conbus_client_config.py

@@ -15,11 +15,13 @@ class ClientConfig(BaseModel):
         ip: IP address of the Conbus server.
         port: Port number for the connection.
         timeout: Connection timeout in seconds.
+        queue_delay_max: Max delay between queued telegrams in centiseconds (default 40 = 0.40s).
     """
 
     ip: str = "192.168.1.100"
     port: int = 10001
     timeout: float = 0.1
+    queue_delay_max: int = 40
 
 
 class ConbusClientConfig(BaseModel):

{conson_xp-1.52.0 → conson_xp-2.0.1}/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.52.0 → conson_xp-2.0.1}/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.52.0 → conson_xp-2.0.1}/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.52.0 → conson_xp-2.0.1}/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}")
@@ -513,7 +513,7 @@ class ConbusEventProtocol(protocol.Protocol, protocol.ClientFactory):
         self.logger.debug("Queue manager: event loop")
         telegram = self.telegram_queue.get_nowait()
         self.sendFrame(telegram)
-        later = randint(10, 80) / 100
+        later = randint(5, self.cli_config.queue_delay_max) / 100
         self.call_later(later, self.process_telegram_queue)
 
     def set_event_loop(self, event_loop: asyncio.AbstractEventLoop) -> None:

{conson_xp-1.52.0 → conson_xp-2.0.1}/src/xp/services/term/homekit_accessory_driver.py

@@ -18,6 +18,7 @@ class XPAccessory(Accessory):
         self,
         driver: "HomekitAccessoryDriver",
         name: str,
+        display_name: str,
         service_type: str,
         aid: int,
     ) -> None:
@@ -26,11 +27,12 @@ class XPAccessory(Accessory):
 
         Args:
             driver: HomekitAccessoryDriver instance.
-            name: Accessory name (unique identifier and display name).
+            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, name, aid=aid)
+        super().__init__(driver._driver, display_name, aid=aid)
         self._hk_driver = driver
         self._accessory_id = name
         self.logger = logging.getLogger(__name__)
@@ -108,6 +110,7 @@ class HomekitAccessoryDriver:
             accessory = XPAccessory(
                 driver=self,
                 name=acc_config.name,
+                display_name=acc_config.description,
                 service_type=acc_config.service,
                 aid=aid,
             )

{conson_xp-1.52.0 → conson_xp-2.0.1}/src/xp/services/term/homekit_service.py

@@ -89,7 +89,7 @@ class HomekitService:
 
     def _initialize_accessory_states(self) -> None:
         """Initialize accessory states from HomekitConfig and ConsonModuleListConfig."""
-        action_keys = "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        action_keys = "abcdefghijklmnopqrstuvwxyz0123456789"
         action_index = 0
         sort_order = 0
 
@@ -180,6 +180,23 @@ class HomekitService:
                 return accessory
         return None
 
+    def _find_accessory_config_by_id(
+        self, accessory_id: str
+    ) -> Optional[HomekitAccessoryConfig]:
+        """
+        Find accessory config by accessory ID.
+
+        Args:
+            accessory_id: Accessory ID (e.g., "A12_1").
+
+        Returns:
+            HomekitAccessoryConfig if found, None otherwise.
+        """
+        state = self._accessory_states.get(accessory_id)
+        if not state:
+            return None
+        return self._find_accessory_config_by_output(state.serial_number, state.output)
+
     def _connect_signals(self) -> None:
         """Connect to protocol signals."""
         self._conbus_protocol.on_connection_made.connect(self._on_connection_made)
@@ -291,13 +308,23 @@ class HomekitService:
         config = self._find_accessory_config(accessory_name)
         if config:
             action = config.on_action if is_on else config.off_action
-            self._conbus_protocol.send_raw_telegram(action)
+            self.send_action(action)
             self.on_status_message.emit(
                 f"HomeKit: {accessory_name} {'ON' if is_on else 'OFF'}"
             )
         else:
             self.logger.warning(f"No config found for accessory: {accessory_name}")
 
+    def send_action(self, action: str) -> None:
+        """
+        Send an action telegram to the conbus protocol.
+
+        Args:
+            action: The action string to send (e.g., "E00L00I00").
+        """
+        self._conbus_protocol.send_raw_telegram(f"{action}M")
+        self._conbus_protocol.send_raw_telegram(f"{action}B")
+
     def toggle_connection(self) -> None:
         """
         Toggle connection state between connected and disconnected.
@@ -313,31 +340,111 @@ class HomekitService:
         else:
             self.connect()
 
-    def toggle_accessory(self, action_key: str) -> bool:
+    def select_accessory(self, action_key: str) -> Optional[str]:
+        """
+        Get accessory ID for action key.
+
+        Args:
+            action_key: Action key (a-z0-9).
+
+        Returns:
+            Accessory ID if found, None otherwise.
         """
-        Toggle accessory by action key.
+        return self._action_map.get(action_key)
 
-        Sends the toggle_action telegram for the accessory mapped to the given key.
+    def toggle_selected(self, accessory_id: str) -> bool:
+        """
+        Toggle accessory by ID.
 
         Args:
-            action_key: Action key (a-z).
+            accessory_id: Accessory ID (e.g., "A12_1").
 
         Returns:
             True if toggle was sent, False otherwise.
         """
-        accessory_id = self._action_map.get(action_key)
-        if not accessory_id:
-            return False
-
         state = self._accessory_states.get(accessory_id)
         if not state or not state.toggle_action:
             self.logger.warning(f"No toggle_action for accessory {accessory_id}")
             return False
 
-        self._conbus_protocol.send_raw_telegram(state.toggle_action)
+        self.send_action(state.toggle_action)
         self.on_status_message.emit(f"Toggling {state.accessory_name}")
         return True
 
+    def turn_on_selected(self, accessory_id: str) -> bool:
+        """
+        Turn on accessory by ID.
+
+        Args:
+            accessory_id: Accessory ID (e.g., "A12_1").
+
+        Returns:
+            True if on command was sent, False otherwise.
+        """
+        config = self._find_accessory_config_by_id(accessory_id)
+        state = self._accessory_states.get(accessory_id)
+        if not config or not state:
+            self.logger.warning(f"No config for accessory {accessory_id}")
+            return False
+
+        self.send_action(config.on_action)
+        self.on_status_message.emit(f"Turning ON {state.accessory_name}")
+        return True
+
+    def turn_off_selected(self, accessory_id: str) -> bool:
+        """
+        Turn off accessory by ID.
+
+        Args:
+            accessory_id: Accessory ID (e.g., "A12_1").
+
+        Returns:
+            True if off command was sent, False otherwise.
+        """
+        config = self._find_accessory_config_by_id(accessory_id)
+        state = self._accessory_states.get(accessory_id)
+        if not config or not state:
+            self.logger.warning(f"No config for accessory {accessory_id}")
+            return False
+
+        self.send_action(config.off_action)
+        self.on_status_message.emit(f"Turning OFF {state.accessory_name}")
+        return True
+
+    def increase_dimmer(self, accessory_id: str) -> bool:
+        """
+        Increase dimmer level for accessory.
+
+        Args:
+            accessory_id: Accessory ID (e.g., "A12_1").
+
+        Returns:
+            True if command was sent, False otherwise.
+        """
+        state = self._accessory_states.get(accessory_id)
+        if not state:
+            return False
+        # TODO: Implement dimmer control
+        self.on_status_message.emit(f"Dimmer+ {state.accessory_name} (not implemented)")
+        return False
+
+    def decrease_dimmer(self, accessory_id: str) -> bool:
+        """
+        Decrease dimmer level for accessory.
+
+        Args:
+            accessory_id: Accessory ID (e.g., "A12_1").
+
+        Returns:
+            True if command was sent, False otherwise.
+        """
+        state = self._accessory_states.get(accessory_id)
+        if not state:
+            return False
+        # TODO: Implement dimmer control
+        self.on_status_message.emit(f"Dimmer- {state.accessory_name} (not implemented)")
+        return False
+
     def refresh_all(self) -> None:
         """
         Refresh all module states.