Skip to content

Do not override a small subset of env vars #1475

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.

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
merged 1 commit into from
Jun 5, 2025
Merged

Do not override a small subset of env vars #1475

merged 1 commit into from
Jun 5, 2025

Conversation

ericcurtin
Copy link
Member

@ericcurtin ericcurtin commented Jun 5, 2025

RamaLama does not try to detect GPU if the user has already set certain env vars. Make this list smaller.

Summary by Sourcery

Restrict automatic environment variable overrides to core GPU settings and refactor image resolution by extracting a dedicated resolver and simplifying GPU-based selection

Enhancements:

  • Split environment-variable detection into get_gpu_type_env_vars for core GPU vars and defer other accelerator vars until explicitly set
  • Extract resolve_image_from_args_and_env to centralize image override logic from args, environment, and config
  • Simplify accel_image to first use the new resolver and then detect GPU type for selecting the appropriate image

Copy link
Contributor

sourcery-ai bot commented Jun 5, 2025

Reviewer's Guide

This PR refactors and simplifies how accelerator environment variables and base image resolution are handled by renaming, narrowing, and restructuring related functions, extracting common logic into a new utility, and streamlining accel_image’s flow.

File-Level Changes

Change Details Files
Streamlined accelerator environment variable handling logic
  • Renamed get_accel_env_vars to get_gpu_type_env_vars and reduced the list of GPU-type vars
  • Introduced a new get_accel_env_vars that selectively merges GPU-type vars with other accelerator-specific vars
  • Updated code paths to use the new functions appropriately
ramalama/common.py
Extracted utility for resolving image from args, environment, and config
  • Added resolve_image_from_args_and_env with clear docstring
  • Centralized argument, environment, and config checks into this function
  • Returned None when no image is resolved to enable fallback logic
ramalama/common.py
Reworked accel_image function to leverage new utilities and simplified flow
  • Renamed accel_image signature and updated its docstring
  • Modified accel_image to first invoke resolve_image_from_args_and_env then fall back
  • Adjusted GPU type detection to use get_gpu_type_env_vars and handle absent vars
ramalama/common.py

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @ericcurtin - I've reviewed your changes - here's some feedback:

  • In accel_image, you’re iterating over env_vars instead of gpu_type_env_vars, which will cause a reference error or skip GPU detection—please fix the variable reference.
  • The docstring for accel_image has an extra "and"—change "Selects and the appropriate image" to "Selects the appropriate image" for clarity.
  • The separation between get_gpu_type_env_vars and get_accel_env_vars introduces some duplication; consider merging or renaming them to more clearly convey their distinct roles.
Here's what I looked at during the review
  • 🟡 General issues: 2 issues found
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

RamaLama does not try to detect GPU if the user has already set
certain env vars. Make this list smaller.

Signed-off-by: Eric Curtin <[email protected]>
@rhatdan
Copy link
Member

rhatdan commented Jun 5, 2025

LGTM

@rhatdan rhatdan merged commit f07a062 into main Jun 5, 2025
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants