Skip to content

Allow BaseTool to be created without name & description, if FunctionDeclaration has them. #207

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow BaseTool to be created without name & description, if FunctionDeclaration has them. #207

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
20 changes: 18 additions & 2 deletions core/src/main/java/com/google/adk/tools/BaseTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ public abstract class BaseTool {
private final String description;
private final boolean isLongRunning;

protected BaseTool() {
this(/* name= */ null, /* description= */ null, /* isLongRunning= */ false);
}

protected BaseTool(boolean isLongRunning) {
this(/* name= */ null, /* description= */ null, isLongRunning);
}

protected BaseTool(@Nonnull String name, @Nonnull String description) {
this(name, description, /* isLongRunning= */ false);
}
Expand All @@ -48,11 +56,19 @@ protected BaseTool(@Nonnull String name, @Nonnull String description, boolean is
}

public String name() {
return name;
return name != null
? name
: declaration()
.flatMap(FunctionDeclaration::name)
.orElseThrow(() -> new IllegalStateException("Tool name is not set."));
}

public String description() {
return description;
return description != null
? description
: declaration()
.flatMap(FunctionDeclaration::description)
.orElseThrow(() -> new IllegalStateException("Tool description is not set."));
}

public boolean longRunning() {
Expand Down