Skip to content

fix(apptainer): keep sandbox env out of argv - #2284

Merged
laszkiewiczp merged 1 commit into
mainfrom
plaszkiewicz/apptainer-sandbox-env-out-of-argv
Aug 3, 2026
Merged

laszkiewiczp merged 1 commit into
mainfrom
plaszkiewicz/apptainer-sandbox-env-out-of-argv

Conversation

@laszkiewiczp

Copy link
Copy Markdown
Contributor

Authored by @arajfer — I'm only carrying it to main. The commit keeps his authorship and Signed-off-by; I added mine as the submitter.

Why this PR exists

This change was written on the cherry-pick-2259-r0.5.0 branch (commit 032ae5184), stacked on top of the PinchBench benchmark-config cherry-pick. When #2259 merged, the bot regenerated that branch as a single squashed commit for #2283, which dropped the stacked work. The commit was never on main — it only ever existed on that branch — so it would have been lost.

What it does

  • nemo_gym/sandbox/providers/apptainer/provider.py — pass sandbox environment through the environment rather than argv, so secrets and env values don't land in the process command line.
  • Adds tavily_api_key plumbing: ${tavily_api_key} on the agent config, and the matching ${oc.env:PINCHBENCH_TAVILY_API_KEY,null} top-level declaration on the benchmark config. Both are required together — the agent config interpolates the key, so the benchmark config must declare it or gym eval prepare fails to resolve. PinchBenchAgentConfig already carries tavily_api_key: Optional[str] = None, so nothing else is needed.
  • Tests: tests/unit_tests/test_apptainer_provider.py (+129) covering the argv/env split, and tests/unit_tests/test_benchmarks.py (+9) pinning the agent/benchmark tavily pairing so the two configs can't drift apart.

Verification

Cherry-picked onto current main (3e210384a) with no conflicts, then:

  • pytest tests/unit_tests/test_apptainer_provider.py tests/unit_tests/test_benchmarks.py — 101 passed, including the new test_pinchbench_tavily_key_is_derived_from_environment
  • pre-commit run clean on all 5 touched files

@arajfer please confirm this is the version you want on main — if you'd rather own the PR yourself, close this and I'll drop the branch. Once it lands it can cherry-pick to r0.5.0 on its own, independently of #2283.

🤖 Generated with Claude Code

Signed-off-by: Adam Rajfer <arajfer@nvidia.com>
(cherry picked from commit 032ae51)
Signed-off-by: plaszkiewicz <plaszkiewicz@nvidia.com>
@copy-pr-bot

copy-pr-bot Bot commented Aug 3, 2026

Copy link
Copy Markdown

This pull request requires additional validation before any workflows can run on NVIDIA's runners.

Pull request vetters can view their responsibilities here.

Contributors can view more details about this message here.

@laszkiewiczp laszkiewiczp added the r0.5.0 Auto-cherrypick to release branch. Apply before merge; cherrypick happens after merge. label Aug 3, 2026
@laszkiewiczp laszkiewiczp self-assigned this Aug 3, 2026
@laszkiewiczp
laszkiewiczp requested a review from AdamRajfer August 3, 2026 09:29
@laszkiewiczp
laszkiewiczp merged commit d58f6ef into main Aug 3, 2026
16 of 30 checks passed
laszkiewiczp added a commit that referenced this pull request Aug 3, 2026
Authored by @arajfer — I'm only carrying it to `main`. The commit keeps
his authorship and `Signed-off-by`; I added mine as the submitter.

## Why this PR exists

This change was written on the `cherry-pick-2259-r0.5.0` branch (commit
`032ae5184`), stacked on top of the PinchBench benchmark-config
cherry-pick. When #2259 merged, the bot regenerated that branch as a
single squashed commit for #2283, which dropped the stacked work. The
commit was never on `main` — it only ever existed on that branch — so it
would have been lost.

## What it does

