agno 1.8.2__py3-none-any.whl → 2.0.0__py3-none-any.whl

agno/tools/replicate.py

@@ -1,13 +1,14 @@
-import os
 from os import getenv
-from typing import Any, Iterable, Iterator, List, Optional, Union
+from pathlib import Path
+from typing import Any, Iterable, Iterator, List, Optional, Tuple, Union
 from urllib.parse import urlparse
 from uuid import uuid4
 
 from agno.agent import Agent
-from agno.media import ImageArtifact, VideoArtifact
+from agno.media import Image, Video
 from agno.team.team import Team
 from agno.tools import Toolkit
+from agno.tools.function import ToolResult
 from agno.utils.log import logger
 
 try:
@@ -22,83 +23,95 @@ class ReplicateTools(Toolkit):
         self,
         api_key: Optional[str] = None,
         model: str = "minimax/video-01",
+        enable_generate_media: bool = True,
+        all: bool = False,
         **kwargs,
     ):
-        self.api_key = api_key or getenv("REPLICATE_API_TOKEN")
+        self.api_key = api_key or getenv("REPLICATE_API_KEY")
         if not self.api_key:
-            logger.error("REPLICATE_API_TOKEN not set. Please set the REPLICATE_API_TOKEN environment variable.")
+            logger.error("REPLICATE_API_KEY not set. Please set the REPLICATE_API_KEY environment variable.")
         self.model = model
 
         tools: List[Any] = []
-        tools.append(self.generate_media)
+        if all or enable_generate_media:
+            tools.append(self.generate_media)
 
         super().__init__(name="replicate_toolkit", tools=tools, **kwargs)
 
-    def generate_media(self, agent: Union[Agent, Team], prompt: str) -> str:
+    def generate_media(self, agent: Union[Agent, Team], prompt: str) -> ToolResult:
         """
         Use this function to generate an image or a video using a replicate model.
         Args:
             prompt (str): A text description of the content.
         Returns:
-            str: Return a URI to the generated video or image.
+            ToolResult: A ToolResult containing the generated media or error message.
         """
         if not self.api_key:
             logger.error("API key is not set. Please provide a valid API key.")
-            return "API key is not set."
+            return ToolResult(content="API key is not set.")
 
-        outputs = replicate.run(ref=self.model, input={"prompt": prompt})
-        if isinstance(outputs, FileOutput):
-            outputs = [outputs]
-        elif isinstance(outputs, (Iterable, Iterator)) and not isinstance(outputs, str):
-            outputs = list(outputs)
-        else:
-            logger.error(f"Unexpected output type: {type(outputs)}")
-            return f"Unexpected output type: {type(outputs)}"
+        try:
+            outputs = replicate.run(ref=self.model, input={"prompt": prompt})
+            if isinstance(outputs, FileOutput):
+                outputs = [outputs]
+            elif isinstance(outputs, (Iterable, Iterator)) and not isinstance(outputs, str):
+                outputs = list(outputs)
+            else:
+                logger.error(f"Unexpected output type: {type(outputs)}")
+                return ToolResult(content=f"Unexpected output type: {type(outputs)}")
+
+            images = []
+            videos = []
+            results = []
 
-        results = []
-        for output in outputs:
-            if not isinstance(output, FileOutput):
-                logger.error(f"Unexpected output type: {type(output)}")
-                return f"Unexpected output type: {type(output)}"
+            for output in outputs:
+                if not isinstance(output, FileOutput):
+                    logger.error(f"Unexpected output type: {type(output)}")
+                    return ToolResult(content=f"Unexpected output type: {type(output)}")
 
-            result = self._parse_output(agent, output)
-            results.append(result)
-        return "\n".join(results)
+                result_msg, media_artifact = self._parse_output(output)
+                results.append(result_msg)
 
-    def _parse_output(self, agent: Union[Agent, Team], output: FileOutput) -> str:
+                if isinstance(media_artifact, Image):
+                    images.append(media_artifact)
+                elif isinstance(media_artifact, Video):
+                    videos.append(media_artifact)
+
+            content = "\n".join(results)
+            return ToolResult(
+                content=content,
+                images=images if images else None,
+                videos=videos if videos else None,
+            )
+        except Exception as e:
+            logger.error(f"Failed to generate media: {e}")
+            return ToolResult(content=f"Error: {e}")
+
+    def _parse_output(self, output: FileOutput) -> Tuple[str, Union[Image, Video]]:
         """
         Parse the outputs from the replicate model.
         """
         # Parse the URL to extract the file extension
         parsed_url = urlparse(output.url)
         path = parsed_url.path
