fix: restore LLM model values in reapply_all_settings fallback (#1587)#2008
fix: restore LLM model values in reapply_all_settings fallback (#1587)#2008hunterxtang wants to merge 2 commits into
Conversation
WalkthroughRefactors provider-priority selection in settings helpers into module-level constants, reworks the no-argument fallback path in ChangesProvider fallback fix
Estimated code review effort: 2 (Simple) | ~15 minutes Sequence Diagram(s)sequenceDiagram
participant Caller
participant UpdateLangflowModelValues as _update_langflow_model_values
participant Helpers as _configured_provider_names
participant Langflow as change_langflow_model_value
Caller->>UpdateLangflowModelValues: call with no arguments
UpdateLangflowModelValues->>Helpers: get configured LLM provider names
Helpers-->>UpdateLangflowModelValues: LLM provider list
loop each configured LLM provider
UpdateLangflowModelValues->>Langflow: change_langflow_model_value(llm_model, force_llm_update=True)
end
UpdateLangflowModelValues->>Helpers: get configured embedding provider names
Helpers-->>UpdateLangflowModelValues: embedding provider list
loop each configured embedding provider
UpdateLangflowModelValues->>Langflow: change_langflow_model_value(embedding_model)
end
Possibly related issues
Possibly related PRs
Suggested labels: Suggested reviewers: 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
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. Comment |
There was a problem hiding this comment.
🧹 Nitpick comments (1)
src/api/settings/helpers.py (1)
32-42: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low valueOptional: dedupe via
_configured_provider_names.Both helpers could delegate to the newly added
_configured_provider_namesto avoid duplicating the "configured" filtering logic.♻️ Optional dedup
def _first_configured_llm_provider(config, excluding: str) -> str: """Return the first configured LLM provider that isn't `excluding`.""" - for p in _LLM_PROVIDER_NAMES: - if p != excluding and getattr(config.providers, p).configured: - return p - return "openai" + for p in _configured_provider_names(config, _LLM_PROVIDER_NAMES): + if p != excluding: + return p + return "openai" def _first_configured_embedding_provider(config, excluding: str) -> str: """Return the first configured embedding provider (openai/watsonx/ollama) that isn't `excluding`, or "" if none.""" - for p in _EMBEDDING_PROVIDER_NAMES: - if p != excluding and getattr(config.providers, p).configured: - return p - return "" + for p in _configured_provider_names(config, _EMBEDDING_PROVIDER_NAMES): + if p != excluding: + return p + return ""🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/api/settings/helpers.py` around lines 32 - 42, The provider-selection helpers duplicate the same “configured and not excluded” filtering logic; update `_first_configured_llm_provider` and `_first_configured_embedding_provider` to delegate to `_configured_provider_names` instead of iterating and checking `configured` themselves. Keep the existing fallback behavior in each helper (`openai` for LLMs and empty string for embeddings) while using the shared helper to pick the first matching provider.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Nitpick comments:
In `@src/api/settings/helpers.py`:
- Around line 32-42: The provider-selection helpers duplicate the same
“configured and not excluded” filtering logic; update
`_first_configured_llm_provider` and `_first_configured_embedding_provider` to
delegate to `_configured_provider_names` instead of iterating and checking
`configured` themselves. Keep the existing fallback behavior in each helper
(`openai` for LLMs and empty string for embeddings) while using the shared
helper to pick the first matching provider.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: b4953853-00dd-4980-91f3-b5d175f41046
📒 Files selected for processing (3)
src/api/settings/helpers.pysrc/api/settings/langflow_sync.pytests/unit/api/test_langflow_sync_bug_1587.py
Fixes #1587 on main. Ports the reviewed version of this fix from #1932 (approved and merged into release-0.5.1, including @Wallgau's review feedback from that PR) back to main's package layout: the provider-name constants and _configured_provider_names helper land in src/api/settings/helpers.py, and the no-arg fallback's LLM loop lands in src/api/settings/langflow_sync.py. Supersedes the closed #1926, which targeted main but predates the review feedback. The test file is #1932's reviewed test file with only the import path adapted; the 3 LLM-specific tests fail on current main and pass with the fix.
Summary by CodeRabbit