conson-xp 1.36.0__tar.gz → 1.37.0__tar.gz

{conson_xp-1.36.0 → conson_xp-1.37.0}/PKG-INFO

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

{conson_xp-1.36.0 → conson_xp-1.37.0}/pyproject.toml

@@ -22,7 +22,7 @@ dependencies = [
 ]
 requires-python = ">=3.11"
 readme = "README.md"
-version = "1.36.0"
+version = "1.37.0"
 
 [project.license]
 file = "LICENSE"

{conson_xp-1.36.0 → conson_xp-1.37.0}/src/xp/__init__.py

@@ -3,7 +3,7 @@
 conson-xp package.
 """
 
-__version__ = "1.36.0"
+__version__ = "1.37.0"
 __manufacturer__ = "salchichon"
 __model__ = "xp.cli"
 __serial__ = "2025.09.23.000"

{conson_xp-1.36.0 → conson_xp-1.37.0}/src/xp/cli/commands/conbus/conbus_actiontable_commands.py

@@ -57,7 +57,7 @@ def conbus_download_actiontable(ctx: Context, serial_number: str) -> None:
         Args:
             progress: Progress message string.
         """
-        click.echo(progress)
+        click.echo(progress, nl=False)
 
     def on_finish(result: tuple) -> None:
         """Handle successful completion of action table download.

{conson_xp-1.36.0 → conson_xp-1.37.0}/src/xp/cli/commands/conbus/conbus_autoreport_commands.py

@@ -57,8 +57,11 @@ def get_autoreport_command(ctx: Context, serial_number: str) -> None:
     with service:
         service.on_finish.connect(on_finish)
         service.query_datapoint(
-            serial_number=serial_number, datapoint_type=DataPointType.AUTO_REPORT_STATUS
+            serial_number=serial_number,
+            datapoint_type=DataPointType.AUTO_REPORT_STATUS,
+            timeout_seconds=1.0,
         )
+        service.start_reactor()
 
 
 @conbus_autoreport.command("set", short_help="Set auto report status for a module")
@@ -104,6 +107,6 @@ def set_autoreport_command(ctx: Context, serial_number: str, status: str) -> Non
             serial_number=serial_number,
             datapoint_type=DataPointType.AUTO_REPORT_STATUS,
             data_value=data_value,
-            timeout_seconds=0.5,
+            timeout_seconds=1.0,
         )
         service.start_reactor()

{conson_xp-1.36.0 → conson_xp-1.37.0}/src/xp/cli/commands/conbus/conbus_lightlevel_commands.py

@@ -200,6 +200,7 @@ def xp_lightlevel_get(
         result["output_number"] = output_number
         result["lightlevel_level"] = lightlevel_level
         click.echo(json.dumps(result, indent=2))
+        service.stop_reactor()
 
     with service:
         service.on_finish.connect(on_finish)
@@ -208,3 +209,4 @@ def xp_lightlevel_get(
             datapoint_type=DataPointType.MODULE_LIGHT_LEVEL,
             timeout_seconds=0.5,
         )
+        service.start_reactor()

{conson_xp-1.36.0 → conson_xp-1.37.0}/src/xp/cli/commands/conbus/conbus_linknumber_commands.py

@@ -93,6 +93,7 @@ def get_linknumber_command(ctx: click.Context, serial_number: str) -> None:
         result = service_response.to_dict()
         result["linknumber_value"] = linknumber_value
         click.echo(json.dumps(result, indent=2))
+        service.stop_reactor()
 
     with service:
         service.on_finish.connect(on_finish)
@@ -101,3 +102,4 @@ def get_linknumber_command(ctx: click.Context, serial_number: str) -> None:
             datapoint_type=DataPointType.LINK_NUMBER,
             timeout_seconds=0.5,
         )
+        service.start_reactor()

{conson_xp-1.36.0 → conson_xp-1.37.0}/src/xp/cli/commands/conbus/conbus_modulenumber_commands.py

@@ -95,6 +95,7 @@ def get_modulenumber_command(ctx: click.Context, serial_number: str) -> None:
         result = service_response.to_dict()
         result["modulenumber_value"] = modulenumber_value
         click.echo(json.dumps(result, indent=2))
+        service.stop_reactor()
 
     with service:
         service.on_finish.connect(on_finish)
@@ -103,3 +104,4 @@ def get_modulenumber_command(ctx: click.Context, serial_number: str) -> None:
             datapoint_type=DataPointType.MODULE_NUMBER,
             timeout_seconds=0.5,
         )
+        service.start_reactor()

{conson_xp-1.36.0 → conson_xp-1.37.0}/src/xp/cli/commands/conbus/conbus_output_commands.py

@@ -121,6 +121,7 @@ def xp_output_status(ctx: click.Context, serial_number: str) -> None:
             response: Datapoint response object.
         """
         click.echo(json.dumps(response.to_dict(), indent=2))
