Skip to content

refactor(spec): clean up all remaining references to basic_catalog.json#1463

Merged
gspencergoog merged 2 commits into
google:mainfrom
gspencergoog:spec_file_restructure
May 20, 2026
Merged

refactor(spec): clean up all remaining references to basic_catalog.json#1463
gspencergoog merged 2 commits into
google:mainfrom
gspencergoog:spec_file_restructure

Conversation

@gspencergoog
Copy link
Copy Markdown
Collaborator

Description

This PR is a follow-on to commit e2053fff00fb30972c60d9604511f9cfa15890a7 (#1452) to clean up all remaining references to the legacy basic_catalog.json schema, re-targeting them to the newly restructured catalog path at catalogs/basic/catalog.json.

Changes

  • TypeScript Evaluation Framework (eval/):
    • Updated specification/v0_9/eval/src/index.ts and specification/v0_10/eval/src/index.ts to resolve and key specification schemas relative to the version root using their repository path (e.g. catalogs/basic/catalog.json).
    • Refactored schema lookups, Ajv validator registration hooks, and targeted subschema validation calls in eval/src/validator.ts to replace references to 'basic_catalog.json' with 'catalogs/basic/catalog.json'.
    • Updated prompt generation instructions in eval/src/generation_flow.ts to use the correct restructured catalog URL.
  • Spec Tests & Runners (test/):
    • Refactored the run_tests.py test suite scripts in v0_9/test/ and v0_10/test/ to point to the new catalog file path by default.
    • Streamlined path resolution logic in v0_10/test/run_tests.py relative to SPEC_DIR, completely removing the legacy fallback array mapping.
    • Batch-updated catalog references inside test cases (such as contact_form_example_test.json, contact_form_example.jsonl, and theme_validation.json).
  • Agent SDKs:
    • Kotlin: Updated Gradle copy tasks in build.gradle.kts and resource mappings in BasicCatalogProvider.kt / ValidatorTest.kt to reference catalog.json inside specification/v0_9/catalogs/basic/.
    • Python: Re-targeted catalog and validator test mock schemas in test_catalog.py, test_validator.py, and verify_load_real.py to use catalogs/basic/catalog.json.
  • Samples & Renderers:
    • Updated 14 example and workflow JSON/Python assets under samples/ to migrate their catalogId field.
    • Corrected the comment inside renderers/angular/scripts/generate-examples.mjs.

Impact & Risks

There are no breaking changes or performance side effects. The remappings are backward-compatible and resolve the exact same JSON schema files under their restructured names.

Testing

  1. Python SDK Unit Tests:
    • Run uv run pytest inside agent_sdks/python to verify all 248 unit and integration tests execute and pass.
  2. Specification Ajv Schema Suite:
    • Run python3 run_tests.py inside specification/v0_9/test/ and specification/v0_10/test/ respectively.
    • Verify that all validation cases execute with zero failures (27/27 passed on v0.9, 29/29 passed on v0.10).

gemini-code-assist[bot]

This comment was marked as resolved.

@gspencergoog gspencergoog force-pushed the spec_file_restructure branch 5 times, most recently from 910f83e to 94b2786 Compare May 20, 2026 01:22
…talogs/basic/catalog.json

Complete the cleanup of basic_catalog.json legacy references by renaming them to catalogs/basic/catalog.json in v0.9 and v0.10 specifications, SDKs (Python/Kotlin), demo samples, test cases, and eval runners.
@gspencergoog gspencergoog force-pushed the spec_file_restructure branch from 94b2786 to 72c42ce Compare May 20, 2026 01:30
Copy link
Copy Markdown
Collaborator

@josemontespg josemontespg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@gspencergoog gspencergoog merged commit a7e4129 into google:main May 20, 2026
25 checks passed
@github-project-automation github-project-automation Bot moved this from Todo to Done in A2UI May 20, 2026
suyangw-g pushed a commit to suyangw-g/A2UI that referenced this pull request May 26, 2026
…on (google#1463)

Complete the cleanup of basic_catalog.json legacy references by renaming them to catalogs/basic/catalog.json in v0.9 and v0.10 specifications, SDKs (Python/Kotlin), demo samples, test cases, and eval runners.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants