Personal AI, On Personal Devices
Python
fix(cli): resolve --research planner model from config instead of gemma4:31b (#1016)
K Karthik10da8ae31ebd
diff --git a/src/openjarvis/cli/ask.py b/src/openjarvis/cli/ask.pyindex 58d0170b..6e94b041 100644--- a/src/openjarvis/cli/ask.py+++ b/src/openjarvis/cli/ask.py@@ -15,7 +15,7 @@ from rich.table import Tablefrom openjarvis.cli._banner import print_bannerfrom openjarvis.cli._tool_names import resolve_tool_namesfrom openjarvis.cli.hints import hint_no_engine-from openjarvis.core.config import load_config+from openjarvis.core.config import JarvisConfig, load_configfrom openjarvis.core.events import EventBus, EventTypefrom openjarvis.core.types import Message, Rolefrom openjarvis.engine import (@@ -53,6 +53,23 @@ LOCAL_ENGINES = {}+def _resolve_research_model(model_name: str | None, config: JarvisConfig | None) -> str:+ """Pick the planner model for ``jarvis ask --research``.++ Mirrors the server's ``_resolve_planner_config`` order: explicit ``-m``,+ then ``[deep_research].model``, then the config default model, and only+ then the legacy ``gemma4:31b`` fallback. Before this the CLI jumped+ straight to the legacy fallback, which 404s on any install that never+ pulled gemma4.+ """+ from openjarvis.agents.research_loop import DEFAULT_PLANNER_MODEL++ candidates = [model_name]+ if config is not None:+ candidates += [config.deep_research.model, config.intelligence.default_model]+ return next((m for m in candidates if m), DEFAULT_PLANNER_MODEL)++def _run_research(*,query_text: str,@@ -61,6 +78,7 @@ def _run_research(knowledge_db: str | None,output_json: bool,console: Console,+ config: JarvisConfig | None = None,) -> None:"""Run the hybrid-search research loop and print the result to the console.@@ -72,7 +90,7 @@ def _run_research(from rich.markdown import Markdownfrom rich.theme import Theme- from openjarvis.agents.research_loop import DEFAULT_PLANNER_MODEL, ResearchAgent+ from openjarvis.agents.research_loop import ResearchAgentfrom openjarvis.connectors.embeddings import OllamaEmbedderfrom openjarvis.connectors.hybrid_search import HybridSearchfrom openjarvis.connectors.store import KnowledgeStore@@ -113,7 +131,7 @@ def _run_research()embedder = None- planner_model = model_name or DEFAULT_PLANNER_MODEL+ planner_model = _resolve_research_model(model_name, config)logger.debug("research: planner_model=%s", planner_model)# ---- Output styling --------------------------------------------------@@ -927,6 +945,7 @@ def ask(knowledge_db=knowledge_db,output_json=output_json,console=console,+ config=config,)returndiff --git a/tests/cli/test_ask_research_model.py b/tests/cli/test_ask_research_model.pynew file mode 100644index 00000000..66e02c96--- /dev/null+++ b/tests/cli/test_ask_research_model.py@@ -0,0 +1,35 @@+"""Tests for the ``jarvis ask --research`` planner-model resolution."""++from __future__ import annotations++from openjarvis.agents.research_loop import DEFAULT_PLANNER_MODEL+from openjarvis.cli.ask import _resolve_research_model+from openjarvis.core.config import JarvisConfig+++def test_explicit_model_flag_wins() -> None:+ config = JarvisConfig()+ config.deep_research.model = "dr-model"+ config.intelligence.default_model = "cfg-model"+ assert _resolve_research_model("cli-model", config) == "cli-model"+++def test_deep_research_section_beats_default_model() -> None:+ config = JarvisConfig()+ config.deep_research.model = "dr-model"+ config.intelligence.default_model = "cfg-model"+ assert _resolve_research_model(None, config) == "dr-model"+++def test_config_default_model_used_when_no_override() -> None:+ """The bug: a configured default model must not be ignored for gemma4."""+ config = JarvisConfig()+ config.intelligence.default_model = "qwen3.5:2b"+ assert _resolve_research_model(None, config) == "qwen3.5:2b"+++def test_legacy_fallback_when_nothing_configured() -> None:+ config = JarvisConfig()+ config.intelligence.default_model = ""+ assert _resolve_research_model(None, config) == DEFAULT_PLANNER_MODEL+ assert _resolve_research_model(None, None) == DEFAULT_PLANNER_MODEL