Don't override image when using rag if user specified it #1727

rhatdan · 2025-07-22T00:29:11Z

Summary by Sourcery

Respect user-provided images by applying the RAG suffix only when the image_override flag is not set, and add a system test to validate this behavior

Bug Fixes:

Prevent unintended overriding of a user-specified image when using RAG

Enhancements:

Introduce the image_override flag to control whether the RAG suffix is applied to images

Tests:

Add a system test to verify that custom images are not modified with the -rag suffix when image_override is enabled

sourcery-ai · 2025-07-22T00:29:16Z

Reviewer's Guide

Adds logic to respect a new image_override flag so that user-specified images are not automatically suffixed with -rag, adjusts both the generate and container name routines to use this flag, and includes a system test to verify the behavior.

File-Level Changes

Change	Details	Files
Conditional image override in generate method	Introduced a local image variable that either uses args.image or rag_image(args.image) based on args.image_override Replaced the direct rag_image call with engine.add([image])	`ramalama/rag.py`
Respect image_override in container name builder	Modified the rag-image decorator condition to check that image_override is not set Updated getattr default for image_override to ensure existing behavior remains unchanged unless explicitly overridden	`ramalama/model.py`
Add system test for override behavior	Added a new run_ramalama invocation using --image and --rag flags Asserted that no '-rag' suffix appears when image_override is implied	`test/system/070-rag.bats`

Possibly linked issues

Using --image with rag command appends -rag to image name #1713: The PR prevents '-rag' from being appended to the image name when '--image' is used, directly addressing the issue.
Using --image with rag command appends -rag to image name #1713: The PR prevents the RAG image from overriding the user-specified image, directly addressing the model's loss of knowledge when RAG is enabled.

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

Contact our support team for questions or feedback.
Visit our documentation for detailed guides and information.
Keep in touch with the Sourcery team by following us on X/Twitter, LinkedIn or GitHub.

gemini-code-assist

Summary of Changes

Hello @rhatdan, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses an issue where the ramalama tool would unintentionally override a user-specified container image with its RAG-specific variant, even when the user had explicitly provided an image. The changes ensure that if a user provides a custom image and indicates it should not be overridden, the tool respects that choice, improving user control and predictability.

Highlights

Preventing Image Override for RAG: Modified the logic in ramalama/model.py and ramalama/rag.py to prevent the automatic transformation of a user-specified image into its -rag variant when the rag feature is enabled, provided an image_override flag is set. Previously, the rag image was forced if the default image was used and rag was enabled. Now, the rag image is only applied if rag is enabled AND image_override is NOT true, ensuring user's explicit image choice is respected.
New Test Case for Image Override: Added a new system test in test/system/070-rag.bats to verify that when a specific --image is provided along with --rag, the tool does not append -rag to the user-specified image, confirming the intended behavior of respecting the user's image choice.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature	Command	Description
Code Review	`/gemini review`	Performs a code review for the current pull request in its current state.
Pull Request Summary	`/gemini summary`	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in issue comments and review comments.
Help	`/gemini help`	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments or fill out our survey to provide feedback.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

sourcery-ai

Hey @rhatdan - I've reviewed your changes and they look great!

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.}

gemini-code-assist

Code Review

The pull request prevents overriding a user-specified image when using the RAG feature. A critical regression was identified in ramalama/model.py where the default RAG image was not being used when a custom image wasn't specified. The default value for getattr should be False to fix this. Also, the new system test was enhanced to cover all scenarios.

gemini-code-assist · 2025-07-22T00:30:38Z

ramalama/model.py

@@ -258,7 +258,7 @@ def get_container_name(self, args):
    def base(self, args, name):
        # force accel_image to use -rag version. Drop TAG if it exists
        # so that accel_image will add -rag to the image specification.
-        if args.image == self.default_image and getattr(args, "rag", None):
+        if getattr(args, "rag", None) and not getattr(args, "image_override", True):


This change introduces a regression. While it correctly prevents overriding a user-specified image, it breaks the case where --rag is used without a custom --image.

In that scenario, args.image_override is not set, so getattr(args, "image_override", True) returns the default value True. This makes the condition not getattr(...) evaluate to False, and the -rag suffix is not appended to the default image. This breaks existing correct behavior.

The default value for getattr should be False to fix this. This would also make it consistent with the logic in ramalama/rag.py.

