diff --git a/agentscope-core/pom.xml b/agentscope-core/pom.xml index f0ffe2d75..100521bd5 100644 --- a/agentscope-core/pom.xml +++ b/agentscope-core/pom.xml @@ -78,6 +78,12 @@ jsonschema-module-jackson + + + tools.jackson.core + jackson-databind + + com.fasterxml.jackson.datatype diff --git a/agentscope-core/src/main/java/io/agentscope/core/util/JsonSchemaUtils.java b/agentscope-core/src/main/java/io/agentscope/core/util/JsonSchemaUtils.java index f15efe598..8166f2f7e 100644 --- a/agentscope-core/src/main/java/io/agentscope/core/util/JsonSchemaUtils.java +++ b/agentscope-core/src/main/java/io/agentscope/core/util/JsonSchemaUtils.java @@ -95,9 +95,9 @@ public class JsonSchemaUtils { */ public static Map generateSchemaFromClass(Class clazz) { try { - JsonNode schemaNode = schemaGenerator.generateSchema(clazz); + String schemaJson = schemaGenerator.generateSchema(clazz).toString(); return JsonUtils.getJsonCodec() - .convertValue(schemaNode, new TypeReference>() {}); + .fromJson(schemaJson, new TypeReference>() {}); } catch (Exception e) { throw new RuntimeException("Failed to generate JSON schema for " + clazz.getName(), e); } @@ -130,9 +130,9 @@ public static Map generateSchemaFromJsonNode(JsonNode schema) { */ public static Map generateSchemaFromType(Type type) { try { - JsonNode schemaNode = schemaGenerator.generateSchema(type); + String schemaJson = schemaGenerator.generateSchema(type).toString(); return JsonUtils.getJsonCodec() - .convertValue(schemaNode, new TypeReference>() {}); + .fromJson(schemaJson, new TypeReference>() {}); } catch (Exception e) { throw new RuntimeException( "Failed to generate JSON schema for " + type.getTypeName(), e); diff --git a/agentscope-core/src/test/java/io/agentscope/core/tool/ToolSchemaModuleTest.java b/agentscope-core/src/test/java/io/agentscope/core/tool/ToolSchemaModuleTest.java index 4cefb082d..deb20ea45 100644 --- a/agentscope-core/src/test/java/io/agentscope/core/tool/ToolSchemaModuleTest.java +++ b/agentscope-core/src/test/java/io/agentscope/core/tool/ToolSchemaModuleTest.java @@ -20,7 +20,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.fasterxml.jackson.databind.JsonNode; import com.github.victools.jsonschema.generator.OptionPreset; import com.github.victools.jsonschema.generator.SchemaGenerator; import com.github.victools.jsonschema.generator.SchemaGeneratorConfigBuilder; @@ -28,6 +27,7 @@ import java.util.List; import java.util.stream.StreamSupport; import org.junit.jupiter.api.Test; +import tools.jackson.databind.JsonNode; /** * Tests for {@link ToolSchemaModule}. diff --git a/agentscope-dependencies-bom/pom.xml b/agentscope-dependencies-bom/pom.xml index 62fa97214..fcc865e94 100644 --- a/agentscope-dependencies-bom/pom.xml +++ b/agentscope-dependencies-bom/pom.xml @@ -105,8 +105,9 @@ 7.0.7 4.0.4 3.2.1-2026.03.30 - 2.0.0 - 4.38.0 + 3.0.0 + 5.0.0 + 3.0.4 2.6 3.20.0 1.9.24 @@ -457,12 +458,6 @@ com.github.victools jsonschema-generator ${jsonschema-generator.version} - - - com.fasterxml.jackson.core - jackson-core - - @@ -472,6 +467,13 @@ ${jsonschema-generator.version} + + + tools.jackson.core + jackson-databind + ${jackson3.version} + + org.apache.commons diff --git a/agentscope-distribution/agentscope-all/pom.xml b/agentscope-distribution/agentscope-all/pom.xml index 78c86323d..c78409d50 100644 --- a/agentscope-distribution/agentscope-all/pom.xml +++ b/agentscope-distribution/agentscope-all/pom.xml @@ -279,6 +279,12 @@ jsonschema-module-jackson + + + tools.jackson.core + jackson-databind + + com.networknt