signalwire-agents 1.0.18.dev8__py3-none-any.whl → 1.0.18.dev9__py3-none-any.whl

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__ = "1.0.18.dev8"
+__version__ = "1.0.18.dev9"
 
 # Import core classes for easier access
 from .core.agent_base import AgentBase

signalwire_agents/agent_server.py

@@ -61,7 +61,7 @@ class AgentServer:
         self.app = FastAPI(
             title="SignalWire AI Agents",
             description="Hosted SignalWire AI Agents",
-            version="1.0.18.dev8",
+            version="1.0.18.dev9",
             redirect_slashes=False
         )
         

signalwire_agents/utils/schema_utils.py

@@ -18,6 +18,10 @@ import json
 import logging
 from typing import Dict, Any, List, Optional, Tuple
 
+# jsonschema is required for full JSON Schema Draft 2020-12 validation
+from jsonschema import Draft202012Validator, ValidationError
+from jsonschema.exceptions import best_match
+
 try:
     import structlog
     # Ensure structlog is configured
@@ -241,35 +245,84 @@ class SchemaUtils:
                 return verb_props.get("required", [])
         return []
     
+    def _get_verb_schema(self, verb_name: str) -> Optional[Dict[str, Any]]:
+        """
+        Get the JSON Schema for validating a verb config.
+
+        This constructs a schema that can be used with jsonschema.validate() by:
+        1. Getting the verb's property schema
+        2. Including all $defs from the main schema so $ref references resolve
+
+        Args:
+            verb_name: The name of the verb
+
+        Returns:
+            A schema dict suitable for jsonschema validation, or None if not found
+        """
+        verb_props = self.get_verb_properties(verb_name)
+        if not verb_props:
+            return None
+
+        # Create a schema with the $defs from the main schema so refs work
+        schema = verb_props.copy()
+        if "$defs" in self.schema:
+            schema["$defs"] = self.schema["$defs"]
+
+        return schema
+
     def validate_verb(self, verb_name: str, verb_config: Dict[str, Any]) -> Tuple[bool, List[str]]:
         """
-        Validate a verb configuration against the schema
-        
+        Validate a verb configuration against the JSON Schema.
+
+        Uses the jsonschema library for full JSON Schema Draft 2020-12 validation,
+        which checks all constraints including:
+        - Required properties
+        - Type checking (string, number, boolean, array, object)
+        - Pattern matching (regex constraints)
+        - Enum values
+        - Minimum/maximum values
+        - MinLength/maxLength for strings
+        - MinItems/maxItems for arrays
+        - anyOf/oneOf/allOf composition
+        - And all other JSON Schema keywords
+
         Args:
             verb_name: The name of the verb (e.g., "ai", "answer", etc.)
             verb_config: The configuration for the verb
-            
+
         Returns:
             (is_valid, error_messages) tuple
         """
-        # Simple validation for now - can be enhanced with more complete JSON Schema validation
         errors = []
-        
+
         # Check if the verb exists in the schema
         if verb_name not in self.verbs:
             errors.append(f"Unknown verb: {verb_name}")
             return False, errors
