ag2 0.9.6__py3-none-any.whl → 0.9.8.post1__py3-none-any.whl

autogen/tools/experimental/searxng/searxng_search.py

@@ -1,13 +1,12 @@
 # Copyright (c) 2023 - 2025, AG2ai, Inc., AG2ai open-source projects maintainers and core contributors
 #
 # SPDX-License-Identifier: Apache-2.0
-"""
-SearxNG Search Tool
+"""SearxNG Search Tool
 A simple tool to perform web searches using a SearxNG instance.
 """
 
 import logging
-from typing import Annotated, Any, List, Optional
+from typing import Annotated, Any
 
 import requests
 
@@ -20,18 +19,19 @@ logger = logging.getLogger(__name__)
 def _execute_searxng_query(
     query: str,
     max_results: int = 5,
-    categories: Optional[List[str]] = None,
-    language: Optional[str] = None,
+    categories: list[str] | None = None,
+    language: str | None = None,
     base_url: str = "https://searxng.site/search",
 ) -> list[dict[str, Any]]:
-    """
-    Execute a search query using a SearxNG instance.
+    """Execute a search query using a SearxNG instance.
+
     Args:
         query (str): The search query string.
         max_results (int, optional): The maximum number of results to return. Defaults to 5.
         categories (Optional[List[str]]): List of categories to search in.
         language (Optional[str]): Language code.
         base_url (str): SearxNG instance URL.
+
     Returns:
         list[dict[str, Any]]: A list of search results from SearxNG.
     """
