scripts: clean up restart-strategy and service help output

[matanl-starkware]

argparse rendered enum choices via str(), so --restart-strategy and --service
showed '{RestartStrategy.ALL_AT_ONCE,...}' / '{Service.Core,...}' rather than the
tokens users type. Add str to both enums returning the accepted token
(value / name), give the args a metavar plus a help line listing the options,
and add a concise help formatter so options render as '-j, --service SERVICE'
instead of repeating the metavar. Also fix restart_strategy_converter to catch
ValueError (Enum value lookup raises ValueError, not KeyError) so invalid input
gets the informative error instead of argparse's generic fallback.

Co-Authored-By: Claude Opus 4.8 (1M context) noreply@anthropic.com

[cursor]

PR Summary

Low Risk
CLI/help and error-message UX only in production ops scripts; parsing behavior is clarified and covered by new unit tests.

Overview
Production CLI scripts now show user-typed tokens in help and errors for --restart-strategy and --service instead of enum reprs like RestartStrategy.ALL_AT_ONCE / Service.Core. RestartStrategy and Service gain __str__ returning the accepted value/name; restart_strategy_converter catches ValueError (correct for enum-by-value lookup) so invalid strategies get a custom ArgumentTypeError listing valid options.

ApolloArgsParserBuilder drops choices= on those enums in favor of metavar plus inline “One of: …” help, and uses a new _ConciseHelpFormatter so help lines read -j, --service SERVICE rather than repeating the metavar (aligned with Python 3.13+ on older runtimes). test_enum_cli_tokens.py locks in string forms and converter error behavior.

^{Reviewed by Cursor Bugbot for commit c5eb3bc. Bugbot is set up for automated code reviews on this repo. Configure here.}

[matanl-starkware]

• scripts: make --service a required argument #14306
• scripts: confirm before restarting all Core pods at once #14305
• scripts: add Committer to Service options #14304
• scripts: clean up restart-strategy and service help output #14303 👈 (View in Graphite)
• scripts: restart and wait on nodes in parallel #14302
• scripts: make metrics gate() thread-safe #14301
• scripts: add run_in_parallel helper for prod ops #14300
• ci: fix hybrid system test for prod-script changes and k3d install #14317
• main

This stack of pull requests is managed by Graphite. Learn more about stacking.

[reviewable-StarkWare]

This change is 

[ron-starkware]

@ron-starkware reviewed 4 files and all commit messages, and made 2 comments.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on matanl-starkware).

---

scripts/prod/update_config_and_restart_nodes.py line 140 at r1 (raw file):

        "--service",
        type=service_type_converter,
        choices=list(Service),

It looks like choices isn't needed, since type is run on first, (service_type_converter) and after that we have if converted_value not in choices: to decide whether to throw an error, but since we are checking the converted value, the input will always be valid (if the input was invalid we would have thrown an error in the `type' check).

---

scripts/prod/update_config_and_restart_nodes_lib.py line 125 at r1 (raw file):

                "--restart-strategy",
                type=restart_strategy_converter,
                choices=list(RestartStrategy),

It looks like choices isn't needed, since type is run on first, (service_type_converter) and after that we have if converted_value not in choices: to decide whether to throw an error, but since we are checking the converted value, the input will always be valid (if the input was invalid we would have thrown an error in the `type' check).

[matanl-starkware]

Addressed: removed the redundant choices=list(...) from both --restart-strategy and --service. The type converters already validate and raise informative argparse.ArgumentTypeErrors, and the metavar + "One of: ..." help still lists the valid values.

[ron-starkware]

@ron-starkware reviewed 3 files and all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on matanl-starkware).

[matanl-starkware]

@ron-starkware — next one 🙏 #14302 merged, so this rebased onto main and its Reviewable check reset. Re-approve this revision when you can? (Rebase only — no code changes since your prior approval.)

[matanl-starkware]

@ron-starkware friendly follow-up 🙏 — this one's been ready overnight (CI green, no open threads); it just needs a fresh LGTM on the rebased revision so I can merge it and continue the stack (#14304–#14306 next). Thanks!

[ron-starkware]

@ron-starkware resolved 2 discussions.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on matanl-starkware).