Commit Graph
81 Commits
Author SHA1 Message Date
perl_d 6affbf9148 style: ruff check --fix --unsafe-fixes 2026-07-27 14:46:06 +02:00
perl_d 1f5af092ac tidy about functions 2026-07-09 12:50:38 +02:00
perl_d 52a9765182 feat: server about info 2026-07-09 10:09:39 +02:00
perl_d 3ec2bc011b feat: add hostname+user to gui logs
Build and Publish / test (pull_request) Successful in 2m16s
Build and Publish / test (pull_request_target) Successful in 2m7s
Build and Publish / build (pull_request) Successful in 19s
Build and Publish / test (push) Successful in 2m28s
Build and Publish / build (pull_request_target) Successful in 19s
Build and Publish / Build and Deploy Docs (pull_request) Successful in 38s
Build and Publish / build (push) Successful in 18s
Build and Publish / Build and Deploy Docs (pull_request_target) Successful in 33s
Build and Publish / Build and Deploy Docs (push) Successful in 33s
2026-07-06 16:27:08 +02:00
perl_d 99326614ae style: ruff check fix 2026-07-06 15:39:02 +02:00
perl_d b0863e5ddb style: format with ruff
Build and Publish / test (pull_request) Failing after 1m23s
Build and Publish / build (pull_request) Skipped
Build and Publish / Build and Deploy Docs (pull_request) Skipped
2026-07-06 11:53:49 +02:00
perl_d 13bddd43c7 refactor: use aarecommon and remove common 2026-07-06 11:53:49 +02:00
perl_d b0b655aea0 feat: live changes 26-07-06
Build and Publish / test (push) Successful in 2m32s
Build and Publish / build (push) Successful in 18s
Build and Publish / Build and Deploy Docs (push) Successful in 47s
2026-07-06 10:45:15 +02:00
appleb_m 18fe88469a bec/gui: added save_current_psotion and save_and_reload macros to GUI
Build and Publish / test (push) Failing after 2m13s
Build and Publish / build (push) Skipped
Build and Publish / Build and Deploy Docs (push) Skipped
2026-07-03 14:13:36 +02:00
appleb_m 6a90a01dbe local_contact_panel.py: added config for autoamtion, currently just the sleep between mount and wait. 2026-07-03 11:28:00 +02:00
appleb_m 8c9f594d24 DAQ/GUI: updated beam location to use fixed exp and gain. This can be set now from teh GUi and stored in REDIS. 2026-06-25 09:58:47 +02:00
appleb_mandClaude Opus 4.8 a205d6422f gui: surface "beamline busy" errors quietly, not as a modal
BeamlineBusyException / TellCommandWhileBusyException fire when a user triggers
an action while the beamline or robot is busy. These are blocking-but-benign
("you can't do that right now"), so route them to the log + status bar instead
of a modal pop-up (and without the defensive automation pause), regardless of
the exception's critical flag. Genuine failures (e.g. No Pin in Gripper) still
get the modal.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-24 16:26:18 +02:00
appleb_mandClaude Opus 4.8 47e05dc28c GUI/DAQ: hutch-safety gating, error pop-ups, and automation pause-and-wait
Fix the GUI pop-up path and add personnel-safety-system (PSS) gating so
door-open / beam-down / shutter-closed conditions are surfaced and acted on.

- exception pop-ups: connect the previously-orphaned http_error signal;
  failed user operations now raise a modal dialog, background/polling errors
  a non-modal banner.
- PSS device (devices/pss_state.py) reading EH1-PSYS PROHIBITED-STATE /
  ALARM-STATE; new critical DoorSafetyError + DOOR_SAFETY_ERROR code.
- mounting service blocks mount/unmount when the hutch is not prohibited or
  an alarm is active; /status now publishes pss_prohibited / pss_alarm.
- GUI blocks manual mount/unmount and the automation Run button immediately
  (pop-up) on door-open, and shows a warning banner while an alarm is active.
