Skip to content

fix: Use JsonBaseModel in FunctionTool (re. #473) #486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 7, 2025
+4 −6
Merged

fix: Use JsonBaseModel in FunctionTool (re. #473) #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions core/src/main/java/com/google/adk/tools/FunctionCallingUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import com.google.adk.JsonBaseModel;
import com.google.common.base.Strings;
import com.google.genai.types.FunctionDeclaration;
Expand All @@ -45,9 +44,8 @@
/** Utility class for function calling. */
public final class FunctionCallingUtils {

private static final ObjectMapper OBJECT_MAPPER =
new ObjectMapper().registerModule(new Jdk8Module());
private static final Logger logger = LoggerFactory.getLogger(FunctionCallingUtils.class);
private static final ObjectMapper OBJECT_MAPPER = JsonBaseModel.getMapper();

/** Holds the state during a single schema generation process to handle caching and recursion. */
private static class SchemaGenerationContext {
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/com/google/adk/tools/FunctionTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import com.google.adk.JsonBaseModel;
import com.google.adk.agents.InvocationContext;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand All @@ -42,9 +42,9 @@

/** FunctionTool implements a customized function calling tool. */
public class FunctionTool extends BaseTool {
private static final ObjectMapper OBJECT_MAPPER =
new ObjectMapper().registerModule(new Jdk8Module());

private static final Logger logger = LoggerFactory.getLogger(FunctionTool.class);
private static final ObjectMapper OBJECT_MAPPER = JsonBaseModel.getMapper();

@Nullable private final Object instance;
private final Method func;
Expand Down