Rename BasicCatalog to BasicModelCatalog

Author: nan-yu

agent_sdks/python/a2ui_core/README.md

@@ -58,7 +58,7 @@ graph TD
 #### 5. Basic Catalog (`src/a2ui/core/basic_catalog`)
 
 - **Basic Component Models**: Symmetrical declarations of core out-of-the-box components (`TextComponent`, `ButtonComponent`, `CardComponent`, etc.) conforming directly to standard schema configurations.
-- **`BasicCatalog`**: Factory provider initializing standard schemas and layout parameters.
+- **`BasicModelCatalog`**: Factory provider initializing standard schemas and layout parameters.
 
 #### 6. Symmetrical Schemas (`src/a2ui/core/schema`)
 

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

@@ -74,7 +74,7 @@ def _basic_catalog_id(spec_version: str) -> str:
     )
 
 
-class BasicCatalog(ModelCatalog):
+class BasicModelCatalog(ModelCatalog):
 
     def __init__(self):
         components_map = {

agent_sdks/python/a2ui_core/tests/test_catalog.py

@@ -17,7 +17,7 @@
 import pytest
 from a2ui.core.catalog import CatalogApi, JsonCatalog, ModelCatalog
 from a2ui.core.validating import CatalogValidator
-from a2ui.core.basic_catalog import BasicCatalog
+from a2ui.core.basic_catalog import BasicModelCatalog
 from a2ui.core.schema.common_types import ComponentId
 from a2ui.core.schema.constants import SPEC_VERSION
 
@@ -830,18 +830,18 @@ def test_json_catalog_unevaluated_properties_handling():
 
 
 # ==============================================================================
-# 3. BasicCatalog Implementation Coverage
+# 3. BasicModelCatalog Implementation Coverage
 # ==============================================================================
 
 
 def test_basic_catalog_initialization():
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
     assert catalog.spec_version == SPEC_VERSION
     assert "https://a2ui.org/specification" in catalog.catalog_id
 
 
 def test_basic_catalog_validate_components():
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
 
     # Valid component payload
     text_comp = {
@@ -863,7 +863,7 @@ def test_basic_catalog_validate_components():
 
 
 def test_basic_catalog_validate_theme():
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
 
     # 1. Test Valid Theme
     _val(catalog).validate_theme({"primaryColor": "#00BFFF"})
@@ -874,7 +874,7 @@ def test_basic_catalog_validate_theme():
 
 
 def test_basic_catalog_validate_functions():
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
 
     # 1. Test validate_function Valid
     # Valid call: formatString takes named parameter 'value'
@@ -890,7 +890,7 @@ def test_basic_catalog_validate_functions():
 
 
 def test_basic_catalog_nested_function_validation():
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
 
     # 1. Rejects unrecognized nested catalog function call
     with pytest.raises(ValueError, match="Unknown function: unrecognizedFunctionName"):
@@ -927,7 +927,7 @@ def test_basic_catalog_nested_function_validation():
 
 
 def test_basic_catalog_extract_ref_fields():
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
     ref_map = catalog.extract_ref_fields()
 
     # Check that Button has 'child' as single ref
@@ -942,7 +942,7 @@ def test_basic_catalog_extract_ref_fields():
 
 
 def test_basic_catalog_tabs_ref():
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
     ref_map = catalog.extract_ref_fields()
     assert "Tabs" in ref_map
     single_refs, list_refs = ref_map["Tabs"]

agent_sdks/python/a2ui_core/tests/test_processing.py

@@ -24,7 +24,7 @@
     MissingDataBindingWarning,
 )
 from a2ui.core.state import SurfaceModel
-from a2ui.core.basic_catalog import BasicCatalog
+from a2ui.core.basic_catalog import BasicModelCatalog
 from a2ui.core.catalog import ModelCatalog, JsonCatalog
 from a2ui.core.schema.constants import SPEC_VERSION
 
@@ -54,7 +54,7 @@ def validate_theme(self, theme):
 
 @pytest.fixture
 def real_catalog_09():
-    return BasicCatalog()
+    return BasicModelCatalog()
 
 
 def test_message_processor_surface_lifecycle(mock_catalog):
@@ -554,7 +554,7 @@ def test_message_processor_strict_mode_unrecognized_component_type(
 
 
 def test_message_processor_xor_conflict_coverage():
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
 
     processor = MessageProcessor(catalogs=[catalog])
 

agent_sdks/python/a2ui_core/tests/test_rendering.py

@@ -22,11 +22,11 @@
     GenericBinder,
     MissingDataBindingWarning,
 )
-from a2ui.core.basic_catalog import BasicCatalog
+from a2ui.core.basic_catalog import BasicModelCatalog
 
 
 def test_component_context_from_surface():
-    surface = SurfaceModel("s1", BasicCatalog(), theme={"primaryColor": "#123456"})
+    surface = SurfaceModel("s1", BasicModelCatalog(), theme={"primaryColor": "#123456"})
     c1 = ComponentModel("c1", "Button", {"label": "Click"})
     surface.components_model.add_component(c1)
 
@@ -49,7 +49,7 @@ def test_component_context_from_surface():
 
 
 def test_data_context_resolve_action_and_locale():
-    surface = SurfaceModel("s1", BasicCatalog(), locale="fr-FR")
+    surface = SurfaceModel("s1", BasicModelCatalog(), locale="fr-FR")
     surface.data_model.set("/username", "Alice")
 
     ctx = DataContext(surface=surface)
@@ -80,7 +80,8 @@ def test_data_context_missing_binding_warning():
 
 
 def test_generic_binder_reactive_checks():
-    surface = SurfaceModel("s1", BasicCatalog())
+    surface = SurfaceModel("s1", BasicModelCatalog())
+
     surface.data_model.set("/score", 50)
 
     c1 = ComponentModel(
@@ -155,10 +156,8 @@ def test_resolve_dynamic_values():
 
 
 def test_string_interpolation_format_string():
-    from a2ui.core.basic_catalog import BasicCatalog
-
     data_model = DataModel({"user": {"name": "Charlie"}})
-    ctx = DataContext(path="/", data_model=data_model, catalog=BasicCatalog())
+    ctx = DataContext(path="/", data_model=data_model, catalog=BasicModelCatalog())
 
     # Test basic formatString execution
     expr = {"call": "formatString", "args": {"value": "Hello ${user/name}!"}}
@@ -168,10 +167,8 @@ def test_string_interpolation_format_string():
 
 
 def test_string_interpolation_with_escapes():
-    from a2ui.core.basic_catalog import BasicCatalog
-
     data_model = DataModel({"user": {"name": "Charlie"}})
-    ctx = DataContext(path="/", data_model=data_model, catalog=BasicCatalog())
+    ctx = DataContext(path="/", data_model=data_model, catalog=BasicModelCatalog())
 
     # Escaped block resolving to literal string
     expr = {

agent_sdks/python/a2ui_core/tests/test_state.py

@@ -25,7 +25,7 @@
     SurfaceModel,
     SurfaceGroupModel,
 )
-from a2ui.core.basic_catalog import BasicCatalog
+from a2ui.core.basic_catalog import BasicModelCatalog
 
 
 def test_component_model_lifecycle():
@@ -274,9 +274,8 @@ def test_component_node_lifecycle():
 
 
 def test_surface_model_node_layer_resolution():
-    from a2ui.core.basic_catalog import BasicCatalog
+    catalog = BasicModelCatalog()
 
-    catalog = BasicCatalog()
     surface = SurfaceModel("main", catalog)
 
     # 1. Access root node placeholder
@@ -349,7 +348,7 @@ def test_node_core_properties():
 
 
 def test_surface_model_root_node_resolution():
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
     surface = SurfaceModel("surf-1", catalog)
 
     # Initial state: no root component, rootNode is None
@@ -370,7 +369,7 @@ def test_surface_model_root_node_resolution():
 
 
 def test_node_layer_reactive_property_resolution():
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
     surface = SurfaceModel("surf-1", catalog)
 
     # Initialize data model
@@ -393,7 +392,7 @@ def test_node_layer_reactive_property_resolution():
 
 
 def test_structural_child_resolution():
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
     surface = SurfaceModel("surf-1", catalog)
 
     # Setup parent component pointing to a child component
@@ -421,7 +420,7 @@ def test_structural_child_resolution():
 
 
 def test_template_child_list_spawning():
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
     surface = SurfaceModel("surf-1", catalog)
 
     # Set up dynamic array data
@@ -482,7 +481,7 @@ def test_template_child_list_spawning():
 
 
 def test_progressive_rendering_and_reconciliation():
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
     surface = SurfaceModel("surf-1", catalog)
 
     # Parent component references a child that hasn't arrived yet
@@ -513,7 +512,7 @@ def test_progressive_rendering_and_reconciliation():
 
 
 def test_action_binding_closures():
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
     surface = SurfaceModel("surf-1", catalog)
 
     # Data model state
@@ -563,7 +562,7 @@ def test_action_binding_closures():
 def test_unresolved_data_binding_warning_and_value():
     from a2ui.core.rendering.data_context import MissingDataBindingWarning
 
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
     surface = SurfaceModel("surf-1", catalog)
 
     # Setup component pointing to a missing path
@@ -584,7 +583,7 @@ def test_unresolved_data_binding_warning_and_value():
 
 
 def test_structural_child_modification():
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
     surface = SurfaceModel("surf-1", catalog)
 
     # Setup parent component and two potential child components
@@ -625,7 +624,7 @@ def test_structural_child_modification():
 
 
 def test_structural_children_and_template_modification():
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
     surface = SurfaceModel("surf-1", catalog)
 
     # Setup parent component pointing to an explicit list of children
@@ -695,7 +694,7 @@ def test_structural_children_and_template_modification():
 
 
 def test_data_context_function_call_bindings():
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
     surface = SurfaceModel("surf-1", catalog)
 
     # Populate data model with string template arguments
@@ -737,7 +736,7 @@ def test_data_context_function_call_bindings():
     assert node_2.props.value["text"] == "Name: ${escaped} and real name John"
 
     # 3. Test catalog custom math function execution ("add" custom catalog invoker)
-    class MathCatalog(BasicCatalog):
+    class MathCatalog(BasicModelCatalog):
 
         def __init__(self):
             super().__init__()
@@ -765,7 +764,7 @@ def execute(self, args, context=None, abort_signal=None):
 
 
 def test_nested_tab_list_child_resolution():
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
     surface = SurfaceModel("surf-1", catalog)
 
     # Setup parent component with tabs property (list of TabItem dicts referencing children)
@@ -809,7 +808,7 @@ def test_nested_tab_list_child_resolution():
 
 
 def test_component_deletion_reconciliation():
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
     surface = SurfaceModel("surf-1", catalog)
 
     # Setup parent referencing a child component
@@ -852,7 +851,7 @@ def test_a2ui_text_renderer_reactive_layouts():
     sys.path.insert(0, os.path.dirname(__file__))
     from text_renderer import A2uiTextRenderer
 
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
     surface = SurfaceModel("surf-1", catalog)
 
     # 1. Set up initial static surface components

agent_sdks/python/a2ui_core/tests/test_validating.py

@@ -26,7 +26,7 @@
     ValidationConfig,
     CatalogValidator,
 )
-from a2ui.core.basic_catalog import BasicCatalog
+from a2ui.core.basic_catalog import BasicModelCatalog
 
 
 # ==============================================================================
@@ -235,7 +235,7 @@ def test_a2ui_validator_protocol_envelope_not_dict():
 
 
 def test_a2ui_validator_validate_valid_payload():
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
     validator = A2uiValidator()
 
     messages = [
@@ -271,7 +271,7 @@ def test_a2ui_validator_validate_valid_payload():
 
 
 def test_a2ui_validator_validate_components_error():
-    catalog = BasicCatalog()
+    catalog = BasicModelCatalog()
     validator = A2uiValidator()
 
     messages = [
@@ -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 = CatalogValidator.from_catalog(BasicModelCatalog())
     validator = A2uiValidator()
     strict_config = ValidationConfig(
         allow_orphan_components=False, allow_dangling_references=False