Commit Graph
223 Commits
Author SHA1 Message Date
appleb_m 12e0d2cb56 Debugging server error message 2026-03-30 15:12:03 +02:00
appleb_m 22f8361711 Changes to BEC CLient Worker for testing 2026-03-30 14:15:31 +02:00
appleb_m e39ad0ea16 STill trying random AI fixes.. I should stop doing this haha 2026-03-27 17:22:57 +01:00
appleb_m ce0fc67867 GUI: Added ui_state_manager to handle Qsettings. Trying to resolve beamline busy and baton conflicts... helpppppp 2026-03-27 17:11:11 +01:00
appleb_m 7965960e46 DAQ: feeding a "fake" session rather than an empty one, before it gets populated. This may be causing issues. 2026-03-27 17:09:57 +01:00
appleb_m 7ae9889606 BATON: tried to convert from sessions to baton. This appears to be causign many issues. need to unpack them on Monday. 2026-03-27 17:09:05 +01:00
appleb_m 53608f917a error_codes: added NOT_BATON_HOLDER error code and helper 2026-03-27 17:08:35 +01:00
appleb_m 336cbcabd4 server: import of run_in_threadpool 2026-03-27 17:07:03 +01:00
appleb_m 9965ec75e2 Baton_request_dialog - changed handling of transfer queued mesage, still seems to be working incorectly. 2026-03-27 17:06:34 +01:00
appleb_m ad46460e0c GUI Login bug: seemed to be a problem when using the login call from GUI where it would timeout if taking too long. Did not resolve why but found using await run_in_threadpool and upping the timeout solved the symptom. Maybe changes to baton ahve ebcome very itnesive seerver side... should monitor. 2026-03-27 17:05:04 +01:00
appleb_m f8eda0a728 user_sample_model.py: added to_list and from_list functions for Qsettings functionality 2026-03-27 17:03:40 +01:00
appleb_m b43b1dea80 status_bar: fixed seleected_pgroup bug where sometimes dialog would be closed before geting the value. Updated logic of the session menu and label based on who has the session 2026-03-27 17:03:10 +01:00
appleb_m e9a5c181dc status: removed duplicate pgroup_label from status bar 2026-03-27 17:01:43 +01:00
appleb_m c6fb98fae0 scan_settings_panel: use SessionsStateEnum for session 2026-03-27 17:01:29 +01:00
appleb_m 568a95f4c9 sample_queue_model.py: added to_state and from_state functions WIP 2026-03-27 17:00:10 +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 f29378f68e GUI State manager: for handlign Qsettings - WIP 2026-03-27 16:57:07 +01:00
appleb_m 66f11fcf0e Camera_image - added baton pending/requesteed message to camera iamge 2026-03-27 16:56:54 +01:00
appleb_m 40da589be2 aerotech: now aarescan is running from mx-x10sa-queue-01.psi.ch 2026-03-27 16:06:33 +01:00
appleb_m 53296a166e Bug fixes following big merge and updated alert banenr
Build and Publish / build (pull_request) Failing after 11s
Build and Publish / Build and Deploy Docs (pull_request) Has been skipped
Build and Publish / build (pull_request_target) Failing after 11s
Build and Publish / Build and Deploy Docs (pull_request_target) Has been skipped
2026-03-27 11:55:22 +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 5a47411727 aaredaq: continuing work on baton exchange procedure 2026-03-26 14:16:25 +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
GotthardG d98769d67c modify spreadsheetupdater.py mTLS certificates 2026-03-25 14:32:43 +01:00
GotthardG 0de5cbfc01 modify spreadsheetupdater.py mTLS certificates 2026-03-25 14:28:16 +01:00
GotthardG 12b749c4e6 modify spreadsheetupdater.py mTLS certificates 2026-03-25 14:24:48 +01:00
GotthardG 97d7e56125 modify spreadsheetupdater.py mTLS certificates 2026-03-25 14:21:07 +01:00
GotthardG 25163a5b4d modify spreadsheetupdater.py mTLS certificates 2026-03-25 14:10:17 +01:00
GotthardG fd20ae50d8 modify tellupdater mTLS certificates 2026-03-25 14:08:00 +01:00
appleb_m 626ccdaebe Merge remote-tracking branch 'origin/x10sa' into x10sa 2026-03-25 13:59:47 +01:00
GotthardG f1a9147f10 modify tellupdater mTLS certificates 2026-03-25 13:59:02 +01:00
appleb_m 6e3e14a837 aaredb: changed certification, host and logging statements 2026-03-25 13:57:10 +01:00
appleb_m b24e3aa12a ml_box: changed to new model yolo26l-seg-overlap-false_2026-03-16.engine 2026-03-25 13:51:39 +01:00
GotthardG 100895f56b Added mTLS certificates authentication to aaredb 2026-03-25 13:49:43 +01:00
appleb_m c9ec2e5028 DAQ/Daq_worker - changes to rotation and raster as well as handling of responses 2026-03-25 13:24:31 +01:00
appleb_m fbc9890fe4 jfjoch: added custom excpetions 2026-03-25 13:24:05 +01:00
appleb_m 98f665370a Aerotech: added custom exception for communication error 2026-03-25 13:23:44 +01:00
appleb_m 3d4e252438 Fixes to alert banner 2026-03-25 13:23:20 +01:00
appleb_m 624a8365a9 Sever_exception_handler: added handlers for JFJOCH and Aerotech errors 2026-03-25 13:21:38 +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
GotthardG d6d20d598f Simplify mTLS handling in tellupdater by consolidating certificate paths and streamlining HTTP/HTTPS logic. 2026-03-24 17:28:11 +01:00
GotthardG a4b6c2575e Update certificate and key file paths in tellupdater to use database-specific mTLS credentials 2026-03-24 17:18:42 +01:00
GotthardG 87df42a179 Conditionally apply mTLS for HTTPS connections in tellupdater to avoid certificate usage on plain HTTP requests. 2026-03-24 16:17:45 +01:00
GotthardG 4e873fefc3 Update CA certificate path in tellupdater to use the full chain file for improved SSL configuration 2026-03-24 16:04:34 +01:00
GotthardG 6a07612509 Enable mandatory mTLS for SSE connections in tellupdater by configuring client certificates and CA root files. 2026-03-24 15:39:21 +01:00
GotthardG a965087669 Add CA certificate configuration to SSL settings in tellupdater to complete mTLS setup 2026-03-24 15:33:42 +01:00
GotthardG 2e4adb5eff Enable mTLS support for WebSocket connections in tellupdater by configuring certificate and key files. 2026-03-24 15:01:46 +01:00