Skip to content

SPA metadata source should include Images-Disc #736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stephen-riggs wants to merge 2 commits into
base: main
Choose a base branch
from
Open

SPA metadata source should include Images-Disc #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75da69f
SPA metadata source should include Images-Disc
stephen-riggs Jan 27, 2026
e900e73
Don't look for Images-Disc as it is sent
stephen-riggs Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 6 additions & 18 deletions src/murfey/client/context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,12 @@ def ensure_dcg_exists(
if collection_type == "tomo":
experiment_type_id = 36
session_file = metadata_source / "Session.dm"
source_visit_dir = metadata_source.parent
elif collection_type == "spa":
experiment_type_id = 37
session_file = metadata_source / "EpuSession.dm"
# For SPA the metadata source sent should include the Images-Disc
session_file = metadata_source.parent / "EpuSession.dm"
source_visit_dir = metadata_source.parent.parent
for h in entry_points(group="murfey.hooks"):
try:
if h.name == "get_epu_session_metadata":
Expand Down Expand Up @@ -90,7 +93,6 @@ def ensure_dcg_exists(
partial_path = "/".join(windows_path.split("\\")[visit_index + 1 :])
logger.info("Partial Linux path successfully constructed from Windows path")

source_visit_dir = metadata_source.parent
logger.info(
f"Looking for atlas XML file in metadata directory {str((source_visit_dir / partial_path).parent)}"
)
Expand Down Expand Up @@ -120,28 +122,14 @@ def ensure_dcg_exists(
atlas=Path(partial_path), sample=sample
)

dcg_search_dir = (
dcg_tag = (
str(metadata_source).replace(f"/{environment.visit}", "").replace("//", "/")
)
if collection_type == "tomo":
dcg_tag = dcg_search_dir
else:
dcg_images_dirs = sorted(
Path(dcg_search_dir).glob("Images-Disc*"),
key=lambda x: x.stat().st_ctime,
)
if not dcg_images_dirs:
logger.warning(
f"Cannot find Images-Disc* in {dcg_search_dir}, falling back to Images-Disc1"
)
dcg_images_dirs = [Path(dcg_search_dir) / "Images-Disc1"]
dcg_tag = str(dcg_images_dirs[-1])

dcg_data = {
"experiment_type_id": experiment_type_id,
"tag": dcg_tag,
"atlas": str(
_atlas_destination(environment, metadata_source, token)
_atlas_destination(environment, session_file.parent, token)
/ environment.samples[metadata_source].atlas.parent
/ atlas_xml_path.with_suffix(".jpg").name
).replace("//", "/"),
Expand Down
75 changes: 42 additions & 33 deletions src/murfey/client/contexts/spa_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,35 +106,39 @@ def post_transfer(
return

if source:
dcg_tag = ensure_dcg_exists(
collection_type="spa",
metadata_source=source,
environment=environment,
token=self._token,
)
gs_pix_positions = get_grid_square_atlas_positions(
source.parent / partial_path
)
for gs, pos_data in gs_pix_positions.items():
if pos_data:
capture_post(
base_url=str(environment.url.geturl()),
router_name="session_control.spa_router",
function_name="register_grid_square",
token=self._token,
session_id=environment.murfey_session,
gsid=int(gs),
data={
"tag": dcg_tag,
"x_location": pos_data[0],
"y_location": pos_data[1],
"x_stage_position": pos_data[2],
"y_stage_position": pos_data[3],
"width": pos_data[4],
"height": pos_data[5],
"angle": pos_data[6],
},
)
for images_disc in list(source.glob("Images-Disc*")) or [
source / "Images-Disc1"
]:
# Do the dcg registration for every Images-Disc with this session file
dcg_tag = ensure_dcg_exists(
collection_type="spa",
metadata_source=images_disc,
environment=environment,
token=self._token,
)
for gs, pos_data in gs_pix_positions.items():
if pos_data:
capture_post(
base_url=str(environment.url.geturl()),
router_name="session_control.spa_router",
function_name="register_grid_square",
token=self._token,
session_id=environment.murfey_session,
gsid=int(gs),
data={
"tag": dcg_tag,
"x_location": pos_data[0],
"y_location": pos_data[1],
"x_stage_position": pos_data[2],
"y_stage_position": pos_data[3],
"width": pos_data[4],
"height": pos_data[5],
"angle": pos_data[6],
},
)

elif (
transferred_file.suffix == ".dm"
Expand All @@ -145,12 +149,15 @@ def post_transfer(
source = _get_source(transferred_file, environment=environment)
if source is None:
return None
ensure_dcg_exists(
collection_type="spa",
metadata_source=source,
environment=environment,
token=self._token,
)
for images_disc in list(source.glob("Images-Disc*")) or [
source / "Images-Disc1"
]:
ensure_dcg_exists(
collection_type="spa",
metadata_source=images_disc,
environment=environment,
token=self._token,
)

gs_name = int(transferred_file.stem.split("_")[1])
logger.info(
Expand All @@ -168,7 +175,9 @@ def post_transfer(
logger.warning(
f"Cannot find Images-Disc* in {visitless_source_search_dir}"
)
return
visitless_source_images_dirs = [
Path(visitless_source_search_dir) / "Images-Disc1"
]
visitless_source = str(visitless_source_images_dirs[-1])

if fh_positions:
Expand Down
2 changes: 1 addition & 1 deletion tests/client/test_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def test_ensure_dcg_exists_spa(mock_capture_post, tmp_path):

ensure_dcg_exists(
collection_type="spa",
metadata_source=metadata_source,
metadata_source=metadata_source / "Images-Disc1",
environment=env,
token="token",
)
Expand Down