conson-xp 1.36.0__py3-none-any.whl → 1.38.0__py3-none-any.whl

xp/services/conbus/actiontable/actiontable_list_service.py

@@ -59,7 +59,7 @@ class ActionTableListService:
 
         # Load configuration
         try:
-            from xp.models.homekit.homekit_conson_config import ConsonModuleListConfig
+            from xp.models.config.conson_module_config import ConsonModuleListConfig
 
             config = ConsonModuleListConfig.from_yaml(str(config_path))
         except Exception as e:
@@ -72,6 +72,7 @@ class ActionTableListService:
             {
                 "serial_number": module.serial_number,
                 "module_type": module.module_type,
+                "action_table": len(module.action_table) if module.action_table else 0,
             }
             for module in config.root
         ]

xp/services/conbus/actiontable/actiontable_show_service.py

@@ -4,7 +4,7 @@ import logging
 from pathlib import Path
 from typing import Any, Callable, Optional
 
-from xp.models.homekit.homekit_conson_config import ConsonModuleConfig
+from xp.models.config.conson_module_config import ConsonModuleConfig
 
 
 class ActionTableShowService:
@@ -61,7 +61,7 @@ class ActionTableShowService:
 
         # Load configuration
         try:
-            from xp.models.homekit.homekit_conson_config import ConsonModuleListConfig
+            from xp.models.config.conson_module_config import ConsonModuleListConfig
 
             config = ConsonModuleListConfig.from_yaml(str(config_path))
         except Exception as e:

xp/services/conbus/actiontable/actiontable_upload_service.py

@@ -5,7 +5,7 @@ from typing import Any, Optional
 
 from psygnal import Signal
 
-from xp.models.homekit.homekit_conson_config import ConsonModuleListConfig
+from xp.models.config.conson_module_config import ConsonModuleListConfig
 from xp.models.protocol.conbus_protocol import TelegramReceivedEvent
 from xp.models.telegram.system_function import SystemFunction
 from xp.models.telegram.telegram_type import TelegramType

xp/services/conbus/conbus_datapoint_service.py

@@ -165,7 +165,7 @@ class ConbusDatapointService:
         self,
         serial_number: str,
         datapoint_type: DataPointType,
-        timeout_seconds: Optional[float] = None,
+        timeout_seconds: float = 1.0,
     ) -> None:
         """Query a specific datapoint from a module.
 

xp/services/conbus/conbus_event_list_service.py

@@ -9,7 +9,7 @@ from collections import defaultdict
 from typing import Dict, List
 
 from xp.models import ConbusEventListResponse
-from xp.models.homekit.homekit_conson_config import ConsonModuleListConfig
+from xp.models.config.conson_module_config import ConsonModuleListConfig
 from xp.services.actiontable.actiontable_serializer import ActionTableSerializer
 
 

xp/services/conbus/conbus_export_service.py

@@ -9,7 +9,7 @@ import yaml
 from psygnal import Signal
 
 from xp.models.conbus.conbus_export import ConbusExportResponse
-from xp.models.homekit.homekit_conson_config import (
+from xp.models.config.conson_module_config import (
     ConsonModuleConfig,
     ConsonModuleListConfig,
 )

xp/services/conbus/msactiontable/__init__.py

@@ -0,0 +1 @@
+"""MsAction table services for Conbus."""

xp/services/conbus/{actiontable/msactiontable_service.py → msactiontable/msactiontable_download_service.py}

@@ -5,6 +5,7 @@ from typing import Any, Optional, Union
 
 from psygnal import Signal
 
+from xp.models.actiontable.msactiontable import MsActionTable
 from xp.models.actiontable.msactiontable_xp20 import Xp20MsActionTable
 from xp.models.actiontable.msactiontable_xp24 import Xp24MsActionTable
 from xp.models.actiontable.msactiontable_xp33 import Xp33MsActionTable
@@ -30,7 +31,7 @@ class MsActionTableError(Exception):
     pass
 
 
-class MsActionTableService:
+class MsActionTableDownloadService:
     """
     Service for downloading MS action tables via Conbus protocol.
 
@@ -46,7 +47,7 @@ class MsActionTableService:
 
     on_progress: Signal = Signal(str)
     on_error: Signal = Signal(str)