@@ -64,18 +64,19 @@ def _execute_searxng_query(
 def _searxng_search(
     query: str,
     max_results: int = 5,
-    categories: Optional[List[str]] = None,
-    language: Optional[str] = None,
+    categories: list[str] | None = None,
+    language: str | None = None,
     base_url: str = "https://searxng.site/search",
 ) -> list[dict[str, Any]]:
-    """
-    Perform a SearxNG search and format the results.
+    """Perform a SearxNG search and format the results.
+
     Args:
         query (str): The search query string.
         max_results (int, optional): The maximum number of results to return. Defaults to 5.
         categories (Optional[List[str]]): List of categories to search in.
         language (Optional[str]): Language code.
         base_url (str): SearxNG instance URL.
+
     Returns:
         list[dict[str, Any]]: A list of dictionaries with 'title', 'link', and 'snippet'.
     """
@@ -95,16 +96,15 @@ def _searxng_search(
 
 @export_module("autogen.tools.experimental")
 class SearxngSearchTool(Tool):
-    """
-    SearxngSearchTool is a tool that uses SearxNG to perform a search.
+    """SearxngSearchTool is a tool that uses SearxNG to perform a search.
 
     This tool allows agents to leverage the SearxNG search engine for information retrieval.
     SearxNG does not require an API key by default, making it easy to use.
     """
 
     def __init__(self, base_url: str = "https://searxng.site/search") -> None:
-        """
-        Initializes the SearxngSearchTool.
+        """Initializes the SearxngSearchTool.
+
         Args:
             base_url (str): The SearxNG instance URL.
         """
@@ -119,16 +119,17 @@ class SearxngSearchTool(Tool):
         self,
         query: Annotated[str, "The search query."],
         max_results: Annotated[int, "The number of results to return."] = 5,
-        categories: Annotated[Optional[List[str]], "List of categories to search in."] = None,
-        language: Annotated[Optional[str], "Language code (e.g., 'en-US')."] = None,
+        categories: Annotated[list[str] | None, "List of categories to search in."] = None,
+        language: Annotated[str | None, "Language code (e.g., 'en-US')."] = None,
     ) -> list[dict[str, Any]]:
-        """
-        Performs a search using the SearxNG API and returns formatted results.
+        """Performs a search using the SearxNG API and returns formatted results.
+
         Args:
             query: The search query string.
             max_results: The maximum number of results to return. Defaults to 5.
             categories: List of categories to search in.
             language: Language code.
+
         Returns:
             A list of dictionaries, each containing 'title', 'link', and 'snippet' of a search result.
         """

autogen/tools/experimental/tavily/tavily_search.py

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 import os
-from typing import Annotated, Any, Optional, Union
+from typing import Annotated, Any
 
 from ....doc_utils import export_module
 from ....import_utils import optional_import_block, require_optional_import
@@ -30,8 +30,7 @@ def _execute_tavily_query(
     include_domains: list[str] = [],
     num_results: int = 5,
 ) -> Any:
-    """
-    Execute a search query using the Tavily API.
+    """Execute a search query using the Tavily API.
 
     Args:
         query (str): The search query string.
@@ -68,8 +67,7 @@ def _tavily_search(
     include_domains: list[str] = [],
     num_results: int = 5,
 ) -> list[dict[str, Any]]:
-    """
-    Perform a Tavily search and format the results.
+    """Perform a Tavily search and format the results.
 
     This function takes search parameters, executes the query using `_execute_tavily_query`,
     and formats the results into a list of dictionaries containing title, link, and snippet.
@@ -107,8 +105,7 @@ def _tavily_search(
 
 @export_module("autogen.tools.experimental")
 class TavilySearchTool(Tool):
-    """
-    TavilySearchTool is a tool that uses the Tavily Search API to perform a search.
+    """TavilySearchTool is a tool that uses the Tavily Search API to perform a search.
 
     This tool allows agents to leverage the Tavily search engine for information retrieval.
     It requires a Tavily API key, which can be provided during initialization or set as
@@ -118,11 +115,8 @@ class TavilySearchTool(Tool):
         tavily_api_key (str): The API key used for authenticating with the Tavily API.
     """
 
-    def __init__(
-        self, *, llm_config: Optional[Union[LLMConfig, dict[str, Any]]] = None, tavily_api_key: Optional[str] = None
-    ):
-        """
-        Initializes the TavilySearchTool.
+    def __init__(self, *, llm_config: LLMConfig | dict[str, Any] | None = None, tavily_api_key: str | None = None):
+        """Initializes the TavilySearchTool.
 
         Args:
             llm_config (Optional[Union[LLMConfig, dict[str, Any]]]): LLM configuration. (Currently unused but kept for potential future integration).
@@ -139,15 +133,14 @@ class TavilySearchTool(Tool):
 
         def tavily_search(
             query: Annotated[str, "The search query."],
-            tavily_api_key: Annotated[Optional[str], Depends(on(self.tavily_api_key))],
-            search_depth: Annotated[Optional[str], "Either 'advanced' or 'basic'"] = "basic",
-            include_answer: Annotated[Optional[str], "Either 'advanced' or 'basic'"] = "basic",
-            include_raw_content: Annotated[Optional[bool], "Include the raw contents"] = False,
-            include_domains: Annotated[Optional[list[str]], "Specific web domains to search"] = [],
+            tavily_api_key: Annotated[str | None, Depends(on(self.tavily_api_key))],
+            search_depth: Annotated[str | None, "Either 'advanced' or 'basic'"] = "basic",
+            include_answer: Annotated[str | None, "Either 'advanced' or 'basic'"] = "basic",
+            include_raw_content: Annotated[bool | None, "Include the raw contents"] = False,
+            include_domains: Annotated[list[str] | None, "Specific web domains to search"] = [],
             num_results: Annotated[int, "The number of results to return."] = 5,
         ) -> list[dict[str, Any]]:
-            """
-            Performs a search using the Tavily API and returns formatted results.
+            """Performs a search using the Tavily API and returns formatted results.
 
             Args:
                 query: The search query string.

autogen/tools/experimental/web_search_preview/web_search_preview.py

@@ -6,7 +6,7 @@
 import copy
 import logging
 import os
-from typing import Annotated, Any, Literal, Optional, Type, Union
+from typing import Annotated, Any, Literal
 
 from pydantic import BaseModel
 
@@ -29,11 +29,11 @@ class WebSearchPreviewTool(Tool):
     def __init__(
         self,
         *,
-        llm_config: Union[LLMConfig, dict[str, Any]],
+        llm_config: LLMConfig | dict[str, Any],
         search_context_size: Literal["low", "medium", "high"] = "medium",
-        user_location: Optional[dict[str, str]] = None,
-        instructions: Optional[str] = None,
-        text_format: Optional[Type[BaseModel]] = None,
+        user_location: dict[str, str] | None = None,
+        instructions: str | None = None,
+        text_format: type[BaseModel] | None = None,
     ):
         """Initialize the WebSearchPreviewTool.
 
@@ -85,7 +85,7 @@ class WebSearchPreviewTool(Tool):
 
         def web_search_preview(
             query: Annotated[str, "The search query. Add all relevant context to the query."],
-        ) -> Union[str, Optional[BaseModel]]:
+        ) -> str | BaseModel | None:
             client = OpenAI()
 
             if not self.text_format:
@@ -95,7 +95,13 @@ class WebSearchPreviewTool(Tool):
                     input=query,
                     instructions=self.instructions,
                 )
