code-puppy 0.0.182__py3-none-any.whl → 0.0.184__py3-none-any.whl

code_puppy/agents/base_agent.py

@@ -33,7 +33,7 @@ from code_puppy.config import (
     get_global_model_name,
     get_protected_token_count,
     get_value,
-    load_mcp_server_configs,
+    load_mcp_server_configs, get_message_limit,
 )
 from code_puppy.mcp_ import ServerConfig, get_mcp_manager
 from code_puppy.messaging import (
@@ -729,6 +729,63 @@ class BaseAgent(ABC):
         manager = get_mcp_manager()
         return manager.get_servers_for_agent()
 
+    def _load_model_with_fallback(
+        self,
+        requested_model_name: str,
+        models_config: Dict[str, Any],
+        message_group: str,
+    ) -> Tuple[Any, str]:
+        """Load the requested model, applying a friendly fallback when unavailable."""
+        try:
+            model = ModelFactory.get_model(requested_model_name, models_config)
+            return model, requested_model_name
+        except ValueError as exc:
+            available_models = list(models_config.keys())
+            available_str = (
+                ", ".join(sorted(available_models))
+                if available_models
+                else "no configured models"
+            )
+            emit_warning(
+                (
+                    f"[yellow]Model '{requested_model_name}' not found. "
+                    f"Available models: {available_str}[/yellow]"
+                ),
+                message_group=message_group,
+            )
+
+            fallback_candidates: List[str] = []
+            global_candidate = get_global_model_name()
+            if global_candidate:
+                fallback_candidates.append(global_candidate)
+
+            for candidate in available_models:
+                if candidate not in fallback_candidates:
+                    fallback_candidates.append(candidate)
+
+            for candidate in fallback_candidates:
+                if not candidate or candidate == requested_model_name:
+                    continue
+                try:
+                    model = ModelFactory.get_model(candidate, models_config)
+                    emit_info(
+                        f"[bold cyan]Using fallback model: {candidate}[/bold cyan]",
+                        message_group=message_group,
+                    )
+                    return model, candidate
+                except ValueError:
+                    continue
+
+            friendly_message = (
+                "No valid model could be loaded. Update the model configuration or set "
+                "a valid model with `config set`."
+            )
+            emit_error(
+                f"[bold red]{friendly_message}[/bold red]",
+                message_group=message_group,
+            )
+            raise ValueError(friendly_message) from exc
+
     def reload_code_generation_agent(self, message_group: Optional[str] = None):
         """Force-reload the pydantic-ai Agent based on current config and model."""
         from code_puppy.tools import register_tools_for_agent
@@ -743,7 +800,11 @@ class BaseAgent(ABC):
             message_group=message_group,
         )
         models_config = ModelFactory.load_config()
