conson-xp 1.19.0__py3-none-any.whl → 1.21.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: conson-xp
3
- Version: 1.19.0
3
+ Version: 1.21.0
4
4
  Summary: XP Protocol Communication Tools
5
5
  Author-Email: ldvchosal <ldvchosal@github.com>
6
6
  License: MIT License
@@ -48,6 +48,7 @@ Requires-Dist: punq>=0.7.0
48
48
  Requires-Dist: twisted>=25.5.0
49
49
  Requires-Dist: bubus>=1.5.6
50
50
  Requires-Dist: psygnal>=0.15.0
51
+ Requires-Dist: textual>=1.0.0
51
52
  Description-Content-Type: text/markdown
52
53
 
53
54
  # 🔌 XP Protocol Communication Tool
@@ -398,6 +399,10 @@ xp telegram parse
398
399
  xp telegram validate
399
400
  xp telegram version
400
401
 
402
+
403
+ xp term
404
+ xp term protocol
405
+
401
406
  <!-- END CLI HELP -->
402
407
  ```
403
408
  </details>
@@ -1,11 +1,11 @@
1
- conson_xp-1.19.0.dist-info/METADATA,sha256=-VtLm8xePli914-pZt50momoSfpi6BARWkhyla_IiYA,9527
2
- conson_xp-1.19.0.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
3
- conson_xp-1.19.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
4
- conson_xp-1.19.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
5
- xp/__init__.py,sha256=xqDwwDvx5lt_aNSuHKANp3WXQCP4x1a9OzyP8CniQnE,181
1
+ conson_xp-1.21.0.dist-info/METADATA,sha256=HK1EyLvZ5dYaq4J30bnPy8dCvOHt7Zg7eZEI_6yjAbk,9584
2
+ conson_xp-1.21.0.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
3
+ conson_xp-1.21.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
4
+ conson_xp-1.21.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
5
+ xp/__init__.py,sha256=XRUlxeaLq3T5GvQqiQm4B3VDGuqGInrFa511pFvemqI,181
6
6
  xp/cli/__init__.py,sha256=QjnKB1KaI2aIyKlzrnvCwfbBuUj8HNgwNMvNJVQofbI,81
7
7
  xp/cli/__main__.py,sha256=l2iKwMdat5rTGd3JWs-uGksnYYDDffp_Npz05QdKEeU,117
8
- xp/cli/commands/__init__.py,sha256=wvo9Z5viwpjvO2432E7YP5HWjLLiW1IFpyXLc5puuGY,4766
8
+ xp/cli/commands/__init__.py,sha256=noh8fdZAWq-ihJEboP8WugbIgq4LJ3jUWMRA7720xWE,4909
9
9
  xp/cli/commands/conbus/__init__.py,sha256=gE3K5OEoXkkZX8UOc2v3nreQQzwkOQi7n0VZ-Z2juXA,495
10
10
  xp/cli/commands/conbus/conbus.py,sha256=eqdY8ArapvD08Z4p7Xk7eh4z0dESHuMSw7PKtwTJRYU,3021
11
11
  xp/cli/commands/conbus/conbus_actiontable_commands.py,sha256=cdjLV9cnm7teEOlu5Jf1MS_aL7lNy8KiDIyjCQa5Nzw,7138
@@ -22,7 +22,7 @@ xp/cli/commands/conbus/conbus_modulenumber_commands.py,sha256=L7-6y3rDllOjQ9g6Bk
22
22
  xp/cli/commands/conbus/conbus_msactiontable_commands.py,sha256=fb9MQ4O04H0Dinpt7vSF5GtfntTZHelQ5TuUmSBbCTg,2899
23
23
  xp/cli/commands/conbus/conbus_output_commands.py,sha256=zdRVbHzVhMbZpG2x5WXtujc3wKTsoQUV4IgkVIbJbCc,5019
24
24
  xp/cli/commands/conbus/conbus_raw_commands.py,sha256=8BKUarwvHgz-sxML7n99YVsb8B1HJNExjQpRsuY_tQw,1829
25
- xp/cli/commands/conbus/conbus_receive_commands.py,sha256=WdH7fYcbjweIGxD2uxrTRD8lJzViMSVdsaHTvSDJNCQ,1757
25
+ xp/cli/commands/conbus/conbus_receive_commands.py,sha256=2lZP0a3dte3Q_Vp28xYkqLAoxnvArS9SsQdeedOHcQw,1788
26
26
  xp/cli/commands/conbus/conbus_scan_commands.py,sha256=JfXucOwOadvLEKT_fW9fwvqWKHaEODOojLjnO8JV_00,1730
27
27
  xp/cli/commands/file_commands.py,sha256=GV102X7FRZDUNKLlzvSsIGcoXAaofOzmjCp3HUpE9lw,5532
28
28
  xp/cli/commands/homekit/__init__.py,sha256=qqwY8ulxTx1S74Mzpb6EKjBLT6fWTNdf9PQ3HKuERKY,50
@@ -40,7 +40,10 @@ xp/cli/commands/telegram/telegram_discover_commands.py,sha256=0UArJinw1eWFbee5EG
40
40
  xp/cli/commands/telegram/telegram_linknumber_commands.py,sha256=7j0-E5Moqqga4NrKDch82C6glaFDFMQn5_3hMwie7BQ,2511
41
41
  xp/cli/commands/telegram/telegram_parse_commands.py,sha256=_OYOso1hS4f_ox96qlkYL2SuFnmimpAvqqdYlLzX9yo,2232
42
42
  xp/cli/commands/telegram/telegram_version_commands.py,sha256=WQyx1-B9yJ8V9WrFyBpOvULJ-jq12GoZZDDoRbM7eyw,1553
43
- xp/cli/main.py,sha256=3TY4wZoKMK8kQBgOn0WshTsag4J4ofoGoGPgg12wueM,2810
43
+ xp/cli/commands/term/__init__.py,sha256=1NNST_8YJfj5LCujQISwQflK6LyEn7mDmZpMpvI9d-o,116
44
+ xp/cli/commands/term/term.py,sha256=gjvsv2OE-F_KNWQrWi04fXQ5cGo0l8P-Ortbb5KTA-A,309
45
+ xp/cli/commands/term/term_commands.py,sha256=5LwxOp1oHqki3iWPHXm6enPCF4De6uDg5N1QDVxjROs,739
46
+ xp/cli/main.py,sha256=ap5jU0DrSnrCKDKqGXcz9N-sngZodyyN-5ReWE8Fh1s,1817
44
47
  xp/cli/utils/__init__.py,sha256=gTGIj60Uai0iE7sr9_TtEpl04fD7krtTzbbigXUsUVU,46
45
48
  xp/cli/utils/click_tree.py,sha256=ilmM2IMa_c-TqUMsv2alrZXuS0BNhvVlrBlSfyN8lzM,1670
46
49
  xp/cli/utils/datapoint_type_choice.py,sha256=HcydhlqxZ7YyorEeTjFGkypF2JnYNPvOzkl1rhZ93Fc,1666
@@ -63,7 +66,7 @@ xp/models/conbus/__init__.py,sha256=VIusMWQdBtlwDgj7oSj06wQkklihTp4oWFShvP_JUgA,
63
66
  xp/models/conbus/conbus.py,sha256=mZQzKPfrdttT-qUnYUSyrEYyc_eHs8z301E5ejeiyvk,2689
64
67
  xp/models/conbus/conbus_autoreport.py,sha256=lKotDfxRBb7h2Z1d4qI3KhhLJhFDwKqLbSdG5Makm8Y,2289
65
68
  xp/models/conbus/conbus_blink.py,sha256=XEAPtA-O76ulX6Zh1oYzsWF6L4css6xJBuUTwNcDQKc,2911
66
- xp/models/conbus/conbus_client_config.py,sha256=fWPmHM-OVUzSASKq667JzP7e9_Qp9ZUyYcTaijWkVlY,1484
69
+ xp/models/conbus/conbus_client_config.py,sha256=MliIffoP0Ku1FxpNznMJPBrpdz9OVKZcs9IJ4g1Z3dE,1485
67
70
  xp/models/conbus/conbus_connection_status.py,sha256=iGbmtBaAMwV6UD7XG3H3tnB0fl2MR8rJhpjrLH2KjsE,1097
68
71
  xp/models/conbus/conbus_custom.py,sha256=8H2sPR6_LIlksuOvL7-8bPkzAJLR0rpYiiwfYYFVjEo,1965
69
72
  xp/models/conbus/conbus_datapoint.py,sha256=4ncR-vB2lRzRBAA30rYn8eguyTxsZoOKrrXtjGmPpWg,3396
@@ -72,6 +75,7 @@ xp/models/conbus/conbus_event_list.py,sha256=M8aHRHVB5VDIjqMzjO86xlERt7AMdfjIjt1
72
75
  xp/models/conbus/conbus_event_raw.py,sha256=i5gc7z-0yeunWOZ4rw3AiBt4MANezmhBQKjOOQk3oDc,1567
73
76
  xp/models/conbus/conbus_lightlevel.py,sha256=GQGhzrCBEJROosNHInXIzBy6MD2AskEIMoFEGgZ60-0,1695
74
77
  xp/models/conbus/conbus_linknumber.py,sha256=uFzKzfB06oIzZEKCb5X2JEI80JjMPFuYglsT1W1k8j4,1815
78
+ xp/models/conbus/conbus_logger_config.py,sha256=cFWjWn8tc_hPPI2kQAib_Akddar8O-3zkoj6wLBsdUo,3328
75
79
  xp/models/conbus/conbus_output.py,sha256=q7QKsD_CWT7YOk-V3otKWD1VM7qThrSLIUOunntMrMc,1953
76
80
  xp/models/conbus/conbus_raw.py,sha256=xqvYao6IE1SXum7JBgZpSuWXm9x_QZquS9N_3_r0Hjs,1460
77
81
  xp/models/conbus/conbus_receive.py,sha256=-1u1qK-texfKCNZV-GYf_9KyLtJdIrx7HuZsKzu26Ow,1322
@@ -100,6 +104,8 @@ xp/models/telegram/system_telegram.py,sha256=9FNQ4Mf47mRK7wGrTg2GzziVsrEWCE5ZkZp
100
104
  xp/models/telegram/telegram.py,sha256=IJUxHX6ftLcET9C1pjvLhUO5Db5JO6W7rUItzdEW30I,842
101
105
  xp/models/telegram/telegram_type.py,sha256=GhqKP63oNMyh2tIvCPcsC5RFp4s4JjhmEqCLCC-8XMk,423
102
106
  xp/models/telegram/timeparam_type.py,sha256=Ar8xvSfPmOAgR2g2Je0FgvP01SL7bPvZn5_HrVDpmJM,1137
107
+ xp/models/term/__init__.py,sha256=c1AMtVitYk80o9K_zWjYNzZYpFDASqM8S1Djm1PD4Qo,192
108
+ xp/models/term/protocol_keys_config.py,sha256=CTujcfI2_NOeltjvHy_cnsHzxLSVsGFXieMZlD-zj0Q,1204
103
109
  xp/models/write_config_type.py,sha256=T2RaO52RpzoJ4782uMHE-fX7Ymx3CaIQAEwByydXq1M,881
104
110
  xp/services/__init__.py,sha256=W9YZyrkh7vm--ZHhAXNQiOYQs5yhhmUHXP5I0Lf1XBg,782
105
111
  xp/services/actiontable/__init__.py,sha256=z6js4EuJ6xKHaseTEhuEvKo1tr9K1XyQiruReJtBiPY,26
@@ -125,7 +131,7 @@ xp/services/conbus/conbus_event_list_service.py,sha256=0xyXXNU44epN5bFkU6oiZMyhx
125
131
  xp/services/conbus/conbus_event_raw_service.py,sha256=FZFu-LNLInrTKTpiGLyootozvyIF5Si5FMrxNk2ALD0,7000
126
132
  xp/services/conbus/conbus_output_service.py,sha256=mHFOAPx2zo0TStZ3pokp6v94AQjIamcwZDeg5YH_-eo,7240
127
133
  xp/services/conbus/conbus_raw_service.py,sha256=4yZLLTIAOxpgByUTWZXw1ihGa6Xtl98ckj9T7VfprDI,4335
128
- xp/services/conbus/conbus_receive_service.py,sha256=frXrS0OyKKvYYQTWdma21Kd0BKw5aSuHn3ZXTTqOaj0,3953
134
+ xp/services/conbus/conbus_receive_service.py,sha256=38lAZ0tc2AjBfcqI7qje-ES_QHiHZ3Ayybrp1ZC8ceM,5412
129
135
  xp/services/conbus/conbus_scan_service.py,sha256=tHJ5qaxcNXxAZb2D2F1v6IrzydfxjJOYllM6Txt1eBE,5176
130
136
  xp/services/conbus/write_config_service.py,sha256=6feNdixI_Nli4MRLe15nea-7gTEXMUwZIvTqv_1OqHI,7157
131
137
  xp/services/homekit/__init__.py,sha256=xAMKmln_AmEFdOOJGKWYi96seRlKDQpKx3-hm7XbdIo,36
@@ -145,7 +151,7 @@ xp/services/homekit/homekit_service.py,sha256=0lW-hg40ETco3gDBEYkR_sX-UIYsLSKCD4
145
151
  xp/services/log_file_service.py,sha256=fvPcZQj8XOKUA-4ep5R8n0PelvwvRlTLlVxvIWM5KR4,10506
146
152
  xp/services/module_type_service.py,sha256=xWhr1EAZMykL5uNWHWdpa5T8yNruGKH43XRTOS8GwZg,7477
147
153
  xp/services/protocol/__init__.py,sha256=qRufBmqRKGzpuzZ5bxBbmwf510TT00Ke8s5HcWGnqRY,818
148
- xp/services/protocol/conbus_event_protocol.py,sha256=6ihDsWj5k08Hb3OpYd3xBZCS-yPa16FfWtFSxJknIwo,12852
154
+ xp/services/protocol/conbus_event_protocol.py,sha256=t_ovcLbwXays-y8u-EqFpDSfo2Xc_BNl3jAj9PqxRwg,13885
149
155
  xp/services/protocol/conbus_protocol.py,sha256=JO7yLkD_ohPT0ETjnAIx4CGpZyobf4LdbuozM_43btE,10276
150
156
  xp/services/protocol/protocol_factory.py,sha256=PmjN9AtW9sxNo3voqUiNgQA-pTvX1RW4XXFlHKfFr5Q,2470
151
157
  xp/services/protocol/telegram_protocol.py,sha256=Ki5DrXsKxiaqLcdP9WWUuhUI7cPu2DfwyZkh-Gv9Lb8,9496
@@ -169,10 +175,18 @@ xp/services/telegram/telegram_link_number_service.py,sha256=1_c-_QCRPTHYn3BmMElr
169
175
  xp/services/telegram/telegram_output_service.py,sha256=UaUv_14fR8o5K2PxQBXrCzx-Hohnk-gzbev_oLw_Clc,10799
170
176
  xp/services/telegram/telegram_service.py,sha256=XrP1CPi0ckxoKBaNwLA6lo-TogWxXgmXDOsU4Xl8BlY,13237
171
177
  xp/services/telegram/telegram_version_service.py,sha256=M5HdOTsLdcwo122FP-jW6R740ktLrtKf2TiMDVz23h8,10528
178
+ xp/term/__init__.py,sha256=Xg2DhBeI3xQJLfc7_BPWI1por-rUXemyer5OtOt9Cus,51
179
+ xp/term/app.py,sha256=vrC5VJbw1tlCvKnLR0n9NvGWaJx44yz0gG6k3--BaNk,5652
180
+ xp/term/protocol.tcss,sha256=biaIv6X-bmD1tbXENFUNsXOF8ABkuoRAUgeSDqwudtQ,2126
181
+ xp/term/protocol.yml,sha256=vPtTsMdasWiruj8iqqQX4f4ZtQdJ5wA39IJ-et3qiZc,2110
182
+ xp/term/widgets/__init__.py,sha256=Ewiza9u6k5K50zZRIMD7jjOHY1IvGhoX1ViwlqhdGms,27
183
+ xp/term/widgets/protocol_log.py,sha256=yuSfc61azgQmWQxLvBcmVik3cJAW1Hocj2Sk8qr3hSg,14343
172
184
  xp/utils/__init__.py,sha256=_avMF_UOkfR3tNeDIPqQ5odmbq5raKkaq1rZ9Cn1CJs,332
173
185
  xp/utils/checksum.py,sha256=HDpiQxmdIedbCbZ4o_Box0i_Zig417BtCV_46ZyhiTk,1711
174
- xp/utils/dependencies.py,sha256=PYe-RvmfGBRXWnLKX62nXGMDFN7PQW3deoGCkIVEG4s,21274
186
+ xp/utils/dependencies.py,sha256=ECS6p0eXzocM5INLwJeckHXn_Dim18uOjXTJ29qQvkQ,22001
175
187
  xp/utils/event_helper.py,sha256=W-A_xmoXlpWZBbJH6qdaN50o3-XrwFsDgvAGMJDiAgo,1001
188
+ xp/utils/logging.py,sha256=rZDXwlBrYK8A6MPq5StsMNpgsRowzJXM6fvROPwJdGM,3750
176
189
  xp/utils/serialization.py,sha256=RWHHk86feaB4ZP7rjE4qOWK0900yg2joUBDkP76gfOY,4618
190
+ xp/utils/state_machine.py,sha256=Oe2sLwCh9z_vr1tF6X0ZRGTeuckRQAGzmef7xc9CNdc,2413
177
191
  xp/utils/time_utils.py,sha256=dEyViDlAG9GWU-J3D_YVa-sGma6yiyyMTgN4h2x3PY4,3781
178
- conson_xp-1.19.0.dist-info/RECORD,,
192
+ conson_xp-1.21.0.dist-info/RECORD,,
@@ -1,4 +1,4 @@
1
1
  Wheel-Version: 1.0
2
- Generator: pdm-backend (2.4.5)
2
+ Generator: pdm-backend (2.4.6)
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any
xp/__init__.py CHANGED
@@ -3,7 +3,7 @@
3
3
  conson-xp package.
4
4
  """
5
5
 
6
- __version__ = "1.19.0"
6
+ __version__ = "1.21.0"
7
7
  __manufacturer__ = "salchichon"
8
8
  __model__ = "xp.cli"
9
9
  __serial__ = "2025.09.23.000"
@@ -86,6 +86,8 @@ from xp.cli.commands.telegram.telegram_parse_commands import (
86
86
  validate_telegram,
87
87
  )
88
88
  from xp.cli.commands.telegram.telegram_version_commands import generate_version_request
89
+ from xp.cli.commands.term.term import term
90
+ from xp.cli.commands.term.term_commands import protocol_monitor
89
91
 
90
92
  __all__ = [
91
93
  # Main command groups (conbus excluded to avoid module shadowing)
@@ -109,7 +111,9 @@ __all__ = [
109
111
  "checksum",
110
112
  "homekit",
111
113
  "homekit_start",
114
+ "term",
112
115
  # Individual command functions
116
+ "protocol_monitor",
113
117
  "conbus_download_msactiontable",
114
118
  "conbus_download_actiontable",
115
119
  "send_blink_on_telegram",
@@ -56,4 +56,5 @@ def receive_telegrams(ctx: Context, timeout: float) -> None:
56
56
  ctx.obj.get("container").get_container().resolve(ConbusReceiveService)
57
57
  )
58
58
  with service:
59
- service.start(progress, on_finish, timeout)
59
+ service.init(progress, on_finish, timeout)
60
+ service.start_reactor()
@@ -0,0 +1,5 @@
1
+ """Term CLI commands package for TUI interfaces."""
2
+
3
+ from xp.cli.commands.term.term import term
4
+
5
+ __all__ = ["term"]
@@ -0,0 +1,12 @@
1
+ """Term CLI group definition for TUI commands."""
2
+
3
+ import click
4
+ from click_help_colors import HelpColorsGroup
5
+
6
+
7
+ @click.group(
8
+ cls=HelpColorsGroup, help_headers_color="yellow", help_options_color="green"
9
+ )
10
+ def term() -> None:
11
+ """Terminal UI commands for interactive monitoring and control."""
12
+ pass
@@ -0,0 +1,31 @@
1
+ """Term protocol CLI command for TUI monitoring."""
2
+
3
+ import click
4
+ from click import Context
5
+
6
+ from xp.cli.commands.term.term import term
7
+
8
+
9
+ @term.command("protocol")
10
+ @click.pass_context
11
+ def protocol_monitor(ctx: Context) -> None:
12
+ r"""Start TUI for real-time protocol monitoring.
13
+
14
+ Displays live RX/TX telegram stream from Conbus server
15
+ in an interactive terminal interface.
16
+
17
+ Args:
18
+ ctx: Click context object.
19
+
20
+ Examples:
21
+ \b
22
+ xp term protocol
23
+ """
24
+ from xp.term.app import ProtocolMonitorApp
25
+
26
+ # Resolve ServiceContainer from context
27
+ container = ctx.obj.get("container").get_container()
28
+
29
+ # Initialize and run Textual app
30
+ app = ProtocolMonitorApp(container=container)
31
+ app.run()
xp/cli/main.py CHANGED
@@ -1,7 +1,5 @@
1
1
  """XP CLI tool entry point with modular command structure."""
2
2
 
3
- import logging
4
-
5
3
  import click
6
4
  from click_help_colors import HelpColorsGroup
7
5
 
@@ -16,8 +14,10 @@ from xp.cli.commands.server.server_commands import server
16
14
 
17
15
  # Import command groups from modular structure
18
16
  from xp.cli.commands.telegram.telegram_parse_commands import telegram
17
+ from xp.cli.commands.term.term import term
19
18
  from xp.cli.utils.click_tree import add_tree_command
20
19
  from xp.utils.dependencies import ServiceContainer
20
+ from xp.utils.logging import LoggerService
21
21
 
22
22
 
23
23
  @click.group(
@@ -31,44 +31,15 @@ def cli(ctx: click.Context) -> None:
31
31
  Args:
32
32
  ctx: Click context object for passing state between commands.
33
33
  """
34
- # Configure logging with thread information
35
- log_format = "%(asctime)s - [%(threadName)s-%(thread)d] - %(levelname)s - %(name)s - %(message)s"
36
- date_format = "%H:%M:%S"
37
-
38
- # Force format on root logger and all handlers
39
- formatter = logging.Formatter(log_format, datefmt=date_format)
40
- root_logger = logging.getLogger()
41
- root_logger.setLevel(logging.DEBUG)
42
-
43
- # Update all existing handlers or create new one
44
- if root_logger.handlers:
45
- for handler in root_logger.handlers:
46
- handler.setFormatter(formatter)
47
- else:
48
- handler = logging.StreamHandler()
49
- handler.setFormatter(formatter)
50
- root_logger.addHandler(handler)
51
-
52
- # Suppress pyhap.hap_protocol logs
53
-
54
- # bubus
55
- logging.getLogger("bubus").setLevel(logging.WARNING)
56
-
57
- # xp
58
- logging.getLogger("xp").setLevel(logging.DEBUG)
59
- logging.getLogger("xp.services.homekit").setLevel(logging.DEBUG)
60
-
61
- # pyhap
62
- logging.getLogger("pyhap").setLevel(logging.WARNING)
63
- logging.getLogger("pyhap.hap_handler").setLevel(logging.WARNING)
64
- logging.getLogger("pyhap.hap_protocol").setLevel(logging.WARNING)
65
- # logging.getLogger('pyhap.accessory_driver').setLevel(logging.WARNING)
34
+ container = ServiceContainer()
35
+ logger_config = container.get_container().resolve(LoggerService)
36
+ logger_config.setup()
66
37
 
67
38
  # Initialize the service container and store it in the context
68
39
  ctx.ensure_object(dict)
69
40
  # Only create a new container if one wasn't provided (e.g., for testing)
70
41
  if "container" not in ctx.obj:
71
- ctx.obj["container"] = ServiceContainer()
42
+ ctx.obj["container"] = container
72
43
 
73
44
 
74
45
  # Register all command groups
@@ -79,6 +50,7 @@ cli.add_command(module)
79
50
  cli.add_command(file)
80
51
  cli.add_command(server)
81
52
  cli.add_command(reverse_proxy)
53
+ cli.add_command(term)
82
54
 
83
55
  # Add the tree command
84
56
  add_tree_command(cli)
@@ -49,6 +49,7 @@ class ConbusClientConfig(BaseModel):
49
49
  except FileNotFoundError:
50
50
  logger.error(f"File {file_path} does not exist, loading default")
51
51
  return cls()
52
+
52
53
  except yaml.YAMLError:
53
54
  logger.error(f"File {file_path} is not valid")
54
55
  # Return default config if YAML parsing fails
@@ -0,0 +1,107 @@
1
+ """Logger configuration models for XP application."""
2
+
3
+ import logging
4
+ from pathlib import Path
5
+ from typing import Dict, Union
6
+
7
+ import yaml
8
+ from pydantic import BaseModel, Field, field_validator
9
+
10
+
11
+ class LoggingConfig(BaseModel):
12
+ """Logging configuration.
13
+
14
+ Attributes:
15
+ path: log folder.
16
+ default_level: DEBUG, WARNING, INFO, ERROR, CRITICAL.
17
+ levels: Per-module log level overrides.
18
+ max_bytes: Maximum size in bytes before rotating (default: 1MB).
19
+ backup_count: Number of backup files to keep (default: 365).
20
+ log_format: Log message format string.
21
+ date_format: Date format string for timestamps.
22
+ """
23
+
24
+ path: str = "log"
25
+ default_level: str = "DEBUG"
26
+ levels: Dict[str, int] = {
27
+ "xp": logging.DEBUG,
28
+ "xp.services.homekit": logging.WARNING,
29
+ "xp.services.server": logging.WARNING,
30
+ }
31
+ max_bytes: int = 1024 * 1024 # 1MB
32
+ backup_count: int = 365
33
+ log_format: str = (
34
+ "%(asctime)s - [%(threadName)s-%(thread)d] - %(levelname)s - %(name)s - %(message)s"
35
+ )
36
+ date_format: str = "%H:%M:%S"
37
+
38
+ @field_validator("levels", mode="before")
39
+ @classmethod
40
+ def convert_level_names(cls, v: Dict[str, Union[str, int]]) -> Dict[str, int]:
41
+ """Convert string level names to numeric values.
42
+
43
+ Args:
44
+ v: Dictionary with string or int log levels.
45
+
46
+ Returns:
47
+ Dictionary with numeric log levels.
48
+
49
+ Raises:
50
+ ValueError: If an invalid log level name is provided.
51
+ """
52
+ level_map = {
53
+ "DEBUG": logging.DEBUG,
54
+ "INFO": logging.INFO,
55
+ "WARNING": logging.WARNING,
56
+ "ERROR": logging.ERROR,
57
+ "CRITICAL": logging.CRITICAL,
58
+ }
59
+
60
+ result = {}
61
+ for module, level in v.items():
62
+ if isinstance(level, str):
63
+ level_upper = level.upper()
64
+ if level_upper not in level_map:
65
+ raise ValueError(
66
+ f"Invalid log level '{level}' for module '{module}'. "
67
+ f"Must be one of: {', '.join(level_map.keys())}"
68
+ )
69
+ result[module] = level_map[level_upper]
70
+ else:
71
+ result[module] = level
72
+ return result
73
+
74
+
75
+ class ConbusLoggerConfig(BaseModel):
76
+ """Logging configuration.
77
+
78
+ Attributes:
79
+ log: LoggingConfig instance for logging settings.
80
+ """
81
+
82
+ log: LoggingConfig = Field(default_factory=LoggingConfig)
83
+
84
+ @classmethod
85
+ def from_yaml(cls, file_path: str) -> "ConbusLoggerConfig":
86
+ """Load configuration from YAML file.
87
+
88
+ Args:
89
+ file_path: Path to the YAML configuration file.
90
+
91
+ Returns:
92
+ ConbusClientConfig instance loaded from file or default config.
93
+ """
94
+ logger = logging.getLogger(__name__)
95
+ try:
96
+ with Path(file_path).open("r") as file:
97
+ data = yaml.safe_load(file)
98
+ return cls(**data)
99
+
100
+ except FileNotFoundError:
101
+ logger.error(f"File {file_path} does not exist, loading default")
102
+ return cls()
103
+
104
+ except yaml.YAMLError:
105
+ logger.error(f"File {file_path} is not valid")
106
+ # Return default config if YAML parsing fails
107
+ return cls()
@@ -0,0 +1,11 @@
1
+ """Terminal UI models."""
2
+
3
+ from xp.models.term.protocol_keys_config import (
4
+ ProtocolKeyConfig,
5
+ ProtocolKeysConfig,
6
+ )
7
+
8
+ __all__ = [
9
+ "ProtocolKeyConfig",
10
+ "ProtocolKeysConfig",
11
+ ]
@@ -0,0 +1,45 @@
1
+ """Protocol keys configuration model."""
2
+
3
+ from pathlib import Path
4
+ from typing import Dict
5
+
6
+ import yaml
7
+ from pydantic import BaseModel, Field
8
+
9
+
10
+ class ProtocolKeyConfig(BaseModel):
11
+ """Configuration for a single protocol key.
12
+
13
+ Attributes:
14
+ name: Human-readable command name.
15
+ telegrams: List of raw telegram strings to send (without angle brackets).
16
+ """
17
+
18
+ name: str = Field(..., description="Human-readable command name")
19
+ telegrams: list[str] = Field(..., description="List of raw telegram strings")
20
+
21
+
22
+ class ProtocolKeysConfig(BaseModel):
23
+ """Protocol keys configuration.
24
+
25
+ Attributes:
26
+ protocol: Dictionary mapping key to protocol configuration.
27
+ """
28
+
29
+ protocol: Dict[str, ProtocolKeyConfig] = Field(
30
+ default_factory=dict, description="Protocol key mappings"
31
+ )
32
+
33
+ @classmethod
34
+ def from_yaml(cls, config_path: Path) -> "ProtocolKeysConfig":
35
+ """Load protocol keys from YAML file.
36
+
37
+ Args:
38
+ config_path: Path to YAML configuration file.
39
+
40
+ Returns:
41
+ ProtocolKeysConfig instance.
42
+ """
43
+ with config_path.open("r") as f:
44
+ data = yaml.safe_load(f)
45
+ return cls(**data)
@@ -1,51 +1,55 @@
1
1
  """Conbus Receive Service for receiving telegrams from Conbus servers.
2
2
 
3
- This service uses ConbusProtocol to provide receive-only functionality,
3
+ This service uses ConbusEventProtocol to provide receive-only functionality,
4
4
  allowing clients to receive waiting event telegrams using empty telegram sends.
5
5
  """
6
6
 
7
+ import asyncio
7
8
  import logging
8
- from typing import Callable, Optional
9
+ from typing import Any, Callable, Optional
9
10
 
10
- from twisted.internet.posixbase import PosixReactorBase
11
-
12
- from xp.models import ConbusClientConfig
13
11
  from xp.models.conbus.conbus_receive import ConbusReceiveResponse
14
12
  from xp.models.protocol.conbus_protocol import TelegramReceivedEvent
15
- from xp.services.protocol import ConbusProtocol
13
+ from xp.services.protocol.conbus_event_protocol import ConbusEventProtocol
16
14
 
17
15
 
18
- class ConbusReceiveService(ConbusProtocol):
16
+ class ConbusReceiveService:
19
17
  """
20
18
  Service for receiving telegrams from Conbus servers.
21
19
 
22
- Uses ConbusProtocol to provide receive-only functionality
20
+ Uses ConbusEventProtocol to provide receive-only functionality
23
21
  for collecting waiting event telegrams from the server.
22
+
23
+ Attributes:
24
+ conbus_protocol: Protocol instance for Conbus communication.
24
25
  """
25
26
 
26
- def __init__(
27
- self,
28
- cli_config: ConbusClientConfig,
29
- reactor: PosixReactorBase,
30
- ) -> None:
27
+ conbus_protocol: ConbusEventProtocol
28
+
29
+ def __init__(self, conbus_protocol: ConbusEventProtocol) -> None:
31
30
  """Initialize the Conbus receive service.
32
31
 
33
32
  Args:
34
- cli_config: Conbus client configuration.
35
- reactor: Twisted reactor instance.
33
+ conbus_protocol: ConbusEventProtocol instance.
36
34
  """
37
- super().__init__(cli_config, reactor)
38
35
  self.progress_callback: Optional[Callable[[str], None]] = None
39
36
  self.finish_callback: Optional[Callable[[ConbusReceiveResponse], None]] = None
40
37
  self.receive_response: ConbusReceiveResponse = ConbusReceiveResponse(
41
38
  success=True
42
39
  )
43
40
 
41
+ self.conbus_protocol: ConbusEventProtocol = conbus_protocol
42
+ self.conbus_protocol.on_connection_made.connect(self.connection_made)
43
+ self.conbus_protocol.on_telegram_sent.connect(self.telegram_sent)
44
+ self.conbus_protocol.on_telegram_received.connect(self.telegram_received)
45
+ self.conbus_protocol.on_timeout.connect(self.timeout)
46
+ self.conbus_protocol.on_failed.connect(self.failed)
47
+
44
48
  # Set up logging
45
49
  self.logger = logging.getLogger(__name__)
46
50
 
47
- def connection_established(self) -> None:
48
- """Handle connection established event."""
51
+ def connection_made(self) -> None:
52
+ """Handle connection made event."""
49
53
  self.logger.debug("Connection established, waiting for telegrams.")
50
54
 
51
55
  def telegram_sent(self, telegram_sent: str) -> None:
@@ -70,17 +74,13 @@ class ConbusReceiveService(ConbusProtocol):
70
74
  self.receive_response.received_telegrams = []
71
75
  self.receive_response.received_telegrams.append(telegram_received.frame)
72
76
 
73
- def timeout(self) -> bool:
74
- """Handle timeout event to stop receiving.
75
-
76
- Returns:
77
- False to stop the reactor.
78
- """
79
- self.logger.info("Receive stopped after: %ss", self.timeout_seconds)
77
+ def timeout(self) -> None:
78
+ """Handle timeout event to stop receiving."""
79
+ timeout = self.conbus_protocol.timeout_seconds
80
+ self.logger.info("Receive stopped after: %ss", timeout)
80
81
  self.receive_response.success = True
81
82
  if self.finish_callback:
82
83
  self.finish_callback(self.receive_response)
83
- return False
84
84
 
85
85
  def failed(self, message: str) -> None:
86
86
  """Handle failed connection event.
@@ -94,22 +94,50 @@ class ConbusReceiveService(ConbusProtocol):
94
94
  if self.finish_callback:
95
95
  self.finish_callback(self.receive_response)
96
96
 
97
- def start(
97
+ def init(
98
98
  self,
99
99
  progress_callback: Callable[[str], None],
100
100
  finish_callback: Callable[[ConbusReceiveResponse], None],
101
101
  timeout_seconds: Optional[float] = None,
102
+ event_loop: Optional[asyncio.AbstractEventLoop] = None,
102
103
  ) -> None:
103
- """Run reactor in dedicated thread with its own event loop.
104
+ """Setup callbacks and timeout for receiving telegrams.
104
105
 
105
106
  Args:
106
107
  progress_callback: Callback for each received telegram.
107
108
  finish_callback: Callback when receiving completes.
108
109
  timeout_seconds: Optional timeout in seconds.
110
+ event_loop: Optional event loop to use for async operations.
109
111
  """
110
112
  self.logger.info("Starting receive")
111
113
  if timeout_seconds:
112
- self.timeout_seconds = timeout_seconds
114
+ self.conbus_protocol.timeout_seconds = timeout_seconds
113
115
  self.progress_callback = progress_callback
114
116
  self.finish_callback = finish_callback
115
- self.start_reactor()
117
+
118
+ if event_loop:
119
+ self.conbus_protocol.set_event_loop(event_loop)
120
+
121
+ def start_reactor(self) -> None:
122
+ """Start the reactor."""
123
+ self.conbus_protocol.start_reactor()
124
+
125
+ def __enter__(self) -> "ConbusReceiveService":
126
+ """Enter context manager.
127
+
128
+ Returns:
129
+ Self for context manager protocol.
130
+ """
131
+ # Reset state for singleton reuse
132
+ self.receive_response = ConbusReceiveResponse(success=True)
133
+ return self
134
+
135
+ def __exit__(
136
+ self, _exc_type: Optional[type], _exc_val: Optional[Exception], _exc_tb: Any
137
+ ) -> None:
138
+ """Exit context manager and disconnect signals."""
139
+ self.conbus_protocol.on_connection_made.disconnect(self.connection_made)
140
+ self.conbus_protocol.on_telegram_sent.disconnect(self.telegram_sent)
141
+ self.conbus_protocol.on_telegram_received.disconnect(self.telegram_received)
142
+ self.conbus_protocol.on_timeout.disconnect(self.timeout)
143
+ self.conbus_protocol.on_failed.disconnect(self.failed)