From bb70f1346f76d1abce439a08adde19793f4ad5b0 Mon Sep 17 00:00:00 2001 From: Boqiang Date: Fri, 7 Aug 2026 11:48:33 -0400 Subject: [PATCH 1/2] chore(deps): pin SPAC to PR #433 merge commit Update requirements.txt and environment.yml to use f9886bcde643ebf14e58a31d5ac397e28b6ea510. --- environment.yml | 5 ++--- requirements.txt | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/environment.yml b/environment.yml index 1645870..0a87d1f 100644 --- a/environment.yml +++ b/environment.yml @@ -84,6 +84,5 @@ dependencies: - tifffile - shapely==2.0.7 # To be consistent with requirement.txt - sag-py-execution-time-decorator @ git+https://github.com/SamhammerAG/sag_py_execution_time_decorator.git@976c9683d561aadc0166495117c42cc1762633d7 - # SPAC package pinned to specific commit for template compatibility (dev branch as of 2025-10-15) - - spac @ git+https://github.com/FNLCR-DMAP/SCSAWorkflow.git@c2a248826b91880c62308e85e60cae9361c275d0#egg=spac - + # SPAC package pinned to the merge commit of PR #433 (dev branch as of 2026-08-04) + - spac @ git+https://github.com/FNLCR-DMAP/SCSAWorkflow.git@f9886bcde643ebf14e58a31d5ac397e28b6ea510#egg=spac diff --git a/requirements.txt b/requirements.txt index bfa0fa1..2cef5aa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -52,5 +52,5 @@ zipp==3.19.2 tifffile shapely==2.0.7 sag-py-execution-time-decorator @ git+https://github.com/SamhammerAG/sag_py_execution_time_decorator.git@976c9683d561aadc0166495117c42cc1762633d7 -# SPAC package pinned to specific commit for template compatibility (dev branch as of 2025-10-15) -spac @ git+https://github.com/FNLCR-DMAP/SCSAWorkflow.git@c2a248826b91880c62308e85e60cae9361c275d0#egg=spac +# SPAC package pinned to the merge commit of PR #433 (dev branch as of 2026-08-04) +spac @ git+https://github.com/FNLCR-DMAP/SCSAWorkflow.git@f9886bcde643ebf14e58a31d5ac397e28b6ea510#egg=spac From 9d425c8578b268803cc3c12e4282dc99be75592f Mon Sep 17 00:00:00 2001 From: Boqiang Date: Fri, 7 Aug 2026 21:50:53 -0400 Subject: [PATCH 2/2] fix(server): update pinned template callers Adapt the Ripley L and nearest-neighbor Shiny server callers to the SPAC PR #433 template API. - Import Ripley from visualize_ripley_l_template. - Replace save_results=False with save_to_disk=False. --- server/nearest_neighbor_server.py | 2 +- server/ripleyL_server.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/nearest_neighbor_server.py b/server/nearest_neighbor_server.py index fe4cbb0..a30bd66 100644 --- a/server/nearest_neighbor_server.py +++ b/server/nearest_neighbor_server.py @@ -222,7 +222,7 @@ def nn_visualization_plot(): # Call run_from_json with virtual path figs, df_data = run_from_json( json_path=params, - save_results=False, # Return figures directly + save_to_disk=False, # Return figures directly show_plot=False ) finally: diff --git a/server/ripleyL_server.py b/server/ripleyL_server.py index 823d005..8758948 100644 --- a/server/ripleyL_server.py +++ b/server/ripleyL_server.py @@ -6,7 +6,7 @@ register_memory_object, unregister_memory_object, ) -from spac.templates.visualize_ripley_template import run_from_json +from spac.templates.visualize_ripley_l_template import run_from_json def ripleyL_server(input, output, session, shared): @@ -15,7 +15,7 @@ def ripleyL_server(input, output, session, shared): This implementation registers the in-memory AnnData object with the memory registry and delegates plotting to - `spac.templates.visualize_ripley_template.run_from_json`. + `spac.templates.visualize_ripley_l_template.run_from_json`. Parameters ---------- @@ -81,7 +81,7 @@ def spac_ripley_l_plot(): # Call template to get figure and dataframe in-memory figs_df: Tuple[Any, Any] = run_from_json( - json_path=params, save_results=False, show_plot=False + json_path=params, save_to_disk=False, show_plot=False ) if figs_df is None: return None