-        _, ext = os.path.splitext(path)
-        ext = ext.lower()
+        ext = Path(path).suffix.lower()
 
         # Define supported extensions
         image_extensions = {".jpg", ".jpeg", ".png", ".gif", ".bmp", ".tiff", ".webp"}
         video_extensions = {".mp4", ".mov", ".avi", ".mkv", ".flv", ".wmv", ".webm"}
 
         media_id = str(uuid4())
+        artifact: Union[Image, Video]
+        media_type: str
 
         if ext in image_extensions:
-            agent.add_image(
-                ImageArtifact(
-                    id=media_id,
-                    url=output.url,
-                )
-            )
+            artifact = Image(id=media_id, url=output.url)
             media_type = "image"
         elif ext in video_extensions:
-            agent.add_video(
-                VideoArtifact(
-                    id=media_id,
-                    url=output.url,
-                )
-            )
+            artifact = Video(id=media_id, url=output.url)
             media_type = "video"
         else:
             logger.error(f"Unsupported media type with extension '{ext}' for URL: {output.url}")
-            return f"Unsupported media type with extension '{ext}'."
+            raise ValueError(f"Unsupported media type with extension '{ext}'.")
 
-        return f"{media_type.capitalize()} generated successfully at {output.url}"
+        return f"{media_type.capitalize()} generated successfully at {output.url}", artifact

agno/tools/resend.py

@@ -15,6 +15,8 @@ class ResendTools(Toolkit):
         self,
         api_key: Optional[str] = None,
         from_email: Optional[str] = None,
+        enable_send_email: bool = True,
+        all: bool = False,
         **kwargs,
     ):
         self.from_email = from_email
@@ -23,7 +25,8 @@ class ResendTools(Toolkit):
             logger.error("No Resend API key provided")
 
         tools: List[Any] = []
-        tools.append(self.send_email)
+        if all or enable_send_email:
+            tools.append(self.send_email)
 
         super().__init__(name="resend_tools", tools=tools, **kwargs)
 

agno/tools/scrapegraph.py

@@ -1,5 +1,5 @@
 import json
-import os
+from os import getenv
 from typing import Any, List, Optional
 
 from agno.tools import Toolkit
@@ -18,31 +18,32 @@ class ScrapeGraphTools(Toolkit):
     def __init__(
         self,
         api_key: Optional[str] = None,
-        smartscraper: bool = True,
-        markdownify: bool = False,
-        crawl: bool = False,
-        searchscraper: bool = False,
-        agentic_crawler: bool = False,
+        enable_smartscraper: bool = True,
+        enable_markdownify: bool = False,
+        enable_crawl: bool = False,
+        enable_searchscraper: bool = False,
+        enable_agentic_crawler: bool = False,
+        all: bool = False,
         **kwargs,
     ):
-        self.api_key: Optional[str] = api_key or os.getenv("SGAI_API_KEY")
+        self.api_key: Optional[str] = api_key or getenv("SGAI_API_KEY")
         self.client = Client(api_key=self.api_key)
 
         # Start with smartscraper by default
         # Only enable markdownify if smartscraper is False
-        if not smartscraper:
-            markdownify = True
+        if not enable_smartscraper and not all:
+            enable_markdownify = True
 
         tools: List[Any] = []
-        if smartscraper:
+        if enable_smartscraper or all:
             tools.append(self.smartscraper)
-        if markdownify:
+        if enable_markdownify or all:
             tools.append(self.markdownify)
-        if crawl:
+        if enable_crawl or all:
             tools.append(self.crawl)
-        if searchscraper:
+        if enable_searchscraper or all:
             tools.append(self.searchscraper)
-        if agentic_crawler:
+        if enable_agentic_crawler or all:
             tools.append(self.agentic_crawler)
 
         super().__init__(name="scrapegraph_tools", tools=tools, **kwargs)

agno/tools/searxng.py

@@ -14,35 +14,22 @@ class Searxng(Toolkit):
         host: str,
         engines: List[str] = [],
         fixed_max_results: Optional[int] = None,
-        images: bool = False,
-        it: bool = False,
-        map: bool = False,
-        music: bool = False,
-        news: bool = False,
-        science: bool = False,
-        videos: bool = False,
         **kwargs,
     ):
         self.host = host
         self.engines = engines
         self.fixed_max_results = fixed_max_results
 