+        service.stop_reactor()
 
     with service:
         service.on_finish.connect(on_finish)
@@ -128,6 +129,7 @@ def xp_output_status(ctx: click.Context, serial_number: str) -> None:
             serial_number=serial_number,
             datapoint_type=DataPointType.MODULE_OUTPUT_STATE,
         )
+        service.start_reactor()
 
 
 @conbus_output.command("state")
@@ -156,6 +158,7 @@ def xp_module_state(ctx: click.Context, serial_number: str) -> None:
             response: Datapoint response object.
         """
         click.echo(json.dumps(response.to_dict(), indent=2))
+        service.stop_reactor()
 
     with service:
         service.on_finish.connect(on_finish)
@@ -163,3 +166,4 @@ def xp_module_state(ctx: click.Context, serial_number: str) -> None:
             serial_number=serial_number,
             datapoint_type=DataPointType.MODULE_STATE,
         )
+        service.start_reactor()

{conson_xp-1.36.0 → conson_xp-1.37.0}/src/xp/models/telegram/datapoint_type.py

@@ -30,6 +30,36 @@ class DataPointType(str, Enum):
         SW_TOP_VERSION: Software top version.
         VOLTAGE: Voltage data point.
         AUTO_REPORT_STATUS: Auto report status.
+
+    Sample telegram datapoint request:
+       <S0020044966F02D30FL>
+
+    Sample telegram datapoint reply:
+       <R0020044966F02D00XP24FH>
+       <R0020044966F02D01XP24FG>
+       <R0020044966F02D02XP24_V0.34.03GI>
+       <R0020044966F02D030020044966FB>
+       <R0020044966F02D0406FL>
+       <R0020044966F02D050007FL>
+       <R0020044966F02D0601FO>
+       <R0020044966F02D0707FJ>
+       <R0020044966F02D08MIFF>
+       <R0020044966F02D09OFFBP>
+       <R0020044966F02D1000FI>
+       <R0020044966F02D11xxxx0000FJ>
+       <R0020044966F02D12xxxx0000FK>
+       <R0020044966F02D1500:000[%],01:000[%],02:000[%],03:000[%]HB>
+       <R0020044966F02D1600:000[H],01:000[H],02:000[H],03:000[H]HC>
+       <R0020044966F02D1700:00000[NA],01:00000[NA],02:00000[NA],03:00000[NA]HD>
+       <R0020044966F02D18+28,5§CIM>
+       <R0020044966F02D19??FB>
+       <R0020044966F02D20??FL>
+       <R0020044966F02D21PPFK>
+       <R0020044966F02D22PLLKMDINEM>
+       <R0020044966F02D23AAFI>
+       <R0020044966F02D24AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFP>
+       <R0020044966F02D25AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFO>
+       <R0020044966F02D26??FN>
     """
 
     MODULE_TYPE = "00"  # Module type (XP24, XP33, ..)

{conson_xp-1.36.0 → conson_xp-1.37.0}/src/xp/services/conbus/actiontable/msactiontable_service.py

@@ -182,7 +182,6 @@ class MsActionTableService:
         """
         self.logger.debug(f"Failed: {message}")
         self.on_error.emit(message)
-        self.on_finish.emit(None)
 
     def succeed(
         self,

{conson_xp-1.36.0 → conson_xp-1.37.0}/src/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.
 

{conson_xp-1.36.0 → conson_xp-1.37.0}/src/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.

{conson_xp-1.36.0 → conson_xp-1.37.0}/tests/unit/test_services/test_xp24_action_table_service.py

@@ -291,7 +291,6 @@ class TestMsActionTableService:
         service.failed("Connection timeout")
 
         mock_error.assert_called_once_with("Connection timeout")
-        mock_finish.assert_called_once_with(None)
 
     def test_start_method_xp24(self, service):
         """Test start method with xp24 module type."""