aiqtoolkit-agno 1.2.0a20250706__py3-none-any.whl → 1.2.0a20250730__py3-none-any.whl

aiq/plugins/agno/llm.py

@@ -18,8 +18,10 @@ import os
 from aiq.builder.builder import Builder
 from aiq.builder.framework_enum import LLMFrameworkEnum
 from aiq.cli.register_workflow import register_llm_client
+from aiq.data_models.retry_mixin import RetryMixin
 from aiq.llm.nim_llm import NIMModelConfig
 from aiq.llm.openai_llm import OpenAIModelConfig
+from aiq.utils.exception_handlers.automatic_retries import patch_with_retry
 
 
 @register_llm_client(config_type=NIMModelConfig, wrapper_type=LLMFrameworkEnum.AGNO)
@@ -46,10 +48,20 @@ async def nim_agno(llm_config: NIMModelConfig, builder: Builder):
                 os.environ["NVIDIA_API_KEY"] = nvidai_api_key
 
     # Create Nvidia instance with conditional base_url
-    nvidia_args = {"id": config_obj.get("id")}
+    kwargs = {"id": config_obj.get("id")}
     if "base_url" in config_obj and config_obj.get("base_url") is not None:
-        nvidia_args["base_url"] = config_obj.get("base_url")
-    yield Nvidia(**nvidia_args)
+        kwargs["base_url"] = config_obj.get("base_url")
+
+    client = Nvidia(**kwargs)  # type: ignore[arg-type]
+
+    if isinstance(client, RetryMixin):
+
+        client = patch_with_retry(client,
+                                  retries=llm_config.num_retries,
+                                  retry_codes=llm_config.retry_on_status_codes,
+                                  retry_on_messages=llm_config.retry_on_errors)
+
+    yield client
 
 
 @register_llm_client(config_type=OpenAIModelConfig, wrapper_type=LLMFrameworkEnum.AGNO)
@@ -57,8 +69,19 @@ async def openai_agno(llm_config: OpenAIModelConfig, builder: Builder):
 
     from agno.models.openai import OpenAIChat
 
-    config_obj = {
-        **llm_config.model_dump(exclude={"type"}, by_alias=True),
-    }
+    # Use model_dump to get the proper field values with correct types
+    kwargs = llm_config.model_dump(exclude={"type"}, by_alias=True)
+
+    # AGNO uses 'id' instead of 'model' for the model name
+    if "model" in kwargs:
+        kwargs["id"] = kwargs.pop("model")
+
+    client = OpenAIChat(**kwargs)
+
+    if isinstance(llm_config, RetryMixin):
+        client = patch_with_retry(client,
+                                  retries=llm_config.num_retries,
+                                  retry_codes=llm_config.retry_on_status_codes,
+                                  retry_on_messages=llm_config.retry_on_errors)
 
-    yield OpenAIChat(**config_obj)
+    yield client

aiq/plugins/agno/tools/serp_api_tool.py

@@ -16,6 +16,8 @@
 import logging
 import os
 
+from pydantic import Field
+
 from aiq.builder.builder import Builder
 from aiq.builder.framework_enum import LLMFrameworkEnum
 from aiq.builder.function_info import FunctionInfo
@@ -24,38 +26,31 @@ from aiq.data_models.function import FunctionBaseConfig
 
 logger = logging.getLogger(__name__)
 
-# Module level variable to track empty query handling
-_empty_query_handled = False
-
 
 class SerpApiToolConfig(FunctionBaseConfig, name="serp_api_tool"):
     """
     Tool that retrieves search results from the web using SerpAPI.
     Requires a SERP_API_KEY.
     """
-    _type: str = "serp_api_tool"  # Flat type name without namespacing
-    api_key: str | None = None
-    max_results: int = 5
+    api_key: str | None = Field(default=None, description="The API key for the SerpAPI service.")
+    max_results: int = Field(default=5, description="The maximum number of results to return.")
 
 
 @register_function(config_type=SerpApiToolConfig, framework_wrappers=[LLMFrameworkEnum.AGNO])
 async def serp_api_tool(tool_config: SerpApiToolConfig, builder: Builder):
