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

{conson_xp-2.0.0.dist-info → conson_xp-2.0.1.dist-info}/METADATA

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

{conson_xp-2.0.0.dist-info → conson_xp-2.0.1.dist-info}/RECORD

@@ -1,8 +1,8 @@
-conson_xp-2.0.0.dist-info/METADATA,sha256=tK46Z8_p-HD8WeGz-pDaZ93S9IxsuLrcSPS96yBBA2A,11319
-conson_xp-2.0.0.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
-conson_xp-2.0.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
-conson_xp-2.0.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
-xp/__init__.py,sha256=kAoWCUKDiEEtQSn6qquI38IMu38W_n_3af1nhKORdzk,181
+conson_xp-2.0.1.dist-info/METADATA,sha256=tjqY8FAUMgkHQOaEMyu0EPYq-T1JRLs5wD7Tqu2lBJA,11319
+conson_xp-2.0.1.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
+conson_xp-2.0.1.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
+conson_xp-2.0.1.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
+xp/__init__.py,sha256=w2LWS-22VYMQH5ujXhsjjaQ9D1sDkzAfiiYv3VkLl9M,181
 xp/cli/__init__.py,sha256=QjnKB1KaI2aIyKlzrnvCwfbBuUj8HNgwNMvNJVQofbI,81
 xp/cli/__main__.py,sha256=l2iKwMdat5rTGd3JWs-uGksnYYDDffp_Npz05QdKEeU,117
 xp/cli/commands/__init__.py,sha256=9TGP3uTxAU-s-kVChvQ-Fn3-HVYj-QpeQ05Is-20HRo,4788
@@ -41,7 +41,7 @@ xp/cli/commands/telegram/telegram_version_commands.py,sha256=hAMjSAa7zfMNfNFln63
 xp/cli/commands/term/__init__.py,sha256=1NNST_8YJfj5LCujQISwQflK6LyEn7mDmZpMpvI9d-o,116
 xp/cli/commands/term/term.py,sha256=gjvsv2OE-F_KNWQrWi04fXQ5cGo0l8P-Ortbb5KTA-A,309
 xp/cli/commands/term/term_commands.py,sha256=pw-hEddLf89_NKft3JPsZALe-7vtvNeq9upubysqLX8,1799
-xp/cli/main.py,sha256=wr8jCGqgAvre0KFz4wZUWV0IpKa25cs2yLYAAcMoOIw,1906
+xp/cli/main.py,sha256=eyy-Y-3AE9w-LwEDY9oBr9qh25g7EogjBre3dLjr7po,2491
 xp/cli/utils/__init__.py,sha256=gTGIj60Uai0iE7sr9_TtEpl04fD7krtTzbbigXUsUVU,46
 xp/cli/utils/click_tree.py,sha256=sr4l9RWTCnASkdvkJKnRRxWSQPlF1DbFdBNu9gL7Ekc,1693
 xp/cli/utils/datapoint_type_choice.py,sha256=fGgwZAmY_jwBt4fc1LQfyqhvf-TBOUgL3ph9idIDvAI,1680
@@ -62,7 +62,7 @@ xp/models/conbus/__init__.py,sha256=VIusMWQdBtlwDgj7oSj06wQkklihTp4oWFShvP_JUgA,
 xp/models/conbus/conbus.py,sha256=-otqoa_dCDpgEdeAdV66AnSSaXbfPfyHrmV3zpvxGSA,2717
 xp/models/conbus/conbus_autoreport.py,sha256=oTgOstjl_PDASL2n4fXVT1vvcX2nPzve_cBDtwq-wHA,2303
 xp/models/conbus/conbus_blink.py,sha256=DKupiA0-7fh_Dx3DRuKEkS6cEyqM7tq_eMXqKG7Awl4,2925
-xp/models/conbus/conbus_client_config.py,sha256=HL5yDUkINWK56tr2KQhnnNGqBKQ_Y7jrRMpqxqhv06Y,1504
+xp/models/conbus/conbus_client_config.py,sha256=o23wJju72kk72gVkgtAGT5XhJbBgoKw4pI5AicKxyR0,1632
 xp/models/conbus/conbus_connection_status.py,sha256=bpIZSGGM47MIDxHxO26bMvDHT1W83rxmcyWgJbmL1lM,1111
 xp/models/conbus/conbus_custom.py,sha256=AoVMT-JYej_zIdZcZC251Ww0JNmAtQobCif2H5kUf00,1979
 xp/models/conbus/conbus_datapoint.py,sha256=4vxQxT8FMKZK7VTyJjXbIe7PlqJcO2iz04gjkn2BwSM,3410
@@ -143,7 +143,7 @@ xp/services/conbus/write_config_service.py,sha256=BCfmLNPRDpwSwRMRYJvx2FXA8IZsdg
 xp/services/log_file_service.py,sha256=y775InPlpG8Z_uitHt7yrgRG-3vlIuCfdJjiZzPc_MA,10578
 xp/services/module_type_service.py,sha256=ga4WO7dmJEaDKrXPmrJ-72n4UaEZonead23lHBkFN1E,7505
 xp/services/protocol/__init__.py,sha256=o5adyCwOrqSf4ADUStor44TFUerYx6QmxGpq4Q0dhSo,631
-xp/services/protocol/conbus_event_protocol.py,sha256=5BmvhZCqDuXekhbTuuOvz1dke6fqsZIJsaWYF8s-mGU,19653
+xp/services/protocol/conbus_event_protocol.py,sha256=ZSejBycY9igqNdiiejkEAoiUWKsVkOgEWMUYp2uMAsk,19681
 xp/services/reverse_proxy_service.py,sha256=Xuxo2ajjmTXLg5yd6gRGKHpFPX4-6kpOUg10doZB8vw,15161
 xp/services/server/__init__.py,sha256=QEcCj-jK0goAukJCe15TKYFQfSAzWsduPT_wW0HxZU8,48
 xp/services/server/base_server_service.py,sha256=Yu4sTOtp3a1yc3O3J7J-51i9FdFqG-VWBv9aNf0j-9k,12845
@@ -191,4 +191,4 @@ xp/utils/logging.py,sha256=wJ1d-yg97NiZUrt2F8iDMcmnHVwC-PErcI-7dpyiRDc,3777
 xp/utils/serialization.py,sha256=TS1OwpTOemSvXsCGw3js4JkYYFEqkzrPe8V9QYQefdw,4684
 xp/utils/state_machine.py,sha256=W9AY4ntRZnFeHAa5d43hm37j53uJPlqkRvWTPiBhJ_0,2464
 xp/utils/time_utils.py,sha256=K17godWpL18VEypbTlvNOEDG6R3huYnf29yjkcnwRpU,3796
-conson_xp-2.0.0.dist-info/RECORD,,
+conson_xp-2.0.1.dist-info/RECORD,,

xp/__init__.py

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

xp/cli/main.py

@@ -24,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)

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):

xp/services/protocol/conbus_event_protocol.py

@@ -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: