Rename CatalogValidator to CatalogSchemaValidator

Author: nan-yu

agent_sdks/python/a2ui_core/src/a2ui/core/validating/__init__.py

@@ -19,7 +19,7 @@
     validate_recursion_and_paths,
     get_component_references,
 )
-from .catalog_validator import CatalogValidator
+from .catalog_schema_validator import CatalogSchemaValidator
 
 __all__ = [
     "A2uiValidator",
@@ -29,5 +29,5 @@
     "validate_component_integrity",
     "validate_recursion_and_paths",
     "get_component_references",
-    "CatalogValidator",
+    "CatalogSchemaValidator",
 ]

…2ui/core/validating/catalog_validator.py …e/validating/catalog_schema_validator.pyagent_sdks/python/a2ui_core/src/a2ui/core/validating/catalog_validator.py renamed to agent_sdks/python/a2ui_core/src/a2ui/core/validating/catalog_schema_validator.py agent_sdks/python/a2ui_core/src/a2ui/core/validating/catalog_validator.py renamed to agent_sdks/python/a2ui_core/src/a2ui/core/validating/catalog_schema_validator.py

@@ -19,6 +19,7 @@
 from referencing.jsonschema import DRAFT202012
 
 from ..catalog import Catalog, ComponentApi, ModelComponentApi
+from ..catalog.catalog import TComponent, TFunction
 from ..schema.common_types import (
     ComponentReference,
     ListReference,
@@ -36,8 +37,8 @@ def _schema_url(spec_version: str, file_name: str) -> str:
     return f"{SPEC_BASE_URL}/{ver.replace('.', '_')}/{file_name}"
 
 
-class CatalogValidator:
-    """Consolidated Catalog Validator for A2UI catalogs using jsonschema engine."""
+class CatalogSchemaValidator:
+    """Consolidated Catalog Schema Validator for A2UI catalogs using jsonschema engine."""
 
     def __init__(self, catalog: Catalog[TComponent, TFunction]):
         self.catalog = catalog
@@ -339,8 +340,8 @@ def extract_ref_fields(self) -> Dict[str, Tuple[Set[str], Set[str]]]:
         return extract_ref_fields(self.catalog)
 
     @classmethod
-    def from_catalog(cls, catalog: Any) -> "CatalogValidator":
-        if isinstance(catalog, CatalogValidator):
+    def from_catalog(cls, catalog: Any) -> "CatalogSchemaValidator":
+        if isinstance(catalog, CatalogSchemaValidator):
             return catalog
         return cls(catalog)
 

agent_sdks/python/a2ui_core/src/a2ui/core/validating/validator.py

@@ -31,7 +31,7 @@
     validate_recursion_and_paths,
 )
 from .topology_analyzer import analyze_topology
-from .catalog_validator import CatalogValidator
+from .catalog_schema_validator import CatalogSchemaValidator
 
 
 class A2uiValidatorError(ValueError):
@@ -116,7 +116,7 @@ def _format_validation_errors(
 
     def validate_components(
         self,
-        catalog_validator: CatalogValidator,
+        schema_validator: CatalogSchemaValidator,
         components: List[Dict[str, Any]],
         config: ValidationConfig = ValidationConfig(),
     ) -> None:
@@ -126,12 +126,12 @@ def validate_components(
             # invalid component and collect all schema validation errors across the payload.
             for c in components:
                 try:
-                    catalog_validator.validate_components([c])
+                    schema_validator.validate_components([c])
                 except Exception as ce:
                     errors.append(ce)
             if not errors:
                 try:
-                    ref_fields = catalog_validator.extract_ref_fields()
+                    ref_fields = schema_validator.extract_ref_fields()
                     validate_component_integrity(
                         components,
                         ref_fields,
@@ -150,7 +150,7 @@ def validate_components(
 
     def validate(
         self,
-        catalog_validator: CatalogValidator,
+        schema_validator: CatalogSchemaValidator,
         a2ui_payload: Union[Dict[str, Any], List[Any]],
         config: Optional[ValidationConfig] = None,
     ) -> None:
@@ -173,14 +173,14 @@ def validate(
                     if MSG_TYPE_CREATE_SURFACE in msg:
                         theme = msg[MSG_TYPE_CREATE_SURFACE].get(THEME_KEY)
                         if theme:
-                            catalog_validator.validate_theme(theme)
+                            schema_validator.validate_theme(theme)
                     elif MSG_TYPE_UPDATE_COMPONENTS in msg:
                         components = msg[MSG_TYPE_UPDATE_COMPONENTS].get(
                             CATALOG_COMPONENTS_KEY
                         )
                         if isinstance(components, list):
                             self.validate_components(
-                                catalog_validator,
+                                schema_validator,
                                 components,
                                 config=config,
                             )

agent_sdks/python/a2ui_core/tests/test_catalog.py

@@ -21,14 +21,14 @@
     ModelComponentApi,
     FunctionImplementation,
 )
-from a2ui.core.validating import CatalogValidator
+from a2ui.core.validating import CatalogSchemaValidator
 from a2ui.core.basic_catalog import BasicCatalog
 from a2ui.core.schema.common_types import ComponentId
 from a2ui.core.schema.constants import SPEC_VERSION
 
 
-def _val(catalog: Catalog[Any, Any]) -> CatalogValidator:
-    return CatalogValidator.from_catalog(catalog)
+def _val(catalog: Catalog[Any, Any]) -> CatalogSchemaValidator:
+    return CatalogSchemaValidator.from_catalog(catalog)
 
 
 # ==============================================================================
@@ -867,7 +867,7 @@ class ModelCompA(BaseModel):
         ],
     )
 
-    validator = CatalogValidator(catalog)
+    validator = CatalogSchemaValidator(catalog)
 
     # 1. Validate payload conforming to ModelComponentApi
     validator.validate_components(

agent_sdks/python/a2ui_core/tests/test_validating.py

@@ -24,7 +24,7 @@
     validate_recursion_and_paths,
     get_component_references,
     ValidationConfig,
-    CatalogValidator,
+    CatalogSchemaValidator,
 )
 from a2ui.core.basic_catalog import BasicCatalog
 
@@ -267,7 +267,7 @@ def test_a2ui_validator_validate_valid_payload():
         },
     ]
 
-    validator.validate(CatalogValidator.from_catalog(catalog), messages)
+    validator.validate(CatalogSchemaValidator.from_catalog(catalog), messages)
 
 
 def test_a2ui_validator_validate_components_error():
@@ -290,7 +290,7 @@ def test_a2ui_validator_validate_components_error():
     ]
 
     with pytest.raises(A2uiValidatorError):
-        validator.validate(CatalogValidator.from_catalog(catalog), messages)
+        validator.validate(CatalogSchemaValidator.from_catalog(catalog), messages)
 
 
 def test_topology_cyclomatic_orphans_coverage():
@@ -421,7 +421,7 @@ def test_validator_aggregated_pydantic_error_formatting():
 def test_validator_config_parameter():
     # Verify that ValidationConfig is respected during validation
 
-    catalog = CatalogValidator.from_catalog(BasicCatalog())
+    catalog = CatalogSchemaValidator.from_catalog(BasicCatalog())
     validator = A2uiValidator()
     strict_config = ValidationConfig(
         allow_orphan_components=False, allow_dangling_references=False