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
104 changes: 80 additions & 24 deletions core/src/main/java/com/google/adk/agents/RunConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,59 +76,115 @@ public enum ToolExecutionMode {

public static Builder builder() {
return new AutoValue_RunConfig.Builder()
.setSaveInputBlobsAsArtifacts(false)
.setResponseModalities(ImmutableList.of())
.setStreamingMode(StreamingMode.NONE)
.setToolExecutionMode(ToolExecutionMode.NONE)
.setMaxLlmCalls(500)
.setAutoCreateSession(false);
.saveInputBlobsAsArtifacts(false)
.responseModalities(ImmutableList.of())
.streamingMode(StreamingMode.NONE)
.toolExecutionMode(ToolExecutionMode.NONE)
.maxLlmCalls(500)
.autoCreateSession(false);
}

public static Builder builder(RunConfig runConfig) {
return new AutoValue_RunConfig.Builder()
.setSaveInputBlobsAsArtifacts(runConfig.saveInputBlobsAsArtifacts())
.setStreamingMode(runConfig.streamingMode())
.setToolExecutionMode(runConfig.toolExecutionMode())
.setMaxLlmCalls(runConfig.maxLlmCalls())
.setResponseModalities(runConfig.responseModalities())
.setSpeechConfig(runConfig.speechConfig())
.setOutputAudioTranscription(runConfig.outputAudioTranscription())
.setInputAudioTranscription(runConfig.inputAudioTranscription())
.setAutoCreateSession(runConfig.autoCreateSession());
.saveInputBlobsAsArtifacts(runConfig.saveInputBlobsAsArtifacts())
.streamingMode(runConfig.streamingMode())
.toolExecutionMode(runConfig.toolExecutionMode())
.maxLlmCalls(runConfig.maxLlmCalls())
.responseModalities(runConfig.responseModalities())
.speechConfig(runConfig.speechConfig())
.outputAudioTranscription(runConfig.outputAudioTranscription())
.inputAudioTranscription(runConfig.inputAudioTranscription())
.autoCreateSession(runConfig.autoCreateSession());
}

/** Builder for {@link RunConfig}. */
@AutoValue.Builder
public abstract static class Builder {

@Deprecated
@CanIgnoreReturnValue
public abstract Builder setSpeechConfig(@Nullable SpeechConfig speechConfig);
public final Builder setSpeechConfig(@Nullable SpeechConfig speechConfig) {
return speechConfig(speechConfig);
}

@CanIgnoreReturnValue
public abstract Builder speechConfig(@Nullable SpeechConfig speechConfig);

@Deprecated
@CanIgnoreReturnValue
public final Builder setResponseModalities(Iterable<Modality> responseModalities) {
return responseModalities(responseModalities);
}

@CanIgnoreReturnValue
public abstract Builder responseModalities(Iterable<Modality> responseModalities);

@Deprecated
@CanIgnoreReturnValue
public abstract Builder setResponseModalities(Iterable<Modality> responseModalities);
public final Builder setSaveInputBlobsAsArtifacts(boolean saveInputBlobsAsArtifacts) {
return saveInputBlobsAsArtifacts(saveInputBlobsAsArtifacts);
}

@CanIgnoreReturnValue
public abstract Builder setSaveInputBlobsAsArtifacts(boolean saveInputBlobsAsArtifacts);
public abstract Builder saveInputBlobsAsArtifacts(boolean saveInputBlobsAsArtifacts);

@Deprecated
@CanIgnoreReturnValue
public abstract Builder setStreamingMode(StreamingMode streamingMode);
public final Builder setStreamingMode(StreamingMode streamingMode) {
return streamingMode(streamingMode);
}

@CanIgnoreReturnValue
public abstract Builder setToolExecutionMode(ToolExecutionMode toolExecutionMode);
public abstract Builder streamingMode(StreamingMode streamingMode);

@Deprecated
@CanIgnoreReturnValue
public abstract Builder setOutputAudioTranscription(
public final Builder setToolExecutionMode(ToolExecutionMode toolExecutionMode) {
return toolExecutionMode(toolExecutionMode);
}

@CanIgnoreReturnValue
public abstract Builder toolExecutionMode(ToolExecutionMode toolExecutionMode);

@Deprecated
@CanIgnoreReturnValue
public final Builder setOutputAudioTranscription(
@Nullable AudioTranscriptionConfig outputAudioTranscription) {
return outputAudioTranscription(outputAudioTranscription);
}

@CanIgnoreReturnValue
public abstract Builder outputAudioTranscription(
@Nullable AudioTranscriptionConfig outputAudioTranscription);

@Deprecated
@CanIgnoreReturnValue
public final Builder setInputAudioTranscription(
@Nullable AudioTranscriptionConfig inputAudioTranscription) {
return inputAudioTranscription(inputAudioTranscription);
}

@CanIgnoreReturnValue
public abstract Builder setInputAudioTranscription(
public abstract Builder inputAudioTranscription(
@Nullable AudioTranscriptionConfig inputAudioTranscription);

@Deprecated
@CanIgnoreReturnValue
public abstract Builder setMaxLlmCalls(int maxLlmCalls);
public final Builder setMaxLlmCalls(int maxLlmCalls) {
return maxLlmCalls(maxLlmCalls);
}

@CanIgnoreReturnValue
public abstract Builder maxLlmCalls(int maxLlmCalls);

@Deprecated
@CanIgnoreReturnValue
public final Builder setAutoCreateSession(boolean autoCreateSession) {
return autoCreateSession(autoCreateSession);
}

@CanIgnoreReturnValue
public abstract Builder setAutoCreateSession(boolean autoCreateSession);
public abstract Builder autoCreateSession(boolean autoCreateSession);

abstract RunConfig autoBuild();

Expand Down
23 changes: 19 additions & 4 deletions core/src/main/java/com/google/adk/memory/SearchMemoryResponse.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import java.util.List;

/** Represents the response from a memory search. */
Expand All @@ -29,18 +30,32 @@ public abstract class SearchMemoryResponse {

/** Creates a new builder for {@link SearchMemoryResponse}. */
public static Builder builder() {
return new AutoValue_SearchMemoryResponse.Builder().setMemories(ImmutableList.of());
return new AutoValue_SearchMemoryResponse.Builder().memories(ImmutableList.of());
}

/** Builder for {@link SearchMemoryResponse}. */
@AutoValue.Builder
public abstract static class Builder {

abstract Builder setMemories(ImmutableList<MemoryEntry> memories);
@Deprecated
@CanIgnoreReturnValue
public final Builder setMemories(ImmutableList<MemoryEntry> memories) {
return memories(memories);
}

/** Sets the list of memory entries using a list. */
public Builder setMemories(List<MemoryEntry> memories) {
return setMemories(ImmutableList.copyOf(memories));
@Deprecated
@CanIgnoreReturnValue
public final Builder setMemories(List<MemoryEntry> memories) {
return memories(ImmutableList.copyOf(memories));
}

@CanIgnoreReturnValue
public abstract Builder memories(ImmutableList<MemoryEntry> memories);

@CanIgnoreReturnValue
public Builder memories(List<MemoryEntry> memories) {
return memories(ImmutableList.copyOf(memories));
}

/** Builds the immutable {@link SearchMemoryResponse} object. */
Expand Down
28 changes: 25 additions & 3 deletions core/src/main/java/com/google/adk/models/VertexCredentials.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import com.google.auth.oauth2.GoogleCredentials;
import com.google.auto.value.AutoValue;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import java.util.Optional;
import org.jspecify.annotations.Nullable;

Expand All @@ -39,11 +40,32 @@ public static Builder builder() {
@AutoValue.Builder
public abstract static class Builder {

public abstract Builder setProject(@Nullable String value);
@Deprecated
@CanIgnoreReturnValue
public final Builder setProject(@Nullable String value) {
return project(value);
}

public abstract Builder setLocation(@Nullable String value);
@CanIgnoreReturnValue
public abstract Builder project(@Nullable String value);

public abstract Builder setCredentials(@Nullable GoogleCredentials value);
@Deprecated
@CanIgnoreReturnValue
public final Builder setLocation(@Nullable String value) {
return location(value);
}

@CanIgnoreReturnValue
public abstract Builder location(@Nullable String value);

@Deprecated
@CanIgnoreReturnValue
public final Builder setCredentials(@Nullable GoogleCredentials value) {
return credentials(value);
}

@CanIgnoreReturnValue
public abstract Builder credentials(@Nullable GoogleCredentials value);

public abstract VertexCredentials build();
}
Expand Down
Loading
Loading