conson-xp 1.48.0__tar.gz → 1.49.0__tar.gz

{conson_xp-1.48.0 → conson_xp-1.49.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conson-xp
-Version: 1.48.0
+Version: 1.49.0
 Summary: XP Protocol Communication Tools
 Author-Email: ldvchosal <ldvchosal@github.com>
 License: MIT License

{conson_xp-1.48.0 → conson_xp-1.49.0}/pyproject.toml

@@ -23,7 +23,7 @@ dependencies = [
 ]
 requires-python = ">=3.11"
 readme = "README.md"
-version = "1.48.0"
+version = "1.49.0"
 
 [project.license]
 file = "LICENSE"

{conson_xp-1.48.0 → conson_xp-1.49.0}/src/xp/__init__.py

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

{conson_xp-1.48.0 → conson_xp-1.49.0}/src/xp/models/protocol/conbus_protocol.py

@@ -13,7 +13,6 @@ from xp.models.telegram.datapoint_type import DataPointType
 
 if TYPE_CHECKING:
     from xp.services.protocol.conbus_event_protocol import ConbusEventProtocol
-    from xp.services.protocol.conbus_protocol import ConbusProtocol
     from xp.services.protocol.telegram_protocol import TelegramProtocol
 
 
@@ -266,7 +265,7 @@ class TelegramEvent(BaseEvent):
         checksum_valid: Checksum valid true or false.
     """
 
-    protocol: Union[TelegramProtocol, ConbusProtocol, ConbusEventProtocol] = Field(
+    protocol: Union[TelegramProtocol, ConbusEventProtocol] = Field(
         description="TelegramProtocol instance"
     )
     frame: str = Field(description="Frame <S0123450001F02D12FK>")

{conson_xp-1.48.0 → conson_xp-1.49.0}/src/xp/services/conbus/conbus_discover_service.py

@@ -25,7 +25,7 @@ class ConbusDiscoverService:
     """
     Service for discovering modules on Conbus servers.
 
-    Uses ConbusProtocol to provide discovery functionality for finding
+    Uses ConbusEventProtocol to provide discovery functionality for finding
     modules connected to the Conbus network.
 
     Attributes:
@@ -45,7 +45,7 @@ class ConbusDiscoverService:
         Initialize the Conbus discover service.
 
         Args:
-            conbus_protocol: ConbusProtocol.
+            conbus_protocol: ConbusEventProtocol instance for communication.
         """
         self.conbus_protocol: ConbusEventProtocol = conbus_protocol
         self.conbus_protocol.on_connection_made.connect(self.connection_made)

{conson_xp-1.48.0 → conson_xp-1.49.0}/src/xp/services/protocol/__init__.py

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

{conson_xp-1.48.0 → conson_xp-1.49.0}/src/xp/services/protocol/conbus_event_protocol.py

@@ -98,7 +98,7 @@ class ConbusEventProtocol(protocol.Protocol, protocol.ClientFactory):
         telegram_service: TelegramService,
     ) -> None:
         """
-        Initialize ConbusProtocol.
+        Initialize ConbusEventProtocol.
 
         Args:
             cli_config: Configuration for Conbus client connection.

conson_xp-1.48.0/src/xp/services/protocol/conbus_protocol.py

@@ -1,335 +0,0 @@
-"""
-Conbus Protocol for XP telegram communication.
-
-This module implements the Twisted protocol for Conbus communication.
-"""
-
-import logging
-from typing import Any, Optional
-
-from twisted.internet import protocol
-from twisted.internet.base import DelayedCall
-from twisted.internet.interfaces import IAddress, IConnector
-from twisted.internet.posixbase import PosixReactorBase
-from twisted.python.failure import Failure
-
-from xp.models import ConbusClientConfig
-from xp.models.protocol.conbus_protocol import (
-    TelegramReceivedEvent,
-)
-from xp.models.telegram.system_function import SystemFunction
-from xp.models.telegram.telegram_type import TelegramType
-from xp.utils import calculate_checksum
-
-
-class ConbusProtocol(protocol.Protocol, protocol.ClientFactory):
-    """
-    Twisted protocol for XP telegram communication.
-
-    Attributes:
-        buffer: Buffer for incoming telegram data.
-        logger: Logger instance for this protocol.
-        cli_config: Conbus configuration settings.
-        reactor: Twisted reactor instance.
-        timeout_seconds: Timeout duration in seconds.
-        timeout_call: Delayed call handle for timeout management.
-    """
-
-    buffer: bytes
-
-    def __init__(
-        self,
-        cli_config: ConbusClientConfig,
-        reactor: PosixReactorBase,
-    ) -> None:
-        """
-        Initialize ConbusProtocol.
-
-        Args:
-            cli_config: Configuration for Conbus client connection.
-            reactor: Twisted reactor for event handling.
-        """
-        self.buffer = b""
-        self.logger = logging.getLogger(__name__)
-        self.cli_config = cli_config.conbus
-        self.reactor = reactor
-        self.timeout_seconds = self.cli_config.timeout
-        self.timeout_call: Optional[DelayedCall] = None
-
-    def connectionMade(self) -> None:
-        """
-        Handle connection established event.
-
-        Called when TCP connection is successfully established. Starts inactivity
-        timeout monitoring.
-        """
-        self.logger.debug("connectionMade")
-        self.connection_established()
-        # Start inactivity timeout
-        self._reset_timeout()
-
-    def dataReceived(self, data: bytes) -> None:
-        """
-        Handle received data from TCP connection.
-
-        Parses incoming telegram frames and dispatches events.
-
-        Args:
-            data: Raw bytes received from connection.
-        """
-        self.logger.debug("dataReceived")
-        self.buffer += data
-
-        while True:
-            start = self.buffer.find(b"<")
-            if start == -1:
-                break
-
-            end = self.buffer.find(b">", start)
-            if end == -1:
-                break
-
-            # <S0123450001F02D12FK>
-            # <R0123450001F02D12FK>
-            # <E12L01I08MAK>
-            frame = self.buffer[start : end + 1]  # <S0123450001F02D12FK>
-            self.buffer = self.buffer[end + 1 :]
-            telegram = frame[1:-1]  # S0123450001F02D12FK
-            telegram_type = telegram[0:1].decode()  # S
-            payload = telegram[:-2]  # S0123450001F02D12
-            checksum = telegram[-2:].decode()  # FK
-            serial_number = (
-                telegram[1:11] if telegram_type in ("S", "R") else b""
-            )  # 0123450001
-            calculated_checksum = calculate_checksum(payload.decode(encoding="latin-1"))
-
-            checksum_valid = checksum == calculated_checksum
-            if not checksum_valid:
-                self.logger.debug(
-                    f"Invalid checksum: {checksum}, calculated: {calculated_checksum}"
-                )
-
-            self.logger.debug(
-                f"frameReceived payload: {payload.decode('latin-1')}, checksum: {checksum}"
-            )
-
-            # Reset timeout on activity
-            self._reset_timeout()
-
-            telegram_received = TelegramReceivedEvent(
-                protocol=self,
-                frame=frame.decode("latin-1"),
-                telegram=telegram.decode("latin-1"),
-                payload=payload.decode("latin-1"),
-                telegram_type=telegram_type,
-                serial_number=serial_number,
-                checksum=checksum,
-                checksum_valid=checksum_valid,
-            )
-            self.telegram_received(telegram_received)
-
-    def sendFrame(self, data: bytes) -> None:
-        """
-        Send telegram frame.
-
-        Args:
-            data: Raw telegram payload (without checksum/framing).
-
-        Raises:
-            IOError: If transport is not open.
-        """
-        # Calculate full frame (add checksum and brackets)
-        checksum = calculate_checksum(data.decode())
-        frame_data = data.decode() + checksum
-        frame = b"<" + frame_data.encode() + b">"
-
-        if not self.transport:
-            self.logger.info("Invalid transport")
-            raise IOError("Transport is not open")
-
-        self.logger.debug(f"Sending frame: {frame.decode()}")
-        self.transport.write(frame)  # type: ignore
-        self.telegram_sent(frame.decode())
-        self._reset_timeout()
-
-    def send_telegram(
-        self,
-        telegram_type: TelegramType,
-        serial_number: str,
-        system_function: SystemFunction,
-        data_value: str,
-    ) -> None:
-        """
-        Send telegram with specified parameters.
-
-        Args:
-            telegram_type: Type of telegram to send.
-            serial_number: Device serial number.
-            system_function: System function code.
-            data_value: Data value to send.
-        """
-        payload = (
-            f"{telegram_type.value}"
-            f"{serial_number}"
-            f"F{system_function.value}"
-            f"D{data_value}"
-        )
-        self.sendFrame(payload.encode())
-
-    def buildProtocol(self, addr: IAddress) -> protocol.Protocol:
-        """
-        Build protocol instance for connection.
-
-        Args:
-            addr: Address of the connection.
-
-        Returns:
-            Protocol instance for this connection.
-        """
-        self.logger.debug(f"buildProtocol: {addr}")
-        return self
-
-    def clientConnectionFailed(self, connector: IConnector, reason: Failure) -> None:
-        """
-        Handle client connection failure.
-
-        Args:
-            connector: Connection connector instance.
-            reason: Failure reason details.
-        """
-        self.logger.debug(f"clientConnectionFailed: {reason}")
-        self.connection_failed(reason)
-        self._cancel_timeout()
-        self._stop_reactor()
-
-    def clientConnectionLost(self, connector: IConnector, reason: Failure) -> None:
-        """
-        Handle client connection lost event.
-
-        Args:
-            connector: Connection connector instance.
-            reason: Reason for connection loss.
-        """
-        self.logger.debug(f"clientConnectionLost: {reason}")
-        self.connection_lost(reason)
-        self._cancel_timeout()
-        self._stop_reactor()
-
-    def timeout(self) -> bool:
-        """
-        Handle timeout event.
-
-        Returns:
-            True to continue waiting for next timeout, False to stop.
-        """
-        self.logger.info("Timeout after: %ss", self.timeout_seconds)
-        self.failed(f"Timeout after: {self.timeout_seconds}s")
-        return False
-
-    def connection_failed(self, reason: Failure) -> None:
-        """
-        Handle connection failure.
-
-        Args:
-            reason: Failure reason details.
-        """
-        self.logger.debug(f"Client connection failed: {reason}")
-        self.failed(reason.getErrorMessage())
-
-    def _reset_timeout(self) -> None:
-        """Reset the inactivity timeout."""
-        self._cancel_timeout()
-        self.timeout_call = self.reactor.callLater(
-            self.timeout_seconds, self._on_timeout
-        )
-
-    def _cancel_timeout(self) -> None:
-        """Cancel the inactivity timeout."""
-        if self.timeout_call and self.timeout_call.active():
-            self.timeout_call.cancel()
-
-    def _on_timeout(self) -> None:
-        """Handle inactivity timeout expiration."""
-        self.logger.debug(f"Conbus timeout after {self.timeout_seconds} seconds")
-        continue_work = self.timeout()
-        if not continue_work:
-            self._stop_reactor()
-
-    def _stop_reactor(self) -> None:
-        """Stop the reactor if it's running."""
-        if self.reactor.running:
-            self.logger.info("Stopping reactor")
-            self.reactor.stop()
-
-    def start_reactor(self) -> None:
-        """Start the reactor if it's running."""
-        # Connect to TCP server
-        self.logger.info(
-            f"Connecting to TCP server {self.cli_config.ip}:{self.cli_config.port}"
-        )
-        self.reactor.connectTCP(self.cli_config.ip, self.cli_config.port, self)
-
-        # Run the reactor (which now uses asyncio underneath)
-        self.logger.info("Starting reactor event loop.")
-        self.reactor.run()
-
-    def __enter__(self) -> "ConbusProtocol":
-        """
-        Enter context manager.
-
-        Returns:
-            Self for context management.
-        """
-        return self
-
-    def __exit__(
-        self,
-        _exc_type: Optional[type],
-        _exc_val: Optional[BaseException],
-        _exc_tb: Optional[Any],
-    ) -> None:
-        """Context manager exit - ensure connection is closed."""
-        self.logger.debug("Exiting the event loop.")
-        self._stop_reactor()
-
-    """Override methods."""
-
-    def telegram_sent(self, telegram_sent: str) -> None:
-        """
-        Override callback when telegram has been sent.
-
-        Args:
-            telegram_sent: The telegram that was sent.
-        """
-        pass
-
-    def telegram_received(self, telegram_received: TelegramReceivedEvent) -> None:
-        """
-        Override callback when telegram is received.
-
-        Args:
-            telegram_received: Event containing received telegram details.
-        """
-        pass
-
-    def connection_established(self) -> None:
-        """Override callback when connection established."""
-        pass
-
-    def connection_lost(self, reason: Failure) -> None:
-        """
-        Override callback when connection is lost.
-
-        Args:
-            reason: Reason for connection loss.
-        """
-        pass
-
-    def failed(self, message: str) -> None:
-        """
-        Override callback when connection failed.
-
-        Args:
-            message: Error message describing the failure.
-        """
-        pass