-    """
-    Create a SerpAPI search tool for use with Agno.
+    """Create a SerpAPI search tool for use with Agno.
 
     This creates a search function that uses SerpAPI to search the web.
 
-    Parameters
-    ----------
-    tool_config : SerpApiToolConfig
-        Configuration for the SerpAPI tool
-    builder : Builder
-        The AIQ Toolkit builder instance
+    Args:
+        tool_config (SerpApiToolConfig): Configuration for the SerpAPI tool.
+        builder (Builder): The AIQ Toolkit builder instance.
 
-    Returns
-    -------
-    A FunctionInfo object wrapping the SerpAPI search functionality
+    Returns:
+        FunctionInfo: A FunctionInfo object wrapping the SerpAPI search functionality.
     """
+    import json
+
     from agno.tools.serpapi import SerpApiTools
 
     if (not tool_config.api_key):
@@ -69,43 +64,35 @@ async def serp_api_tool(tool_config: SerpApiToolConfig, builder: Builder):
     search_tool = SerpApiTools(api_key=tool_config.api_key)
 
     # Simple search function with a single string parameter
-    async def _serp_api_search(query: str = "") -> str:
+    async def _serp_api_search(query: str) -> str:
         """
         Search the web using SerpAPI.
 
         Args:
-            query: The search query to perform. If empty, returns initialization message.
+            query (str): The search query to perform. If empty, returns initialization message.
 
         Returns:
