move search_config_from_kwargs to utils

Author: snow-ghost

sgr_agent_core/services/tavily_search.py

@@ -1,33 +1,12 @@
 import logging
-from typing import Any
 
 from tavily import AsyncTavilyClient
 
-from sgr_agent_core.agent_definition import AgentConfig, SearchConfig
+from sgr_agent_core.agent_definition import SearchConfig
 from sgr_agent_core.models import SourceData
 
 logger = logging.getLogger(__name__)
 
-SEARCH_CONFIG_KEYS = (
-    "tavily_api_key",
-    "tavily_api_base_url",
-    "max_searches",
-    "max_results",
-    "content_limit",
-)
-
-
-def search_config_from_kwargs(config: AgentConfig | None, kwargs: dict[str, Any]) -> SearchConfig:
-    """Build SearchConfig from config.search and tool kwargs (kwargs override).
-
-    Used by WebSearchTool and ExtractPageContentTool to get search
-    settings from the tools array config (kwargs) with fallback to agent
-    config.search.
-    """
-    base = config.search.model_dump() if config and config.search else {}
-    overrides = {k: v for k, v in kwargs.items() if k in SEARCH_CONFIG_KEYS and v is not None}
-    return SearchConfig(**{**base, **overrides})
-
 
 class TavilySearchService:
     def __init__(self, search_config: SearchConfig):

sgr_agent_core/tools/extract_page_content_tool.py

@@ -5,9 +5,10 @@
 
 from pydantic import Field
 
+from sgr_agent_core.agent_definition import SearchConfig
 from sgr_agent_core.base_tool import BaseTool
 from sgr_agent_core.services import TavilySearchService
-from sgr_agent_core.services.tavily_search import search_config_from_kwargs
+from sgr_agent_core.utils import config_from_kwargs
 
 if TYPE_CHECKING:
     from sgr_agent_core.agent_definition import AgentConfig
@@ -42,7 +43,11 @@ async def __call__(self, context: AgentContext, config: AgentConfig, **kwargs: A
         Search settings (e.g. tavily_api_key, content_limit) are taken
         from kwargs (tool config) with fallback to config.search.
         """
-        search_config = search_config_from_kwargs(config, dict(kwargs))
+        search_config = config_from_kwargs(
+            SearchConfig,
+            config.search if config else None,
+            dict(kwargs),
+        )
         logger.info(f"📄 Extracting content from {len(self.urls)} URLs")
 
         self._search_service = TavilySearchService(search_config)

sgr_agent_core/tools/web_search_tool.py

@@ -6,10 +6,11 @@
 
 from pydantic import Field
 
-from sgr_agent_core.agent_definition import AgentConfig
+from sgr_agent_core.agent_definition import AgentConfig, SearchConfig
 from sgr_agent_core.base_tool import BaseTool
 from sgr_agent_core.models import SearchResult
-from sgr_agent_core.services.tavily_search import TavilySearchService, search_config_from_kwargs
+from sgr_agent_core.services.tavily_search import TavilySearchService
+from sgr_agent_core.utils import config_from_kwargs
 
 if TYPE_CHECKING:
     from sgr_agent_core.models import AgentContext
@@ -58,7 +59,11 @@ async def __call__(self, context: AgentContext, config: AgentConfig, **kwargs: A
         Search settings are taken from kwargs (tool config) with
         fallback to config.search.
         """
-        search_config = search_config_from_kwargs(config, dict(kwargs))
+        search_config = config_from_kwargs(
+            SearchConfig,
+            config.search if config else None,
+            dict(kwargs),
+        )
         logger.info(f"🔍 Search query: '{self.query}'")
         self._search_service = TavilySearchService(search_config)
 

sgr_agent_core/utils.py

@@ -0,0 +1,27 @@
+"""Internal utilities for config merging and tool helpers."""
+
+from typing import Any, TypeVar
+
+from pydantic import BaseModel
+
+T = TypeVar("T", bound=BaseModel)
+
+
+def config_from_kwargs(config_class: type[T], base: T | None, kwargs: dict[str, Any]) -> T:
+    """Build a config instance from base (optional) and kwargs; kwargs override
+    base.
+
+    Generic helper for any Pydantic config model. Used by tools to merge
+    agent-level config with per-tool kwargs from the tools array (global or inline).
+
+    Args:
+        config_class: Pydantic model class to instantiate (e.g. SearchConfig).
+        base: Existing config instance, or None to use only kwargs (with model defaults).
+        kwargs: Overrides; keys present here override base. None values are skipped.
+
+    Returns:
+        New instance of config_class with merged values.
+    """
+    data = base.model_dump() if base is not None else {}
+    data.update({k: v for k, v in kwargs.items() if v is not None})
+    return config_class(**data)