Skip to content

Commit 91f198b

Browse files
josemontespgjosemontespg
committed
Merge branch 'upstream/main' into fix-explorer-build-and-test
2 parents 8ac7bec + 0e03757 commit 91f198b

232 files changed

Lines changed: 13347 additions & 5992 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/enforce-formatting.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ jobs:
3939
with:
4040
python-version: "3.x"
4141

42+
- name: Set up Flutter (for Dart SDK)
43+
uses: subosito/flutter-action@1a449444c387b1966244ae4d4f8c696479add0b2
44+
with:
45+
channel: stable
46+
cache: true
47+
4248
- name: Install `uv` globally
4349
run: |
4450
python -m pip install --upgrade pip

‎agent_sdks/kotlin/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ val copySpecs by tasks.registering(Copy::class) {
7373
from(File(repoRoot, "specification/v0_9/json/common_types.json")) {
7474
into("com/google/a2ui/assets/0.9")
7575
}
76-
from(File(repoRoot, "specification/v0_9/json/basic_catalog.json")) {
77-
into("com/google/a2ui/assets/0.9")
76+
from(File(repoRoot, "specification/v0_9/catalogs/basic/catalog.json")) {
77+
into("com/google/a2ui/assets/0.9/catalogs/basic")
7878
}
7979

8080
into(layout.buildDirectory.dir("generated/resources/specs"))

agent_sdks/kotlin/src/main/kotlin/com/google/a2ui/core/InferenceStrategy.kt renamed to agent_sdks/kotlin/src/main/kotlin/com/google/a2ui/InferenceStrategy.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.a2ui.core
17+
package com.google.a2ui
18+
19+
import kotlinx.serialization.json.JsonObject
1820

1921
/**
2022
* Defines the contract for an A2UI inference strategy, responsible for constructing the LLM system
@@ -40,7 +42,7 @@ interface InferenceStrategy {
4042
roleDescription: String,
4143
workflowDescription: String = "",
4244
uiDescription: String = "",
43-
clientUiCapabilities: kotlinx.serialization.json.JsonObject? = null,
45+
clientUiCapabilities: JsonObject? = null,
4446
allowedComponents: List<String> = emptyList(),
4547
allowedMessages: List<String> = emptyList(),
4648
includeSchema: Boolean = false,

‎agent_sdks/kotlin/src/main/kotlin/com/google/a2ui/a2a/A2aHandler.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
package com.google.a2ui.a2a
1818

19-
import com.google.a2ui.core.parser.hasA2uiParts
20-
import com.google.a2ui.core.parser.parseResponseToParts
21-
import com.google.a2ui.core.schema.A2uiConstants
19+
import com.google.a2ui.parser.hasA2uiParts
20+
import com.google.a2ui.parser.parseResponseToParts
21+
import com.google.a2ui.schema.A2uiConstants
2222
import com.google.adk.agents.RunConfig
2323
import com.google.adk.events.Event
2424
import com.google.adk.runner.Runner

‎agent_sdks/kotlin/src/main/kotlin/com/google/a2ui/a2a/A2uiA2a.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.google.a2ui.a2a
1818

19-
import com.google.a2ui.core.schema.A2uiConstants
19+
import com.google.a2ui.schema.A2uiConstants
2020
import io.a2a.spec.AgentExtension
2121
import io.a2a.spec.DataPart
2222
import io.a2a.spec.Part

‎agent_sdks/kotlin/src/main/kotlin/com/google/a2ui/adk/a2a_extension/Converters.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
package com.google.a2ui.adk.a2a_extension
1818

1919
import com.google.a2ui.a2a.A2uiA2a
20-
import com.google.a2ui.core.parser.hasA2uiParts
21-
import com.google.a2ui.core.parser.parseResponseToParts
22-
import com.google.a2ui.core.schema.A2uiCatalog
20+
import com.google.a2ui.parser.hasA2uiParts
21+
import com.google.a2ui.parser.parseResponseToParts
22+
import com.google.a2ui.schema.A2uiCatalog
2323
import com.google.adk.a2a.converters.EventConverter
2424
import com.google.adk.agents.InvocationContext
2525
import com.google.adk.events.Event

‎agent_sdks/kotlin/src/main/kotlin/com/google/a2ui/adk/a2a_extension/SendA2uiToClientToolset.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.google.a2ui.adk.a2a_extension
1818

19-
import com.google.a2ui.core.schema.A2uiCatalog
19+
import com.google.a2ui.schema.A2uiCatalog
2020
import com.google.adk.agents.ReadonlyContext
2121
import com.google.adk.models.LlmRequest
2222
import com.google.adk.tools.BaseTool

‎agent_sdks/kotlin/src/main/kotlin/com/google/a2ui/basic_catalog/BasicCatalogProvider.kt‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818

1919
package com.google.a2ui.basic_catalog
2020

21-
import com.google.a2ui.core.schema.A2uiCatalogProvider
22-
import com.google.a2ui.core.schema.A2uiConstants
23-
import com.google.a2ui.core.schema.A2uiVersion
24-
import com.google.a2ui.core.schema.CatalogConfig
25-
import com.google.a2ui.core.schema.SchemaResourceLoader
26-
import com.google.a2ui.core.schema.resolveExamplesPath
21+
import com.google.a2ui.schema.A2uiCatalogProvider
22+
import com.google.a2ui.schema.A2uiConstants
23+
import com.google.a2ui.schema.A2uiVersion
24+
import com.google.a2ui.schema.CatalogConfig
25+
import com.google.a2ui.schema.SchemaResourceLoader
26+
import com.google.a2ui.schema.resolveExamplesPath
2727
import kotlinx.serialization.json.JsonObject
2828
import kotlinx.serialization.json.JsonPrimitive
2929

@@ -38,7 +38,12 @@ class BundledCatalogProvider(private val version: A2uiVersion) : A2uiCatalogProv
3838
override fun load(): JsonObject {
3939
val specMap = BasicCatalog.BASIC_CATALOG_PATHS[version] ?: emptyMap()
4040
val relPath = specMap[A2uiConstants.CATALOG_SCHEMA_KEY] ?: ""
41-
val filename = relPath.substringAfterLast('/')
41+
val filename =
42+
if (version == A2uiVersion.VERSION_0_9) {
43+
relPath.substringAfter("specification/v0_9/")
44+
} else {
45+
relPath.substringAfterLast('/')
46+
}
4247

4348
val resource =
4449
SchemaResourceLoader.loadFromBundledResource(version.value, filename)?.toMutableMap()
@@ -75,7 +80,7 @@ object BasicCatalog {
7580
"specification/v0_8/json/standard_catalog_definition.json"
7681
),
7782
A2uiVersion.VERSION_0_9 to
78-
mapOf(A2uiConstants.CATALOG_SCHEMA_KEY to "specification/v0_9/json/basic_catalog.json"),
83+
mapOf(A2uiConstants.CATALOG_SCHEMA_KEY to "specification/v0_9/catalogs/basic/catalog.json"),
7984
)
8085

8186
/**

agent_sdks/kotlin/src/main/kotlin/com/google/a2ui/core/parser/Parser.kt renamed to agent_sdks/kotlin/src/main/kotlin/com/google/a2ui/parser/Parser.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.a2ui.core.parser
17+
package com.google.a2ui.parser
1818

19-
import com.google.a2ui.core.schema.A2uiConstants
20-
import com.google.a2ui.core.schema.A2uiValidator
19+
import com.google.a2ui.schema.A2uiConstants
20+
import com.google.a2ui.schema.A2uiValidator
2121
import java.util.logging.Logger
2222
import kotlinx.serialization.json.JsonElement
2323

24-
private val logger = Logger.getLogger("com.google.a2ui.core.parser.Parser")
24+
private val logger = Logger.getLogger("com.google.a2ui.parser.Parser")
2525

2626
internal val A2UI_BLOCK_REGEX =
2727
Regex(

agent_sdks/kotlin/src/main/kotlin/com/google/a2ui/core/parser/PayloadFixer.kt renamed to agent_sdks/kotlin/src/main/kotlin/com/google/a2ui/parser/PayloadFixer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.a2ui.core.parser
17+
package com.google.a2ui.parser
1818

1919
import java.util.logging.Logger
2020
import kotlinx.serialization.json.Json

0 commit comments

Comments
 (0)