waldiez 0.5.3__py3-none-any.whl → 0.5.5__py3-none-any.whl

waldiez/models/tool/predefined/_tavily.py

@@ -62,7 +62,7 @@ class TavilySearchToolImpl(PredefinedTool):
         list[str]
             List of missing required secrets.
         """
-        missing = []
+        missing: list[str] = []
         if not secrets.get("TAVILY_API_KEY"):
             missing.append("TAVILY_API_KEY")
         return missing
@@ -101,14 +101,51 @@ class TavilySearchToolImpl(PredefinedTool):
         os.environ["TAVILY_API_KEY"] = secrets.get(
             "TAVILY_API_KEY", os.environ.get("TAVILY_API_KEY", "")
         )
-        content = f"""
-tavily_api_key = os.environ.get("TAVILY_API_KEY", "")
-if not tavily_api_key:
-    raise ValueError("TAVILY_API_KEY is required for Tavily search tool.")
-{self.name} = TavilySearchTool(
-    tavily_api_key=tavily_api_key,
-)
-"""
+        content = f'''
+def {self.name}(
+    query: str,
+    tavily_api_key: str = os.environ.get("TAVILY_API_KEY", ""),
+    search_depth: str = "basic",
+    topic: str = "general",
+    include_answer: str = "basic",
+    include_raw_content: bool = False,
+    include_domains: list[str] = [],
+    num_results: int = 5,
+) -> list[dict[str, Any]]:
+    """Performs a search using the Tavily API and returns formatted results.
+
+            Args:
+                query: The search query string.
+                tavily_api_key: The API key for Tavily (injected dependency).
+                search_depth: The depth of the search ('basic' or 'advanced'). Defaults to "basic".
+                include_answer: Whether to include an AI-generated answer ('basic' or 'advanced'). Defaults to "basic".
+                include_raw_content: Whether to include raw content in the results. Defaults to False.
+                include_domains: A list of domains to include in the search. Defaults to [].
+                num_results: The maximum number of results to return. Defaults to 5.
+
+            Returns:
+                A list of dictionaries, each containing 'title', 'link', and 'snippet' of a search result.
+
+            Raises:
+                ValueError: If the Tavily API key is not available.
+    """
+    tavily_api_key = os.environ.get("TAVILY_API_KEY", "")
+    if not tavily_api_key:
+        raise ValueError("TAVILY_API_KEY is required for Tavily search tool.")
+    {self.name}_tool = TavilySearchTool(
+        tavily_api_key=tavily_api_key,
+    )
+    return {self.name}_tool(
+        query=query,
+        tavily_api_key=tavily_api_key,
+        search_depth=search_depth,
+        topic=topic,
+        include_answer=include_answer,
+        include_raw_content=include_raw_content,
+        include_domains=include_domains,
+        num_results=num_results,
+    )
+'''
         return content
 
 

waldiez/models/tool/predefined/_wikipedia.py

@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
+# pylint: disable=line-too-long
+# flake8: noqa: E501
 """Predefined Wikipedia search tool for Waldiez."""
 
 from typing import Any
@@ -84,11 +86,11 @@ class WikipediaSearchToolImpl(PredefinedTool):
         list[str]
             List of missing required keyword arguments.
         """
-        for key, _ in self.kwargs.items():
+        for key, value in self.kwargs.items():
             if key in kwargs:
-                type_of = self.required_kwargs.get(key, str)
+                type_of = self.kwargs_types.get(key, str)
                 try:
-                    casted = type_of(kwargs[key])
+                    casted = type_of(value)
                     if key in self.kwargs:
                         self.kwargs[key] = casted
                 except Exception:  # pylint: disable=broad-except
@@ -111,10 +113,28 @@ class WikipediaSearchToolImpl(PredefinedTool):
         str
             Content of the tool.
         """
-        content = f"{self.name} = WikipediaQueryRunTool(\n"
+        content = f'''
+def {self.name}(query: str, language: str = "en", top_k: int = 3, verbose: bool = False) -> Union[list[str], str]:
+    """Search Wikipedia for a given query and return results.
+
+    Args:
+        query: The search query string.
+        language: The language to search in (default: "en").
+        top_k: The number of top results to return (default: 3).
+        verbose: Whether to include additional information in the results (default: False).
+
+    Returns
+    -------
+        Union[list[str], str]: A list of search results or a message if no results found.
+    """
+    tool = WikipediaQueryRunTool(
+'''
         for key, value in self.kwargs.items():
-            content += f"    {key}={value!r},\n"
-        content += ")\n"
+            content += f"       {key}={value!r},\n"
+        content += "    )\n"
+        content += """
+    return tool(query=query)
+"""
         return content
 
 

waldiez/models/tool/predefined/_youtube.py

@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0.
 # Copyright (c) 2024 - 2025 Waldiez and contributors.
+# pylint: disable=line-too-long
+# flake8: noqa: E501
 """Predefined YouTube search tool for Waldiez."""
 
 import os
@@ -100,14 +102,40 @@ class YouTubeSearchToolImpl(PredefinedTool):
             The content for the tool.
         """
         os.environ["YOUTUBE_API_KEY"] = secrets.get("YOUTUBE_API_KEY", "")
