Skip to content

Conversation

@ldjebran
Copy link
Contributor

@ldjebran ldjebran commented Jul 31, 2025

Description

Fixes llama-stack model-id introduced with version 0.2.16, This allows lightspeed-stack to preserve its interface and any configuration and clients to remain compatible.

Type of change

  • Refactor
  • New feature
  • Bug fix
  • CVE fix
  • Optimization
  • Documentation Update
  • Configuration Update
  • Bump-up service version
  • Bump-up dependent library
  • Bump-up library or tool used for development (does not change the final image)
  • CI configuration change
  • Konflux configuration change
  • Unit tests improvement
  • Integration tests improvement
  • End to end tests improvement

Related Tickets & Documents

  • Related Issue #
  • Closes #

Checklist before requesting a review

  • I have performed a self-review of my code.
  • PR has passed all pre-merge test jobs.
  • If it is a core feature, I have added thorough tests.

Testing

  • Please provide detailed steps to perform tests related to this code change.
  • How were the fix/results from this change verified? Please provide relevant screenshots or results.

Summary by CodeRabbit

  • Bug Fixes

    • Improved model selection and validation by using fully qualified model identifiers combining provider and model names.
  • Tests

    • Updated tests to verify the use of fully qualified model identifiers in model selection.

@ldjebran ldjebran requested review from manstis and tisnik July 31, 2025 10:19
@ldjebran ldjebran added the bug Something isn't working label Jul 31, 2025
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Jul 31, 2025

Walkthrough

The model selection logic in select_model_and_provider_id was updated to use a composite model identifier combining the provider and model IDs. Test cases were adjusted to expect and validate these fully qualified identifiers, reflecting the new identifier format in their assertions.

Changes

Cohort / File(s) Change Summary
Model Selection Logic
src/app/endpoints/query.py
Modified to construct and validate a composite model identifier (provider_id/model_id) for model selection.
Unit Tests for Model Selection
tests/unit/app/endpoints/test_query.py
Updated test cases and assertions to use and expect the new composite model identifier format.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Poem

A rabbit hops through code so spry,
Now models wear their names with pride—
Provider and model, side by side!
Tests were tweaked to match the tune,
All identifiers in full bloom.
With slashes joined, the logic’s neat—
This carrot change is quite a treat! 🥕

Note

⚡️ Unit Test Generation is now available in beta!

Learn more here, or try it out under "Finishing Touches" below.


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 8770e76 and 7d49636.

📒 Files selected for processing (2)
  • src/app/endpoints/query.py (2 hunks)
  • tests/unit/app/endpoints/test_query.py (4 hunks)
🚧 Files skipped from review as they are similar to previous changes (2)
  • tests/unit/app/endpoints/test_query.py
  • src/app/endpoints/query.py
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
  • GitHub Check: build-pr
✨ Finishing Touches
  • 📝 Generate Docstrings
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai generate unit tests to generate unit tests for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@manstis manstis left a comment

Choose a reason for hiding this comment

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

LGTM 👍

Copy link
Contributor

@tisnik tisnik left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 16f274a and 8770e76.

📒 Files selected for processing (2)
  • src/app/endpoints/query.py (2 hunks)
  • tests/unit/app/endpoints/test_query.py (4 hunks)
🔇 Additional comments (6)
src/app/endpoints/query.py (3)

219-219: LGTM: Composite model identifier creation

The creation of the composite model identifier follows the expected "provider_id/model_id" format, which aligns with llama-stack 0.2.16 requirements.


236-236: No downstream compatibility issues detected with composite model identifiers

All call sites—including query_endpoint_handler and streaming_query_endpoint_handler—pass through the returned model_id and tests for select_model_and_provider_id already assert the provider/model format. No further changes are needed.


222-225: No changes needed: validation logic aligns with composite identifiers
I’ve confirmed that all existing tests for select_model_and_provider_id mock models with identifier="provider/model" (e.g. "provider1/model1"), and the lookup in src/app/endpoints/query.py (lines 222–225) along with metric labeling in src/metrics/utils.py all consistently treat identifier as the composite provider_id/model_id. No update to the validation logic is required at this time.

tests/unit/app/endpoints/test_query.py (3)

194-205: LGTM: Test data updated for composite identifiers

The mock model objects correctly use composite identifiers matching the "provider_id/model_id" format, which aligns with the updated function behavior.


215-216: LGTM: Assertion updated for composite identifier

The assertion correctly expects the composite identifier format "provider2/model2" returned by the updated function.


249-250: LGTM: Assertion updated for default configuration scenario

The assertion correctly expects the composite identifier "default_provider/default_model" when using default configuration values.

Fixes llama-stack model-id introduced with version 0.2.16,
This allows lightspeed-stack to preserve its interface and any configuration and clients to remain compatible.

Signed-off-by: Djebran Lezzoum <ldjebran@gmail.com>
@ldjebran ldjebran force-pushed the fixes-llama-stack-model-id branch from 8770e76 to 7d49636 Compare July 31, 2025 10:26
@tisnik tisnik merged commit accf3a9 into lightspeed-core:main Jul 31, 2025
17 of 19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants