Agent Zero AI framework
Honor configured Browser model preset
Alessandroa0eefe19bd81
diff --git a/plugins/_browser/extensions/python/_functions/agent/Agent/get_chat_model/start/_20_browser_model.py b/plugins/_browser/extensions/python/_functions/agent/Agent/get_chat_model/start/_20_browser_model.pynew file mode 100644index 000000000..de17c4680--- /dev/null+++ b/plugins/_browser/extensions/python/_functions/agent/Agent/get_chat_model/start/_20_browser_model.py@@ -0,0 +1,14 @@+from helpers.extension import Extension+from plugins._browser.helpers.config import (+ browser_model_is_active,+ resolve_browser_model,+)+++class BrowserModelProvider(Extension):+ def execute(self, data: dict = {}, **kwargs):+ if self.agent and browser_model_is_active(self.agent):+ data["result"] = resolve_browser_model(+ self.agent,+ fallback=data.get("result"),+ )diff --git a/plugins/_browser/extensions/python/monologue_end/_20_browser_model.py b/plugins/_browser/extensions/python/monologue_end/_20_browser_model.pynew file mode 100644index 000000000..3a0b42b18--- /dev/null+++ b/plugins/_browser/extensions/python/monologue_end/_20_browser_model.py@@ -0,0 +1,8 @@+from helpers.extension import Extension+from plugins._browser.helpers.config import clear_browser_model+++class BrowserModelCleanup(Extension):+ def execute(self, **kwargs):+ if self.agent:+ clear_browser_model(self.agent)diff --git a/plugins/_browser/helpers/config.py b/plugins/_browser/helpers/config.pyindex 589eeeb31..ea4de4e4b 100644--- a/plugins/_browser/helpers/config.py+++ b/plugins/_browser/helpers/config.py@@ -9,6 +9,7 @@ if TYPE_CHECKING:PLUGIN_NAME = "_browser"MODEL_PRESET_KEY = "model_preset"+BROWSER_MODEL_ACTIVE_KEY = "_browser_model_active"DEFAULT_HOMEPAGE_KEY = "default_homepage"AUTOFOCUS_ACTIVE_PAGE_KEY = "autofocus_active_page"TAB_SCOPE_KEY = "browser_tab_scope"@@ -319,10 +320,34 @@ def resolve_browser_model_selection(}-def resolve_browser_model(agent: "Agent", settings: dict[str, Any] | None = None):+def activate_browser_model(agent: "Agent") -> dict[str, Any]:+ selection = resolve_browser_model_selection(agent=agent)+ agent.set_data(+ BROWSER_MODEL_ACTIVE_KEY,+ selection["selected_preset_name"]+ if selection["source_kind"] == "preset"+ else "",+ )+ return selection+++def clear_browser_model(agent: "Agent") -> None:+ agent.set_data(BROWSER_MODEL_ACTIVE_KEY, "")+++def browser_model_is_active(agent: "Agent") -> bool:+ return bool(agent.get_data(BROWSER_MODEL_ACTIVE_KEY))+++def resolve_browser_model(+ agent: "Agent",+ settings: dict[str, Any] | None = None,+ fallback: Any = None,+):selection = resolve_browser_model_selection(agent=agent, settings=settings)if selection["source_kind"] == "main":- return agent.get_chat_model()+ clear_browser_model(agent)+ return fallback if fallback is not None else agent.get_chat_model()import modelsfrom plugins._model_config.helpers import model_configdiff --git a/plugins/_browser/tools/browser.py b/plugins/_browser/tools/browser.pyindex 10220f028..94773a7a2 100644--- a/plugins/_browser/tools/browser.py+++ b/plugins/_browser/tools/browser.py@@ -10,6 +10,7 @@ from typing import Anyfrom helpers import filesfrom helpers.print_style import PrintStylefrom helpers.tool import Response, Tool+from plugins._browser.helpers.config import activate_browser_modelfrom plugins._browser.helpers.selector import get_tool_runtime@@ -74,6 +75,10 @@ class Browser(Tool):action = "clipboard"else:action = str(action or self.method or "state").strip().lower().replace("-", "_")+ try:+ activate_browser_model(self.agent)+ except Exception as exc:+ PrintStyle.warning(f"Browser model preset could not be activated: {exc}")try:runtime = await get_runtime(self.agent.context.id, agent=self.agent)except Exception as exc:diff --git a/tests/test_browser_agent_regressions.py b/tests/test_browser_agent_regressions.pyindex edf4cd374..c2f1b844a 100644--- a/tests/test_browser_agent_regressions.py+++ b/tests/test_browser_agent_regressions.py@@ -22,6 +22,19 @@ class _TestAgentContext:return None+class _TestAgent:+ pass+++class _TestAgentConfig:+ pass+++class _TestAgentContextType:+ BACKGROUND = "background"+ USER = SimpleNamespace(value="user")++class _TestResponse(SimpleNamespace):def __init__(self, message="", break_loop=False, **kwargs):super().__init__(message=message, break_loop=break_loop, **kwargs)@@ -67,7 +80,15 @@ class _TestWsResult(dict):)-sys.modules.setdefault("agent", SimpleNamespace(AgentContext=_TestAgentContext))+sys.modules.setdefault(+ "agent",+ SimpleNamespace(+ Agent=_TestAgent,+ AgentConfig=_TestAgentConfig,+ AgentContext=_TestAgentContext,+ AgentContextType=_TestAgentContextType,+ ),+)sys.modules.setdefault("helpers.tool", SimpleNamespace(Response=_TestResponse, Tool=_TestTool))sys.modules.setdefault("helpers.ws", SimpleNamespace(WsHandler=_TestWsHandler))sys.modules.setdefault("helpers.ws_manager", SimpleNamespace(WsResult=_TestWsResult))@@ -295,6 +316,47 @@ def test_browser_model_selection_falls_back_to_main_for_missing_preset(monkeypatassert selection["config"] == {"provider": "openrouter", "name": "main/model"}+def test_browser_model_preset_controls_followup_turn_and_clears(monkeypatch):+ import importlib+ import plugins._browser.helpers.config as browser_config_module++ state = {}+ agent = SimpleNamespace(+ set_data=lambda key, value: state.__setitem__(key, value),+ get_data=lambda key: state.get(key),+ )+ monkeypatch.setattr(+ browser_config_module,+ "resolve_browser_model_selection",+ lambda agent=None, settings=None: {+ "source_kind": "preset",+ "selected_preset_name": "Browser",+ },+ )++ browser_config_module.activate_browser_model(agent)+ assert browser_config_module.browser_model_is_active(agent)++ provider_module = importlib.import_module(+ "plugins._browser.extensions.python._functions.agent.Agent.get_chat_model.start._20_browser_model"+ )+ cleanup_module = importlib.import_module(+ "plugins._browser.extensions.python.monologue_end._20_browser_model"+ )+ selected_model = object()+ monkeypatch.setattr(+ provider_module,+ "resolve_browser_model",+ lambda agent, fallback=None: selected_model,+ )+ model_data = {"result": object()}+ provider_module.BrowserModelProvider(agent).execute(data=model_data)+ assert model_data["result"] is selected_model++ cleanup_module.BrowserModelCleanup(agent).execute()+ assert not browser_config_module.browser_model_is_active(agent)++def test_browser_model_preset_options_include_missing_selected(monkeypatch):from plugins._model_config.helpers import model_config