-        tools: List[Any] = []
-        tools.append(self.search)
-        if images:
-            tools.append(self.image_search)
-        if it:
-            tools.append(self.it_search)
-        if map:
-            tools.append(self.map_search)
-        if music:
-            tools.append(self.music_search)
-        if news:
-            tools.append(self.news_search)
-        if science:
-            tools.append(self.science_search)
-        if videos:
-            tools.append(self.video_search)
+        tools: List[Any] = [
+            self.search,
+            self.image_search,
+            self.it_search,
+            self.map_search,
+            self.music_search,
+            self.news_search,
+            self.science_search,
+            self.video_search,
+        ]
 
         super().__init__(name="searxng", tools=tools, **kwargs)
 

agno/tools/serpapi.py

@@ -15,7 +15,9 @@ class SerpApiTools(Toolkit):
     def __init__(
         self,
         api_key: Optional[str] = None,
-        search_youtube: bool = False,
+        enable_search_google: bool = True,
+        enable_search_youtube: bool = False,
+        all: bool = False,
         **kwargs,
     ):
         self.api_key = api_key or getenv("SERP_API_KEY")
@@ -23,8 +25,9 @@ class SerpApiTools(Toolkit):
             logger.warning("No Serpapi API key provided")
 
         tools: List[Any] = []
-        tools.append(self.search_google)
-        if search_youtube:
+        if all or enable_search_google:
+            tools.append(self.search_google)
+        if all or enable_search_youtube:
             tools.append(self.search_youtube)
 
         super().__init__(name="serpapi_tools", tools=tools, **kwargs)

agno/tools/serper.py

@@ -16,6 +16,11 @@ class SerperTools(Toolkit):
         language: str = "en",
         num_results: int = 10,
         date_range: Optional[str] = None,
