bec-ipython-client 3.64.5__py3-none-any.whl → 3.65.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.
Files changed (9) hide show
  1. PKG-INFO +1 -1
  2. bec_ipython_client/callbacks/ipython_live_updates.py +1 -1
  3. bec_ipython_client/callbacks/live_table.py +3 -1
  4. {bec_ipython_client-3.64.5.dist-info → bec_ipython_client-3.65.0.dist-info}/METADATA +1 -1
  5. {bec_ipython_client-3.64.5.dist-info → bec_ipython_client-3.65.0.dist-info}/RECORD +9 -9
  6. pyproject.toml +1 -1
  7. tests/client_tests/test_live_table.py +33 -11
  8. {bec_ipython_client-3.64.5.dist-info → bec_ipython_client-3.65.0.dist-info}/WHEEL +0 -0
  9. {bec_ipython_client-3.64.5.dist-info → bec_ipython_client-3.65.0.dist-info}/entry_points.txt +0 -0
PKG-INFO CHANGED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: bec_ipython_client
3
- Version: 3.64.5
3
+ Version: 3.65.0
4
4
  Summary: BEC IPython client
5
5
  Project-URL: Bug Tracker, https://github.com/bec-project/bec/issues
6
6
  Project-URL: Homepage, https://github.com/bec-project/bec
