signalwire-agents 0.1.50__tar.gz → 0.1.51__tar.gz

{signalwire_agents-0.1.50/signalwire_agents.egg-info → signalwire_agents-0.1.51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: signalwire_agents
-Version: 0.1.50
+Version: 0.1.51
 Summary: SignalWire AI Agents SDK
 Author-email: SignalWire Team <info@signalwire.com>
 License: MIT

{signalwire_agents-0.1.50 → signalwire_agents-0.1.51}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "signalwire_agents"
-version = "0.1.50"
+version = "0.1.51"
 description = "SignalWire AI Agents SDK"
 authors = [
     {name = "SignalWire Team", email = "info@signalwire.com"}

{signalwire_agents-0.1.50 → signalwire_agents-0.1.51}/signalwire_agents/__init__.py

@@ -18,7 +18,7 @@ A package for building AI agents using SignalWire's AI and SWML capabilities.
 from .core.logging_config import configure_logging
 configure_logging()
 
-__version__ = "0.1.50"
+__version__ = "0.1.51"
 
 # Import core classes for easier access
 from .core.agent_base import AgentBase

{signalwire_agents-0.1.50 → signalwire_agents-0.1.51}/signalwire_agents/core/skill_base.py

@@ -53,6 +53,26 @@ class SkillBase(ABC):
         """Register SWAIG tools with the agent"""
         pass
         
+    def define_tool(self, **kwargs) -> None:
+        """
+        Wrapper method that automatically includes swaig_fields when defining tools.
+        
+        This method delegates to self.agent.define_tool() but automatically merges
+        any swaig_fields configured for this skill. Skills should use this method
+        instead of calling self.agent.define_tool() directly.
+        
+        Args:
+            **kwargs: All arguments supported by agent.define_tool()
+                     (name, description, parameters, handler, etc.)
+        """
+        # Merge swaig_fields with any explicitly passed fields
+        # Explicit fields take precedence over swaig_fields
+        merged_kwargs = dict(self.swaig_fields)
+        merged_kwargs.update(kwargs)
+        
+        # Call the agent's define_tool with merged arguments
+        return self.agent.define_tool(**merged_kwargs)
+        
 
         
     def get_hints(self) -> List[str]:

{signalwire_agents-0.1.50 → signalwire_agents-0.1.51}/signalwire_agents/skills/datasphere/skill.py

@@ -159,7 +159,7 @@ class DataSphereSkill(SkillBase):
         
     def register_tools(self) -> None:
         """Register knowledge search tool with the agent"""
-        self.agent.define_tool(
+        self.define_tool(
             name=self.tool_name,
             description="Search the knowledge base for information on any topic and return relevant results",
             parameters={
@@ -168,8 +168,7 @@ class DataSphereSkill(SkillBase):
                     "description": "The search query - what information you're looking for in the knowledge base"
                 }
             },
-            handler=self._search_knowledge_handler,
-            **self.swaig_fields
+            handler=self._search_knowledge_handler
         )
         
     def _search_knowledge_handler(self, args, raw_data):

{signalwire_agents-0.1.50 → signalwire_agents-0.1.51}/signalwire_agents/skills/datetime/skill.py

@@ -30,7 +30,7 @@ class DateTimeSkill(SkillBase):
     def register_tools(self) -> None:
         """Register datetime tools with the agent"""
         
-        self.agent.define_tool(
+        self.define_tool(
             name="get_current_time",
             description="Get the current time, optionally in a specific timezone",
             parameters={
@@ -39,11 +39,10 @@ class DateTimeSkill(SkillBase):
                     "description": "Timezone name (e.g., 'America/New_York', 'Europe/London'). Defaults to UTC."
                 }
             },
-            handler=self._get_time_handler,
-            **self.swaig_fields
+            handler=self._get_time_handler
         )
         
-        self.agent.define_tool(
+        self.define_tool(
             name="get_current_date",
             description="Get the current date",
             parameters={
@@ -52,8 +51,7 @@ class DateTimeSkill(SkillBase):
                     "description": "Timezone name for the date. Defaults to UTC."
                 }
             },
-            handler=self._get_date_handler,
-            **self.swaig_fields
+            handler=self._get_date_handler
         )
         
     def _get_time_handler(self, args, raw_data):

{signalwire_agents-0.1.50 → signalwire_agents-0.1.51}/signalwire_agents/skills/math/skill.py

@@ -29,7 +29,7 @@ class MathSkill(SkillBase):
     def register_tools(self) -> None:
         """Register math tools with the agent"""
         
-        self.agent.define_tool(
+        self.define_tool(
             name="calculate",
             description="Perform a mathematical calculation with basic operations (+, -, *, /, %, **)",
             parameters={
@@ -38,8 +38,7 @@ class MathSkill(SkillBase):
                     "description": "Mathematical expression to evaluate (e.g., '2 + 3 * 4', '(10 + 5) / 3')"
                 }
             },
-            handler=self._calculate_handler,
-            **self.swaig_fields
+            handler=self._calculate_handler
         )
         
     def _calculate_handler(self, args, raw_data):

{signalwire_agents-0.1.50 → signalwire_agents-0.1.51}/signalwire_agents/skills/mcp_gateway/skill.py

@@ -215,7 +215,7 @@ class MCPGatewaySkill(SkillBase):
                 self.logger.error(f"Failed to get tools for service '{service_name}': {e}")
         
         # Register the hangup hook for session cleanup
-        self.agent.define_tool(
+        self.define_tool(
             name="_mcp_gateway_hangup",
             description="Internal cleanup function for MCP sessions",
             parameters={},
@@ -260,7 +260,7 @@ class MCPGatewaySkill(SkillBase):
             return self._call_mcp_tool(service_name, tool_name, args, raw_data)
         
         # Register the SWAIG function
-        self.agent.define_tool(
+        self.define_tool(
             name=swaig_name,
             description=f"[{service_name}] {tool_def.get('description', tool_name)}",
             parameters=swaig_params,

{signalwire_agents-0.1.50 → signalwire_agents-0.1.51}/signalwire_agents/skills/native_vector_search/skill.py

@@ -136,6 +136,13 @@ class NativeVectorSearchSkill(SkillBase):
                 "default": "",
                 "required": False
             },
+            "max_content_length": {
+                "type": "integer",
+                "description": "Maximum total response size in characters (distributed across all results)",
+                "default": 32768,
+                "required": False,
+                "minimum": 1000
+            },
             "response_format_callback": {
                 "type": "callable",
                 "description": "Optional callback function to format/transform the response. Called with (response, agent, query, results, args). Must return a string.",
@@ -251,6 +258,7 @@ class NativeVectorSearchSkill(SkillBase):
         )
         self.response_prefix = self.params.get('response_prefix', '')
         self.response_postfix = self.params.get('response_postfix', '')
+        self.max_content_length = self.params.get('max_content_length', 32768)
         self.response_format_callback = self.params.get('response_format_callback')
         self.keyword_weight = self.params.get('keyword_weight')
         self.model_name = self.params.get('model_name', 'mini')
@@ -274,8 +282,8 @@ class NativeVectorSearchSkill(SkillBase):
                 if parsed.path:
                     self.remote_base_url += parsed.path
         
-        # SWAIG fields for function fillers
-        self.swaig_fields = self.params.get('swaig_fields', {})
+        # SWAIG fields are already extracted by SkillBase.__init__()
+        # No need to re-fetch from params - use self.swaig_fields inherited from parent
         
         # **EARLY REMOTE CHECK - Option 1**
         # If remote URL is configured, skip all heavy local imports and just validate remote connectivity
@@ -460,7 +468,7 @@ class NativeVectorSearchSkill(SkillBase):
             'Search the local knowledge base for information'
         )
         
-        self.agent.define_tool(
+        self.define_tool(
             name=self.tool_name,
             description=description,
             parameters={
@@ -474,8 +482,7 @@ class NativeVectorSearchSkill(SkillBase):
                     "default": self.count
                 }
             },
-            handler=self._search_handler,
-            **self.swaig_fields
+            handler=self._search_handler
         )
         
         # Add our tool to the Knowledge Search section
@@ -601,21 +608,36 @@ class NativeVectorSearchSkill(SkillBase):
                 
                 return SwaigFunctionResult(no_results_msg)
             
-            # Format results
+            # Format results with dynamic per-result truncation
             response_parts = []
-            
+
             # Add response prefix if configured
             if self.response_prefix:
                 response_parts.append(self.response_prefix)
-            
+
             response_parts.append(f"Found {len(results)} relevant results for '{query}':\n")
-            
+
+            # Calculate per-result content budget
+            # Estimate overhead per result: metadata (~200 chars) + formatting (~100 chars)
+            estimated_overhead_per_result = 300
+            # Account for prefix/postfix/header in total overhead
+            prefix_postfix_overhead = len(self.response_prefix) + len(self.response_postfix) + 100
+            total_overhead = (len(results) * estimated_overhead_per_result) + prefix_postfix_overhead
+            available_for_content = self.max_content_length - total_overhead
+
+            # Ensure minimum of 500 chars per result
+            per_result_limit = max(500, available_for_content // len(results)) if len(results) > 0 else 1000
+
             for i, result in enumerate(results, 1):
                 filename = result['metadata']['filename']
                 section = result['metadata'].get('section', '')
                 score = result['score']
                 content = result['content']
-                
+
+                # Truncate content to per-result limit
+                if len(content) > per_result_limit:
+                    content = content[:per_result_limit] + "..."
+
                 # Get tags from either top level or metadata
                 tags = result.get('tags', [])
                 if not tags and 'metadata' in result['metadata'] and 'tags' in result['metadata']['metadata']:
@@ -624,16 +646,16 @@ class NativeVectorSearchSkill(SkillBase):
                 elif not tags and 'tags' in result['metadata']:
                     # Check in metadata directly
                     tags = result['metadata']['tags']
-                
+
                 result_text = f"**Result {i}** (from {filename}"
                 if section:
                     result_text += f", section: {section}"
                 if tags:
                     result_text += f", tags: {', '.join(tags)}"
                 result_text += f", relevance: {score:.2f})\n{content}\n"
-                
+
                 response_parts.append(result_text)
-            
+
             # Add response postfix if configured
             if self.response_postfix:
                 response_parts.append(self.response_postfix)

{signalwire_agents-0.1.50 → signalwire_agents-0.1.51}/signalwire_agents/skills/spider/skill.py

@@ -223,7 +223,7 @@ class SpiderSkill(SkillBase):
             tool_prefix = f"{tool_prefix}_"
         
         # Register scrape_url tool
-        self.agent.define_tool(
+        self.define_tool(
             name=f"{tool_prefix}scrape_url",
             description="Extract text content from a single web page",
             parameters={
@@ -233,12 +233,11 @@ class SpiderSkill(SkillBase):
                 }
             },
             required=["url"],
-            handler=self._scrape_url_handler,
-            **self.swaig_fields
+            handler=self._scrape_url_handler
         )
         
         # Register crawl_site tool
-        self.agent.define_tool(
+        self.define_tool(
             name=f"{tool_prefix}crawl_site",
             description="Crawl multiple pages starting from a URL",
             parameters={
@@ -248,12 +247,11 @@ class SpiderSkill(SkillBase):
                 }
             },
             required=["start_url"],
-            handler=self._crawl_site_handler,
-            **self.swaig_fields
+            handler=self._crawl_site_handler
         )
         
         # Register extract_structured_data tool
-        self.agent.define_tool(
+        self.define_tool(
             name=f"{tool_prefix}extract_structured_data",
             description="Extract specific data from a web page using selectors",
             parameters={
@@ -263,8 +261,7 @@ class SpiderSkill(SkillBase):
                 }
             },
             required=["url"],
-            handler=self._extract_structured_handler,
-            **self.swaig_fields
+            handler=self._extract_structured_handler
         )
     
     def _fetch_url(self, url: str) -> Optional[requests.Response]:

{signalwire_agents-0.1.50 → signalwire_agents-0.1.51}/signalwire_agents/skills/web_search/skill.py

@@ -21,7 +21,7 @@ from signalwire_agents.core.function_result import SwaigFunctionResult
 class GoogleSearchScraper:
     """Google Search and Web Scraping functionality"""
     
-    def __init__(self, api_key: str, search_engine_id: str, max_content_length: int = 2000):
+    def __init__(self, api_key: str, search_engine_id: str, max_content_length: int = 32768):
         self.api_key = api_key
         self.search_engine_id = search_engine_id
         self.max_content_length = max_content_length
@@ -62,63 +62,84 @@ class GoogleSearchScraper:
         except Exception as e:
             return []
 
-    def extract_text_from_url(self, url: str, timeout: int = 10) -> str:
-        """Scrape a URL and extract readable text content"""
+    def extract_text_from_url(self, url: str, content_limit: int = None, timeout: int = 10) -> str:
+        """Scrape a URL and extract readable text content
+
+        Args:
+            url: URL to scrape
+            content_limit: Maximum characters to return (uses self.max_content_length if not provided)
+            timeout: Request timeout in seconds
+        """
         try:
             response = self.session.get(url, timeout=timeout)
             response.raise_for_status()
-            
+
             soup = BeautifulSoup(response.content, 'html.parser')
-            
+
             # Remove unwanted elements
             for script in soup(["script", "style", "nav", "footer", "header", "aside"]):
                 script.decompose()
-            
+
             text = soup.get_text()
-            
+
             # Clean up the text
             lines = (line.strip() for line in text.splitlines())
             chunks = (phrase.strip() for line in lines for phrase in line.split("  "))
             text = ' '.join(chunk for chunk in chunks if chunk)
-            
+
             # Limit text length
-            if len(text) > self.max_content_length:
-                text = text[:self.max_content_length] + "... [Content truncated]"
-            
+            limit = content_limit if content_limit is not None else self.max_content_length
+            if len(text) > limit:
+                text = text[:limit]
+
             return text
-            
+
         except Exception as e:
             return ""
 
     def search_and_scrape(self, query: str, num_results: int = 3, delay: float = 0.5) -> str:
-        """Main function: search Google and scrape the resulting pages"""
+        """Main function: search Google and scrape the resulting pages
+
+        Dynamically calculates per-result content limit based on total max_content_length
+        and number of results to ensure total response stays within bounds.
+        """
         search_results = self.search_google(query, num_results)
-        
+
         if not search_results:
             return f"No search results found for query: {query}"
-        
+
+        # Calculate per-result content budget
+        # Reserve ~300 chars per result for overhead (titles, URLs, snippets, formatting)
+        estimated_overhead_per_result = 300
+        total_overhead = num_results * estimated_overhead_per_result
+        available_for_content = self.max_content_length - total_overhead
+
+        # Ensure we have at least 1000 chars per result
+        per_result_limit = max(1000, available_for_content // num_results)
+
         all_text = []
-        
+
         for i, result in enumerate(search_results, 1):
             text_content = f"=== RESULT {i} ===\n"
             text_content += f"Title: {result['title']}\n"
             text_content += f"URL: {result['url']}\n"
             text_content += f"Snippet: {result['snippet']}\n"
             text_content += f"Content:\n"
-            
-            page_text = self.extract_text_from_url(result['url'])
-            
+
+            # Pass the calculated per-result limit
+            page_text = self.extract_text_from_url(result['url'], content_limit=per_result_limit)
+
             if page_text:
                 text_content += page_text
             else:
                 text_content += "Failed to extract content from this page."
-            
+
             text_content += f"\n{'='*50}\n\n"
             all_text.append(text_content)
-            
+
             if i < len(search_results):
                 time.sleep(delay)
-        
+
         return '\n'.join(all_text)
 
 
@@ -163,7 +184,7 @@ class WebSearchSkill(SkillBase):
         # Set default parameters
         self.default_num_results = self.params.get('num_results', 1)
         self.default_delay = self.params.get('delay', 0)
-        self.max_content_length = self.params.get('max_content_length', 2000)
+        self.max_content_length = self.params.get('max_content_length', 32768)
         self.no_results_message = self.params.get('no_results_message', 
             "I couldn't find any results for '{query}'. "
             "This might be due to a very specific query or temporary issues. "
@@ -184,7 +205,7 @@ class WebSearchSkill(SkillBase):
         
     def register_tools(self) -> None:
         """Register web search tool with the agent"""
-        self.agent.define_tool(
+        self.define_tool(
             name=self.tool_name,
             description="Search the web for information on any topic and return detailed results with content from multiple sources",
             parameters={
@@ -193,8 +214,7 @@ class WebSearchSkill(SkillBase):
                     "description": "The search query - what you want to find information about"
                 }
             },
-            handler=self._web_search_handler,
-            **self.swaig_fields
+            handler=self._web_search_handler
         )
         
     def _web_search_handler(self, args, raw_data):
@@ -308,10 +328,10 @@ class WebSearchSkill(SkillBase):
             },
             "max_content_length": {
                 "type": "integer",
-                "description": "Maximum content length per scraped page (characters)",
-                "default": 2000,
+                "description": "Maximum total response size in characters (distributed across all results)",
+                "default": 32768,
                 "required": False,
-                "min": 100
+                "min": 1000
             },
             "no_results_message": {
                 "type": "string",
@@ -321,4 +341,4 @@ class WebSearchSkill(SkillBase):
             }
         })
         
-        return schema 
+        return schema 

{signalwire_agents-0.1.50 → signalwire_agents-0.1.51}/signalwire_agents/skills/wikipedia_search/skill.py

@@ -84,7 +84,7 @@ class WikipediaSearchSkill(SkillBase):
         """
         Register the SWAIG tool for Wikipedia search.
         """
-        self.agent.define_tool(
+        self.define_tool(
             name="search_wiki",
             description="Search Wikipedia for information about a topic and get article summaries",
             parameters={
@@ -93,8 +93,7 @@ class WikipediaSearchSkill(SkillBase):
                     "description": "The search term or topic to look up on Wikipedia"
                 }
             },
-            handler=self._search_wiki_handler,
-            **self.swaig_fields
+            handler=self._search_wiki_handler
         )
     
     def _search_wiki_handler(self, args, raw_data):

{signalwire_agents-0.1.50 → signalwire_agents-0.1.51/signalwire_agents.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: signalwire_agents
-Version: 0.1.50
+Version: 0.1.51
 Summary: SignalWire AI Agents SDK
 Author-email: SignalWire Team <info@signalwire.com>
 License: MIT