Agent Zero AI framework
browser-use intervention hack
frdelcd82c448ae59
diff --git a/README.md b/README.mdindex 6ba7407d2..2311d0c2a 100644--- a/README.md+++ b/README.md@@ -4,7 +4,8 @@# `Agent Zero`-[](https://www.skool.com/agent-zero) [](https://discord.gg/B8KZKNsPpj) [](https://www.youtube.com/@AgentZeroFW) [](https://www.linkedin.com/in/jan-tomasek/) [](https://x.com/JanTomasekDev)+[](https://github.com/sponsors/frdel) [](https://www.skool.com/agent-zero) [](https://discord.gg/B8KZKNsPpj) [](https://www.youtube.com/@AgentZeroFW) [](https://www.linkedin.com/in/jan-tomasek/) [](https://x.com/JanTomasekDev)+[Installation](./docs/installation.md) •[How to update](./docs/installation.md#how-to-update-agent-zero) •diff --git a/docs/res/favicon.png b/docs/res/favicon.pngnew file mode 100644index 000000000..f34f92463Binary files /dev/null and b/docs/res/favicon.png differdiff --git a/docs/res/favicon_round.png b/docs/res/favicon_round.pngnew file mode 100644index 000000000..4fc7e8833Binary files /dev/null and b/docs/res/favicon_round.png differdiff --git a/python/extensions/message_loop_prompts/.gitkeep b/python/extensions/message_loop_prompts/.gitkeepnew file mode 100644index 000000000..e69de29bbdiff --git a/python/extensions/message_loop_start/.gitkeep b/python/extensions/message_loop_start/.gitkeepnew file mode 100644index 000000000..e69de29bbdiff --git a/python/extensions/message_loop_start/_10_iteration_no.py b/python/extensions/message_loop_start/_10_iteration_no.pynew file mode 100644index 000000000..82b1951c3--- /dev/null+++ b/python/extensions/message_loop_start/_10_iteration_no.py@@ -0,0 +1,14 @@+from python.helpers.extension import Extension+from agent import Agent, LoopData++DATA_NAME_ITER_NO = "iteration_no"++class IterationNo(Extension):+ async def execute(self, loop_data: LoopData = LoopData(), **kwargs):+ # total iteration number+ no = self.agent.get_data(DATA_NAME_ITER_NO) or 0+ self.agent.set_data(DATA_NAME_ITER_NO, no + 1)+++def get_iter_no(agent: Agent) -> int:+ return agent.get_data(DATA_NAME_ITER_NO) or 0\ No newline at end of filediff --git a/python/extensions/monologue_end/.gitkeep b/python/extensions/monologue_end/.gitkeepnew file mode 100644index 000000000..e69de29bbdiff --git a/python/extensions/system_prompt/.gitkeep b/python/extensions/system_prompt/.gitkeepnew file mode 100644index 000000000..e69de29bbdiff --git a/python/tools/browser_agent.py b/python/tools/browser_agent.pyindex 64d326c22..b55a730c0 100644--- a/python/tools/browser_agent.py+++ b/python/tools/browser_agent.py@@ -1,13 +1,14 @@import asyncioimport jsonimport time-from agent import Agent+from agent import Agent, InterventionExceptionimport modelsfrom python.helpers.tool import Tool, Responsefrom python.helpers import dirty_json, files, rfc_exchange, defer, strings, persist_chatfrom python.helpers.print_style import PrintStylefrom python.helpers.browser_use import browser_use+from python.extensions.message_loop_start._10_iteration_no import get_iter_nofrom pydantic import BaseModelimport uuid@@ -24,6 +25,8 @@ class State:self.task = Noneself.use_agent = Noneself.browser = None+ self.iter_no = 0+def __del__(self):self.kill_task()@@ -42,6 +45,9 @@ class State:# Await the coroutine to get the browser contextself.context = await self.browser.new_context()+ # override async methods to create hooks+ self.override_hooks()+# Add init script to the context - this will be applied to all new pagesawait self.context._initialize_session()pw_context = self.context.session.context # type: ignore@@ -68,6 +74,7 @@ class State:self.context = Noneself.use_agent = Noneself.browser = None+ self.iter_no = 0async def _run_task(self, task: str):@@ -117,9 +124,34 @@ class State:system_prompt_class=CustomSystemPrompt,controller=controller,)++ self.iter_no = get_iter_no(self.agent)++ # orig_err_hnd = self.use_agent._handle_step_error+ # def new_err_hnd(*args, **kwargs):+ # if isinstance(args[0], InterventionException):+ # raise args[0]+ # return orig_err_hnd(*args, **kwargs)+ # self.use_agent._handle_step_error = new_err_hnd+result = await self.use_agent.run()return result+ def override_hooks(self):+ # override async function to create a hook+ def override_hook(func):+ async def wrapper(*args, **kwargs):+ await self.agent.wait_if_paused()+ if self.iter_no != get_iter_no(self.agent):+ raise InterventionException("Task cancelled")+ return await func(*args, **kwargs)+ return wrapper++ if self.context:+ self.context.get_state = override_hook(self.context.get_state)+ self.context.get_session = override_hook(self.context.get_session)+ self.context.remove_highlights = override_hook(self.context.remove_highlights)+async def get_page(self):if self.use_agent:return await self.use_agent.browser_context.get_current_page()@@ -150,8 +182,11 @@ class BrowserAgent(Tool):# collect resultresult = await task.result()answer = result.final_result()- answer_data = dirty_json.DirtyJson.parse_string(answer)- answer_text = strings.dict_to_text(answer_data) # type: ignore+ try:+ answer_data = dirty_json.DirtyJson.parse_string(answer)+ answer_text = strings.dict_to_text(answer_data) # type: ignore+ except Exception as e:+ answer_text = answerself.log.update(answer=answer_text)return Response(message=answer, break_loop=False)diff --git a/webui/index.html b/webui/index.htmlindex 635b0c4d2..cb800a7df 100644--- a/webui/index.html+++ b/webui/index.html@@ -457,7 +457,7 @@<div :class="{'field': true, 'field-full': field.type === 'textarea'}"><div class="field-label"><div class="field-title" x-text="field.title"></div>- <div class="field-description" x-html="field.description"></div>+ <div class="field-description" x-html="field.description || ''"></div></div><div class="field-control">diff --git a/webui/public/favicon_round.svg b/webui/public/favicon_round.svgnew file mode 100644index 000000000..82c069665--- /dev/null+++ b/webui/public/favicon_round.svg@@ -0,0 +1,15 @@+<?xml version="1.0" encoding="UTF-8" standalone="no"?>+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">+<svg width="100%" height="100%" viewBox="0 0 960 960" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">+ <g transform="matrix(1.07993,0,0,1.07993,-76.6057,-32.2424)">+ <circle cx="515.545" cy="474.371" r="442.821" style="fill:rgb(1,4,26);"/>+ </g>+ <g transform="matrix(1,0,0,1,0,-61.814)">+ <g transform="matrix(1.03321,0,0,1.03321,-15.9385,-15.938)">+ <path d="M717.77,788.27C638.99,652.89 559.87,516.92 479.15,378.22C399.29,516.59 320.58,652.95 241.99,789.12L120,789.12C239.91,581.87 479.49,170.89 479.49,170.89C479.49,170.89 720.12,580.92 840,788.27L717.77,788.27Z" style="fill:white;fill-rule:nonzero;"/>+ </g>+ <g transform="matrix(1.03321,0,0,1.03321,-15.9385,-15.938)">+ <path d="M633.08,788.85L323.54,788.85C344.15,753.01 364.09,718.33 383.88,683.93L574.1,683.93C593.38,718.23 612.57,752.36 633.08,788.85Z" style="fill:white;fill-rule:nonzero;"/>+ </g>+ </g>+</svg>