- `nemo_gym/sandbox/providers/apptainer/provider.py` — pass sandbox
environment through the environment rather than `argv`, so secrets and
env values don't land in the process command line.
- Adds `tavily_api_key` plumbing: `${tavily_api_key}` on the agent
config, and the matching `${oc.env:PINCHBENCH_TAVILY_API_KEY,null}`
top-level declaration on the benchmark config. Both are required
together — the agent config interpolates the key, so the benchmark
config must declare it or `gym eval prepare` fails to resolve.
`PinchBenchAgentConfig` already carries `tavily_api_key: Optional[str] =
None`, so nothing else is needed.
- Tests: `tests/unit_tests/test_apptainer_provider.py` (+129) covering
the argv/env split, and `tests/unit_tests/test_benchmarks.py` (+9)
pinning the agent/benchmark tavily pairing so the two configs can't
drift apart.

## Verification

Cherry-picked onto current `main` (`3e210384a`) with no conflicts, then:

- `pytest tests/unit_tests/test_apptainer_provider.py
tests/unit_tests/test_benchmarks.py` — **101 passed**, including the new
`test_pinchbench_tavily_key_is_derived_from_environment`
- `pre-commit run` clean on all 5 touched files

@arajfer please confirm this is the version you want on `main` — if
you'd rather own the PR yourself, close this and I'll drop the branch.
Once it lands it can cherry-pick to `r0.5.0` on its own, independently
of #2283.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Signed-off-by: Adam Rajfer <arajfer@nvidia.com>
Signed-off-by: plaszkiewicz <plaszkiewicz@nvidia.com>
Co-authored-by: Adam Rajfer <arajfer@nvidia.com>
(cherry picked from commit d58f6ef)
hemildesai added a commit that referenced this pull request Aug 3, 2026
Picks up the pinchbench benchmark config (#2259), the apptainer argv fix
(#2284), and the fern CLI docs migration (#2282).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Signed-off-by: Hemil Desai <hemild@nvidia.com>
OlegSudakov pushed a commit to OlegSudakov/Gym that referenced this pull request Aug 7, 2026
Authored by @arajfer — I'm only carrying it to `main`. The commit keeps
his authorship and `Signed-off-by`; I added mine as the submitter.

## Why this PR exists

This change was written on the `cherry-pick-2259-r0.5.0` branch (commit
`032ae5184`), stacked on top of the PinchBench benchmark-config
cherry-pick. When NVIDIA-NeMo#2259 merged, the bot regenerated that branch as a
single squashed commit for NVIDIA-NeMo#2283, which dropped the stacked work. The
commit was never on `main` — it only ever existed on that branch — so it
would have been lost.

## What it does

- `nemo_gym/sandbox/providers/apptainer/provider.py` — pass sandbox
environment through the environment rather than `argv`, so secrets and
env values don't land in the process command line.
- Adds `tavily_api_key` plumbing: `${tavily_api_key}` on the agent
config, and the matching `${oc.env:PINCHBENCH_TAVILY_API_KEY,null}`
top-level declaration on the benchmark config. Both are required
together — the agent config interpolates the key, so the benchmark
config must declare it or `gym eval prepare` fails to resolve.
`PinchBenchAgentConfig` already carries `tavily_api_key: Optional[str] =
None`, so nothing else is needed.
- Tests: `tests/unit_tests/test_apptainer_provider.py` (+129) covering
the argv/env split, and `tests/unit_tests/test_benchmarks.py` (+9)
pinning the agent/benchmark tavily pairing so the two configs can't
drift apart.

## Verification

Cherry-picked onto current `main` (`3e210384a`) with no conflicts, then:

- `pytest tests/unit_tests/test_apptainer_provider.py
tests/unit_tests/test_benchmarks.py` — **101 passed**, including the new
`test_pinchbench_tavily_key_is_derived_from_environment`
- `pre-commit run` clean on all 5 touched files

@arajfer please confirm this is the version you want on `main` — if
you'd rather own the PR yourself, close this and I'll drop the branch.
Once it lands it can cherry-pick to `r0.5.0` on its own, independently
of NVIDIA-NeMo#2283.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Signed-off-by: Adam Rajfer <arajfer@nvidia.com>
Signed-off-by: plaszkiewicz <plaszkiewicz@nvidia.com>
Co-authored-by: Adam Rajfer <arajfer@nvidia.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

r0.5.0 Auto-cherrypick to release branch. Apply before merge; cherrypick happens after merge.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants