From 301644d3d0dca10585831c4c2994d5009d0fa158 Mon Sep 17 00:00:00 2001 From: "Eugene M." Date: Tue, 3 Feb 2026 14:10:47 -0500 Subject: [PATCH 1/3] ENH: configure Prefect deployment --- data_validation.py | 8 +++----- prefect.yaml | 19 +++++++++++-------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/data_validation.py b/data_validation.py index 5d1b697..afdbb8b 100644 --- a/data_validation.py +++ b/data_validation.py @@ -4,11 +4,9 @@ from prefect.blocks.system import Secret from tiled.client import from_profile -BEAMLINE_OR_ENDSTATION = "!!! Set the endstation or beamline_TLA here !!!" - @task(retries=2, retry_delay_seconds=10) -def read_all_streams(uid, beamline_acronym=BEAMLINE_OR_ENDSTATION): +def read_all_streams(uid, beamline_acronym="iss"): logger = get_run_logger() api_key = Secret.load(f"tiled-{beamline_acronym}-api-key", _sync=True).get() tiled_client = from_profile("nsls2", api_key=api_key) @@ -27,5 +25,5 @@ def read_all_streams(uid, beamline_acronym=BEAMLINE_OR_ENDSTATION): @flow(log_prints=True) -def data_validation(uid): - read_all_streams(uid) +def data_validation(uid, beamline_acronym="iss"): + read_all_streams(uid, beamline_acronym=beamline_acronym) diff --git a/prefect.yaml b/prefect.yaml index a3d8e56..79d47ed 100644 --- a/prefect.yaml +++ b/prefect.yaml @@ -1,4 +1,4 @@ -name: prefect-docker-pixi-tiled-tla +name: prefect-docker-pixi-tiled-iss prefect-version: 3.6.10 build: null @@ -9,14 +9,14 @@ pull: - prefect.deployments.steps.set_working_directory: directory: /repo - prefect.deployments.steps.git_clone: - repository: https://github.com/nsls2/nsls2-workflows-template.git + repository: https://github.com/nsls2/iss-workflows.git branch: main deployments: - - name: tla-end-of-run-workflow-docker + - name: iss-end-of-run-workflow-docker version: 0.1.1 tags: - - tla + - iss - main description: Deploy the updated Docker image entrypoint: end_of_run_workflow.py:end_of_run_workflow @@ -26,13 +26,16 @@ deployments: job_variables: env: TILED_SITE_PROFILES: /nsls2/software/etc/tiled/profiles - image: ghcr.io/nsls2/nsls2-workflows-template:main + image: ghcr.io/nsls2/iss-workflows:main image_pull_policy: Always network: slirp4netns volumes: - - /nsls2/data/tla/proposals:/nsls2/data/tla/proposals + - /nsls2/data/iss/proposals:/nsls2/data/iss/proposals + - /nsls2/data3/iss/proposals:/nsls2/data3/iss/proposals + - /nsls2/data/iss/legacy:/nsls2/data/iss/legacy # To be removed after data security work is completed + - /nsls2/data3/iss/legacy:/nsls2/data3/iss/legacy # To be removed after data security work is completed - /nsls2/software/etc/tiled:/nsls2/software/etc/tiled container_create_kwargs: - userns_mode: "keep-id:uid=402xxx,gid=402xxx" # workflow-tla:workflow-tla + userns_mode: "keep-id:uid=402955,gid=402955" # workflow-iss:workflow-iss auto_remove: true - name: tla-work-pool-docker + name: iss-work-pool-docker From 846a15762a11b3fb0df0bc8f9e64883670f790c8 Mon Sep 17 00:00:00 2001 From: "Eugene M." Date: Tue, 3 Feb 2026 14:15:53 -0500 Subject: [PATCH 2/3] MNT: fmt and lint --- README.md | 4 +++- prefect.yaml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4397126..58f21bb 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,6 @@ Repository of workflows for the ISS beamline. -This repository superseded the [old workflows repo](https://github.com/NSLS-II-ISS/iss-workflows) and is meant to be used with the modern Prefect3 deployment. +This repository superseded the +[old workflows repo](https://github.com/NSLS-II-ISS/iss-workflows) and is meant +to be used with the modern Prefect3 deployment. diff --git a/prefect.yaml b/prefect.yaml index 79d47ed..f529e93 100644 --- a/prefect.yaml +++ b/prefect.yaml @@ -32,8 +32,8 @@ deployments: volumes: - /nsls2/data/iss/proposals:/nsls2/data/iss/proposals - /nsls2/data3/iss/proposals:/nsls2/data3/iss/proposals - - /nsls2/data/iss/legacy:/nsls2/data/iss/legacy # To be removed after data security work is completed - - /nsls2/data3/iss/legacy:/nsls2/data3/iss/legacy # To be removed after data security work is completed + - /nsls2/data/iss/legacy:/nsls2/data/iss/legacy # To be removed after data security work is completed + - /nsls2/data3/iss/legacy:/nsls2/data3/iss/legacy # To be removed after data security work is completed - /nsls2/software/etc/tiled:/nsls2/software/etc/tiled container_create_kwargs: userns_mode: "keep-id:uid=402955,gid=402955" # workflow-iss:workflow-iss From 99b1eadf9e17297b2281e709c6108dc1da82689a Mon Sep 17 00:00:00 2001 From: "Eugene M." Date: Tue, 3 Feb 2026 14:20:33 -0500 Subject: [PATCH 3/3] ENH: Use the full Tiled installation --- pixi.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pixi.toml b/pixi.toml index 73f5dd0..67fb3cb 100644 --- a/pixi.toml +++ b/pixi.toml @@ -6,6 +6,6 @@ platforms = ["linux-64"] [dependencies] prefect = "3.*" python = "<3.14" -tiled-client = ">=0.2.3" +tiled = ">=0.2.3" prefect-docker = "*" bluesky-tiled-plugins = ">=2"