-        content = f"""
-youtube_api_key = os.environ.get("YOUTUBE_API_KEY", "")
-if not youtube_api_key:
-    raise ValueError("YOUTUBE_API_KEY is required for YouTube search tool.")
-{self.name} = YoutubeSearchTool(
-    youtube_api_key=youtube_api_key,
-)
-"""
+        content = f'''
+def {self.name}(
+    query: str,
+    youtube_api_key: str = os.environ.get("YOUTUBE_API_KEY", ""),
+    max_results: int = 5,
+    include_video_details: bool = True,
+) -> list[dict[str, Any]]:
+    """Perform a YouTube search and return formatted results.
+
+    Args:
+        query: The search query string.
+        youtube_api_key: The API key for the YouTube Data API.
+        max_results: The maximum number of results to return. Defaults to 5.
+        include_video_details: Whether to include detailed video information. Defaults to True.
+
+    Returns:
+        A list of dictionaries of the search results.
+
+    Raises:
+        ValueError: If YOUTUBE_API_KEY is not set or if the search fails.
+    """
+    youtube_api_key = os.environ.get("YOUTUBE_API_KEY", "")
+    if not youtube_api_key:
+        raise ValueError("YOUTUBE_API_KEY is required for YouTube search tool.")
+    youtube_search_tool = YoutubeSearchTool(
+        youtube_api_key=youtube_api_key,
+    )
+    return youtube_search_tool(
+        query=query,
+        youtube_api_key=youtube_api_key,
+        max_results=max_results,
+        include_video_details=include_video_details,
+    )
+'''
         return content
 
 

waldiez/models/tool/predefined/registry.py

@@ -3,7 +3,10 @@
 """Predefined tools registry for Waldiez."""
 
 from ._config import PredefinedToolConfig
+from ._duckduckgo import DuckDuckGoSearchConfig
 from ._google import GoogleSearchConfig
+from ._perplexity import PerplexitySearchConfig
+from ._searxng import SearxNGSearchConfig
 from ._tavily import TavilySearchConfig
 from ._wikipedia import WikipediaSearchConfig
 from ._youtube import YouTubeSearchConfig
@@ -13,6 +16,9 @@ PREDEFINED_TOOLS: dict[str, PredefinedToolConfig] = {
     WikipediaSearchConfig.name: WikipediaSearchConfig,
     YouTubeSearchConfig.name: YouTubeSearchConfig,
     TavilySearchConfig.name: TavilySearchConfig,
+    DuckDuckGoSearchConfig.name: DuckDuckGoSearchConfig,
+    PerplexitySearchConfig.name: PerplexitySearchConfig,
+    SearxNGSearchConfig.name: SearxNGSearchConfig,
 }
 
 

waldiez/models/waldiez.py

@@ -163,6 +163,11 @@ class Waldiez:
         """Check if the flow has RAG agents."""
         return any(agent.is_rag_user for agent in self.agents)
 
+    @property
+    def has_doc_agents(self) -> bool:
+        """Check if the flow has document agents."""
+        return any(agent.is_doc_agent for agent in self.agents)
+
     @property
     def has_multimodal_agents(self) -> bool:
         """Check if the flow has multimodal agents."""
@@ -277,6 +282,13 @@ class Waldiez:
         if self.has_captain_agents:  # pragma: no branch
             captain_extras = get_captain_agent_extra_requirements()
             requirements.update(captain_extras)
+        for doc_agent in self.flow.data.agents.docAgents:
+            requirements.update(
+                doc_agent.get_llm_requirements(
+                    ag2_version=autogen_version,
+                    all_models=list(self.models),
+                )
+            )
         requirements.update(
             get_models_extra_requirements(
                 self.models,