leonarski_f
54c0100e8e
Build Packages / Unit tests (push) Successful in 1h28m28s
Build Packages / build:windows:nocuda (push) Successful in 14m45s
Build Packages / build:windows:cuda (push) Successful in 13m13s
Build Packages / build:viewer-tgz:cpu (push) Successful in 6m47s
Build Packages / build:viewer-tgz:cuda (push) Successful in 7m22s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m52s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 14m16s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 13m19s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 12m50s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 14m40s
Build Packages / build:rpm (rocky8) (push) Successful in 11m18s
Build Packages / build:rpm (rocky9) (push) Successful in 12m4s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 11m55s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 11m22s
Build Packages / DIALS test (push) Successful in 13m37s
Build Packages / XDS test (durin plugin) (push) Successful in 8m47s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 9m4s
Build Packages / XDS test (neggia plugin) (push) Successful in 7m45s
Build Packages / Generate python client (push) Successful in 34s
Build Packages / Build documentation (push) Successful in 1m4s
Build Packages / Create release (push) Skipped
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 7m16s
This is an UNSTABLE release. It includes many experimental features, as well as many AI generated fixes. We recommend using rc.152 for production use. * rugnux: Rebrand the offline data-processing subsystem as `rugnux` and consolidate all offline analysis into the single `rugnux` binary - `jfjoch_process` is now `rugnux`, the former `jfjoch_azint` is now `rugnux --azint-only`, and `jfjoch_scale` is now `rugnux --scale` (see the new docs/NAMING.md and docs/RUGNUX.md). Scaling and merging are on by default for rotation and stills (`--no-merge` disables them), replacing the previous opt-in `-M, --scale-merge`. * rugnux: CLI fixes - default `-N` to all hardware threads, parse numeric option arguments strictly (reject non-numeric or trailing input instead of silently yielding 0), require `--wavelength > 0`, and correct the reproduced command line and `--scale` reference-cell handling. * rugnux: De-novo space-group improvements - recover genuine high symmetry and centred Bravais lattices from intensities, add an automatic CC1/2 high-resolution cutoff, and report L-test twinning statistics. * rugnux: Index weakly-diffracting low-resolution rotation data that previously failed (e.g. F-cubic crystals that diffract only to ~4 A on a detector reaching ~1.5 A). The per-frame indexing gate now measures the indexed fraction only within the resolution range the lattice actually diffracts to, so the many sub-diffraction ice/noise spots no longer make the fraction floor unreachable; the two-pass first pass tries several image-sampling schemes (spread across the whole rotation vs a consecutive wedge whose native stride keeps a reflection's rocking curve continuous, letting the FFT resolve a long axis) and keeps the one that indexes the most frames; and the de-novo space-group search no longer discards all reflections (and crashes) when every resolution shell falls below <I/sigma> = 1. * rugnux: Lower the low-resolution R-meas for strongly-diffracting rotation data - drop edge-of-sweep truncated fulls whose rocking curve was captured below `--min-captured-fraction` (default 0.7 for rotation), and report R-meas only over the observations kept by outlier rejection (matching XDS). The 0.7 default also strips the partiality-extrapolated fulls that dominate the intensity second moment on weakly-diffracting crystals, so the de-novo space-group search is no longer starved by the error-model I/sigma floor and recovers the correct symmetry (e.g. the F-cubic Benas crystals: Benas_3 -> F432, Benas_7 -> P6122, instead of P4/P1); on the reference battery every other crystal keeps its space group. * rugnux: Write the refined geometry (beam, tilt, axis) to _process.h5 and place non-standard mmCIF items under a reserved `jfjoch` prefix. * jfjoch_broker: Ordinary acquisition failures (receiver/writer/analysis problems, missed packets, writer disconnect) now return to the Idle state with an Error-severity message, so a run can be retried without an expensive re-initialisation; only failures that leave the detector in an undefined state (new JFJochCriticalException, e.g. PCIe/FPGA faults) go to the Error state and force re-initialisation. * jfjoch_broker: A synchronous /start now reports its failure to the HTTP caller instead of returning HTTP 200, and an incomplete or truncated dataset (missing packets, writer disconnect) is reported as an error rather than a "reduce frame rate" warning. * jfjoch_broker: Drop uncollected placeholder rows (number = -1) from the scan_result REST endpoint. * jfjoch_broker: Fix the inverted per-image compression ratio reported by the Lite receiver (was compressed/uncompressed instead of uncompressed/compressed). * jfjoch_broker: Bragg integration adds a quantization-noise variance floor with a box-sum fallback, and treats the type-maximum marker as an invalid pixel for unsigned image types. * jfjoch_writer: Detect file-overwrite conflicts at start for back-channel transports, and reset the writer when end-of-collection finalisation fails. * jfjoch_viewer: Preview overlays follow the geometry (resolution/ROI arcs, true beam centre, predictions, coral secondary-lattice spots, legend), add save-as-JPEG, and fix an HTTP live-follow memory leak. * Frontend: Improved aesthetics and usability, and added in-browser pixel-mask and JUNGFRAU-pedestal visualisation. * CI: Name the Windows installer jfjoch-viewer-* instead of jfjoch-*.Reviewed-on: #67 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
203 lines
9.8 KiB
C++
203 lines
9.8 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
// Using OpenAPI licensed with Apache License 2.0
|
|
#pragma once
|
|
|
|
#include <httplib.h>
|
|
#include <nlohmann/json.hpp>
|
|
|
|
#include <memory>
|
|
#include <optional>
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "../common/Logger.h"
|
|
#include "JFJochServices.h"
|
|
#include "JFJochStateMachine.h"
|
|
#include "OpenAPIConvert.h"
|
|
|
|
#include "gen/model/Azim_int_settings.h"
|
|
#include "gen/model/Bragg_integration_settings.h"
|
|
#include "gen/model/Broker_status.h"
|
|
#include "gen/model/Dark_mask_settings.h"
|
|
#include "gen/model/Dataset_settings.h"
|
|
#include "gen/model/Detector_selection.h"
|
|
#include "gen/model/Detector_settings.h"
|
|
#include "gen/model/Detector_status.h"
|
|
#include "gen/model/Error_message.h"
|
|
#include "gen/model/File_writer_settings.h"
|
|
#include "gen/model/Image_buffer_status.h"
|
|
#include "gen/model/Image_format_settings.h"
|
|
#include "gen/model/Image_pusher_status.h"
|
|
#include "gen/model/Indexing_settings.h"
|
|
#include "gen/model/Instrument_metadata.h"
|
|
#include "gen/model/Jfjoch_statistics.h"
|
|
#include "gen/model/Plots.h"
|
|
#include "gen/model/Roi_definitions.h"
|
|
#include "gen/model/Scan_result.h"
|
|
#include "gen/model/Spot_finding_settings.h"
|
|
#include "gen/model/Zeromq_metadata_settings.h"
|
|
#include "gen/model/Zeromq_preview_settings.h"
|
|
|
|
class JFJochBrokerHttp {
|
|
Logger logger{"JFJochBroker"};
|
|
JFJochServices services{logger};
|
|
JFJochStateMachine state_machine;
|
|
std::string frontend_directory;
|
|
|
|
static void send_plain(httplib::Response &res, int code, const std::string &body) {
|
|
res.status = code;
|
|
res.set_content(body, "text/plain");
|
|
}
|
|
|
|
template<class T>
|
|
void ProcessOutput(const T &output, httplib::Response &response) {
|
|
std::stringstream s;
|
|
if (!output.validate(s)) {
|
|
logger.Error(s.str());
|
|
response.status = 500;
|
|
response.set_content(s.str(), "text/plain");
|
|
return;
|
|
}
|
|
|
|
nlohmann::json j = output;
|
|
response.status = 200;
|
|
response.set_content(j.dump(), "application/json");
|
|
}
|
|
|
|
std::pair<int, std::string> handleParsingException(const std::exception &ex) const noexcept;
|
|
std::pair<int, std::string> handleOperationException(const std::exception &ex) const noexcept;
|
|
|
|
void register_routes(httplib::Server &server);
|
|
|
|
void cancel_post(httplib::Response &response);
|
|
void deactivate_post(httplib::Response &response);
|
|
void initialize_post(httplib::Response &response);
|
|
|
|
void start_post(const org::openapitools::server::model::Dataset_settings &datasetSettings,
|
|
httplib::Response &response);
|
|
void status_get(httplib::Response &response);
|
|
void wait_till_done_post(const std::optional<int32_t> &timeout, httplib::Response &response);
|
|
void wait_until_running_post(const std::optional<int32_t> &timeout, httplib::Response &response);
|
|
|
|
void trigger_post(httplib::Response &response);
|
|
void pedestal_post(httplib::Response &response);
|
|
|
|
void config_detector_get(httplib::Response &response);
|
|
void config_detector_put(const org::openapitools::server::model::Detector_settings &detectorSettings,
|
|
httplib::Response &response);
|
|
|
|
void config_azim_int_get(httplib::Response &response);
|
|
void config_azim_int_put(const org::openapitools::server::model::Azim_int_settings &azimIntSettings,
|
|
httplib::Response &response);
|
|
|
|
void config_select_detector_get(httplib::Response &response);
|
|
void config_select_detector_put(const org::openapitools::server::model::Detector_selection &detectorSelection,
|
|
httplib::Response &response);
|
|
|
|
void config_spot_finding_get(httplib::Response &response);
|
|
void config_spot_finding_put(const org::openapitools::server::model::Spot_finding_settings &spotFindingSettings,
|
|
httplib::Response &response);
|
|
|
|
void statistics_calibration_get(httplib::Response &response);
|
|
void statistics_data_collection_get(httplib::Response &response);
|
|
|
|
void config_file_writer_get(httplib::Response &response);
|
|
void config_file_writer_put(const org::openapitools::server::model::File_writer_settings &fileWriterSettings,
|
|
httplib::Response &response);
|
|
|
|
void config_image_format_get(httplib::Response &response);
|
|
void config_image_format_put(const org::openapitools::server::model::Image_format_settings &imageFormatSettings,
|
|
httplib::Response &response);
|
|
void config_image_format_conversion_post(httplib::Response &response);
|
|
void config_image_format_raw_post(httplib::Response &response);
|
|
|
|
void fpga_status_get(httplib::Response &response);
|
|
|
|
void statistics_get(httplib::Response &response);
|
|
|
|
void config_zeromq_preview_get(httplib::Response &response);
|
|
void config_zeromq_preview_put(const org::openapitools::server::model::Zeromq_preview_settings &zeromqPreviewSettings,
|
|
httplib::Response &response);
|
|
|
|
void config_zeromq_metadata_get(httplib::Response &response);
|
|
void config_zeromq_metadata_put(const org::openapitools::server::model::Zeromq_metadata_settings &zeromqMetadataSettings,
|
|
httplib::Response &response);
|
|
|
|
void config_internal_generator_image_put(const std::optional<int64_t> &id,
|
|
const httplib::Request &request,
|
|
httplib::Response &response);
|
|
|
|
void config_internal_generator_image_tiff_put(const std::optional<int64_t> &id,
|
|
const httplib::Request &request,
|
|
httplib::Response &response);
|
|
|
|
void image_buffer_clear_post(httplib::Response &response);
|
|
void image_buffer_image_cbor_get(const std::optional<int64_t> &id, httplib::Response &response);
|
|
void image_buffer_image_jpeg_get(const std::optional<int64_t> &id, const std::optional<bool> &showUserMask,
|
|
const std::optional<bool> &showRoi, const std::optional<bool> &showSpots,
|
|
const std::optional<bool> &showPredictions,
|
|
const std::optional<bool> &showBeamCenter, const std::optional<float> &saturation,
|
|
const std::optional<int64_t> &jpegQuality, const std::optional<float> &showResRing,
|
|
const std::optional<std::string> &color, const std::optional<bool> &showResEst,
|
|
httplib::Response &response);
|
|
void image_buffer_image_tiff_get(const std::optional<int64_t> &id, httplib::Response &response);
|
|
void image_buffer_start_cbor_get(httplib::Response &response);
|
|
void image_buffer_status_get(httplib::Response &response);
|
|
|
|
void detector_status_get(httplib::Response &response);
|
|
void image_pusher_status_get(httplib::Response &response);
|
|
|
|
void preview_pedestal_tiff_get(const std::optional<int32_t> &gainLevel, const std::optional<int32_t> &sc,
|
|
httplib::Response &response);
|
|
void preview_plot_bin_get(const std::optional<std::string> &type, const std::optional<std::string> &roi,
|
|
httplib::Response &response);
|
|
void preview_plot_get(const std::optional<std::string> &type, const std::optional<int32_t> &binning,
|
|
const std::optional<float> &fill,
|
|
const std::optional<bool> &experimentalCoord, const std::optional<std::string> &azintUnit,
|
|
httplib::Response &response);
|
|
|
|
void config_mask_get(httplib::Response &response);
|
|
void config_mask_tiff_get(httplib::Response &response);
|
|
void config_user_mask_get(httplib::Response &response);
|
|
void config_user_mask_put(const httplib::Request &request, httplib::Response &response);
|
|
void config_user_mask_tiff_get(httplib::Response &response);
|
|
void config_user_mask_tiff_put(const httplib::Request &request, httplib::Response &response);
|
|
|
|
void config_roi_get(httplib::Response &response);
|
|
void config_roi_put(const org::openapitools::server::model::Roi_definitions &roiDefinitions,
|
|
httplib::Response &response);
|
|
|
|
void result_scan_get(httplib::Response &response);
|
|
void version_get(httplib::Response &response);
|
|
|
|
void config_instrument_get(httplib::Response &response);
|
|
void config_instrument_put(const org::openapitools::server::model::Instrument_metadata &instrumentMetadata,
|
|
httplib::Response &response);
|
|
|
|
void config_indexing_get(httplib::Response &response);
|
|
void config_indexing_put(const org::openapitools::server::model::Indexing_settings &indexingSettings,
|
|
httplib::Response &response);
|
|
void config_bragg_integration_get(httplib::Response &response);
|
|
void config_bragg_integration_put(const org::openapitools::server::model::Bragg_integration_settings &braggIntegrationSettings,
|
|
httplib::Response &response);
|
|
|
|
void config_dark_mask_get(httplib::Response &response);
|
|
void config_dark_mask_put(const org::openapitools::server::model::Dark_mask_settings &darkMaskSettings,
|
|
httplib::Response &response);
|
|
|
|
void xfel_event_code_get(httplib::Response &response);
|
|
void xfel_pulse_id_get(httplib::Response &response);
|
|
|
|
public:
|
|
JFJochBrokerHttp(const DiffractionExperiment &experiment,
|
|
const SpotFindingSettings &spot_finding_settings);
|
|
|
|
void AddDetectorSetup(const DetectorSetup &setup);
|
|
JFJochServices &Services();
|
|
JFJochBrokerHttp &FrontendDirectory(const std::string &directory);
|
|
void attach(httplib::Server &server);
|
|
|
|
~JFJochBrokerHttp() = default;
|
|
};
|