-                return response.output_text
+                text = []
+                for output in response.output:
+                    if output.type == "message":
+                        for content in output.content:
+                            if content.type == "output_text":
+                                text.append(content.text)
+                return "\n".join(text)
 
             else:
                 response = client.responses.parse(

autogen/tools/experimental/wikipedia/wikipedia.py

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-from typing import Any, Optional, Union
+from typing import Any
 
 import requests
 from pydantic import BaseModel
@@ -102,7 +102,7 @@ class WikipediaClient:
         search_data = data.get("query", {}).get("search", [])
         return search_data
 
-    def get_page(self, title: str) -> Optional[Any]:
+    def get_page(self, title: str) -> Any | None:
         """Retrieve a WikipediaPage object by title.
 
         Args:
@@ -158,7 +158,7 @@ class WikipediaQueryRunTool(Tool):
             func_or_tool=self.query_run,
         )
 
-    def query_run(self, query: str) -> Union[list[str], str]:
+    def query_run(self, query: str) -> list[str] | str:
         """Search Wikipedia and return formatted page summaries.
 
         Truncates `query` to MAX_QUERY_LENGTH before searching.
@@ -194,8 +194,7 @@ class WikipediaQueryRunTool(Tool):
 
 @require_optional_import(["wikipediaapi"], "wikipedia")
 class WikipediaPageLoadTool(Tool):
-    """
-    A tool to load up to N characters of Wikipedia page content along with metadata.
+    """A tool to load up to N characters of Wikipedia page content along with metadata.
 
     This tool uses a language-specific Wikipedia client to search for relevant articles
     and returns a list of Document objects containing truncated page content and metadata
@@ -212,8 +211,7 @@ class WikipediaPageLoadTool(Tool):
     """
 
     def __init__(self, language: str = "en", top_k: int = 3, truncate: int = 4000, verbose: bool = False) -> None:
-        """
-        Initializes the WikipediaPageLoadTool with configurable language, result count, and content length.
+        """Initializes the WikipediaPageLoadTool with configurable language, result count, and content length.
 
         Args:
             language (str): The language code for the Wikipedia edition (default is "en").
@@ -240,9 +238,8 @@ class WikipediaPageLoadTool(Tool):
             func_or_tool=self.content_search,
         )
 
-    def content_search(self, query: str) -> Union[list[Document], str]:
-        """
-        Executes a Wikipedia search and returns page content plus metadata.
+    def content_search(self, query: str) -> list[Document] | str:
+        """Executes a Wikipedia search and returns page content plus metadata.
 
         Args:
             query (str): The search term to query Wikipedia.

autogen/tools/function_utils.py

@@ -7,14 +7,14 @@
 import functools
 import inspect
 import json
+from collections.abc import Callable
 from logging import getLogger
-from typing import Annotated, Any, Callable, ForwardRef, Optional, TypeVar, Union
+from typing import Annotated, Any, ForwardRef, Literal, TypeVar, get_args, get_origin
 
 from packaging.version import parse
 from pydantic import BaseModel, Field, TypeAdapter
 from pydantic import __version__ as pydantic_version
 from pydantic.json_schema import JsonSchemaValue
-from typing_extensions import Literal, get_args, get_origin
 
 from ..doc_utils import export_module
 from .dependency_injection import Field as AG2Field
@@ -93,7 +93,7 @@ def get_typed_return_annotation(call: Callable[..., Any]) -> Any:
     return get_typed_annotation(annotation, globalns)
 
 
-def get_param_annotations(typed_signature: inspect.Signature) -> dict[str, Union[Annotated[type[Any], str], type[Any]]]:
+def get_param_annotations(typed_signature: inspect.Signature) -> dict[str, Annotated[type[Any], str] | type[Any]]:
     """Get the type annotations of the parameters of a function
 
     Args:
@@ -142,7 +142,7 @@ def get_parameter_json_schema(k: str, v: Any, default_values: dict[str, Any]) ->
         A Pydanitc model for the parameter
     """
 
-    def type2description(k: str, v: Union[Annotated[type[Any], str], type[Any]]) -> str:
+    def type2description(k: str, v: Annotated[type[Any], str] | type[Any]) -> str:
         if not hasattr(v, "__metadata__"):
             return k
 
@@ -189,7 +189,7 @@ def get_default_values(typed_signature: inspect.Signature) -> dict[str, Any]:
 
 def get_parameters(
     required: list[str],
-    param_annotations: dict[str, Union[Annotated[type[Any], str], type[Any]]],
+    param_annotations: dict[str, Annotated[type[Any], str] | type[Any]],
     default_values: dict[str, Any],
 ) -> Parameters:
     """Get the parameters of a function as defined by the OpenAI API
@@ -231,7 +231,7 @@ def get_missing_annotations(typed_signature: inspect.Signature, required: list[s
 
 
 @export_module("autogen.tools")
-def get_function_schema(f: Callable[..., Any], *, name: Optional[str] = None, description: str) -> dict[str, Any]:
+def get_function_schema(f: Callable[..., Any], *, name: str | None = None, description: str) -> dict[str, Any]:
     """Get a JSON schema for a function as defined by the OpenAI API
 
     Args:
@@ -306,7 +306,7 @@ def get_function_schema(f: Callable[..., Any], *, name: Optional[str] = None, de
     return function.model_dump()
 
 
-def get_load_param_if_needed_function(t: Any) -> Optional[Callable[[dict[str, Any], type[BaseModel]], BaseModel]]:
+def get_load_param_if_needed_function(t: Any) -> Callable[[dict[str, Any], type[BaseModel]], BaseModel] | None:
     """Get a function to load a parameter if it is a Pydantic model
 
     Args:

autogen/tools/tool.py

@@ -3,7 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import inspect
-from typing import TYPE_CHECKING, Any, Callable, Optional, Union
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any, Union
 
 from ..doc_utils import export_module
 from ..tools.function_utils import get_function_schema
@@ -32,10 +33,10 @@ class Tool:
     def __init__(
         self,
         *,
-        name: Optional[str] = None,
-        description: Optional[str] = None,
+        name: str | None = None,
+        description: str | None = None,
         func_or_tool: Union["Tool", Callable[..., Any]],
-        parameters_json_schema: Optional[dict[str, Any]] = None,
+        parameters_json_schema: dict[str, Any] | None = None,
     ) -> None:
         """Create a new Tool object.
 
@@ -170,7 +171,7 @@ class Tool:
 
 
 @export_module("autogen.tools")
-def tool(name: Optional[str] = None, description: Optional[str] = None) -> Callable[[Callable[..., Any]], Tool]:
+def tool(name: str | None = None, description: str | None = None) -> Callable[[Callable[..., Any]], Tool]:
     """Decorator to create a Tool from a function.
 
     Args:

autogen/types.py

@@ -5,9 +5,9 @@
 # Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
 # SPDX-License-Identifier: MIT
 
-from typing import Any, Literal, TypedDict, Union
+from typing import Any, Literal, TypedDict
 
-MessageContentType = Union[str, list[Union[dict[str, Any], str]], None]
+MessageContentType = str | list[dict[str, Any] | str] | None
 
 
 class UserMessageTextContentPart(TypedDict):

autogen/version.py

@@ -4,4 +4,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.9.6"
+__version__ = "0.9.8.post1"