+        enable_search: bool = True,
+        enable_search_news: bool = True,
+        enable_search_scholar: bool = True,
+        enable_scrape_webpage: bool = True,
+        all: bool = False,
         **kwargs,
     ):
         """
@@ -38,10 +43,14 @@ class SerperTools(Toolkit):
         self.date_range = date_range
 
         tools: List[Any] = []
-        tools.append(self.search)
-        tools.append(self.search_news)
-        tools.append(self.search_scholar)
-        tools.append(self.scrape_webpage)
+        if all or enable_search:
+            tools.append(self.search)
+        if all or enable_search_news:
+            tools.append(self.search_news)
+        if all or enable_search_scholar:
+            tools.append(self.search_scholar)
+        if all or enable_scrape_webpage:
+            tools.append(self.scrape_webpage)
 
         super().__init__(name="serper_tools", tools=tools, **kwargs)
 

agno/tools/shell.py

@@ -6,13 +6,20 @@ from agno.utils.log import log_debug, log_info, logger
 
 
 class ShellTools(Toolkit):
-    def __init__(self, base_dir: Optional[Union[Path, str]] = None, **kwargs):
+    def __init__(
+        self,
+        base_dir: Optional[Union[Path, str]] = None,
+        enable_run_shell_command: bool = True,
+        all: bool = False,
+        **kwargs,
+    ):
         self.base_dir: Optional[Path] = None
         if base_dir is not None:
             self.base_dir = Path(base_dir) if isinstance(base_dir, str) else base_dir
 
         tools = []
-        tools.append(self.run_shell_command)
+        if all or enable_run_shell_command:
+            tools.append(self.run_shell_command)
 
         super().__init__(name="shell_tools", tools=tools, **kwargs)
 

agno/tools/slack.py

@@ -1,8 +1,8 @@
 import json
-import os
+from os import getenv
 from typing import Any, Dict, List, Optional
 
-from agno.tools.toolkit import Toolkit
+from agno.tools import Toolkit
 from agno.utils.log import logger
 
 try:
@@ -16,25 +16,26 @@ class SlackTools(Toolkit):
     def __init__(
         self,
         token: Optional[str] = None,
-        send_message: bool = True,
-        send_message_thread: bool = True,
-        list_channels: bool = True,
-        get_channel_history: bool = True,
+        enable_send_message: bool = True,
+        enable_send_message_thread: bool = True,
+        enable_list_channels: bool = True,
+        enable_get_channel_history: bool = True,
+        all: bool = False,
         **kwargs,
     ):
-        self.token: Optional[str] = token or os.getenv("SLACK_TOKEN")
+        self.token: Optional[str] = token or getenv("SLACK_TOKEN")
         if self.token is None or self.token == "":
             raise ValueError("SLACK_TOKEN is not set")
         self.client = WebClient(token=self.token)
 
         tools: List[Any] = []
-        if send_message:
+        if enable_send_message or all:
             tools.append(self.send_message)
-        if send_message_thread:
+        if enable_send_message_thread or all:
             tools.append(self.send_message_thread)
-        if list_channels:
+        if enable_list_channels or all:
             tools.append(self.list_channels)
-        if get_channel_history:
+        if enable_get_channel_history or all:
             tools.append(self.get_channel_history)
 
         super().__init__(name="slack", tools=tools, **kwargs)

agno/tools/sleep.py

@@ -5,9 +5,10 @@ from agno.utils.log import log_info
 
 
 class SleepTools(Toolkit):
-    def __init__(self, **kwargs):
+    def __init__(self, enable_sleep: bool = True, all: bool = False, **kwargs):
         tools = []
-        tools.append(self.sleep)
+        if all or enable_sleep:
+            tools.append(self.sleep)
 
         super().__init__(name="sleep", tools=tools, **kwargs)
 

agno/tools/spider.py

@@ -7,16 +7,33 @@ except ImportError:
 
 from typing import Any, List, Optional
 
-from agno.tools.toolkit import Toolkit
+from agno.tools import Toolkit
 from agno.utils.log import log_info, logger
 
 
 class SpiderTools(Toolkit):
+    """
+    Spider is a toolkit for web searching, scraping, and crawling.
+
+    Args:
+        enable_search (bool): Enable web search functionality. Default is True.
+        enable_scrape (bool): Enable web scraping functionality. Default is True.
+        enable_crawl (bool): Enable web crawling functionality. Default is True.
+        all (bool): Enable all tools. Overrides individual flags when True. Default is False.
+        max_results (Optional[int]): Default maximum number of results.
+        url (Optional[str]): Default URL for operations.
+        optional_params (Optional[dict]): Additional parameters for operations.
+    """
+
     def __init__(
         self,
         max_results: Optional[int] = None,
         url: Optional[str] = None,
         optional_params: Optional[dict] = None,
+        enable_search: bool = True,
+        enable_scrape: bool = True,
+        enable_crawl: bool = True,
+        all: bool = False,
         **kwargs,
     ):
         self.max_results = max_results
@@ -24,9 +41,12 @@ class SpiderTools(Toolkit):
         self.optional_params = optional_params or {}
 
         tools: List[Any] = []
-        tools.append(self.search)
-        tools.append(self.scrape)
-        tools.append(self.crawl)
+        if enable_search or all:
+            tools.append(self.search)
+        if enable_scrape or all:
+            tools.append(self.scrape)
+        if enable_crawl or all:
+            tools.append(self.crawl)
 
         super().__init__(name="spider", tools=tools, **kwargs)
 

agno/tools/sql.py

@@ -25,9 +25,10 @@ class SQLTools(Toolkit):
         schema: Optional[str] = None,
         dialect: Optional[str] = None,
         tables: Optional[Dict[str, Any]] = None,
-        list_tables: bool = True,
-        describe_table: bool = True,
-        run_sql_query: bool = True,
+        enable_list_tables: bool = True,
+        enable_describe_table: bool = True,
+        enable_run_sql_query: bool = True,
+        all: bool = False,
         **kwargs,
     ):
         # Get the database engine
@@ -53,11 +54,11 @@ class SQLTools(Toolkit):
         self.tables: Optional[Dict[str, Any]] = tables
 
         tools: List[Any] = []
-        if list_tables:
+        if enable_list_tables or all:
             tools.append(self.list_tables)
-        if describe_table:
+        if enable_describe_table or all:
             tools.append(self.describe_table)
-        if run_sql_query:
+        if enable_run_sql_query or all:
             tools.append(self.run_sql_query)
 
         super().__init__(name="sql_tools", tools=tools, **kwargs)

agno/tools/tavily.py

@@ -15,12 +15,13 @@ class TavilyTools(Toolkit):
     def __init__(
         self,
         api_key: Optional[str] = None,
-        search: bool = True,
+        enable_search: bool = True,
+        enable_search_context: bool = False,
+        all: bool = False,
         max_tokens: int = 6000,
         include_answer: bool = True,
         search_depth: Literal["basic", "advanced"] = "advanced",
         format: Literal["json", "markdown"] = "markdown",
-        use_search_context: bool = False,
         **kwargs,
     ):
         self.api_key = api_key or getenv("TAVILY_API_KEY")
@@ -34,8 +35,9 @@ class TavilyTools(Toolkit):
         self.format: Literal["json", "markdown"] = format
 
         tools: List[Any] = []
-        if search:
-            if use_search_context:
+
+        if enable_search or all:
+            if enable_search_context:
                 tools.append(self.web_search_with_tavily)
             else:
                 tools.append(self.web_search_using_tavily)

agno/tools/telegram.py

@@ -1,4 +1,4 @@
-import os
+from os import getenv
 from typing import Any, List, Optional, Union
 
 import httpx
@@ -10,15 +10,23 @@ from agno.utils.log import log_debug, logger
 class TelegramTools(Toolkit):
     base_url = "https://api.telegram.org"
 
-    def __init__(self, chat_id: Union[str, int], token: Optional[str] = None, **kwargs):
-        self.token = token or os.getenv("TELEGRAM_TOKEN")
+    def __init__(
+        self,
+        chat_id: Union[str, int],
+        token: Optional[str] = None,
+        enable_send_message: bool = True,
+        all: bool = False,
+        **kwargs,
+    ):
+        self.token = token or getenv("TELEGRAM_TOKEN")
         if not self.token:
             logger.error("TELEGRAM_TOKEN not set. Please set the TELEGRAM_TOKEN environment variable.")
 
         self.chat_id = chat_id
 
         tools: List[Any] = []
-        tools.append(self.send_message)
+        if all or enable_send_message:
+            tools.append(self.send_message)
 
         super().__init__(name="telegram", tools=tools, **kwargs)
 

agno/tools/todoist.py

@@ -1,5 +1,5 @@
 import json
-import os
+from os import getenv
 from typing import Any, Dict, List, Optional
 
 from agno.tools import Toolkit
@@ -17,48 +17,28 @@ class TodoistTools(Toolkit):
     def __init__(
         self,
         api_token: Optional[str] = None,
-        create_task: bool = True,
-        get_task: bool = True,
-        update_task: bool = True,
-        close_task: bool = True,
-        delete_task: bool = True,
-        get_active_tasks: bool = True,
-        get_projects: bool = True,
         **kwargs,
     ):
         """Initialize the Todoist toolkit.
 
         Args:
             api_token: Optional Todoist API token. If not provided, will look for TODOIST_API_TOKEN env var
