diff --git a/demo/beamline_config.yml b/demo/beamline_config.yml index e48cc554b..6cc07670a 100644 --- a/demo/beamline_config.yml +++ b/demo/beamline_config.yml @@ -100,6 +100,7 @@ configuration: skip_existing_images: true take_snapshots: true sub_wedge_size: 10 + disable_processing: false # Not really needed (default is already false) # NB 'compression' not added as apparently never used helical: diff --git a/poetry.lock b/poetry.lock index d0cf38521..c352890ef 100644 --- a/poetry.lock +++ b/poetry.lock @@ -718,6 +718,18 @@ files = [ docs = ["ipython", "matplotlib", "numpydoc", "sphinx"] tests = ["pytest", "pytest-cov", "pytest-xdist"] +[[package]] +name = "defusedxml" +version = "0.7.1" +description = "XML bomb protection for Python stdlib modules" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +groups = ["main"] +files = [ + {file = "defusedxml-0.7.1-py2.py3-none-any.whl", hash = "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61"}, + {file = "defusedxml-0.7.1.tar.gz", hash = "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69"}, +] + [[package]] name = "deprecated" version = "1.2.18" @@ -2013,18 +2025,19 @@ websockets = ">=12.0,<13.0" [[package]] name = "mxcubecore" -version = "1.269.0" +version = "1.339.0" description = "Core libraries for the MXCuBE application" optional = false python-versions = "<3.12,>=3.10" groups = ["main"] files = [ - {file = "mxcubecore-1.269.0-py3-none-any.whl", hash = "sha256:97f6ec4f4fd98cd0cfe6159088749323549ea148a66c89a55b087afa45b2482d"}, - {file = "mxcubecore-1.269.0.tar.gz", hash = "sha256:0e38d892ddb059f9e90599f9a0d007ae94ca7d95c08454457090782d2ed0da02"}, + {file = "mxcubecore-1.339.0-py3-none-any.whl", hash = "sha256:80a4929623ebc3e7e9709ac9e88a99cf9ec8889143e48e07669f176f8355741e"}, + {file = "mxcubecore-1.339.0.tar.gz", hash = "sha256:f8094e824b14ec8508af3eb261d9453c42eb4a3f7a657bc48894f05de5f3d0a6"}, ] [package.dependencies] colorama = ">=0.4.6,<0.5.0" +defusedxml = "0.7.1" f90nml = "1.3.1" gevent = ">=23.9.1,<24.0.0" greenlet = ">=3.0.3,<4.0.0" @@ -4062,4 +4075,4 @@ testing = ["coverage[toml]", "zope.event", "zope.testing"] [metadata] lock-version = "2.1" python-versions = ">=3.10,<3.12" -content-hash = "dc2def53fc94de26b70e638ddc8bfef77c815a30d73f6a20dedae84bd4c215dc" +content-hash = "44e5f582871dedb0529c1aa0aab6c659f3f43bd9f279d66b13384a3e26aeba78" diff --git a/pyproject.toml b/pyproject.toml index 01ea72fd4..4102b0749 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -51,7 +51,7 @@ pydantic = ">=2.8.2,<2.9.0" PyDispatcher = "^2.0.6" pytz = "^2022.6" tzlocal = "^4.2" -mxcubecore = ">=1.269.0" +mxcubecore = ">=1.335.0" bcrypt = "^4.0.1" authlib = "^1.3.0" flask-limiter = "^3.12" diff --git a/test/input_parameters.py b/test/input_parameters.py index 8d3634ce0..404506456 100644 --- a/test/input_parameters.py +++ b/test/input_parameters.py @@ -128,6 +128,7 @@ "detector_binning_mode": None, "detector_distance": 0.0, "detector_roi_mode": 0, + "disable_processing": False, "exp_time": 0.02, "experiment_type": "", "first_image": 1, @@ -188,6 +189,7 @@ "detector_distance": 0.0, "detector_roi_mode": 0, "determine_rad_params": False, + "disable_processing": False, "exp_time": 0.05, "experiment_type": "", "first_image": 1, @@ -260,6 +262,7 @@ "detector_binning_mode": None, "detector_distance": 0.0, "detector_roi_mode": 0, + "disable_processing": False, "exp_time": 10, "experiment_type": "", "first_image": 1, @@ -312,6 +315,7 @@ "detector_binning_mode": None, "detector_distance": 0.0, "detector_roi_mode": 0, + "disable_processing": False, "exp_time": 0.02, "experiment_type": "", "first_image": 1, diff --git a/ui/src/components/Tasks/DataCollection.jsx b/ui/src/components/Tasks/DataCollection.jsx index a841d1dd0..be850f1aa 100644 --- a/ui/src/components/Tasks/DataCollection.jsx +++ b/ui/src/components/Tasks/DataCollection.jsx @@ -293,46 +293,50 @@ class DataCollection extends React.Component { - - -
- - - Unit Cell: - - - - - - - - - - - - -
+ {!this.props.initialValues.disable_processing && ( +
+ + +
+ + + Unit Cell: + + + + + + + + + + + + +
+
+ )} {this.props.taskData.state ? '' : this.showFooter()} diff --git a/ui/src/components/Tasks/Helical.jsx b/ui/src/components/Tasks/Helical.jsx index 5be5f2ed5..61c60f615 100644 --- a/ui/src/components/Tasks/Helical.jsx +++ b/ui/src/components/Tasks/Helical.jsx @@ -187,46 +187,50 @@ class Helical extends React.Component { - - -
- - - Unit Cell: - - - - - - - - - - - - -
+ {!this.props.initialValues.disable_processing && ( +
+ + +
+ + + Unit Cell: + + + + + + + + + + + + +
+
+ )} {this.props.taskData.state ? ( '' diff --git a/ui/src/components/Tasks/Mesh.jsx b/ui/src/components/Tasks/Mesh.jsx index a2ffa7e1d..8091d92b0 100644 --- a/ui/src/components/Tasks/Mesh.jsx +++ b/ui/src/components/Tasks/Mesh.jsx @@ -196,46 +196,50 @@ class Mesh extends React.Component { - - -
- - - Unit Cell: - - - - - - - - - - - - -
+ {!this.props.initialValues.disable_processing && ( +
+ + +
+ + + Unit Cell: + + + + + + + + + + + + +
+
+ )} {this.props.taskData.state ? ( ''