- centralise per-action precondition checks (ring current, safety shutter,
  hutch door) into one combined "continue?" dialog with a session-global
  "don't ask again for 1 hour" snooze, applied to all data-collection buttons.
- live automation pauses and auto-resumes on bad conditions (beam, shutter,
  door, robot) with continue-now / stop overrides, gated by a default-on
  "Pause on bad conditions" checkbox replacing the dead CHECK_ENABLED constant.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-24 15:30:08 +02:00
appleb_m 90758fd246 better erro hadnling for status bar 2026-06-24 15:30:03 +02:00
appleb_m 36a06ccf14 Change how detector metadate is stored - now in redis - so status updates are faster. 2026-06-24 15:30:01 +02:00
appleb_m f444f6c2c8 Beamline state panel: exposed new beamline state changes to GUI 2026-06-24 15:29:59 +02:00
appleb_m c09718a030 daq_worker: error logging added to status request 2026-06-24 15:29:58 +02:00
appleb_m a88423d413 prediction_subscriber.py: removed message logging 2026-06-11 16:14:38 +02:00
duan_j 37ef7e8381 handle SSL errors for self-signed certificates in SSEClient and DAQWorker 2026-06-10 11:28:07 +02:00
appleb_m bd8f66009c DAQ: finish refactor of exception handler, improve mount count fail handling and updated tests 2026-06-09 14:25:37 +02:00
appleb_m 0a47294244 gui_tests: removed irrelevant import/mocking that was causing tests to fail 2026-06-09 11:16:09 +02:00
appleb_m cbfb66949e axis_camera: added refeesh button and busy overlay. Made sperate widget/panel as "default" axis camera tab 2026-06-08 13:40:27 +02:00
appleb_m c3f16bcdf8 local_contact panel: added new tabs, connected back end tools such as reinitialising bec macros and devices, opening beamline specific web helpers, restarting backend connections tod evices such as jfjoch, tell, aerotech and smargon. 2026-06-05 14:10:34 +02:00
appleb_m f2581f0684 EXCEPTION REFACTOR: Large scale exception refactor mdipoint, to be tested. If broken scale back this commit and fix tests
Build and Publish / test (push) Successful in 1m30s
Build and Publish / build (push) Successful in 18s
Build and Publish / Build and Deploy Docs (push) Successful in 39s
2026-06-03 16:43:42 +02:00
appleb_m c6ee5560a0 EXCEPTION REFACTOR: Large scale exception refactor mdipoint, to be tested. If broken scale back this commit and fix tests 2026-06-03 15:57:26 +02:00
appleb_m 8ebd4cd962 cameraThread: bug whhere it would try to quti forever if already quit 2026-06-03 15:54:03 +02:00
appleb_m 7847b5a98e DAQ/GUI: fixed local_contact_panel.py, exception handling for state transition errors, added transition to BEC maintenance mode, and wired or added palce holder functions for local contact panel
Build and Publish / test (push) Successful in 1m20s
Build and Publish / build (push) Successful in 16s
Build and Publish / Build and Deploy Docs (push) Successful in 36s
2026-05-20 15:50:16 +02:00
appleb_m b744fce6de Merge remote-tracking branch 'origin/master'
Build and Publish / test (push) Failing after 1m31s
Build and Publish / build (push) Skipped
Build and Publish / Build and Deploy Docs (push) Skipped
# Conflicts:
#	src/aare/gui/main_window.py
2026-05-20 13:55:45 +02:00
Martin Appleby e86fbb3d9f DAQ: added loco panel and commands such as tell dry to GUI and DAQ
Build and Publish / test (push) Failing after 1m36s
Build and Publish / build (push) Skipped
Build and Publish / Build and Deploy Docs (push) Skipped
2026-05-20 13:54:28 +02:00
appleb_m 6990d94a7f GUI: daq_worker surppress 403 errros and also adjust message when step failed. 2026-05-20 11:49:46 +02:00
appleb_m 3c909b4017 GUI: tidy up daq worker imports 2026-05-13 11:15:00 +02:00
appleb_m ab4dd89486 GUI: added controls for mono_picth_scan and change_energy 2026-05-12 17:05:07 +02:00
appleb_m e99681ddd8 DAQ: handle critical detector errors, GUI now intercepts and halts automation. Should also throw an error when a detector has a fault during manual collection.
Build and Publish / test (push) Successful in 8m9s
Build and Publish / build (push) Successful in 16s
Build and Publish / Build and Deploy Docs (push) Successful in 34s
2026-05-04 15:36:20 +02:00
appleb_m 8b441b4bff GUI: automation progress widget updates 2026-05-01 17:51:43 +02:00
appleb_m 856c2ba34b DAQ/GUI: removed automation workflow manager runner, workflow, models and tidied up GUI/DAQ as it is not in use at the moment. 2026-05-01 16:53:03 +02:00
appleb_m 499897cb46 JFJOCH: centralize URL resolution 2026-05-01 16:20:28 +02:00
appleb_m f4718d396c DAQ: fix bug in TransformationInvalidException handling and pass this to GUI to stop automation if critical error occurs 2026-05-01 14:28:20 +02:00
appleb_m 34e8a4bfd5 GUI: added cleaunp, fixed recovery_action bug 2026-05-01 10:39:20 +02:00
appleb_m 947e142f6e DAQ/GUI updated: gui session handling in daq and gui so staff can now close erroneous GUIs and see who has the baton. Added tests
Build and Publish / test (push) Successful in 1m26s
Build and Publish / build (push) Successful in 15s
Build and Publish / Build and Deploy Docs (push) Successful in 38s
2026-04-30 14:03:10 +02:00
appleb_m 2b7c634227 GUI/DAQ: track active guis and allow staff to force close sessions if needed. GUI's should autoclose if no interaction or uaomation after a grace period. REDIS should clear close GUIS after 10 minutes of no status updates
Build and Publish / test (push) Successful in 1m23s
Build and Publish / build (push) Successful in 16s
Build and Publish / Build and Deploy Docs (push) Successful in 35s
2026-04-30 12:44:02 +02:00
appleb_m f48c9702f4 sse_client.py: added missing imports 2026-04-27 11:52:08 +02:00
appleb_m 8fe5183f8e GUI/DAQ: allowed beamline_state_panel to move to states such as DC and RSE if transitiion is allowed (harder to define) 2026-04-23 17:21:19 +02:00
appleb_m 9c15a7ac5e DAQ: big update, added an automation progress panel to the gui, and wired it up. IT is now using redis persistently across multiple workers. 2026-04-23 13:49:15 +02:00
appleb_m c4ea023f8e DAQ: refactored measure_raster to use auto_center flag instead of auto to be more explicit and to avoid shadowing outer scope 2026-04-23 08:12:54 +02:00
appleb_m b9b253f6fb GUI: improved performance for prediction subscriber, prediction_metrics_panel.py and target_stability_panel.py. 2026-04-22 11:35:44 +02:00
appleb_m 5cbc0171f3 GUI: visualisation of target position added to GUI 2026-04-20 16:14:18 +02:00
appleb_m a0aff79675 GUI: added protection against smargon and raster moves while camera is off 2026-04-20 15:21:43 +02:00
appleb_m 8cfb9718e0 GUI: added check to camera thread to handle encoded jpeg or not encoded streams 2026-04-20 09:30:57 +02:00
appleb_m b4c14fe950 GUI: fixed camera image bug 2026-04-16 11:50:41 +02:00
appleb_m 2c38b9f7ab CHANGELOG.md updated and added autodocstrings to daq daq_worker and server.py 2026-03-31 14:34:47 +02:00