Skip to content

Run beamline service dir check before overwriting with ixx-services #244

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

Merged
OCopping merged 2 commits into from
Jun 25, 2026
+21 −9
Merged

Run beamline service dir check before overwriting with ixx-services #244

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
8f923db
Run beamline service dir check before overwriting with ixx-services
OCopping Jun 24, 2026
ee7b158
Fix test
OCopping Jun 24, 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
26 changes: 19 additions & 7 deletions src/techui_builder/main_app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,6 @@ def find_dirs(file_path: Path, beamline: str) -> tuple:

directory = beamline

if not beamline.startswith("i"):
# If not found, try searching for Ixx-services as some
# J/K beamlines are in Ixx-services dir
directory = f"i{beamline[1:]}"
logger_.info(
f"{beamline}-services not found. Searching for I{beamline[1:]}-services..."
)
# Get the relative path of ixx-services to techui.yaml
ixx_services_dir = next(
(
Expand All @@ -44,6 +37,25 @@ def find_dirs(file_path: Path, beamline: str) -> tuple:
None,
)

if ixx_services_dir is None:
if not beamline.startswith("i"):
# If not found, try searching for Ixx-services as some
# J/K beamlines are in Ixx-services dir
directory = f"i{beamline[1:]}"
logger_.info(
f"{beamline}-services not found."
f" Searching for i{beamline[1:]}-services..."
)
# Get the relative path of ixx-services to techui.yaml
ixx_services_dir = next(
(
ixx_services.relative_to(cwd, walk_up=True)
for parent in abs_path.parents
for ixx_services in parent.glob(f"{directory}-services")
),
None,
)

if ixx_services_dir is None:
logging.critical(
f"{beamline}-services not found. Is you file structure correct?"
Expand Down
4 changes: 2 additions & 2 deletions tests/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,12 @@ def test_find_dirs_jxx_services(caplog):
mock_path = MagicMock(spec=Path)
mock_path.absolute.return_value = mock_absolute

with caplog.at_level(logging.INFO):
with caplog.at_level(logging.DEBUG):
services, synoptic = find_dirs(mock_path, "jxx")

assert synoptic == mock_absolute.parent
assert services == Path("mock_rel_path")
assert "jxx-services not found. Searching for Ixx-services..." in caplog.text
assert "ixx-services relative path:" in caplog.text


def test_find_bob(caplog):
Expand Down