Skip to content

refactor: Simplifying calls to resolveModel() #551

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
+6 −16
Open

refactor: Simplifying calls to resolveModel() #551

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: 2 additions & 2 deletions core/src/main/java/com/google/adk/agents/LlmAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,8 +875,8 @@ private Model resolveModelInternal() {
}
BaseAgent current = this.parentAgent();
while (current != null) {
if (current instanceof LlmAgent) {
return ((LlmAgent) current).resolvedModel();
if (current instanceof LlmAgent agent) {
return agent.resolvedModel();
}
current = current.parentAgent();
}
Expand Down
10 changes: 2 additions & 8 deletions core/src/main/java/com/google/adk/flows/llmflows/BaseLlmFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,7 @@ private Flowable<LlmResponse> callLlm(
if (beforeResponse.isPresent()) {
return Flowable.just(beforeResponse.get());
}
BaseLlm llm =
agent.resolvedModel().model().isPresent()
? agent.resolvedModel().model().get()
: LlmRegistry.getLlm(agent.resolvedModel().modelName().get());
BaseLlm llm = agent.resolvedModel().model().get();
return Flowable.defer(
() -> {
Span llmCallSpan =
Expand Down Expand Up @@ -464,10 +461,7 @@ public Flowable<Event> runLive(InvocationContext invocationContext) {

String eventIdForSendData = Event.generateEventId();
LlmAgent agent = (LlmAgent) invocationContext.agent();
BaseLlm llm =
agent.resolvedModel().model().isPresent()
? agent.resolvedModel().model().get()
: LlmRegistry.getLlm(agent.resolvedModel().modelName().get());
BaseLlm llm = agent.resolvedModel().model().get();
BaseLlmConnection connection = llm.connect(llmRequestAfterPreprocess);
Completable historySent =
llmRequestAfterPreprocess.contents().isEmpty()
Expand Down
8 changes: 2 additions & 6 deletions core/src/main/java/com/google/adk/flows/llmflows/Basic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,10 @@ public Basic() {}
@Override
public Single<RequestProcessor.RequestProcessingResult> processRequest(
InvocationContext context, LlmRequest request) {
if (!(context.agent() instanceof LlmAgent)) {
if (!(context.agent() instanceof LlmAgent agent)) {
throw new IllegalArgumentException("Agent in InvocationContext is not an instance of Agent.");
}
LlmAgent agent = (LlmAgent) context.agent();
String modelName =
agent.resolvedModel().model().isPresent()
? agent.resolvedModel().model().get().model()
: agent.resolvedModel().modelName().get();
String modelName = agent.resolvedModel().modelName().get();

LiveConnectConfig.Builder liveConnectConfigBuilder =
LiveConnectConfig.builder().responseModalities(context.runConfig().responseModalities());
Expand Down
Loading