Skip to content

Don't use jinja in the multimodal case #1435

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
May 24, 2025
Merged

Don't use jinja in the multimodal case #1435

merged 1 commit into from
May 24, 2025

Conversation

ericcurtin
Copy link
Collaborator

@ericcurtin ericcurtin commented May 23, 2025

At least with smolvlm the output becomes junk with this option on.

Summary by Sourcery

Ensure Jinja templating is only applied when no multimodal project file is present and simplify reference file handling.

Bug Fixes:

  • Disable the unconditional --jinja flag in multimodal cases to prevent junk output.

Enhancements:

  • Consolidate duplicate ref_file existence checks into single conditional blocks in setup_mounts and serve methods.

At least with smolvlm the output becomes junk with this option on.

Signed-off-by: Eric Curtin <[email protected]>
Copy link
Contributor

sourcery-ai bot commented May 23, 2025

Reviewer's Guide

This PR refactors the template mounting and serving logic in ramalama/model.py to remove redundant checks, consolidate conditional blocks for chat and multimodal project files, and disable Jinja processing when a multimodal project is present.

Updated Class Diagram for the Model Class

classDiagram
  class Model {
    +setup_mounts(model_path, args)
    +build_exec_args_serve(args, exec_model_path, chat_template_path, mmproj_path)
    +serve(args, quiet)
  }
Loading

File-Level Changes

Change Details Files
Unified ref_file mount logic
  • Combined separate ref_file checks into a single block
  • Retained distinct mounts for chat_template and mmproj under one conditional
ramalama/model.py
Restrict Jinja flag application
  • Moved --jinja into the else branch when no mmproj_path is provided
  • Removed the unconditional --jinja flag from default exec_args
ramalama/model.py
Consolidated path resolution in serve method
  • Merged repeated if ref_file checks for chat_template and mmproj
  • Simplified assignment to chat_template_path and mmproj_path under one ref_file guard
ramalama/model.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.

We encountered an error and are unable to review this PR. We have been notified and are working to fix it.

You can try again by commenting this pull request with @sourcery-ai review, or contact us for 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:

  • Consolidate the repeated if ref_file logic in both setup_mounts and serve into a shared helper to reduce duplication and improve maintainability.
  • In build_exec_args_serve, consider defaulting to --jinja in the base args and then removing or overriding it when mmproj_path is provided to simplify the conditional logic.
Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 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.

@rhatdan
Copy link
Member

rhatdan commented May 24, 2025

LGTM

@rhatdan rhatdan merged commit a1e2fad into main May 24, 2025
13 of 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