Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion core/src/main/java/com/google/adk/tools/AgentTool.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import com.google.adk.runner.Runner;
import com.google.adk.sessions.State;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.genai.types.Content;
Expand Down Expand Up @@ -131,8 +132,14 @@ private Optional<Schema> getOutputSchema(BaseAgent agent) {

@Override
public Optional<FunctionDeclaration> declaration() {

// The genai FunctionDeclaration builder uses Optional.of() internally, which NPEs on a null
// description. Coerce null to an empty string. This matches the Python, Go, and Kotlin ports,
// which send an empty description when the agent has none.
String desc = Strings.nullToEmpty(this.description());

FunctionDeclaration.Builder builder =
FunctionDeclaration.builder().description(this.description()).name(this.name());
FunctionDeclaration.builder().description(desc).name(this.name());

Optional<Schema> agentInputSchema = getInputSchema(agent);

Expand Down
18 changes: 18 additions & 0 deletions core/src/test/java/com/google/adk/tools/AgentToolTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import io.reactivex.rxjava3.core.Flowable;
import io.reactivex.rxjava3.core.Maybe;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.Before;
import org.junit.Test;
Expand Down Expand Up @@ -882,4 +883,21 @@ private ToolContext createToolContext(BaseAgent agent) {
.build())
.build();
}

@Test
public void declaration_withNullDescription_usesEmptyDescription() {
// Create an agent with a name but NO description
LlmAgent testAgent =
LlmAgent.builder()
.name("TestAgent")
// .description() is intentionally left out
.build();

AgentTool tool = AgentTool.create(testAgent);
Optional<FunctionDeclaration> declaration = tool.declaration();
assertThat(declaration).isPresent();
assertThat(declaration.get().name()).hasValue("TestAgent");
// Matches the Python, Go, and Kotlin ports: a missing description becomes an empty string.
assertThat(declaration.get().description()).hasValue("");
}
}
Loading