-    on_finish: Signal = Signal(object)  # Union type for Xp20/24/33 or None
+    on_finish: Signal = Signal(MsActionTable, str)  # Union type for Xp20/24/33 or None
 
     def __init__(
         self,
@@ -164,7 +165,8 @@ class MsActionTableService:
             all_data = "".join(self.msactiontable_data)
             # Deserialize from received data
             msactiontable = self.serializer.from_data(all_data)
-            self.succeed(msactiontable)
+            msactiontable_short = self.serializer.format_decoded_output(msactiontable)  # type: ignore[arg-type]
+            self.succeed(msactiontable, msactiontable_short)
             return
 
         self.logger.debug("Invalid msactiontable response")
@@ -182,18 +184,19 @@ class MsActionTableService:
         """
         self.logger.debug(f"Failed: {message}")
         self.on_error.emit(message)
-        self.on_finish.emit(None)
 
     def succeed(
         self,
         msactiontable: Union[Xp20MsActionTable, Xp24MsActionTable, Xp33MsActionTable],
+        msactiontable_short: str,
     ) -> None:
         """Handle succeed connection event.
 
         Args:
             msactiontable: result.
+            msactiontable_short: result in short form.
         """
-        self.on_finish.emit(msactiontable)
+        self.on_finish.emit(msactiontable, msactiontable_short)
 
     def start(
         self,
@@ -242,7 +245,7 @@ class MsActionTableService:
         """Stop the reactor."""
         self.conbus_protocol.stop_reactor()
 
-    def __enter__(self) -> "MsActionTableService":
+    def __enter__(self) -> "MsActionTableDownloadService":
         """Enter context manager.
 
         Returns:

xp/services/conbus/msactiontable/msactiontable_list_service.py

@@ -0,0 +1,92 @@
+"""Service for listing modules with action table configurations from conson.yml."""
+
+import logging
+from pathlib import Path
+from typing import Any, Optional
+
+from psygnal import Signal
+
+
+class MsActionTableListService:
+    """Service for listing modules with action table configurations.
+
+    Reads conson.yml and returns a list of all modules that have action table
+    configurations defined.
+
+    Attributes:
+        on_finish: Signal emitted with dict[str, Any] when listing completes.
+        on_error: Signal emitted with error message string when an error occurs.
+    """
+
+    on_finish: Signal = Signal(object)  # dict[str, Any]
+    on_error: Signal = Signal(str)
+
+    def __init__(self) -> None:
+        """Initialize the action table list service."""
+        self.logger = logging.getLogger(__name__)
+
+    def __enter__(self) -> "MsActionTableListService":
+        """Context manager entry.
+
+        Returns:
+            Self for context manager use.
+        """
+        return self
+
+    def __exit__(self, _exc_type: Any, _exc_val: Any, _exc_tb: Any) -> None:
+        """Context manager exit."""
+        # Disconnect service signals
+        self.on_finish.disconnect()
+        self.on_error.disconnect()
+
+    def start(
+        self,
+        config_path: Optional[Path] = None,
+    ) -> None:
+        """List all modules with action table configurations.
+
+        Args:
+            config_path: Optional path to conson.yml. Defaults to current directory.
+        """
+        # Default to current directory if not specified
+        if config_path is None:
+            config_path = Path.cwd() / "conson.yml"
+
+        # Check if config file exists
+        if not config_path.exists():
+            self._handle_error("Error: conson.yml not found in current directory")
+            return
+
+        # Load configuration
+        try:
+            from xp.models.config.conson_module_config import ConsonModuleListConfig
+
+            config = ConsonModuleListConfig.from_yaml(str(config_path))
+        except Exception as e:
+            self.logger.error(f"Failed to load conson.yml: {e}")
+            self._handle_error(f"Error: Failed to load conson.yml: {e}")
+            return
+
+        # Filter modules that have ms_action_table configured
+        modules_with_msactiontable = [
+            {
+                "serial_number": module.serial_number,
+                "module_type": module.module_type,
+                "msaction_table": 1 if module.msaction_table else 0,
+            }
+            for module in config.root
+        ]
+
+        # Prepare result
+        result = {"modules": modules_with_msactiontable}
+
+        # Emit finish signal
+        self.on_finish.emit(result)
+
+    def _handle_error(self, message: str) -> None:
+        """Handle error and emit error signal.
+
+        Args:
+            message: Error message.
+        """
+        self.on_error.emit(message)

xp/services/conbus/msactiontable/msactiontable_show_service.py

@@ -0,0 +1,89 @@
+"""Service for showing ms action table configuration for a specific module."""
+
+import logging
+from pathlib import Path
+from typing import Any, Callable, Optional
+
+from xp.models.config.conson_module_config import ConsonModuleConfig
+
+
+class MsActionTableShowService:
+    """Service for showing action table configuration for a specific module.
+
+    Reads conson.yml and returns the action table configuration for the specified
+    module serial number.
+    """
+
+    def __init__(self) -> None:
+        """Initialize the action table show service."""
+        self.logger = logging.getLogger(__name__)
+        self.finish_callback: Optional[Callable[[ConsonModuleConfig], None]] = None
+        self.error_callback: Optional[Callable[[str], None]] = None
+
+    def __enter__(self) -> "MsActionTableShowService":
+        """Context manager entry.
+
+        Returns:
+            Self for context manager use.
+        """
+        return self
+
+    def __exit__(self, _exc_type: Any, _exc_val: Any, _exc_tb: Any) -> None:
+        """Context manager exit."""
+        pass
+
+    def start(
+        self,
+        serial_number: str,
+        finish_callback: Callable[[ConsonModuleConfig], None],
+        error_callback: Callable[[str], None],
+        config_path: Optional[Path] = None,
+    ) -> None:
+        """Show ms action table configuration for a specific module.
+
+        Args:
+            serial_number: Module serial number.
+            finish_callback: Callback to invoke with the module configuration.
+            error_callback: Callback to invoke on error.
+            config_path: Optional path to conson.yml. Defaults to current directory.
+        """
+        self.finish_callback = finish_callback
+        self.error_callback = error_callback
+
+        # Default to current directory if not specified
+        if config_path is None:
+            config_path = Path.cwd() / "conson.yml"
+
+        # Check if config file exists
+        if not config_path.exists():
+            self._handle_error("Error: conson.yml not found in current directory")
+            return
+
+        # Load configuration
+        try:
+            from xp.models.config.conson_module_config import ConsonModuleListConfig
+
+            config = ConsonModuleListConfig.from_yaml(str(config_path))
+        except Exception as e:
+            self.logger.error(f"Failed to load conson.yml: {e}")
+            self._handle_error(f"Error: Failed to load conson.yml: {e}")
+            return
+
+        # Find module
+        module = config.find_module(serial_number)
+        if not module:
+            self._handle_error(f"Error: Module {serial_number} not found in conson.yml")
+            return
+
+        # Invoke callback
+        if self.finish_callback is not None:
+            self.finish_callback(module)
+
+    def _handle_error(self, message: str) -> None:
+        """Handle error and invoke error callback.
+
+        Args:
+            message: Error message.
+        """
+        if self.error_callback is not None:
+            self.error_callback(message)

xp/services/homekit/homekit_config_validator.py

@@ -253,8 +253,8 @@ class ConfigValidationService:
             conson_config_path: Path to conson.yml configuration file.
             homekit_config_path: Path to homekit.yml configuration file.
         """
+        from xp.models.config.conson_module_config import ConsonModuleListConfig
         from xp.models.homekit.homekit_config import HomekitConfig
-        from xp.models.homekit.homekit_conson_config import ConsonModuleListConfig
 
         self.conson_config = ConsonModuleListConfig.from_yaml(conson_config_path)
         self.homekit_config = HomekitConfig.from_yaml(homekit_config_path)

xp/services/homekit/homekit_conson_validator.py

@@ -5,7 +5,7 @@ This module validates conson.yml configuration files for HomeKit integration.
 
 from typing import List, Set
 
-from xp.models.homekit.homekit_conson_config import (
+from xp.models.config.conson_module_config import (
     ConsonModuleConfig,
     ConsonModuleListConfig,
 )

xp/services/homekit/homekit_dimminglight.py

@@ -10,8 +10,8 @@ from pyhap.accessory import Accessory
 from pyhap.accessory_driver import AccessoryDriver
 from pyhap.const import CATEGORY_LIGHTBULB
 
+from xp.models.config.conson_module_config import ConsonModuleConfig
 from xp.models.homekit.homekit_config import HomekitAccessoryConfig
-from xp.models.homekit.homekit_conson_config import ConsonModuleConfig
 from xp.models.protocol.conbus_protocol import (
     DimmingLightGetBrightnessEvent,
     DimmingLightGetOnEvent,

xp/services/homekit/homekit_lightbulb.py

@@ -10,8 +10,8 @@ from pyhap.accessory import Accessory
 from pyhap.accessory_driver import AccessoryDriver
 from pyhap.const import CATEGORY_LIGHTBULB
 
+from xp.models.config.conson_module_config import ConsonModuleConfig
 from xp.models.homekit.homekit_config import HomekitAccessoryConfig
-from xp.models.homekit.homekit_conson_config import ConsonModuleConfig
 from xp.models.protocol.conbus_protocol import (
     LightBulbGetOnEvent,
     LightBulbSetOnEvent,

xp/services/homekit/homekit_module_service.py

@@ -6,7 +6,7 @@ This module provides service implementation for HomeKit module management.
 import logging
 from typing import Optional
 
-from xp.models.homekit.homekit_conson_config import (
+from xp.models.config.conson_module_config import (
     ConsonModuleConfig,
     ConsonModuleListConfig,
 )

xp/services/homekit/homekit_outlet.py

@@ -10,8 +10,8 @@ from pyhap.accessory import Accessory
 from pyhap.accessory_driver import AccessoryDriver
 from pyhap.const import CATEGORY_OUTLET
 
+from xp.models.config.conson_module_config import ConsonModuleConfig
 from xp.models.homekit.homekit_config import HomekitAccessoryConfig
-from xp.models.homekit.homekit_conson_config import ConsonModuleConfig
 from xp.models.protocol.conbus_protocol import (
     OutletGetInUseEvent,
     OutletGetOnEvent,

xp/services/protocol/conbus_event_protocol.py

@@ -320,9 +320,13 @@ class ConbusEventProtocol(protocol.Protocol, protocol.ClientFactory):
 
     def stop_reactor(self) -> None:
         """Stop the reactor if it's running."""
-        if self._reactor.running:
-            self.logger.info("Stopping reactor")
-            self._reactor.stop()
+        try:
+            if self._reactor.running:
+                self.logger.info("Stopping reactor")
+                self._reactor.stop()
+        except Exception as e:
+            # Reactor might have already stopped or not been started via run()
+            self.logger.debug(f"Reactor stop failed (likely already stopped): {e}")
 
     def connect(self) -> None:
         """Connect to TCP server.

xp/services/server/server_service.py

@@ -11,7 +11,7 @@ import threading
 from pathlib import Path
 from typing import Dict, List, Optional
 
-from xp.models.homekit.homekit_conson_config import (
+from xp.models.config.conson_module_config import (
     ConsonModuleConfig,
     ConsonModuleListConfig,
 )

xp/services/term/state_monitor_service.py

@@ -6,7 +6,7 @@ from typing import Dict, List, Optional
 
 from psygnal import Signal
 
-from xp.models.homekit.homekit_conson_config import ConsonModuleListConfig
+from xp.models.config.conson_module_config import ConsonModuleListConfig
 from xp.models.protocol.conbus_protocol import TelegramReceivedEvent
 from xp.models.telegram.datapoint_type import DataPointType
 from xp.models.telegram.module_type_code import ModuleTypeCode

xp/utils/dependencies.py

@@ -8,8 +8,8 @@ from twisted.internet.posixbase import PosixReactorBase
 
 from xp.models import ConbusClientConfig
 from xp.models.conbus.conbus_logger_config import ConbusLoggerConfig
+from xp.models.config.conson_module_config import ConsonModuleListConfig
 from xp.models.homekit.homekit_config import HomekitConfig
-from xp.models.homekit.homekit_conson_config import ConsonModuleListConfig
 from xp.models.term.protocol_keys_config import ProtocolKeysConfig
 from xp.services.actiontable.actiontable_serializer import ActionTableSerializer
 from xp.services.actiontable.msactiontable_serializer import MsActionTableSerializer
@@ -23,7 +23,7 @@ from xp.services.actiontable.msactiontable_xp33_serializer import (
     Xp33MsActionTableSerializer,
 )
 from xp.services.conbus.actiontable.actiontable_download_service import (
-    ActionTableService,
+    ActionTableDownloadService,
 )
 from xp.services.conbus.actiontable.actiontable_list_service import (
     ActionTableListService,
@@ -34,7 +34,6 @@ from xp.services.conbus.actiontable.actiontable_show_service import (
 from xp.services.conbus.actiontable.actiontable_upload_service import (
     ActionTableUploadService,
 )
-from xp.services.conbus.actiontable.msactiontable_service import MsActionTableService
 from xp.services.conbus.conbus_blink_all_service import ConbusBlinkAllService
 from xp.services.conbus.conbus_blink_service import ConbusBlinkService
 from xp.services.conbus.conbus_custom_service import ConbusCustomService
@@ -52,6 +51,15 @@ from xp.services.conbus.conbus_output_service import ConbusOutputService
 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.msactiontable.msactiontable_download_service import (
+    MsActionTableDownloadService,
+)
+from xp.services.conbus.msactiontable.msactiontable_list_service import (
+    MsActionTableListService,
+)
+from xp.services.conbus.msactiontable.msactiontable_show_service import (
+    MsActionTableShowService,
+)
 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
@@ -99,6 +107,7 @@ class ServiceContainer:
         logger_config_path: str = "logger.yml",
         homekit_config_path: str = "homekit.yml",
         conson_config_path: str = "conson.yml",
+        export_config_path: str = "export.yml",
         server_port: int = 10001,
         protocol_keys_config_path: str = "protocol.yml",
         reverse_proxy_port: int = 10001,
@@ -111,6 +120,7 @@ class ServiceContainer:
             logger_config_path: Path to the Conbus Loggerr configuration file
             homekit_config_path: Path to the HomeKit configuration file
             conson_config_path: Path to the Conson configuration file
+            export_config_path: Path to the Conson export file
             protocol_keys_config_path: Path to the protocol keys configuration file
             server_port: Port for the server service
             reverse_proxy_port: Port for the reverse proxy service
@@ -120,6 +130,7 @@ class ServiceContainer:
         self._logger_config_path = logger_config_path
         self._homekit_config_path = homekit_config_path
         self._conson_config_path = conson_config_path
+        self._export_config_path = export_config_path
         self._protocol_keys_config_path = protocol_keys_config_path
         self._server_port = server_port
         self._reverse_proxy_port = reverse_proxy_port
@@ -141,6 +152,12 @@ class ServiceContainer:
             scope=punq.Scope.singleton,
         )
 
+        self.container.register(
+            ConsonModuleListConfig,
+            factory=lambda: ConsonModuleListConfig.from_yaml(self._conson_config_path),
+            scope=punq.Scope.singleton,
+        )
+
         # Telegram services layer
         self.container.register(TelegramService, scope=punq.Scope.singleton)
         self.container.register(
@@ -302,8 +319,8 @@ class ServiceContainer:
         )
 
         self.container.register(
-            ActionTableService,
-            factory=lambda: ActionTableService(
+            ActionTableDownloadService,
+            factory=lambda: ActionTableDownloadService(
                 conbus_protocol=self.container.resolve(ConbusEventProtocol),
                 actiontable_serializer=self.container.resolve(ActionTableSerializer),
                 telegram_service=self.container.resolve(TelegramService),
@@ -353,8 +370,8 @@ class ServiceContainer:
         )
 
         self.container.register(
-            MsActionTableService,
-            factory=lambda: MsActionTableService(
+            MsActionTableDownloadService,
+            factory=lambda: MsActionTableDownloadService(
                 conbus_protocol=self.container.resolve(ConbusEventProtocol),
                 xp20ms_serializer=self.container.resolve(Xp20MsActionTableSerializer),
                 xp24ms_serializer=self.container.resolve(Xp24MsActionTableSerializer),
@@ -389,13 +406,6 @@ class ServiceContainer:
             scope=punq.Scope.singleton,
         )
 
-        # HomeKit conson config
-        self.container.register(
-            ConsonModuleListConfig,
-            factory=lambda: ConsonModuleListConfig.from_yaml(self._conson_config_path),
-            scope=punq.Scope.singleton,
-        )
-
         # HomeKit services layer
         self.container.register(
             HomekitModuleService,
@@ -468,6 +478,18 @@ class ServiceContainer:
             scope=punq.Scope.singleton,
         )
 
+        self.container.register(
+            MsActionTableListService,
+            factory=MsActionTableListService,
+            scope=punq.Scope.singleton,
+        )
+
+        self.container.register(
+            MsActionTableShowService,
+            factory=MsActionTableShowService,
+            scope=punq.Scope.singleton,
+        )
+
         # Server services layer
         self.container.register(
             ServerService,