Merge branch 'main' into tomo-extract

Author: stephen-riggs

.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/client/tui/screens.py

@@ -685,15 +685,23 @@ def on_button_pressed(self, event: Button.Pressed):
                 self.app.push_screen("launcher")
 
         if machine_data.get("upstream_data_directories"):
-            upstream_downloads = capture_get(
+            upstream_downloads: dict[str, dict[str, Path]] = capture_get(
                 base_url=str(self.app._environment.url.geturl()),
                 router_name="session_control.correlative_router",
                 function_name="find_upstream_visits",
                 token=token,
                 session_id=self.app._environment.murfey_session,
             ).json()
+            # Pass flattened dict for backwards compatibility
             self.app.install_screen(
-                UpstreamDownloads(upstream_downloads), "upstream-downloads"
+                UpstreamDownloads(
+                    {
+                        visit_name: visit_dir
+                        for _, upstream_visits in upstream_downloads.items()
+                        for visit_name, visit_dir in upstream_visits.items()
+                    }
+                ),
+                "upstream-downloads",
             )
             self.app.push_screen("upstream-downloads")
 
@@ -759,15 +767,23 @@ def on_button_pressed(self, event: Button.Pressed):
             self.app.push_screen("directory-select")
 
         if machine_data.get("upstream_data_directories"):
-            upstream_downloads = capture_get(
+            upstream_downloads: dict[str, dict[str, Path]] = capture_get(
                 base_url=str(self.app._environment.url.geturl()),
                 router_name="session_control.correlative_router",
                 function_name="find_upstream_visits",
                 token=token,
                 session_id=self.app._environment.murfey_session,
             ).json()
+            # Pass a flattened dict for backwards compatibility
             self.app.install_screen(
-                UpstreamDownloads(upstream_downloads), "upstream-downloads"
+                UpstreamDownloads(
+                    {
+                        visit_name: visit_dir
+                        for _, upstream_visits in upstream_downloads.items()
+                        for visit_name, visit_dir in upstream_visits.items()
+                    }
+                ),
+                "upstream-downloads",
             )
             self.app.push_screen("upstream-downloads")
 
@@ -817,7 +833,7 @@ def on_button_pressed(self, event: Button.Pressed):
                 stream_response = capture_get(
                     base_url=str(self.app._environment.url.geturl()),
                     router_name="session_control.correlative_router",
-                    function_name="get_tiff",
+                    function_name="get_tiff_file",
                     token=token,
                     visit_name=event.button.label,
                     session_id=self.app._environment.murfey_session,