bec_ipython_client/callbacks/ipython_live_updates.py CHANGED
@@ -49,7 +49,7 @@ class IPythonLiveUpdates:
49
49
  """
50
50
  scan_type = self._active_request.content["scan_type"]
51
51
  if scan_type in ["open_scan_def", "close_scan_def"]:
52
- self._process_instruction({"scan_progress": 0})
52
+ self._process_instruction({"scan_progress": {"points": 0, "show_table": True}})
53
53
  return
54
54
  if scan_type == "close_scan_group":
55
55
  return
bec_ipython_client/callbacks/live_table.py CHANGED
@@ -182,7 +182,9 @@ class LiveUpdatesTable(LiveUpdatesBase):
182
182
  break
183
183
  self.check_alarms()
184
184
 
185
- self._run_update(self.report_instruction[self.REPORT_TYPE])
185
+ show_table = self.report_instruction[self.REPORT_TYPE].get("show_table", True)
186
+ self._print_table_data = show_table
187
+ self._run_update(self.report_instruction[self.REPORT_TYPE]["points"])
186
188
 
187
189
  def _run_update(self, target_num_points: int):
188
190
  """run the update loop with the progress bar
{bec_ipython_client-3.64.5.dist-info → bec_ipython_client-3.65.0.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: bec_ipython_client
3
- Version: 3.64.5
3
+ Version: 3.65.0
4
4
  Summary: BEC IPython client
5
5
  Project-URL: Bug Tracker, https://github.com/bec-project/bec/issues
6
6
  Project-URL: Homepage, https://github.com/bec-project/bec
{bec_ipython_client-3.64.5.dist-info → bec_ipython_client-3.65.0.dist-info}/RECORD RENAMED
@@ -1,7 +1,7 @@
1
1
  .gitignore,sha256=UmJ0gTRAPp4EI1A6tb9Pi-k5uxDIb_NWJU9ye6AW-8Y,3306
2
- PKG-INFO,sha256=qo7r0HIpMzJq-U5WmKnd8rO1XA4dUKt3MBlDckt3TXE,1052
2
+ PKG-INFO,sha256=cJzZdVnBzk2rOzf9-kd6-LYSlDX_J-OhUuNbitxhehQ,1052
3
3
  demo.py,sha256=TE-niyXPUEAP-GaL-QRBPgnaxfXqBmTsBiKUxl3F_VQ,7053
4
- pyproject.toml,sha256=7g-FvI5o2d2B6seUrSny-xZRM1amSbTBXleb1aQiCHo,1229
4
+ pyproject.toml,sha256=-8k1TFtLZbLVplP5juTHvTQe9uQ24wsIfGR9zcipH1A,1229
5
5
  bec_ipython_client/__init__.py,sha256=ihd_V8I7Qo0MWKMo7bcvPf-ZyUQqkcNf8IAWLJKiFJE,79
6
6
  bec_ipython_client/beamline_mixin.py,sha256=scMWIFbHJajyECzbwEVKyQUGjpqA9C_KiU2M6FuRH_Q,1067
7
7
  bec_ipython_client/bec_magics.py,sha256=Rz2aXkUCeAV_VxdXqLUNHh8T44kSH9ha83OiEtdptzI,2792
@@ -12,8 +12,8 @@ bec_ipython_client/progressbar.py,sha256=aDKYjzXmGSwa82ewm59V8WSuqVQz9GiZPx5G65f
12
12
  bec_ipython_client/signals.py,sha256=mbThPo6h3mQ6RFRm9viETDMC_unFa7QxiymCdM_ZK7U,4194
13
13
  bec_ipython_client/callbacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
14
14
  bec_ipython_client/callbacks/device_progress.py,sha256=y3GFSlCD-etOIrLJkX2ozxEyCNRMaRAaTdZmN8xOcjk,2385
15
- bec_ipython_client/callbacks/ipython_live_updates.py,sha256=2giQImMMaqRKnD7PW1xrDPmrxi-qy8MHdY_daWtJe-g,10290
16
- bec_ipython_client/callbacks/live_table.py,sha256=DifTdAsPUqiursmcHd49-UhBxqGhPpjbXCUP3LeIXKY,13209
15
+ bec_ipython_client/callbacks/ipython_live_updates.py,sha256=tcr3ATyg46NAS3yQHhdOS7KFJnfVxri36PuKpILjyqU,10322
16
+ bec_ipython_client/callbacks/live_table.py,sha256=2FjNSTC5HbNgg-aNJcEfNZRnhIUqJoRRTthU3L1UKD4,13350
17
17
  bec_ipython_client/callbacks/move_device.py,sha256=FXCztPGqKNmaSKs9Q13y7syZJs57IZo4mJH6GTOIbOU,5863
18
18
  bec_ipython_client/callbacks/utils.py,sha256=AEEzsfD9S2ZMuJA4yAxy9gMa1iPMCxQ3zr7ZDO01bHE,5702
19
19
  bec_ipython_client/high_level_interfaces/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -30,14 +30,14 @@ tests/client_tests/test_beamline_mixins.py,sha256=8Ws0bmzl2gSW0VuOVu80_JbYNb5Y-h
30
30
  tests/client_tests/test_bec_client.py,sha256=JF7k0UiLRaBLW_vk_dGBLVQDyngIWxY79hbRK0t21Dw,7717
31
31
  tests/client_tests/test_device_progress.py,sha256=GEw2g8MQZnv5mxABEZlxBmaMpxVS33wogaYohFolDEs,2353
32
32
  tests/client_tests/test_ipython_live_updates.py,sha256=HpA16Mx0WdseqlfP0FojlAd6VfvjnwAUReDkItZVYWs,6081
33
- tests/client_tests/test_live_table.py,sha256=Ll7h0eKSRmMxV-hvrUC9qDA49sDE9zi_w7AleOE4TmU,17576
33
+ tests/client_tests/test_live_table.py,sha256=5ZtCWDYBm_Vxg1lw6Nuj5qpmtY4VPGCYdX-cY00dSf8,18178
34
34
  tests/client_tests/test_move_callback.py,sha256=e5c14pa9tUsMPgNhI9m7vrml5TKEAmMAQKLuiZPftDw,7026
35
35
  tests/client_tests/test_pretty_table.py,sha256=uQ-KPb3RXoCFE_t1IrpkT6kZAoqW7pFXxbFc445sX0Y,469
36
36
  tests/end-2-end/_ensure_requirements_container.py,sha256=iAcTHqudgJMh7yS9kmfN1bqfqUgvj6ZG-LyuJVIfgFE,722
37
37
  tests/end-2-end/test_procedures_e2e.py,sha256=3CPzjW3VpsSU8GKVP814SSvLZ0c7bBtPB_VtX725TCY,4737
38
38
  tests/end-2-end/test_scans_e2e.py,sha256=CxlXjQrzDJebaoZObt_oYx41wbnHLuJLSjKlno4u2B4,30981
39
39
  tests/end-2-end/test_scans_lib_e2e.py,sha256=9_ofsT1soChV9DZ72hoUb9hAIHqZouvjPg11sh5a6lo,19128
40
- bec_ipython_client-3.64.5.dist-info/METADATA,sha256=qo7r0HIpMzJq-U5WmKnd8rO1XA4dUKt3MBlDckt3TXE,1052
41
- bec_ipython_client-3.64.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
42
- bec_ipython_client-3.64.5.dist-info/entry_points.txt,sha256=oQUXYY0jjD9ZvKPHwaGn2wkUIWpDZM8L4ixDA3RlBWE,53
43
- bec_ipython_client-3.64.5.dist-info/RECORD,,
40
+ bec_ipython_client-3.65.0.dist-info/METADATA,sha256=cJzZdVnBzk2rOzf9-kd6-LYSlDX_J-OhUuNbitxhehQ,1052
41
+ bec_ipython_client-3.65.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
42
+ bec_ipython_client-3.65.0.dist-info/entry_points.txt,sha256=oQUXYY0jjD9ZvKPHwaGn2wkUIWpDZM8L4ixDA3RlBWE,53
43
+ bec_ipython_client-3.65.0.dist-info/RECORD,,
pyproject.toml CHANGED
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
4
4
 
5
5
  [project]
6
6
  name = "bec_ipython_client"
7
- version = "3.64.5"
7
+ version = "3.65.0"
8
8
  description = "BEC IPython client"
9
9
  requires-python = ">=3.10"
10
10
  classifiers = [
tests/client_tests/test_live_table.py CHANGED
@@ -111,7 +111,9 @@ class TestLiveTable:
111
111
  data = messages.ScanMessage(
112
112
  point_id=0, scan_id="", data={}, metadata={"scan_report_devices": scan_report_devices}
113
113
  )
114
- live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
114
+ live_update = LiveUpdatesTable(
115
+ client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
116
+ )
115
117
  devices = live_update.get_devices_from_scan_data(data)
116
118
  assert devices[0 : len(scan_report_devices)] == scan_report_devices
117
119
 
@@ -123,7 +125,9 @@ class TestLiveTable:
123
125
  )
124
126
  client.queue.request_storage.update_with_request(request_msg)
125
127
  client.queue.request_storage.update_with_response(response_msg)
126
- live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
128
+ live_update = LiveUpdatesTable(
129
+ client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
130
+ )
127
131
  with mock.patch.object(client.queue.queue_storage, "find_queue_item_by_requestID"):
128
132
  live_update.wait_for_request_acceptance()
129
133
 
@@ -138,7 +142,9 @@ class TestLiveTable:
138
142
  client = bec_client_mock
139
143
  client.start()
140
144
  data = messages.ScanMessage(point_id=0, scan_id="", data={}, metadata={})
141
- live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
145
+ live_update = LiveUpdatesTable(
146
+ client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
147
+ )
142
148
  live_update.scan_item = scan_item
143
149
  scan_item.num_points = 2
144
150
  scan_item.live_data = {0: data}
@@ -163,7 +169,9 @@ class TestLiveTable:
163
169
  client = bec_client_mock
164
170
  client.start()
165
171
  data = messages.ScanMessage(point_id=0, scan_id="", data={}, metadata={})
166
- live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
172
+ live_update = LiveUpdatesTable(
173
+ client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
174
+ )
167
175
  live_update.scan_item = scan_item
168
176
  scan_item.num_points = 2
169
177
  scan_item.live_data = {0: data}
@@ -193,7 +201,9 @@ class TestLiveTable:
193
201
  )
