Merged recent changes from 'main' branch

Author: tieneupin

.bumpclient.toml

@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "0.21.0"
+current_version = "0.21.1"
 commit = true
 tag = false
 

.bumpversion.toml

@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "0.21.0"
+current_version = "0.21.1"
 commit = true
 tag = true
 

Helm/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 name: murfey-services
 description: Umbrella Helm chart for deploying the servers and daemons needed to enable Murfey to transfer and process data
-version: 0.21.0
+version: 0.21.1
 dependencies:
   - name: murfey-instrument-server-clem
   - name: murfey-instrument-server-tem

Helm/charts/murfey-instrument-server-clem/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 name: murfey-instrument-server-clem
 description: Helm chart for deploying a Murfey instrument server, which executes orders to detect, modify, and transfer files on the instrument PC, and notifies the backend server about transferred files
-version: 0.21.0
+version: 0.21.1

Helm/charts/murfey-instrument-server-tem/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 name: murfey-instrument-server-tem
 description: Helm chart for deploying a Murfey instrument server, which executes orders to detect, modify, and transfer files on the instrument PC, and notifies the backend server about transferred files
-version: 0.21.0
+version: 0.21.1

Helm/charts/murfey-rsync/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 name: murfey-rsync
 description: Helm chart for deploying an rsync daemon, which is responsible for executing the transfer of files from the client storage directory to the server storage system
-version: 0.21.0
+version: 0.21.1

Helm/charts/murfey-server/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 name: murfey-server
 description: Helm chart for deploying a Murfey backend server, which is responsible for orchestrating the data transfer and processing workflow between the client PC and the storage system
-version: 0.21.0
+version: 0.21.1

pyproject.toml

@@ -7,7 +7,7 @@ requires = [
 
 [project]
 name = "murfey"
-version = "0.21.0"
+version = "0.21.1"
 description = "Client-Server architecture hauling Cryo-EM data"
 readme = "README.md"
 keywords = [

src/murfey/__init__.py

@@ -1,4 +1,4 @@
 from __future__ import annotations
 
-__version__ = "0.21.0"
-__supported_client_version__ = "0.21.0"
+__version__ = "0.21.1"
+__supported_client_version__ = "0.21.1"

src/murfey/server/api/instrument.py

@@ -233,6 +233,7 @@ class ProvidedProcessingParameters(BaseModel):
     particle_diameter: Optional[float] = None
     symmetry: str = "C1"
     eer_fractionation: int = 20
+    run_class3d: bool = True
 
 
 @router.post("/sessions/{session_id}/provided_processing_parameters")
@@ -241,13 +242,26 @@ async def pass_proc_params_to_instrument_server(
 ):
     session = db.exec(select(Session).where(Session.id == session_id)).one()
 
-    session_processing_parameters = SessionProcessingParameters(
-        session_id=session_id,
-        dose_per_frame=proc_params.dose_per_frame,
-        gain_ref=session.current_gain_ref,
-        symmetry=proc_params.symmetry,
-        eer_fractionation=proc_params.eer_fractionation,
-    )
+    existing_parameters = db.exec(
+        select(SessionProcessingParameters).where(
+            SessionProcessingParameters.session_id == session_id
+        )
+    ).all()
+    if not existing_parameters:
+        session_processing_parameters = SessionProcessingParameters(
+            session_id=session_id,
+            dose_per_frame=proc_params.dose_per_frame,
+            gain_ref=session.current_gain_ref,
+            symmetry=proc_params.symmetry,
+            eer_fractionation=proc_params.eer_fractionation,
+            run_class3d=proc_params.run_class3d,
+        )
+    else:
+        session_processing_parameters = existing_parameters[0]
+        session_processing_parameters.dose_per_frame = proc_params.dose_per_frame
+        session_processing_parameters.eer_fractionation = proc_params.eer_fractionation
+        session_processing_parameters.symmetry = proc_params.symmetry
+        session_processing_parameters.run_class3d = proc_params.run_class3d
     db.add(session_processing_parameters)
     db.commit()