Commit Graph
69 Commits
Author SHA1 Message Date
appleb_m 5d60ebf4ef Exceptions: added AutoRasterSampleSkipped for automation 2026-05-08 13:10:20 +02:00
appleb_m c31a60fb1c Exceptions: added BeamlineBusyTimeoutException, primarily for automation 2026-05-08 11:34:05 +02:00
appleb_m a82a083c67 DAQ: added tell_state handler that creates states based on sse stream from tell in redis. Currently not used in logc, tracking for debugging before implementing. 2026-05-04 17:01:07 +02:00
appleb_m 65b765f870 COMMON: beamline new get_jfjoch_url helper correction to match legacy code
Build and Publish / test (push) Successful in 1m58s
Build and Publish / build (push) Successful in 16s
Build and Publish / Build and Deploy Docs (push) Successful in 35s
2026-05-01 16:53:38 +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 e84e2db32b DAQ: add simulate_raster.py for no-beam/simualted detector 2026-05-01 15:45:01 +02:00
appleb_m e27d938236 DAQ: updates to find_xtal.py 2026-05-01 15:42:18 +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 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 8cd26d54b7 Face_detection: bug in pytest due to same names, refactored face_detection scripts to be utils in daq/operations/face_detection
Build and Publish / test (push) Successful in 1m20s
Build and Publish / build (push) Successful in 14s
Build and Publish / Build and Deploy Docs (push) Successful in 37s
2026-04-30 13:39:25 +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 c1db7a8d8a DAQ: refactored MLBOX and loop_Centering MLBOXTYPe. Loop_centering should no longer move if the only class found is pin, ice or needle. Refactored tests.
Build and Publish / test (push) Successful in 1m18s
Build and Publish / build (push) Successful in 14s
Build and Publish / Build and Deploy Docs (push) Successful in 35s
2026-04-28 15:23:24 +02:00
appleb_m d307b049bc gitea: fix os error in login.py and auth.py
Build and Publish / test (push) Successful in 1m29s
Build and Publish / build (push) Successful in 18s
Build and Publish / Build and Deploy Docs (push) Successful in 38s
2026-04-28 14:25:03 +02:00
appleb_m 4ac17f1117 facedetection - catch warning if doesnt tend towards a fit 2026-04-28 14:13:06 +02:00
appleb_m 02cfbde470 gitea workflows: tellupdater dependendency on mx_beamline() moved to if __name__=="main". and put if name is None: return MXBeamline.SIMULATED.
Build and Publish / test (push) Failing after 1m32s
Build and Publish / build (push) Has been skipped
Build and Publish / Build and Deploy Docs (push) Has been skipped
2026-04-27 17:08:08 +02:00
appleb_m 93c88ef0cf gitea workflows: added logging_dev.yaml
Build and Publish / test (push) Failing after 1m5s
Build and Publish / build (push) Has been skipped
Build and Publish / Build and Deploy Docs (push) Has been skipped
2026-04-27 14:36:00 +02:00
appleb_m cc2c339210 autofocus_tools.py: fixed bug so mask.sum() always prints 2026-04-27 11:50:50 +02:00
appleb_m b8ee008477 logging: attempted to standardise logging, in particular timing of functions with a wrapper, focus on raster and timing at the moment. 2026-04-24 14:53:09 +02:00
appleb_m 3b39bb2144 raster: now do auto_centre_line_scan based off of target_y instead of just above and below beam cente, if target avaialble, now submit iamges to databse, reduced number of significant figures inr aster message to db, grid_to_image and iamge_to_grid fucntions 2026-04-24 14:19:36 +02:00
appleb_m e5ffbb9b18 Server: updated server_exception_handler.py and also error_codes.py to cover all custom exceptions
Build and Publish / build (push) Successful in 19s
Build and Publish / Build and Deploy Docs (push) Successful in 58s
2026-04-23 17:22:36 +02:00
appleb_m 0685d35086 TELL: moved custom exceptions from backend to common/exception_handler 2026-04-23 17:22:14 +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 17815b1503 DAQ: added new exceptions to exception_handler.py for raster and data collection 2026-04-23 10:59:58 +02:00
appleb_m 43105ebc3b Models: beamline state enum now has a function called display name to give uniform strings whenever needed 2026-04-23 10:58:24 +02:00
appleb_m 9aaa664c44 models: fixed pydantic deprecation warning 2026-04-23 07:56:27 +02:00
appleb_m 833416b5e0 Logs: moved default logging location to tmp on mx-queue 2026-04-23 07:56:04 +02:00
appleb_m 198170d5c4 models: reformated DCP model to be easier to read 2026-04-22 17:00:46 +02:00
appleb_m 9a1030a2aa aarelc_infer.py: will eventually use gpu-003 2026-04-22 10:17:54 +02:00
appleb_m 0bbe070776 Logging: suprress sample/reference_tools and sample/spreadsheet success messages but keep failures. Should be disabled when debugging. 2026-04-20 12:06:05 +02:00
appleb_m 65e6e22e2d Exceptions: added an UnmountingFailed exception 2026-04-20 12:05:41 +02:00
appleb_m 8f75b466b7 Models: added DAQOperation Enum and LoopCenteringResult dataclass. Corrected some whitespace formatting 2026-04-20 11:47:14 +02:00
appleb_m 52c90abc70 DAQ: tidied up logging in server.py, added a filter to uvicron access so it does not log successful status access requests, this should be enabled if status debugging is needed, for example if status polling is causing lag. 2026-04-20 09:46:53 +02:00
appleb_m e5194107d0 DAQ: the mlbox prediction bug fixes and updates, now uses target from aarelc_infer.py 2026-04-17 17:27:04 +02:00
appleb_m f4b5d420cf DAQ: the big mlbox upgrade 2026-04-17 10:59:56 +02:00
appleb_m 85e67f2f5c DAQ: added in magnet_positon sensor exception_handler.py 2026-04-02 15:40:00 +02:00
appleb_m 53608f917a error_codes: added NOT_BATON_HOLDER error code and helper 2026-03-27 17:08:35 +01:00
appleb_m cc0625ffcf Models: added additional Session States for Pending. Also Added from_dict function for SampleShortInfo Model 2026-03-27 16:59:44 +01:00
appleb_m fec26c1186 Merge branch 'x10sa' into x10sa-tutorial
# Conflicts:
#	src/aare/daq/devices.py
#	src/aare/daq/server.py
#	src/aare/devices/aerotech.py
#	src/aare/devices/tell_client.py
#	src/aare/gui/gui.py
#	src/aare/gui/threads/daq_worker.py
#	src/aare/gui/widgets/alert_banner.py
2026-03-27 11:52:32 +01:00
appleb_m 5949f14599 aaredaq: continuing work on baton exchange procedure 2026-03-26 17:31:13 +01:00
appleb_m 303173ae82 Automation 2.0: WIP added endpoints to backend, frontend connected and panel made, now debugging 2026-03-26 17:29:17 +01:00
appleb_m 3c1cf09417 aaredaq: continuing work on baton exchange procedure 2026-03-26 11:20:31 +01:00
appleb_m 3dd5f46f1e Automation 2.0: WIP added endpoints to backend, frontend connected and panel made, now debugging 2026-03-25 15:41:57 +01:00
appleb_m 0225bb1e3b Exception handler p- added exceptions for JFJOCH, Aerotech and AareDB communication errors 2026-03-25 13:21:02 +01:00
appleb_m 3b440cd1fa aerotech models 2026-03-24 11:13:09 +01:00
appleb_m e9f3688952 Models: added aerotech connected and error to DAQStatusModel 2026-03-24 10:59:16 +01:00
appleb_m 95010444fd DAQ: throttle userrightsexception. so it does not repeatedly log the same error 2026-03-24 09:31:16 +01:00
appleb_m eaa6f0cd0c DAQ: throttle userrightsexception. so it does not repeatedly log the same error 2026-03-24 09:31:09 +01:00
appleb_m 9db0e45f8b GUI: FD panel bug fix 2026-03-20 16:56:35 +01:00
appleb_m 67d682c39c Merge branch 'x10sa'
Build and Publish / build (push) Successful in 15s
# Conflicts:
#	common/pyproject.toml
#	daq/src/aaredaq/spreadsheetupdater.py
#	gui/pyproject.toml
#	pyproject.toml
#	src/aare/daq/tellupdater.py
2026-03-10 13:36:10 +01:00