194
202
  client.queue.request_storage.update_with_request(request_msg)
195
203
  client.queue.request_storage.update_with_response(response_msg)
196
- live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
204
+ live_update = LiveUpdatesTable(
205
+ client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
206
+ )
197
207
  live_update.point_data = messages.ScanMessage(
198
208
  point_id=0,
199
209
  scan_id="",
@@ -212,7 +222,9 @@ class TestLiveTable:
212
222
  )
213
223
  client.queue.request_storage.update_with_request(request_msg)
214
224
  client.queue.request_storage.update_with_response(response_msg)
215
- live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
225
+ live_update = LiveUpdatesTable(
226
+ client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
227
+ )
216
228
  live_update.point_data = messages.ScanMessage(
217
229
  point_id=0,
218
230
  scan_id="",
@@ -231,7 +243,9 @@ class TestLiveTable:
231
243
  )
232
244
  client.queue.request_storage.update_with_request(request_msg)
233
245
  client.queue.request_storage.update_with_response(response_msg)
234
- live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
246
+ live_update = LiveUpdatesTable(
247
+ client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
248
+ )
235
249
  client.device_manager.devices["samx"]._info["hints"] = {"fields": ["samx_hint"]}
236
250
  client.device_manager.devices["samx"].precision = 3
237
251
  live_update.point_data = messages.ScanMessage(
@@ -263,7 +277,9 @@ class TestLiveTable:
263
277
  )
264
278
  client.queue.request_storage.update_with_request(request_msg)
265
279
  client.queue.request_storage.update_with_response(response_msg)
266
- live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
280
+ live_update = LiveUpdatesTable(
281
+ client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
282
+ )
267
283
  client.device_manager.devices["samx"]._info["hints"] = {"fields": ["samx_hint"]}
268
284
  client.device_manager.devices["samx"].precision = prec
269
285
  live_update.point_data = messages.ScanMessage(
@@ -312,7 +328,9 @@ class TestLiveTable:
312
328
  )
313
329
  client.queue.request_storage.update_with_request(request_msg)
314
330
  client.queue.request_storage.update_with_response(response_msg)
315
- live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
331
+ live_update = LiveUpdatesTable(
332
+ client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
333
+ )
316
334
  live_update.point_data = messages.ScanMessage(
317
335
  point_id=0,
318
336
  scan_id="",
@@ -355,7 +373,9 @@ class TestLiveTable:
355
373
  "find_queue_item_by_requestID",
356
374
  return_value=mock_queue_item,
357
375
  ):
358
- live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
376
+ live_update = LiveUpdatesTable(
377
+ client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
378
+ )
359
379
  live_update.wait_for_request_acceptance()
360
380
  result = StringIO()
361
381
  with redirect_stdout(result):
@@ -376,7 +396,9 @@ class TestLiveTable:
376
396
  )
377
397
  client.queue.request_storage.update_with_request(request_msg)
378
398
  client.queue.request_storage.update_with_response(response_msg)
379
- live_update = LiveUpdatesTable(client, {"scan_progress": 10}, request_msg)
399
+ live_update = LiveUpdatesTable(
400
+ client, {"scan_progress": {"points": 10, "show_table": True}}, request_msg
401
+ )
380
402
  client.device_manager.devices["samx"]._info["hints"] = {"fields": ["samx_hint"]}
381
403
  client.device_manager.devices["samx"].precision = prec
382
404
  live_update.point_data = messages.ScanMessage(