-            
-        # Get the required properties for this verb
-        required_props = self.get_verb_required_properties(verb_name)
-        
-        # Check if all required properties are present
-        for prop in required_props:
-            if prop not in verb_config:
-                errors.append(f"Missing required property '{prop}' for verb '{verb_name}'")
-                
-        # Return validation result
-        return len(errors) == 0, errors
+
+        # Get the verb schema for validation
+        verb_schema = self._get_verb_schema(verb_name)
+        if not verb_schema:
+            self.log.debug("verb_schema_not_found", verb=verb_name,
+                          message="Could not extract verb schema, allowing config")
+            return True, []
+
+        # Use jsonschema for full validation
+        validator = Draft202012Validator(verb_schema)
+        validation_errors = list(validator.iter_errors(verb_config))
+
+        if not validation_errors:
+            return True, []
+
+        # Collect all error messages with their paths
+        for error in validation_errors:
+            if error.path:
+                path_str = ".".join(str(p) for p in error.path)
+                errors.append(f"{path_str}: {error.message}")
+            else:
+                errors.append(error.message)
+
+        return False, errors
     
     def get_all_verb_names(self) -> List[str]:
         """

{signalwire_agents-1.0.18.dev8.dist-info → signalwire_agents-1.0.18.dev9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: signalwire_agents
-Version: 1.0.18.dev8
+Version: 1.0.18.dev9
 Summary: SignalWire AI Agents SDK
 Author-email: SignalWire Team <info@signalwire.com>
 License: MIT
@@ -29,6 +29,7 @@ Requires-Dist: uvicorn>=0.34.2
 Requires-Dist: beautifulsoup4>=4.12.3
 Requires-Dist: pytz>=2023.3
 Requires-Dist: lxml>=4.9.0
+Requires-Dist: jsonschema>=4.26.0
 Provides-Extra: search-queryonly
 Requires-Dist: numpy>=1.24.0; extra == "search-queryonly"
 Requires-Dist: scikit-learn>=1.3.0; extra == "search-queryonly"

{signalwire_agents-1.0.18.dev8.dist-info → signalwire_agents-1.0.18.dev9.dist-info}/RECORD

@@ -1,5 +1,5 @@
-signalwire_agents/__init__.py,sha256=npeS4j80LTMW61xutzEwYole8zeZr7OLoIXHvWVwv6c,5036
-signalwire_agents/agent_server.py,sha256=5amS5HRy1L07pht8n0msLuYm9jw33sAe9Jt6OBnzeXY,32352
+signalwire_agents/__init__.py,sha256=2sCw-ij5lO1AUuMDx4XvkyfUzY-N6D8qW9lcMH2grLg,5036
+signalwire_agents/agent_server.py,sha256=w7hkGArZv7-AiMyTExrvQUIzsfhjuLBUrracvCYYa0I,32352
 signalwire_agents/schema.json,sha256=YQv4-KiegE00XvxoLMKAml6aCGitnt3kBq31ECxTHK8,385886
 signalwire_agents/agents/bedrock.py,sha256=J582gooNtxtep4xdVOfyDzRtHp_XrurPMS93xf2Xod0,10836
 signalwire_agents/cli/__init__.py,sha256=XbxAQFaCIdGXIXJiriVBWoFPOJsC401u21588nO4TG8,388
@@ -131,17 +131,17 @@ signalwire_agents/skills/wikipedia_search/__init__.py,sha256=yJ6iYTSyJC96mwwUsI_
 signalwire_agents/skills/wikipedia_search/skill.py,sha256=peNxT3GHMJY5OFQ-weneO83NpSstGjcmrTN_ENzUsEo,7910
 signalwire_agents/utils/__init__.py,sha256=1KVsHzwgfktSXHe3vqSRGImjtIE58szwD2FHHoFBtvY,601
 signalwire_agents/utils/pom_utils.py,sha256=4Mr7baQ_xR_hfJ72YxQRAT_GFa663YjFX_PumJ35Xds,191
-signalwire_agents/utils/schema_utils.py,sha256=i4okv_O9bUApwT_jJf4Yoij3bLCrGrW3DC-vzSy2RuY,16392
+signalwire_agents/utils/schema_utils.py,sha256=fBbzRJx9GSJFfYbc_18CbjpFL2K83Nr7utNaH-ZnMqE,18224
 signalwire_agents/utils/token_generators.py,sha256=4Mr7baQ_xR_hfJ72YxQRAT_GFa663YjFX_PumJ35Xds,191
 signalwire_agents/utils/validators.py,sha256=4Mr7baQ_xR_hfJ72YxQRAT_GFa663YjFX_PumJ35Xds,191
 signalwire_agents/web/__init__.py,sha256=XE_pSTY9Aalzr7J7wqFth1Zr3cccQHPPcF5HWNrOpz8,383
 signalwire_agents/web/web_service.py,sha256=a2PSHJgX1tlZr0Iz1A1UouZjXEePJAZL632evvLVM38,21071
-signalwire_agents-1.0.18.dev8.data/data/share/man/man1/sw-agent-init.1,sha256=J4k5Oi74BnWCPCvsaw00vuyyqDPuIECjJIPu5OynvJc,8381
-signalwire_agents-1.0.18.dev8.data/data/share/man/man1/sw-search.1,sha256=9jJ6V6t6DgmXByz8Lw9exjf683Cw3sJGro8-eB0M9EY,10413
-signalwire_agents-1.0.18.dev8.data/data/share/man/man1/swaig-test.1,sha256=Ri0EITo8YMFowkcYltwPSwU4VJdRzo7XTWloi5WddCg,7815
-signalwire_agents-1.0.18.dev8.dist-info/licenses/LICENSE,sha256=NYvAsB-rTcSvG9cqHt9EUHAWLiA9YzM4Qfz-mPdvDR0,1067
-signalwire_agents-1.0.18.dev8.dist-info/METADATA,sha256=38PNqIfDS1niAIzvHmPgP29UgLfufTJh1NDa-LxXd6s,41745
-signalwire_agents-1.0.18.dev8.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-signalwire_agents-1.0.18.dev8.dist-info/entry_points.txt,sha256=fMiBH-GLeXGaWWn58Mcj7KM_m3SdomQMUQu-1LTqscw,315
-signalwire_agents-1.0.18.dev8.dist-info/top_level.txt,sha256=kDGS6ZYv84K9P5Kyg9_S8P_pbUXoHkso0On_DB5bbWc,18
-signalwire_agents-1.0.18.dev8.dist-info/RECORD,,
+signalwire_agents-1.0.18.dev9.data/data/share/man/man1/sw-agent-init.1,sha256=J4k5Oi74BnWCPCvsaw00vuyyqDPuIECjJIPu5OynvJc,8381
+signalwire_agents-1.0.18.dev9.data/data/share/man/man1/sw-search.1,sha256=9jJ6V6t6DgmXByz8Lw9exjf683Cw3sJGro8-eB0M9EY,10413
+signalwire_agents-1.0.18.dev9.data/data/share/man/man1/swaig-test.1,sha256=Ri0EITo8YMFowkcYltwPSwU4VJdRzo7XTWloi5WddCg,7815
+signalwire_agents-1.0.18.dev9.dist-info/licenses/LICENSE,sha256=NYvAsB-rTcSvG9cqHt9EUHAWLiA9YzM4Qfz-mPdvDR0,1067
+signalwire_agents-1.0.18.dev9.dist-info/METADATA,sha256=8RegFa1Xmud4xJAFo3SUEd3UMszJ982nZLH_7qjyAvc,41779
+signalwire_agents-1.0.18.dev9.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+signalwire_agents-1.0.18.dev9.dist-info/entry_points.txt,sha256=fMiBH-GLeXGaWWn58Mcj7KM_m3SdomQMUQu-1LTqscw,315
+signalwire_agents-1.0.18.dev9.dist-info/top_level.txt,sha256=kDGS6ZYv84K9P5Kyg9_S8P_pbUXoHkso0On_DB5bbWc,18
+signalwire_agents-1.0.18.dev9.dist-info/RECORD,,