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

xp/utils/dependencies.py

@@ -1,9 +1,7 @@
 """Dependency injection container for XP services."""
 
 import punq
-from bubus import EventBus
 from twisted.internet import asyncioreactor
-from twisted.internet.interfaces import IConnector
 from twisted.internet.posixbase import PosixReactorBase
 
 from xp.models import ConbusClientConfig
@@ -55,19 +53,9 @@ from xp.services.conbus.conbus_raw_service import ConbusRawService
 from xp.services.conbus.conbus_receive_service import ConbusReceiveService
 from xp.services.conbus.conbus_scan_service import ConbusScanService
 from xp.services.conbus.write_config_service import WriteConfigService
-from xp.services.homekit.homekit_cache_service import HomeKitCacheService
-from xp.services.homekit.homekit_conbus_service import HomeKitConbusService
-from xp.services.homekit.homekit_dimminglight_service import HomeKitDimmingLightService
-from xp.services.homekit.homekit_hap_service import HomekitHapService
-from xp.services.homekit.homekit_lightbulb_service import HomeKitLightbulbService
-from xp.services.homekit.homekit_module_service import HomekitModuleService
-from xp.services.homekit.homekit_outlet_service import HomeKitOutletService
-from xp.services.homekit.homekit_service import HomeKitService
 from xp.services.log_file_service import LogFileService
 from xp.services.module_type_service import ModuleTypeService
 from xp.services.protocol import ConbusEventProtocol
-from xp.services.protocol.protocol_factory import TelegramFactory
-from xp.services.protocol.telegram_protocol import TelegramProtocol
 from xp.services.reverse_proxy_service import ReverseProxyService
 from xp.services.server.device_service_factory import DeviceServiceFactory
 from xp.services.server.server_service import ServerService
@@ -77,6 +65,7 @@ from xp.services.telegram.telegram_discover_service import TelegramDiscoverServi
 from xp.services.telegram.telegram_link_number_service import LinkNumberService
 from xp.services.telegram.telegram_output_service import TelegramOutputService
 from xp.services.telegram.telegram_service import TelegramService
+from xp.services.term.homekit_accessory_driver import HomekitAccessoryDriver
 from xp.services.term.homekit_service import HomekitService
 from xp.services.term.protocol_monitor_service import ProtocolMonitorService
 from xp.services.term.state_monitor_service import StateMonitorService
@@ -168,7 +157,24 @@ class ServiceContainer:
         self.container.register(TelegramDatapointService, scope=punq.Scope.singleton)
         self.container.register(LinkNumberService, scope=punq.Scope.singleton)
 
+        # Reactor
+        self.container.register(
+            PosixReactorBase,
+            factory=lambda: reactor,
+            scope=punq.Scope.singleton,
+        )
+
         # Conbus services layer