-            create_task: Whether to register the create_task function
-            get_task: Whether to register the get_task function
-            update_task: Whether to register the update_task function
-            close_task: Whether to register the close_task function
-            delete_task: Whether to register the delete_task function
-            get_active_tasks: Whether to register the get_active_tasks function
-            get_projects: Whether to register the get_projects function
         """
-        self.api_token = api_token or os.getenv("TODOIST_API_TOKEN")
+        self.api_token = api_token or getenv("TODOIST_API_TOKEN")
         if not self.api_token:
             raise ValueError("TODOIST_API_TOKEN not set. Please set the TODOIST_API_TOKEN environment variable.")
 
         self.api = TodoistAPI(self.api_token)
 
-        tools: List[Any] = []
-        if create_task:
-            tools.append(self.create_task)
-        if get_task:
-            tools.append(self.get_task)
-        if update_task:
-            tools.append(self.update_task)
-        if close_task:
-            tools.append(self.close_task)
-        if delete_task:
-            tools.append(self.delete_task)
-        if get_active_tasks:
-            tools.append(self.get_active_tasks)
-        if get_projects:
-            tools.append(self.get_projects)
+        tools: List[Any] = [
+            self.create_task,
+            self.get_task,
+            self.update_task,
+            self.close_task,
+            self.delete_task,
+            self.get_active_tasks,
+            self.get_projects,
+        ]
 
         super().__init__(name="todoist", tools=tools, **kwargs)
 

agno/tools/toolkit.py

@@ -131,7 +131,7 @@ class Toolkit:
                 requires_confirmation=tool_name in self.requires_confirmation_tools,
                 external_execution=tool_name in self.external_execution_required_tools,
                 stop_after_tool_call=tool_name in self.stop_after_tool_call_tools,
-                show_result=tool_name in self.show_result_tools,
+                show_result=tool_name in self.show_result_tools or tool_name in self.stop_after_tool_call_tools,
             )
             self.functions[f.name] = f
             log_debug(f"Function: {f.name} registered with {self.name}")