-            Formatted search results or initialization message
+            str: Formatted search results or initialization message.
         """
-        # Use the module-level variable for tracking
-        global _empty_query_handled
 
-        # Handle the case where no query is provided
         if not query or query.strip() == "":
-            # Only provide initialization message once, then provide a more direct error
-            if not _empty_query_handled:
-                _empty_query_handled = True
-                logger.info("Empty query provided, returning initialization message (first time)")
-                return "SerpAPI Tool is initialized and ready for use. Please provide a search query."
-            else:
-                logger.warning("Empty query provided again, returning error message to stop looping")
-                return "ERROR: Search query cannot be empty. Please provide a specific search term to continue."
-        else:
-            # Reset the empty query flag when we get a valid query
-            _empty_query_handled = False
-
-        logger.info(f"Searching SerpAPI with query: '{query}', max_results: {tool_config.max_results}")
+            exception_msg = "Search query cannot be empty. Please provide a specific search term to continue."
+            logger.warning(exception_msg)
+            return exception_msg
+
+        logger.info("Searching SerpAPI with query: '%s', max_results: %s", query, tool_config.max_results)
 
         try:
             # Perform the search
-            results = await search_tool.search_google(query=query, num_results=tool_config.max_results)
-            logger.info(f"SerpAPI returned {len(results)} results")
+            raw_all_results: str = search_tool.search_google(query=query, num_results=tool_config.max_results)
+            all_results: dict = json.loads(raw_all_results)
+            search_results = all_results.get('search_results', [])
+
+            logger.info("SerpAPI returned %s results", len(search_results))
 
             # Format the results as a string
             formatted_results = []
-            for i, result in enumerate(results, 1):
+            for result in search_results:
                 title = result.get('title', 'No Title')
                 link = result.get('link', 'No Link')
                 snippet = result.get('snippet', 'No Snippet')
@@ -118,21 +105,11 @@ async def serp_api_tool(tool_config: SerpApiToolConfig, builder: Builder):
 
             return "\n\n---\n\n".join(formatted_results)
         except Exception as e:
-            logger.exception(f"Error searching with SerpAPI: {e}")
+            logger.exception("Error searching with SerpAPI: %s", e)
             return f"Error performing search: {str(e)}"
 
-    # Create a FunctionInfo object with simple string parameter
     fn_info = FunctionInfo.from_fn(
         _serp_api_search,
-        description="""
-            This tool searches the web using SerpAPI and returns relevant results for the given query.
-
-            Args:
-                query (str, optional): The search query to perform. A valid search query is required.
-
-            Returns:
-                str: Formatted search results or error message if query is empty.
-        """,
-    )
+        description="""This tool searches the web using SerpAPI and returns relevant results for the given query.""")
 
     yield fn_info

{aiqtoolkit_agno-1.2.0a20250706.dist-info → aiqtoolkit_agno-1.2.0a20250730.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: aiqtoolkit-agno
-Version: 1.2.0a20250706
+Version: 1.2.0a20250730
 Summary: Subpackage for Agno integration in AIQtoolkit
 Keywords: ai,rag,agents
 Classifier: Programming Language :: Python
 Requires-Python: <3.13,>=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: aiqtoolkit==v1.2.0a20250706
+Requires-Dist: aiqtoolkit==v1.2.0a20250730
 Requires-Dist: agno~=1.2.3
 Requires-Dist: openai~=1.66
 Requires-Dist: google-search-results~=2.4.2

{aiqtoolkit_agno-1.2.0a20250706.dist-info → aiqtoolkit_agno-1.2.0a20250730.dist-info}/RECORD

@@ -1,13 +1,13 @@
 aiq/meta/pypi.md,sha256=N2ermX9UkrluhitorV664jAxkwiT_gmbMyDHyZhb8N4,1174
 aiq/plugins/agno/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aiq/plugins/agno/llm.py,sha256=KvtcyBCKzN1gEVet8RORjjYh1dctazzC8V2xZhwCSgc,2459
+aiq/plugins/agno/llm.py,sha256=d08EfB4xOFwNh6cgaAoFPBiXVSofazd_puZRK1oO8Zg,3434
 aiq/plugins/agno/register.py,sha256=6vC1TjMxo3igqTnEtVFgLEf_jgLYkBfBZxjwqxGng6w,820
 aiq/plugins/agno/tool_wrapper.py,sha256=bWsCdx6IkzOZbvBYC30N5mvGnHNVBScdHji6Mj9amB0,15939
 aiq/plugins/agno/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aiq/plugins/agno/tools/register.py,sha256=OCmzR03CHmQHm34ZEascM1dRVh-ALMs2mafDcqLDz6s,775
-aiq/plugins/agno/tools/serp_api_tool.py,sha256=93Rnj9tmK8N4hVWzXHMflcTOrj8YLNiY9b2jT_K72d8,5303
-aiqtoolkit_agno-1.2.0a20250706.dist-info/METADATA,sha256=9XLDipRQ9fel_cN-iCai1jNMWigptxMthYBavUC4D7s,1577
-aiqtoolkit_agno-1.2.0a20250706.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aiqtoolkit_agno-1.2.0a20250706.dist-info/entry_points.txt,sha256=iMjZt0Aziz5vGiuTfSNjy1gWeOj2URFhhKt-gti-9sY,103
-aiqtoolkit_agno-1.2.0a20250706.dist-info/top_level.txt,sha256=fo7AzYcNhZ_tRWrhGumtxwnxMew4xrT1iwouDy_f0Kc,4
-aiqtoolkit_agno-1.2.0a20250706.dist-info/RECORD,,
+aiq/plugins/agno/tools/serp_api_tool.py,sha256=gTLWwsDmkzmJ6Zp-OzupbwA6t_neSCGrzKdrGQcpIkg,4450
+aiqtoolkit_agno-1.2.0a20250730.dist-info/METADATA,sha256=cRelDOqeF8WgnLbEBEBGEZQshqFMbf3VPofjyN5LPe0,1577
+aiqtoolkit_agno-1.2.0a20250730.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aiqtoolkit_agno-1.2.0a20250730.dist-info/entry_points.txt,sha256=iMjZt0Aziz5vGiuTfSNjy1gWeOj2URFhhKt-gti-9sY,103
+aiqtoolkit_agno-1.2.0a20250730.dist-info/top_level.txt,sha256=fo7AzYcNhZ_tRWrhGumtxwnxMew4xrT1iwouDy_f0Kc,4
+aiqtoolkit_agno-1.2.0a20250730.dist-info/RECORD,,