With False as the default:

No --image: getattr returns False, not False is True, condition passes, -rag suffix is added. (Correct)

With --image: image_override is True, getattr returns True, not True is False, condition fails, user image is respected. (Correct)

Suggested change

if getattr(args, "rag", None) and not getattr(args, "image_override", True):

if getattr(args, "rag", None) and not getattr(args, "image_override", False):

gemini-code-assist · 2025-07-22T00:30:38Z

test/system/070-rag.bats

+    run_ramalama --image quay.io/ramalama/bogus --dryrun run --rag quay.io/ramalama/myrag:1.2 ollama://smollm:135m
+    assert "$output" !~ ".*quay.io/ramalama/bogus-rag.*" "Expected to not use -rag image"


This test verifies that a user-provided image is not overridden. Consider adding a test case for the opposite scenario: when --rag is used without a custom --image, the default image is correctly modified to use the -rag version.

A complete test suite for this logic would cover both cases, ensuring both the fix and existing functionality are preserved.

A previous check already handles this.

Fixes: containers#1713 Signed-off-by: Daniel J Walsh <[email protected]>

bmahabirbu · 2025-07-22T02:28:34Z

LGTM

sarroutbi · 2025-07-22T08:25:42Z

/packit retest-failed

rhatdan requested review from ericcurtin, bmahabirbu, maxamillion, swarajpande5, jhjaggars, cgruver and engelmi as code owners July 22, 2025 00:29

gemini-code-assist bot reviewed Jul 22, 2025

View reviewed changes

sourcery-ai bot approved these changes Jul 22, 2025

View reviewed changes

gemini-code-assist bot reviewed Jul 22, 2025

View reviewed changes

Don't override image when using rag if user specified it

4825348

Fixes: containers#1713 Signed-off-by: Daniel J Walsh <[email protected]>

rhatdan force-pushed the rag branch from 01c320c to 4825348 Compare July 22, 2025 00:40

bmahabirbu approved these changes Jul 22, 2025

View reviewed changes

sarroutbi approved these changes Jul 22, 2025

View reviewed changes

rhatdan merged commit dba9889 into containers:main Jul 22, 2025
66 of 68 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Don't override image when using rag if user specified it #1727

Don't override image when using rag if user specified it #1727

Uh oh!

rhatdan commented Jul 22, 2025 •

edited by sourcery-ai bot

Loading

Uh oh!

sourcery-ai bot commented Jul 22, 2025 •

edited

Loading

Interacting with Sourcery

Customizing Your Experience

Getting Help

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

sourcery-ai bot left a comment

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

gemini-code-assist bot Jul 22, 2025

Uh oh!

gemini-code-assist bot Jul 22, 2025

Uh oh!

rhatdan Jul 22, 2025

Uh oh!

bmahabirbu commented Jul 22, 2025

Uh oh!

sarroutbi commented Jul 22, 2025

Uh oh!

Uh oh!

Uh oh!

	if getattr(args, "rag", None) and not getattr(args, "image_override", True):
	if getattr(args, "rag", None) and not getattr(args, "image_override", False):

		run_ramalama --image quay.io/ramalama/bogus --dryrun run --rag quay.io/ramalama/myrag:1.2 ollama://smollm:135m
		assert "$output" !~ ".quay.io/ramalama/bogus-rag." "Expected to not use -rag image"

Don't override image when using rag if user specified it #1727

Don't override image when using rag if user specified it #1727

Uh oh!

Conversation

rhatdan commented Jul 22, 2025 • edited by sourcery-ai bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by Sourcery

Uh oh!

sourcery-ai bot commented Jul 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer's Guide

File-Level Changes

Possibly linked issues

Interacting with Sourcery

Customizing Your Experience

Getting Help

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Summary of Changes

Highlights

Footnotes

Uh oh!

sourcery-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist bot Jul 22, 2025

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot Jul 22, 2025

Choose a reason for hiding this comment

Uh oh!

rhatdan Jul 22, 2025

Choose a reason for hiding this comment

Uh oh!

bmahabirbu commented Jul 22, 2025

Uh oh!

sarroutbi commented Jul 22, 2025

Uh oh!

Uh oh!

Uh oh!

rhatdan commented Jul 22, 2025 •

edited by sourcery-ai bot

Loading

sourcery-ai bot commented Jul 22, 2025 •

edited

Loading