+        self.container.register(
+            ConbusEventProtocol,
+            factory=lambda: ConbusEventProtocol(
+                cli_config=self.container.resolve(ConbusClientConfig),
+                reactor=self.container.resolve(PosixReactorBase),
+                telegram_service=self.container.resolve(TelegramService),
+            ),
+            scope=punq.Scope.singleton,
+        )
+
         self.container.register(
             ConbusDatapointService,
             factory=lambda: ConbusDatapointService(
@@ -195,16 +201,6 @@ class ServiceContainer:
             scope=punq.Scope.singleton,
         )
 
-        self.container.register(
-            ConbusEventProtocol,
-            factory=lambda: ConbusEventProtocol(
-                cli_config=self.container.resolve(ConbusClientConfig),
-                reactor=self.container.resolve(PosixReactorBase),
-                telegram_service=self.container.resolve(TelegramService),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
         self.container.register(
             ConbusDiscoverService,
             factory=lambda: ConbusDiscoverService(
@@ -267,6 +263,21 @@ class ServiceContainer:
             scope=punq.Scope.singleton,
         )
 
+        # HomeKit config
+        self.container.register(
+            HomekitConfig,
+            factory=lambda: HomekitConfig.from_yaml(self._homekit_config_path),
+            scope=punq.Scope.singleton,
+        )
+
+        self.container.register(
+            HomekitAccessoryDriver,
+            factory=lambda: HomekitAccessoryDriver(
+                homekit_config=self.container.resolve(HomekitConfig),
+            ),
+            scope=punq.Scope.singleton,
+        )
+
         self.container.register(
             HomekitService,
             factory=lambda: HomekitService(
@@ -274,6 +285,7 @@ class ServiceContainer:
                 homekit_config=self.container.resolve(HomekitConfig),
                 conson_config=self.container.resolve(ConsonModuleListConfig),
                 telegram_service=self.container.resolve(TelegramService),
+                accessory_driver=self.container.resolve(HomekitAccessoryDriver),
             ),
             scope=punq.Scope.singleton,
         )
@@ -431,39 +443,6 @@ class ServiceContainer:
             scope=punq.Scope.singleton,
         )
 
-        # HomeKit services layer
-        self.container.register(
-            HomekitModuleService,
-            factory=lambda: HomekitModuleService(
-                conson_modules_config=self.container.resolve(ConsonModuleListConfig),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
-        # Create event bus
-        self.container.register(
-            EventBus,
-            factory=lambda: EventBus(max_history_size=500),
-            scope=punq.Scope.singleton,
-        )
-
-        # HomeKit conson config
-        self.container.register(
-            HomekitConfig,
-            factory=lambda: HomekitConfig.from_yaml(self._homekit_config_path),
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            HomekitHapService,
-            factory=lambda: HomekitHapService(
-                homekit_config=self.container.resolve(HomekitConfig),
-                module_service=self.container.resolve(HomekitModuleService),
-                event_bus=self.container.resolve(EventBus),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
         # Log file services layer
         self.container.register(
             LogFileService,
@@ -526,105 +505,6 @@ class ServiceContainer:
             scope=punq.Scope.singleton,
         )
 
-        # Create protocol with built-in debouncing
-        self.container.register(
-            TelegramProtocol,
-            factory=lambda: TelegramProtocol(
-                event_bus=self.container.resolve(EventBus),
-                debounce_ms=50,
-            ),
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            IConnector,
-            factory=lambda: reactor,
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            TelegramFactory,
-            factory=lambda: TelegramFactory(
-                event_bus=self.container.resolve(EventBus),
-                telegram_protocol=self.container.resolve(TelegramProtocol),
-                connector=self.container.resolve(IConnector),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            PosixReactorBase,
-            factory=lambda: reactor,
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            HomeKitLightbulbService,
-            factory=lambda: HomeKitLightbulbService(
-                event_bus=self.container.resolve(EventBus),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            HomeKitOutletService,
-            factory=lambda: HomeKitOutletService(
-                event_bus=self.container.resolve(EventBus),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            HomeKitDimmingLightService,
-            factory=lambda: HomeKitDimmingLightService(
-                event_bus=self.container.resolve(EventBus),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
-        # Cache service must be registered BEFORE HomeKitConbusService
-        # so it intercepts ReadDatapointEvent first
-        self.container.register(
-            HomeKitCacheService,
-            factory=lambda: HomeKitCacheService(
-                event_bus=self.container.resolve(EventBus),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            HomeKitConbusService,
-            factory=lambda: HomeKitConbusService(
-                event_bus=self.container.resolve(EventBus),
-                telegram_protocol=self.container.resolve(TelegramProtocol),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            TelegramService,
-            factory=TelegramService,
-            scope=punq.Scope.singleton,
-        )
-
-        self.container.register(
-            HomeKitService,
-            factory=lambda: HomeKitService(
-                cli_config=self.container.resolve(ConbusClientConfig),
-                event_bus=self.container.resolve(EventBus),
-                telegram_factory=self.container.resolve(TelegramFactory),
-                reactor=self.container.resolve(PosixReactorBase),
-                lightbulb_service=self.container.resolve(HomeKitLightbulbService),
-                outlet_service=self.container.resolve(HomeKitOutletService),
-                dimminglight_service=self.container.resolve(HomeKitDimmingLightService),
-                cache_service=self.container.resolve(HomeKitCacheService),
-                conbus_service=self.container.resolve(HomeKitConbusService),
-                module_factory=self.container.resolve(HomekitHapService),
-                telegram_service=self.container.resolve(TelegramService),
-            ),
-            scope=punq.Scope.singleton,
-        )
-
     def _load_protocol_keys(self) -> "ProtocolKeysConfig":
         """
         Load protocol keys from YAML config file.

xp/cli/commands/homekit/__init__.py

@@ -1,3 +0,0 @@
-"""HomeKit CLI commands package."""
-
-__all__ = []

xp/cli/commands/homekit/homekit.py

@@ -1,120 +0,0 @@
-"""HomeKit management CLI commands."""
-
-import click
-from click_help_colors import HelpColorsGroup
-
-from xp.cli.utils.decorators import service_command
-
-
-@click.group(
-    cls=HelpColorsGroup, help_headers_color="yellow", help_options_color="green"
-)
-def homekit() -> None:
-    """Manage the HomeKit server for XP Protocol operations."""
-    pass
-
-
-@homekit.group(
-    cls=HelpColorsGroup, help_headers_color="yellow", help_options_color="green"
-)
-def config() -> None:
-    """Manage HomeKit configuration."""
-    pass
-
-
-@config.command()
-@click.option(
-    "--conson-config",
-    default="conson.yml",
-    help="Path to conson.yml configuration file",
-)
-@click.option(
-    "--homekit-config",
-    default="homekit.yml",
-    help="Path to homekit.yml configuration file",
-)
-@service_command()
-def validate(conson_config: str, homekit_config: str) -> None:
-    """
-    Validate homekit.yml and conson.yml coherence.
-
-    Args:
-        conson_config: Path to conson.yml configuration file.
-        homekit_config: Path to homekit.yml configuration file.
-    """
-    from xp.services.homekit.homekit_config_validator import ConfigValidationService
-
-    try:
-        validator = ConfigValidationService(conson_config, homekit_config)
-        results = validator.validate_all()
-
-        if results["is_valid"]:
-            click.echo(click.style("✓ Configuration validation passed", fg="green"))
-        else:
-            click.echo(
-                click.style(
-                    f"✗ Configuration validation failed with {results['total_errors']} errors",
-                    fg="red",
-                )
-            )
-
-            if results["conson_errors"]:
-                click.echo(
-                    click.style("\nConson Configuration Errors:", fg="red", bold=True)
-                )
-                for error in results["conson_errors"]:
-                    click.echo(f"  - {error}")
-
-            if results["homekit_errors"]:
-                click.echo(
-                    click.style("\nHomeKit Configuration Errors:", fg="red", bold=True)
-                )
-                for error in results["homekit_errors"]:
-                    click.echo(f"  - {error}")
-
-            if results["cross_reference_errors"]:
-                click.echo(
-                    click.style("\nCross-Reference Errors:", fg="red", bold=True)
-                )
-                for error in results["cross_reference_errors"]:
-                    click.echo(f"  - {error}")
-
-            exit(1)
-
-    except Exception as e:
-        click.echo(click.style(f"✗ Validation failed: {e}", fg="red"))
-        exit(1)
-
-
-@config.command("show")
-@click.option(
-    "--conson-config",
-    default="conson.yml",
-    help="Path to conson.yml configuration file",
-)
-@click.option(
-    "--homekit-config",
-    default="homekit.yml",
-    help="Path to homekit.yml configuration file",
-)
-@service_command()
-def show_config(conson_config: str, homekit_config: str) -> None:
-    """
-    Display parsed configuration summary.
-
-    Args:
-        conson_config: Path to conson.yml configuration file.
-        homekit_config: Path to homekit.yml configuration file.
-    """
-    from xp.services.homekit.homekit_config_validator import ConfigValidationService
-
-    try:
-        validator = ConfigValidationService(conson_config, homekit_config)
-        summary = validator.print_config_summary()
-
-        click.echo(click.style("Configuration Summary:", fg="blue", bold=True))
-        click.echo(summary)
-
-    except Exception as e:
-        click.echo(click.style(f"✗ Failed to load configuration: {e}", fg="red"))
-        exit(1)

xp/cli/commands/homekit/homekit_start_commands.py

@@ -1,44 +0,0 @@
-"""API server start command."""
-
-import sys
-
-import click
-from click import Context
-
-from xp.cli.commands.homekit.homekit import homekit
-from xp.services.homekit.homekit_service import HomeKitService
-
-
-@homekit.command("start")
-@click.pass_context
-def homekit_start(ctx: Context) -> None:
-    r"""
-    Start the HomeKit server.
-
-    This command starts the XP Protocol HomeKit server using HAP-python.
-    The server provides HomeKit endpoints for Conbus operations.
-
-    Args:
-        ctx: Click context object.
-
-    Examples:
-        \b
-        # Start server on default host and port
-        xp homekit start
-    """
-    click.echo("Starting XP Protocol HomeKit server...")
-
-    try:
-        service: HomeKitService = (
-            ctx.obj.get("container").get_container().resolve(HomeKitService)
-        )
-        service.start()  # Blocking call - reactor.run() never returns
-
-    except KeyboardInterrupt:
-        click.echo("\nShutting down server...")
-    except Exception as e:
-        click.echo(
-            click.style(f"Error starting server: {e}", fg="red"),
-            err=True,
-        )
-        sys.exit(1)

xp/services/homekit/__init__.py

@@ -1 +0,0 @@
-"""HomeKit integration services."""