Skip to content

Enable CLI to bypass required flag "--beamline" if specified in env #190

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Enable CLI to bypass required flag "--beamline" if specified in env #190

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
44a7cc0
🔍 Enable CLI to bypass required flag "--beamline" if specified in env…
Kezzsim Aug 7, 2024
4fdd2aa
1️⃣ simplification
Kezzsim Aug 9, 2024
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
Binary file removed nslsii/sync_experiment/.DS_Store
View file
Open in desktop
Binary file not shown.
11 changes: 8 additions & 3 deletions nslsii/sync_experiment/sync_experiment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import json
import re
import os
import redis
import httpx
import warnings
Expand Down Expand Up @@ -174,8 +175,7 @@ def main():
"--beamline",
dest="beamline",
type=str,
help="Which beamline (e.g. CHX)",
required=True,
help="Which beamline (e.g. CHX)"
)
parser.add_argument(
"-p",
Expand All @@ -188,6 +188,11 @@ def main():
parser.add_argument("-v", "--verbose", action=argparse.BooleanOptionalAction)

args = parser.parse_args()

beamline = args.beamline or os.getenv("BEAMLINE_ACRONYM")
# Make required:
if not beamline:
raise ValueError("Beamline needs to be specified. Either provide -b, --beamline or set BEAMLINE_ACRONYM in env vars.")
sync_experiment(
proposal_number=args.proposal, beamline=args.beamline, verbose=args.verbose
proposal_number=args.proposal, beamline=beamline, verbose=args.verbose
)