Merge branch 'main' into reconcile-v0_10-superset

Author: gspencergoog

agent_sdks/kotlin/build.gradle.kts

@@ -39,7 +39,7 @@ repositories {
 
 dependencies {
   api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
-  implementation("com.networknt:json-schema-validator:1.5.1")
+  implementation("com.networknt:json-schema-validator:2.0.1")
   implementation("com.fasterxml.jackson.core:jackson-databind:2.17.2")
 
   // Core Dependencies

agent_sdks/kotlin/src/main/kotlin/com/google/a2ui/schema/Validator.kt

@@ -16,11 +16,11 @@
 
 package com.google.a2ui.schema
 
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.networknt.schema.JsonSchema
-import com.networknt.schema.JsonSchemaFactory
-import com.networknt.schema.SchemaValidatorsConfig
-import com.networknt.schema.SpecVersion
+import com.networknt.schema.InputFormat
+import com.networknt.schema.Schema
+import com.networknt.schema.SchemaRegistry
+import com.networknt.schema.SchemaRegistryConfig
+import com.networknt.schema.dialect.Dialects
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonElement
@@ -44,21 +44,18 @@ constructor(
   private val catalog: A2uiCatalog,
   private val schemaMappings: Map<String, String> = emptyMap(),
 ) {
-  private val validator: JsonSchema = buildValidator()
-  private val mapper = ObjectMapper()
-  private val shared0_9Factory: JsonSchemaFactory by lazy {
-    JsonSchemaFactory.builder(JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V202012))
-      .schemaMappers { schemaMappers ->
-        schemaMappings.forEach { (prefix, target) -> schemaMappers.mapPrefix(prefix, target) }
+  private val shared0_9Registry: SchemaRegistry by lazy {
+    SchemaRegistry.withDialect(Dialects.getDraft202012()) { builder ->
+      builder.schemaIdResolvers { schemaIdResolvers ->
+        schemaMappings.forEach { (prefix, target) -> schemaIdResolvers.mapPrefix(prefix, target) }
       }
-      .build()
-  }
-  private val sharedConfig: SchemaValidatorsConfig by lazy {
-    SchemaValidatorsConfig.builder().build()
+    }
   }
-  private val subValidators = mutableMapOf<String, JsonSchema>()
+  private val sharedConfig: SchemaRegistryConfig by lazy { SchemaRegistryConfig.builder().build() }
+  private val subValidators = mutableMapOf<String, Schema>()
+  private val validator: Schema = buildValidator()
 
-  private fun buildValidator(): JsonSchema =
+  private fun buildValidator(): Schema =
     if (catalog.version == A2uiVersion.VERSION_0_8) build0_8Validator() else build0_9Validator()
 
   private fun injectAdditionalProperties(
@@ -121,7 +118,7 @@ constructor(
     return bundled as JsonObject
   }
 
-  private fun build0_8Validator(): JsonSchema {
+  private fun build0_8Validator(): Schema {
     val bundledSchema = bundle0_8Schemas()
     val fullSchema = SchemaResourceLoader.wrapAsJsonArray(bundledSchema).toMutableMap()
     fullSchema[KEY_DOLLAR_SCHEMA] = JsonPrimitive(SCHEMA_DRAFT_2020_12)
@@ -132,38 +129,29 @@ constructor(
     val baseDirUri = baseUri.substringBeforeLast("/")
     val commonTypesUri = "$baseDirUri/$FILE_COMMON_TYPES"
 
-    val config = SchemaValidatorsConfig.builder().build()
-
     val jsonFmt = Json { prettyPrint = false }
 
-    val factory =
-      JsonSchemaFactory.builder(JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V202012))
-        .schemaMappers { schemaMappers ->
-          schemaMappings.forEach { (prefix, target) -> schemaMappers.mapPrefix(prefix, target) }
-          schemaMappers.mapPrefix(FILE_COMMON_TYPES, commonTypesUri)
+    val registry =
+      SchemaRegistry.withDialect(Dialects.getDraft202012()) { builder ->
+        builder.schemaIdResolvers { schemaIdResolvers ->
+          schemaMappings.forEach { (prefix, target) -> schemaIdResolvers.mapPrefix(prefix, target) }
+          schemaIdResolvers.mapPrefix(FILE_COMMON_TYPES, commonTypesUri)
         }
-        .build()
+        builder.schemaRegistryConfig(sharedConfig)
+      }
 
     val schemaString = jsonFmt.encodeToString(JsonElement.serializer(), JsonObject(fullSchema))
-    return factory.getSchema(schemaString, config)
+    return registry.getSchema(schemaString, InputFormat.JSON)
   }
 
-  private fun build0_9Validator(): JsonSchema {
+  private fun build0_9Validator(): Schema {
     val fullSchema =
       SchemaResourceLoader.wrapAsJsonArray(catalog.serverToClientSchema).toMutableMap()
     fullSchema[KEY_DOLLAR_SCHEMA] = JsonPrimitive(SCHEMA_DRAFT_2020_12)
 
-    val config = SchemaValidatorsConfig.builder().build()
-    val factory =
-      JsonSchemaFactory.builder(JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V202012))
-        .schemaMappers { schemaMappers ->
-          schemaMappings.forEach { (prefix, target) -> schemaMappers.mapPrefix(prefix, target) }
-        }
-        .build()
-
     val jsonFmt = Json { prettyPrint = false }
     val schemaString = jsonFmt.encodeToString(JsonElement.serializer(), JsonObject(fullSchema))
-    return factory.getSchema(schemaString, config)
+    return shared0_9Registry.getSchema(schemaString, InputFormat.JSON)
   }
 
   /**
@@ -185,9 +173,8 @@ constructor(
       // Basic schema validation
       val jsonFmt = Json { prettyPrint = false }
       val messagesString = jsonFmt.encodeToString(JsonElement.serializer(), messages)
-      val jsonNode = mapper.readTree(messagesString)
 
-      val errors = validator.validate(jsonNode)
+      val errors = validator.validate(messagesString, InputFormat.JSON)
       if (errors.isNotEmpty()) {
         val msg = buildString {
           append("Validation failed:")
@@ -290,7 +277,7 @@ constructor(
     }
   }
 
-  private fun getSubValidator(defName: String): JsonSchema {
+  private fun getSubValidator(defName: String): Schema {
     return subValidators.getOrPut(defName) {
       val defs =
         catalog.serverToClientSchema["\$defs"] as? JsonObject
@@ -310,22 +297,21 @@ constructor(
 
       val jsonFmt = Json { prettyPrint = false }
       val schemaString = jsonFmt.encodeToString(JsonElement.serializer(), tempSchema)
-      shared0_9Factory.getSchema(schemaString, sharedConfig)
+      shared0_9Registry.getSchema(schemaString, InputFormat.JSON)
     }
   }
 
   private fun getFormattedErrors(
-    validator: JsonSchema,
+    validator: Schema,
     instance: JsonElement,
     basePath: String,
   ): List<String> {
     val jsonFmt = Json { prettyPrint = false }
     val instanceStr = jsonFmt.encodeToString(JsonElement.serializer(), instance)
-    val jsonNode = mapper.readTree(instanceStr)
-    val errors = validator.validate(jsonNode)
+    val errors = validator.validate(instanceStr, InputFormat.JSON)
 
     return errors.map { err ->
-      val msg = err.message ?: ""
+      val msg = err.toString()
       val unexpectedRegex =
         Regex(
           "property '(.*?)' is not defined in the schema and the schema does not allow additional properties"
@@ -419,7 +405,7 @@ constructor(
           )
         val jsonFmt = Json { prettyPrint = false }
         val schemaString = jsonFmt.encodeToString(JsonElement.serializer(), tempSchema)
-        shared0_9Factory.getSchema(schemaString, sharedConfig)
+        shared0_9Registry.getSchema(schemaString, InputFormat.JSON)
       }
 
     return getFormattedErrors(validator, comp, path)

agent_sdks/python/src/a2ui/adk/a2a/part_converter.py

@@ -55,17 +55,25 @@ class A2uiPartConverter:
   This converter handles both tool-based A2UI (via `send_a2ui_json_to_client`)
   and text-based A2UI (via A2UI delimiter tags). It uses the provided
   catalog to validate and fix JSON payloads.
+
+  Args:
+      a2ui_catalog: The A2UI catalog.
+      bypass_tool_check: If True, bypass tool validation.
+      fallback_text: Optional text to fall back on if parsing fails.
+      version: The A2UI version to use. Defaults to "0.8".
   """
 
   def __init__(
       self,
       a2ui_catalog: A2uiCatalog,
       bypass_tool_check: bool = False,
       fallback_text: Optional[str] = None,
+      version: str = constants.VERSION_0_8,
   ):
     self._catalog = a2ui_catalog
     self._bypass_tool_check = bypass_tool_check
     self._fallback_text = fallback_text
+    self._version = version
 
   def convert(self, part: genai_types.Part) -> list[a2a_types.Part]:
     """Converts a GenAI part to A2A parts, with A2UI validation.
@@ -97,7 +105,10 @@ def convert(self, part: genai_types.Part) -> list[a2a_types.Part]:
         ):
           json_data = response_dict.get(constants.A2UI_VALIDATED_JSON_KEY)
           if json_data:
-            return [create_a2ui_part(message) for message in json_data]
+            return [
+                create_a2ui_part(message, version=self._version)
+                for message in json_data
+            ]
 
         if is_send_a2ui_json_to_client_response:
           logger.info("No result in A2UI tool response")
@@ -111,6 +122,7 @@ def convert(self, part: genai_types.Part) -> list[a2a_types.Part]:
               result,
               validator=self._catalog.validator,
               fallback_text=self._fallback_text,
+              version=self._version,
           )
 
     # 2. Handle Tool Calls (FunctionCall) - Skip sending to client
@@ -126,6 +138,7 @@ def convert(self, part: genai_types.Part) -> list[a2a_types.Part]:
             text,
             validator=self._catalog.validator,
             fallback_text=self._fallback_text,
+            version=self._version,
         )
 
     # 4. Default conversion for other parts

agent_sdks/python/tests/adk/a2a/test_part_converter.py

@@ -24,7 +24,7 @@
 from a2ui.adk.a2a.part_converter import A2uiPartConverter
 from a2ui.adk.send_a2ui_to_client_toolset import SendA2uiToClientToolset
 from a2ui.schema.catalog import A2uiCatalog
-from a2ui.schema.constants import A2UI_CLOSE_TAG, A2UI_OPEN_TAG
+from a2ui.schema.constants import A2UI_CLOSE_TAG, A2UI_OPEN_TAG, VERSION_0_8, VERSION_0_9_1
 from google.genai import types as genai_types
 
 
@@ -45,7 +45,27 @@ def test_converter_class_convert_valid_tool_response():
 
   a2a_parts = converter.convert(part)
   assert len(a2a_parts) == 1
-  assert a2a_parts[0] == create_a2ui_part(valid_a2ui)
+  assert a2a_parts[0] == create_a2ui_part(valid_a2ui, version=VERSION_0_8)
+
+
+def test_converter_class_convert_valid_tool_response_v0_9_1():
+  catalog_mock = MagicMock(spec=A2uiCatalog)
+  converter = A2uiPartConverter(catalog_mock, version=VERSION_0_9_1)
+
+  valid_a2ui = {"type": "Text", "text": "Hello"}
+  function_response = genai_types.FunctionResponse(
+      name=SendA2uiToClientToolset._SendA2uiJsonToClientTool.TOOL_NAME,
+      response={
+          SendA2uiToClientToolset._SendA2uiJsonToClientTool.VALIDATED_A2UI_JSON_KEY: [
+              valid_a2ui
+          ]
+      },
+  )
+  part = genai_types.Part(function_response=function_response)
+
+  a2a_parts = converter.convert(part)
+  assert len(a2a_parts) == 1
+  assert a2a_parts[0] == create_a2ui_part(valid_a2ui, version=VERSION_0_9_1)
 
 
 def test_converter_class_convert_tool_error_response():
@@ -107,7 +127,26 @@ def test_converter_class_convert_text_with_a2ui():
   # Expect 2 parts: TextPart and A2UI DataPart
   assert len(a2a_parts) == 2
   assert a2a_parts[0].root.text == "Here is the UI:"
-  assert a2a_parts[1] == create_a2ui_part(valid_a2ui[0])
+  assert a2a_parts[1] == create_a2ui_part(valid_a2ui[0], version=VERSION_0_8)
+  catalog_mock.validator.validate.assert_called_once_with(valid_a2ui)
+
+
+def test_converter_class_convert_text_with_a2ui_v0_9_1():
+  catalog_mock = MagicMock(spec=A2uiCatalog)
+  converter = A2uiPartConverter(catalog_mock, version=VERSION_0_9_1)
+
+  valid_a2ui = [{"type": "Text", "text": "Hello"}]
+  catalog_mock.validator.validate.return_value = None
+
+  text = f"Here is the UI:\n{A2UI_OPEN_TAG}\n{json.dumps(valid_a2ui)}\n{A2UI_CLOSE_TAG}"
+  part = genai_types.Part(text=text)
+
+  a2a_parts = converter.convert(part)
+
+  # Expect 2 parts: TextPart and A2UI DataPart
+  assert len(a2a_parts) == 2
+  assert a2a_parts[0].root.text == "Here is the UI:"
+  assert a2a_parts[1] == create_a2ui_part(valid_a2ui[0], version=VERSION_0_9_1)
   catalog_mock.validator.validate.assert_called_once_with(valid_a2ui)
 
 
@@ -123,7 +162,7 @@ def test_converter_class_convert_text_empty_leading():
   a2a_parts = converter.convert(part)
 
   assert len(a2a_parts) == 1
-  assert a2a_parts[0] == create_a2ui_part(ui[0])
+  assert a2a_parts[0] == create_a2ui_part(ui[0], version=VERSION_0_8)
 
 
 def test_converter_class_convert_text_markdown_wrapped():
@@ -140,7 +179,7 @@ def test_converter_class_convert_text_markdown_wrapped():
 
   assert len(a2a_parts) == 2
   assert a2a_parts[0].root.text == "Behold:"
-  assert a2a_parts[1] == create_a2ui_part(ui[0])
+  assert a2a_parts[1] == create_a2ui_part(ui[0], version=VERSION_0_8)
   catalog_mock.validator.validate.assert_called_once_with(ui)
 
 
@@ -197,7 +236,7 @@ def test_converter_class_convert_tool_response_with_result_containing_a2ui():
   # Expect 2 parts: TextPart and A2UI DataPart
   assert len(a2a_parts) == 2
   assert a2a_parts[0].root.text == "Here is the result:"
-  assert a2a_parts[1] == create_a2ui_part(valid_a2ui[0])
+  assert a2a_parts[1] == create_a2ui_part(valid_a2ui[0], version=VERSION_0_8)
   catalog_mock.validator.validate.assert_called_once_with(valid_a2ui)
 
 

samples/client/flutter/restaurant_finder/e2e_test/test/infra_test.dart

@@ -30,13 +30,9 @@ void main() {
     print('Joke from AI:\n\n$result\n\n');
   });
 
-  test(
-    'test can start restaurant_finder',
-    () async {
-      final restaurantFinderClient = TestRestaurantFinderClient();
-      addTearDown(restaurantFinderClient.dispose);
-      await restaurantFinderClient.startAndVerify();
-    },
-    timeout: const Timeout(Duration(minutes: 5)),
-  );
+  test('test can start restaurant_finder', () async {
+    final restaurantFinderClient = TestRestaurantFinderClient();
+    addTearDown(restaurantFinderClient.dispose);
+    await restaurantFinderClient.startAndVerify();
+  }, timeout: const Timeout(Duration(minutes: 5)));
 }