-        model = ModelFactory.get_model(model_name, models_config)
+        model, resolved_model_name = self._load_model_with_fallback(
+            model_name,
+            models_config,
+            message_group,
+        )
 
         emit_info(
             f"[bold magenta]Loading Agent: {self.name}[/bold magenta]",
@@ -786,7 +847,7 @@ class BaseAgent(ABC):
         register_tools_for_agent(p_agent, agent_tools)
 
         self._code_generation_agent = p_agent
-        self._last_model_name = model_name
+        self._last_model_name = resolved_model_name
         # expose for run_with_mcp
         self.pydantic_agent = p_agent
         return self._code_generation_agent
@@ -806,7 +867,7 @@ class BaseAgent(ABC):
         self.message_history_processor(ctx, _message_history)
         return self.get_message_history()
 
-    async def run_with_mcp(self, prompt: str, usage_limits=None, **kwargs) -> Any:
+    async def run_with_mcp(self, prompt: str, **kwargs) -> Any:
         """
         Run the agent with MCP servers and full cancellation support.
 
@@ -832,6 +893,7 @@ class BaseAgent(ABC):
                 self.set_message_history(
                     self.prune_interrupted_tool_calls(self.get_message_history())
                 )
+                usage_limits = pydantic_ai.agent._usage.UsageLimits(request_limit=get_message_limit())
                 result_ = await pydantic_agent.run(
                     prompt,
                     message_history=self.get_message_history(),

{code_puppy-0.0.182.dist-info → code_puppy-0.0.184.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.182
+Version: 0.0.184
 Summary: Code generation agent
 Project-URL: repository, https://github.com/mpfaffenberger/code_puppy
 Project-URL: HomePage, https://github.com/mpfaffenberger/code_puppy

{code_puppy-0.0.182.dist-info → code_puppy-0.0.184.dist-info}/RECORD

@@ -26,7 +26,7 @@ code_puppy/agents/agent_qa_expert.py,sha256=wCGXzuAVElT5c-QigQVb8JX9Gw0JmViCUQQn
 code_puppy/agents/agent_qa_kitten.py,sha256=5PeFFSwCFlTUvP6h5bGntx0xv5NmRwBiw0HnMqY8nLI,9107
 code_puppy/agents/agent_security_auditor.py,sha256=ADafi2x4gqXw6m-Nch5vjiKjO0Urcbj0x4zxHti3gDw,3712
 code_puppy/agents/agent_typescript_reviewer.py,sha256=EDY1mFkVpuJ1BPXsJFu2wQ2pfAV-90ipc_8w9ymrKPg,4054
-code_puppy/agents/base_agent.py,sha256=MFyC4YSxlQ1xzQRBnSXgtyO7XPpHZuSJVzRATU8j7J0,36992
+code_puppy/agents/base_agent.py,sha256=lIHy3j5lN6_u6gAMbKFVPo1pODz7-BoxIRjqwim2so0,39426
 code_puppy/agents/json_agent.py,sha256=KPS1q-Rr3b5ekem4i3wtu8eLJRDd5nSPiZ8duJ_tn0U,4630
 code_puppy/command_line/__init__.py,sha256=y7WeRemfYppk8KVbCGeAIiTuiOszIURCDjOMZv_YRmU,45
 code_puppy/command_line/command_handler.py,sha256=JeJo6kc9-4B7S0_pbMp1LO7jtAT6XMXtSSnOShfoG-Y,27237
@@ -119,9 +119,9 @@ code_puppy/tui/screens/help.py,sha256=eJuPaOOCp7ZSUlecearqsuX6caxWv7NQszUh0tZJjB
 code_puppy/tui/screens/mcp_install_wizard.py,sha256=vObpQwLbXjQsxmSg-WCasoev1usEi0pollKnL0SHu9U,27693
 code_puppy/tui/screens/settings.py,sha256=-WLldnKyWVKUYVPJcfOn1UU6eP9t8lLPUAVI317SOOM,10685
 code_puppy/tui/screens/tools.py,sha256=3pr2Xkpa9Js6Yhf1A3_wQVRzFOui-KDB82LwrsdBtyk,1715
-code_puppy-0.0.182.data/data/code_puppy/models.json,sha256=iXmLZGflnQcu2DRh4WUlgAhoXdvoxUc7KBhB8YxawXM,3088
-code_puppy-0.0.182.dist-info/METADATA,sha256=W7GR68g_PVcOx0lC0bvdIH8mdmN5mkBgmYnQsqVjELY,20079
-code_puppy-0.0.182.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-code_puppy-0.0.182.dist-info/entry_points.txt,sha256=Tp4eQC99WY3HOKd3sdvb22vZODRq0XkZVNpXOag_KdI,91
-code_puppy-0.0.182.dist-info/licenses/LICENSE,sha256=31u8x0SPgdOq3izJX41kgFazWsM43zPEF9eskzqbJMY,1075
-code_puppy-0.0.182.dist-info/RECORD,,
+code_puppy-0.0.184.data/data/code_puppy/models.json,sha256=iXmLZGflnQcu2DRh4WUlgAhoXdvoxUc7KBhB8YxawXM,3088
+code_puppy-0.0.184.dist-info/METADATA,sha256=ZkHxBwyThIm0dxsILQI4NS_KiDOeKOwYFhR-cjCbSTE,20079
+code_puppy-0.0.184.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+code_puppy-0.0.184.dist-info/entry_points.txt,sha256=Tp4eQC99WY3HOKd3sdvb22vZODRq0XkZVNpXOag_KdI,91
+code_puppy-0.0.184.dist-info/licenses/LICENSE,sha256=31u8x0SPgdOq3izJX41kgFazWsM43zPEF9eskzqbJMY,1075
+code_puppy-0.0.184.dist-info/RECORD,,