autobyteus 1.0.4__tar.gz → 1.0.6__tar.gz

{autobyteus-1.0.4 → autobyteus-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autobyteus
-Version: 1.0.4
+Version: 1.0.6
 Summary: Multi-Agent framework
 Home-page: https://github.com/AutoByteus/autobyteus
 Author: Ryan Zheng
@@ -28,7 +28,7 @@ Requires-Dist: Jinja2
 Requires-Dist: ollama==0.4.5
 Requires-Dist: mistral_common
 Requires-Dist: aiohttp
-Requires-Dist: autobyteus-llm-client==1.0.9
+Requires-Dist: autobyteus-llm-client==1.1.0
 Requires-Dist: brui-core==1.0.8
 Provides-Extra: dev
 Requires-Dist: coverage; extra == "dev"

{autobyteus-1.0.4 → autobyteus-1.0.6}/autobyteus/agent/agent.py

@@ -223,7 +223,7 @@ class Agent(EventEmitter):
             
         external_tools_section = ""
         for i, tool in enumerate(self.tools):
-            external_tools_section += f"  {i + 1} {tool.tool_usage_xml()}\n\n"
+            external_tools_section += f"  {i + 1} {tool.tool_usage()}\n\n"
         return external_tools_section.strip()
 
     def on_task_completed(self, *args, **kwargs):

{autobyteus-1.0.4 → autobyteus-1.0.6}/autobyteus/agent/message/send_message_to.py

@@ -18,9 +18,6 @@ class SendMessageTo(BaseTool):
         except ValueError as e:
             return f"Error: {str(e)}"
     
-    def tool_usage(self) -> str:
-        return self.tool_usage_xml()
-
     def tool_usage_xml(self) -> str:
         return '''SendMessageTo: Sends a message to another agent in the group. Usage:
     <command name="SendMessageTo">

{autobyteus-1.0.4 → autobyteus-1.0.6}/autobyteus/llm/autobyteus_provider.py

@@ -56,12 +56,13 @@ class AutobyteusModelProvider:
                         value=model_info["value"],
                         provider=LLMProvider(model_info["provider"]),  # Convert string to enum
                         llm_class=AutobyteusLLM,
+                        canonical_name=model_info["canonical_name"],  # Add canonical_name
                         default_config=llm_config
                     )
                     
                     LLMFactory.register_model(llm_model)
                     registered_count += 1
-                    logger.debug(f"Registered model: {model_info['name']}")
+                    logger.debug(f"Registered model: {model_info['name']} with canonical name: {model_info['canonical_name']}")
                     
                 except Exception as e:
                     logger.error(f"Model registration failed: {str(e)}")

{autobyteus-1.0.4 → autobyteus-1.0.6}/autobyteus/llm/llm_factory.py

@@ -98,6 +98,7 @@ class LLMFactory:
                 value="gpt-4o",
                 provider=LLMProvider.OPENAI,
                 llm_class=OpenAILLM,
+                canonical_name="gpt-4o",
                 default_config=LLMConfig(
                     rate_limit=40, 
                     token_limit=8192,
@@ -105,38 +106,32 @@ class LLMFactory:
                 )
             ),
             LLMModel(
-                name="o1_API",
-                value="o1",
+                name="o3_API",
+                value="o3",
                 provider=LLMProvider.OPENAI,
                 llm_class=OpenAILLM,
+                canonical_name="o3",
                 default_config=LLMConfig(
                     pricing_config=TokenPricingConfig(15.00, 60.00)
                 )
             ),
             LLMModel(
-                name="o1_MINI_API",
-                value="o3-mini",
+                name="o4_MINI_API",
+                value="o4-mini",
                 provider=LLMProvider.OPENAI,
                 llm_class=OpenAILLM,
+                canonical_name="o4-mini",
                 default_config=LLMConfig(
                     pricing_config=TokenPricingConfig(1.0, 4.00)
                 )
             ),
-            LLMModel(
-                name="GPT_3_5_TURBO_API",
-                value="gpt-3.5-turbo",
-                provider=LLMProvider.OPENAI,
-                llm_class=OpenAILLM,
-                default_config=LLMConfig(
-                    pricing_config=TokenPricingConfig(1.50, 2.00)
-                )
-            ),
             # MISTRAL Provider Models
             LLMModel(
                 name="MISTRAL_LARGE_API",
                 value="mistral-large-latest",
                 provider=LLMProvider.MISTRAL,
                 llm_class=MistralLLM,
+                canonical_name="mistral-large",
                 default_config=LLMConfig(
                     pricing_config=TokenPricingConfig(2.00, 6.00)
                 )
@@ -147,6 +142,7 @@ class LLMFactory:
                 value="claude-3-7-sonnet-20250219",
                 provider=LLMProvider.ANTHROPIC,
                 llm_class=ClaudeLLM,
+                canonical_name="claude-3.7",
                 default_config=LLMConfig(
                     pricing_config=TokenPricingConfig(3.00, 15.00)
                 )
@@ -156,6 +152,7 @@ class LLMFactory:
                 value="anthropic.claude-3-7-sonnet-20250219-v1:0",
                 provider=LLMProvider.ANTHROPIC,
                 llm_class=ClaudeLLM,
+                canonical_name="claude-3.7",
                 default_config=LLMConfig(
                     pricing_config=TokenPricingConfig(3.00, 15.00)
                 )
@@ -166,6 +163,7 @@ class LLMFactory:
                 value="deepseek-chat",
                 provider=LLMProvider.DEEPSEEK,
                 llm_class=DeepSeekLLM,
+                canonical_name="deepseek-chat",
                 default_config=LLMConfig(
                     rate_limit=60,
                     token_limit=8000,
@@ -178,6 +176,7 @@ class LLMFactory:
                 value="deepseek-reasoner",
                 provider=LLMProvider.DEEPSEEK,
                 llm_class=DeepSeekLLM,
+                canonical_name="deepseek-reasoner",
                 default_config=LLMConfig(
                     rate_limit=60,
                     token_limit=8000,
@@ -190,6 +189,7 @@ class LLMFactory:
                 value="gemini-1-5-pro",
                 provider=LLMProvider.GEMINI,
                 llm_class=OpenAILLM,
+                canonical_name="gemini-1.5-pro",
                 default_config=LLMConfig(
                     pricing_config=TokenPricingConfig(1.25, 5.00)
                 )
@@ -199,6 +199,7 @@ class LLMFactory:
                 value="gemini-1-5-flash",
                 provider=LLMProvider.GEMINI,
                 llm_class=OpenAILLM,
+                canonical_name="gemini-1.5-flash",
                 default_config=LLMConfig(
                     pricing_config=TokenPricingConfig(0.075, 0.30)
                 )
@@ -209,6 +210,7 @@ class LLMFactory:
                 value="grok-2-1212",
                 provider=LLMProvider.GROK,
                 llm_class=GrokLLM,
+                canonical_name="grok-2",
                 default_config=LLMConfig(
                     rate_limit=60,
                     token_limit=8000,
@@ -290,3 +292,21 @@ class LLMFactory:
         """
         LLMFactory.ensure_initialized()
         return LLMFactory._models_by_provider.get(provider, [])
+
+    @staticmethod
+    def get_canonical_name(model_name: str) -> Optional[str]:
+        """
+        Get the canonical name for a model by its name.
+        
+        Args:
+            model_name (str): The model name (e.g., "GPT_4o_API")
+            
+        Returns:
+            Optional[str]: The canonical name if found, None otherwise
+        """
+        LLMFactory.ensure_initialized()
+        for models in LLMFactory._models_by_provider.values():
+            for model_instance in models:
+                if model_instance.name == model_name:
+                    return model_instance.canonical_name
+        return None

{autobyteus-1.0.4 → autobyteus-1.0.6}/autobyteus/llm/models.py

@@ -13,6 +13,7 @@ class LLMModel:
     Represents a single model's metadata:
       - name (str): A human-readable label, e.g. "GPT-4 Official" 
       - value (str): A unique identifier used in code or APIs, e.g. "gpt-4o"
+      - canonical_name (str): A shorter, standardized reference name for prompts, e.g. "gpt-4o" or "claude-3.7"
       - provider (LLMProvider): The provider enum 
       - llm_class (Type[BaseLLM]): Which Python class to instantiate 
       - default_config (LLMConfig): Default configuration (token limit, etc.)
@@ -26,6 +27,7 @@ class LLMModel:
         value: str,
         provider: LLMProvider,
         llm_class: Type["BaseLLM"],
+        canonical_name: str,
         default_config: Optional[LLMConfig] = None
     ):
         # Validate name doesn't already exist as a class attribute
@@ -36,6 +38,7 @@ class LLMModel:
             
         self._name = name
         self._value = value
+        self._canonical_name = canonical_name
         self.provider = provider
         self.llm_class = llm_class
         self.default_config = default_config if default_config else LLMConfig()
@@ -58,6 +61,14 @@ class LLMModel:
         """
         return self._value
 
+    @property
+    def canonical_name(self) -> str:
+        """
+        A standardized, shorter reference name for this model.
+        Useful for prompt engineering and cross-referencing similar models.
+        """
+        return self._canonical_name
+
     def create_llm(self, custom_config: Optional[LLMConfig] = None) -> "BaseLLM":
         """
         Instantiate the LLM class for this model, applying
@@ -69,5 +80,6 @@ class LLMModel:
     def __repr__(self):
         return (
             f"LLMModel(name='{self._name}', value='{self._value}', "
+            f"canonical_name='{self._canonical_name}', "
             f"provider='{self.provider.name}', llm_class='{self.llm_class.__name__}')"
         )

{autobyteus-1.0.4 → autobyteus-1.0.6}/autobyteus/llm/ollama_provider.py

@@ -79,6 +79,7 @@ class OllamaModelProvider:
                         value=model_name,
                         provider=LLMProvider.OLLAMA,
                         llm_class=OllamaLLM,
+                        canonical_name=model_name,  # Use model_name as the canonical_name
                         default_config=LLMConfig(
                             rate_limit=60,
                             token_limit=8192,

{autobyteus-1.0.4 → autobyteus-1.0.6}/autobyteus/tools/ask_user_input.py

@@ -12,27 +12,16 @@ class AskUserInput(BaseTool):
         super().__init__()
         self.logger = logging.getLogger(__name__)
 
-    def tool_usage(self):
+    @classmethod
+    def tool_usage_xml(cls):
         """
-        Return a string describing the usage of the AskUserInput tool.
+        Return an XML string describing the usage of the AskUserInput tool.
+
+        Returns:
+            str: An XML description of how to use the AskUserInput tool.
         """
-        return '''AskUserInput: Requests input from the user based on LLM's prompt. 
-        Usage: <<<AskUserInput(request="[Your request here]")>>>
-        
-        Examples:
-        1. When needing to request user for search input:
-           <<<AskUserInput(request="What would you like to search for?")>>>
-        
-        2. When needing to request user for form input:
-           <<<AskUserInput(request="Please enter your full name:")>>>
-        
-        3. When needing to request user for a choice:
-           <<<AskUserInput(request="Select an option (1, 2, or 3):")>>>
-        '''
-
-    def tool_usage_xml(self):
         return '''AskUserInput: Requests input from the user based on a given context or prompt. 
-    <command name="AskUserInput"
+    <command name="AskUserInput">
     <arg name="request">[Your request here]</arg>
     </command>
 
@@ -90,4 +79,4 @@ class AskUserInput(BaseTool):
         except Exception as e:
             error_message = f"An error occurred while getting user input: {str(e)}"
             self.logger.error(error_message)
-            return f"[Error: {error_message}]"
+            return f"[Error: {error_message}]"

autobyteus-1.0.6/autobyteus/tools/base_tool.py

@@ -0,0 +1,77 @@
+# File: autobyteus/tools/base_tool.py
+
+import logging
+from abc import ABC, abstractmethod
+from typing import Optional, Any
+
+from autobyteus.events.event_emitter import EventEmitter
+from autobyteus.events.event_types import EventType
+
+from .tool_meta import ToolMeta
+
+logger = logging.getLogger('autobyteus')
+
+class BaseTool(ABC, EventEmitter, metaclass=ToolMeta):
+    """
+    Abstract base class for all tools, with auto-registration via ToolMeta.
+
+    Subclasses inherit a default `get_name` (the class name) and MUST implement
+    the abstract class method `tool_usage_xml`, and the abstract instance
+    method `_execute`.
+    """
+    def __init__(self):
+        super().__init__()
+        self.agent_id: Optional[str] = None
+        logger.debug(f"BaseTool instance initializing for potential class {self.__class__.__name__}")
+
+    @classmethod
+    def get_name(cls) -> str:
+        """
+        Return the name of the tool. Defaults to the class name.
+        Can be overridden by child classes if a different registration name is needed.
+        """
+        return cls.__name__
+    
+    @classmethod
+    def tool_usage_xml(cls) -> str:
+        """
+        Return the static usage description string for the tool in XML format.
+        Must be implemented by subclasses.
+        """
+        pass
+
+    def set_agent_id(self, agent_id: str):
+        """Sets the ID of the agent using this tool instance."""
+        self.agent_id = agent_id
+        logger.debug(f"Agent ID '{agent_id}' set for tool instance '{self.__class__.get_name()}'")
+
+    async def execute(self, **kwargs):
+        """
+        Execute the tool's main functionality by calling _execute.
+        Argument validation must be handled within _execute.
+        """
+        tool_name = self.__class__.get_name()
+        logger.info(f"Executing tool '{tool_name}' for agent '{self.agent_id}' with args: {kwargs}")
+        try:
+            result = await self._execute(**kwargs)
+            logger.info(f"Tool '{tool_name}' execution completed successfully.")
+            return result
+        except Exception as e:
+            logger.error(f"Tool '{tool_name}' execution failed: {str(e)}", exc_info=True)
+            return f"Error executing tool '{tool_name}': {str(e)}"
+
+    @abstractmethod
+    async def _execute(self, **kwargs) -> Any:
+        """
+        Implement the actual execution logic in subclasses.
+        MUST handle own argument validation.
+        """
+        pass
+
+    @classmethod
+    def tool_usage(cls) -> str:
+        """
+        Returns the tool's static XML usage description by calling the class method tool_usage_xml.
+        This is a convenience class method.
+        """
+        return cls.tool_usage_xml()

{autobyteus-1.0.4 → autobyteus-1.0.6}/autobyteus/tools/bash/bash_executor.py

@@ -27,20 +27,8 @@ class BashExecutor(BaseTool):
         """
         super().__init__()
 
-    def tool_usage(self):
-        """
-        Return a string describing the usage of the BashExecutor tool.
-
-        Returns:
-            str: A description of how to use the BashExecutor tool.
-        """
-        return (
-            'BashExecutor: Executes bash commands and retrieves their output. '
-            'Usage: <<<BashExecutor(command="bash command")>>>, '
-            'where "bash command" is a string containing the command to be executed.'
-        )
-
-    def tool_usage_xml(self):
+    @classmethod
+    def tool_usage_xml(cls):
         """
         Return an XML string describing the usage of the BashExecutor tool.
 
@@ -100,4 +88,4 @@ class BashExecutor(BaseTool):
         except Exception as e:
             logger.exception(f"An error occurred while executing the command: {str(e)}")
             self.emit(EventType.TOOL_EXECUTION_FAILED, str(e))
-            raise
+            raise

{autobyteus-1.0.4 → autobyteus-1.0.6}/autobyteus/tools/browser/session_aware/browser_session_aware_navigate_to.py

@@ -13,10 +13,14 @@ class BrowserSessionAwareNavigateTo(BrowserSessionAwareTool):
     def get_name(self) -> str:
         return "NavigateTo"
 
-    def tool_usage(self):
-        return "NavigateTo: Navigates to a specified website. Usage: <<<NavigateTo(webpage_url='https://example.com')>>>, where 'https://example.com' is the URL of the website to navigate to."
+    @classmethod
+    def tool_usage_xml(cls):
+        """
+        Return an XML string describing the usage of the NavigateTo tool.
 
-    def tool_usage_xml(self):
+        Returns:
+            str: An XML description of how to use the NavigateTo tool.
+        """
         return '''
         NavigateTo: Navigates to a specified website. Usage:
         <command name="NavigateTo">
@@ -58,4 +62,4 @@ class BrowserSessionAwareNavigateTo(BrowserSessionAwareTool):
             result = urlparse(url)
             return all([result.scheme, result.netloc])
         except ValueError:
-            return False
+            return False

{autobyteus-1.0.4 → autobyteus-1.0.6}/autobyteus/tools/browser/session_aware/browser_session_aware_web_element_trigger.py

@@ -14,46 +14,14 @@ class BrowserSessionAwareWebElementTrigger(BrowserSessionAwareTool):
     def get_name(self) -> str:
         return "WebElementTrigger"
     
-    def tool_usage(self):
-        return """WebElementTrigger: Triggers actions on web elements on web pages, takes a screenshot, and returns the absolute path of the screenshot.
-    Usage: <<<WebElementTrigger(webpage_url='url', css_selector='selector', action='action', params='<param><name>param_name</name><value>param_value</value></param>')>>>
-
-    Parameters:
-    - webpage_url: String. URL of the webpage to interact with.
-    - css_selector: String. CSS selector to find the target element.
-    - action: String. Type of interaction to perform on the element. Must be one of: 
-      {', '.join(str(action) for action in WebElementAction)}
-    - params: String. XML-formatted string containing additional parameters for specific actions.
-
-    Common actions and their parameters:
-    1. click: No additional params required.
-    2. type: Requires 'text' param. Example: <param><name>text</name><value>Hello, World!</value></param>
-    3. select: Requires 'option' param. Example: <param><name>option</name><value>option1</value></param>
-    4. check: Optional 'state' param (default: true). Example: <param><name>state</name><value>false</value></param>
-    5. submit: No additional params required.
-    6. hover: No additional params required.
-    7. double_click: No additional params required.
-
-    Return Value:
-    - String: Absolute path to the screenshot taken after the action is performed.
-      The screenshot is saved in the current working directory with the filename format:
-      'screenshot_<action>_<timestamp>.png'
-
-    Examples:
-    1. Typing in a search box:
-      <<<WebElementTrigger(webpage_url='https://example.com', css_selector='#search-input', action='type', params='<param><name>text</name><value>Python tutorial</value></param>')>>>
-      Returns: '/path/to/screenshot_type_20230615_120530.png'
-
-    2. Selecting an option from a dropdown:
-      <<<WebElementTrigger(webpage_url='https://example.com', css_selector='#country-select', action='select', params='<param><name>option</name><value>USA</value></param>')>>>
-      Returns: '/path/to/screenshot_select_20230615_120545.png'
-
-    3. Clicking a button:
-      <<<WebElementTrigger(webpage_url='https://example.com', css_selector='.submit-button', action='click')>>>
-      Returns: '/path/to/screenshot_click_20230615_120600.png'
-    """
-
-    def tool_usage_xml(self):
+    @classmethod
+    def tool_usage_xml(cls):
+        """
+        Return an XML string describing the usage of the WebElementTrigger tool.
+
+        Returns:
+            str: An XML description of how to use the WebElementTrigger tool.
+        """
         return f'''WebElementTrigger: Triggers actions on web elements on web pages, takes a screenshot, and returns the absolute path of the screenshot.
     <command name="WebElementTrigger">
       <arg name="webpage_url">url</arg>
@@ -76,12 +44,9 @@ class BrowserSessionAwareWebElementTrigger(BrowserSessionAwareTool):
 
     Common actions and their parameters:
     1. click: No additional params required.
-    2. type: Requires 'text' param. 
-       Example: <param><name>text</name><value>Hello, World!</value></param>
-    3. select: Requires 'option' param. 
-       Example: <param><name>option</name><value>option1</value></param>
-    4. check: Optional 'state' param (default: true). 
-       Example: <param><name>state</name><value>false</value></param>
+    2. type: Requires 'text' param. Example: <param><name>text</name><value>Hello, World!</value></param>
+    3. select: Requires 'option' param. Example: <param><name>option</name><value>option1</value></param>
+    4. check: Optional 'state' param (default: true). Example: <param><name>state</name><value>false</value></param>
     5. submit: No additional params required.
     6. hover: No additional params required.
     7. double_click: No additional params required.
@@ -174,12 +139,6 @@ class BrowserSessionAwareWebElementTrigger(BrowserSessionAwareTool):
             raise ValueError(f"Unsupported action: {action}")
 
         # Take screenshot after action
-        #timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-        #screenshot_filename = f"screenshot_{action}_{timestamp}.png"
-        #screenshot_path = os.path.join(os.getcwd(), screenshot_filename)
-        #await shared_session.page.screenshot(path=screenshot_path, full_page=True)
-        #absolute_screenshot_path = os.path.abspath(screenshot_path)
-        #return absolute_screenshot_path
         return "The WebElementTrigger command is executed"
 
     def _parse_params(self, params_str):
@@ -187,7 +146,6 @@ class BrowserSessionAwareWebElementTrigger(BrowserSessionAwareTool):
             return {}
         
         try:
-            # Wrap the params string in a root element to make it valid XML
             xml_string = f"<root>{params_str}</root>"
             root = ET.fromstring(xml_string)
             params = {}
@@ -198,5 +156,4 @@ class BrowserSessionAwareWebElementTrigger(BrowserSessionAwareTool):
                     params[name_elem.text] = value_elem.text
             return params
         except ET.ParseError:
-            # If parsing fails, return an empty dict
-            return {}
+            return {}

{autobyteus-1.0.4 → autobyteus-1.0.6}/autobyteus/tools/browser/session_aware/browser_session_aware_webpage_reader.py

@@ -12,11 +12,15 @@ class BrowserSessionAwareWebPageReader(BrowserSessionAwareTool):
     def get_name(self) -> str:
         return "WebPageReader"
 
-    def tool_usage(self):
-        return 'WebPageReader: Reads and cleans the HTML content from a given webpage. Usage: <<<WebPageReader(webpage_url="url_to_read")>>>, where "url_to_read" is a string containing the URL of the webpage to read the content from.'
+    @classmethod
+    def tool_usage_xml(cls):
+        """
+        Return an XML string describing the usage of the WebPageReader tool.
 
-    def tool_usage_xml(self):
-        return '''WebPageReader: Reads the HTML content from a given webpage. Usage:
+        Returns:
+            str: An XML description of how to use the WebPageReader tool.
+        """
+        return '''WebPageReader: Reads and cleans the HTML content from a given webpage. Usage:
 <command name="WebPageReader">
   <arg name="webpage_url">url_to_read</arg>
 </command>
@@ -26,4 +30,4 @@ where "url_to_read" is a string containing the URL of the webpage to read the co
     async def perform_action(self, shared_session: SharedBrowserSession, **kwargs):
         page_content = await shared_session.page.content()
         cleaned_content = clean(page_content, self.cleaning_mode)
-        return cleaned_content
+        return cleaned_content

{autobyteus-1.0.4 → autobyteus-1.0.6}/autobyteus/tools/browser/session_aware/browser_session_aware_webpage_screenshot_taker.py

@@ -11,10 +11,14 @@ class BrowserSessionAwareWebPageScreenshotTaker(BrowserSessionAwareTool):
     def get_name(self) -> str:
         return "WebPageScreenshotTaker"
 
-    def tool_usage(self):
-        return "WebPageScreenshotTaker: Takes a screenshot of a given webpage and saves it to the specified file. Usage: <<<WebPageScreenshotTaker(webpage_url='url_to_screenshot', file_name='screenshot_file_name')>>>, where 'url_to_screenshot' is a string containing the URL of the webpage to take a screenshot of, and 'screenshot_file_name' is the name of the file to save the screenshot (including extension, e.g., 'screenshot.png'). Optionally, 'screenshot_file_name' can include a relative path (e.g., 'images/screenshot.png'). Returns the absolute file path of the saved screenshot."
+    @classmethod
+    def tool_usage_xml(cls):
+        """
+        Return an XML string describing the usage of the WebPageScreenshotTaker tool.
 
-    def tool_usage_xml(self):
+        Returns:
+            str: An XML description of how to use the WebPageScreenshotTaker tool.
+        """
         return '''WebPageScreenshotTaker: Takes a screenshot of a given webpage and saves it to the specified file. Usage:
 <command name="WebPageScreenshotTaker">
   <arg name="webpage_url">url_to_screenshot</arg>
@@ -31,4 +35,4 @@ Returns the absolute file path of the saved screenshot.
 
         await shared_session.page.screenshot(path=file_name, full_page=True)
         absolute_path = os.path.abspath(file_name)
-        return absolute_path
+        return absolute_path

{autobyteus-1.0.4 → autobyteus-1.0.6}/autobyteus/tools/browser/standalone/google_search_ui.py

@@ -46,15 +46,13 @@ class GoogleSearch(BaseTool, UIIntegrator):
         self.text_area_selector = 'textarea[name="q"]'
         self.cleaning_mode = cleaning_mode
 
-    def tool_usage(self):
-        """
-        Return a string describing the usage of the GoogleSearch tool.
-        """
-        return 'GoogleSearch: Searches the internet for information. Usage: <<<GoogleSearch(query="search query")>>>, where "search query" is a string.'
-
-    def tool_usage_xml(self):
+    @classmethod
+    def tool_usage_xml(cls):
         """
         Return an XML string describing the usage of the GoogleSearch tool.
+
+        Returns:
+            str: An XML description of how to use the GoogleSearch tool.
         """
         return '''GoogleSearch: Searches the internet for information. Usage:
     <command name="GoogleSearch">
@@ -64,45 +62,21 @@ class GoogleSearch(BaseTool, UIIntegrator):
     '''
 
     async def _execute(self, **kwargs):
-        """
-        Perform a Google search using Playwright and return the search results.
-
-        This method initializes the Playwright browser, navigates to Google, performs the search,
-        and retrieves the results. After initialization, self.page is available as a Playwright
-        page object for interacting with the web browser.
-
-        Args:
-            **kwargs: Keyword arguments containing the search query. The query should be specified as 'query'.
-
-        Returns:
-            str: A string containing the cleaned HTML of the search results.
-
-        Raises:
-            ValueError: If the 'query' keyword argument is not specified.
-        """
         query = kwargs.get('query')
         if not query:
             raise ValueError("The 'query' keyword argument must be specified.")
 
-        # Call the initialize method from the UIIntegrator class to set up the Playwright browser
         await self.initialize()
-        # After initialization, self.page is now available as a Playwright page object
-
         await self.page.goto('https://www.google.com/')
 
-        # Find the search box element, type in the search query, and press the Enter key
         textarea = self.page.locator(self.text_area_selector)
         await textarea.click()
         await self.page.type(self.text_area_selector, query)
         await self.page.keyboard.press('Enter')
         await self.page.wait_for_load_state()
 
-        # Wait for the search results to load
-        # Wait for the search results to load, we didnt use main because main will contain a lot of base64 encoded images. This will consume a lot of tokens.
-        #search_result_div = await self.page.wait_for_selector('div.main', state="visible", timeout=10000)
         search_result_div = await self.page.wait_for_selector('#search', state="visible", timeout=10000)
         await asyncio.sleep(2)
-        # Get the content of the div
         search_result = await search_result_div.inner_html()
         cleaned_search_result = clean(search_result, mode=self.cleaning_mode)
         await self.close()
@@ -110,4 +84,4 @@ class GoogleSearch(BaseTool, UIIntegrator):
                   <GoogleSearchResultStart>
                         {cleaned_search_result}
                   </GoogleSearchResultEnd>
-                '''
+                '''