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
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public static List<Event> runLoop(BaseAgent agent, boolean streaming, Object...
allEvents.addAll(
runner
.runAsync(
session,
session.sessionKey(),
messageContent,
RunConfig.builder()
.setStreamingMode(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import static org.junit.jupiter.api.Assertions.*;

import com.google.adk.agents.LlmAgent;
import com.google.adk.agents.RunConfig;
import com.google.adk.events.Event;
import com.google.adk.models.springai.integrations.tools.WeatherTool;
import com.google.adk.runner.InMemoryRunner;
Expand Down Expand Up @@ -73,14 +74,15 @@ public ChatResponse call(Prompt prompt) {

// when
Runner runner = new InMemoryRunner(agent);
Session session = runner.sessionService().createSession("test-app", "test-user").blockingGet();
Session session =
runner.sessionService().createSession(agent.name(), "test-user").blockingGet();

Content userMessage =
Content.builder().role("user").parts(List.of(Part.fromText("What is a qubit?"))).build();

List<Event> events =
runner
.runAsync(session, userMessage, com.google.adk.agents.RunConfig.builder().build())
.runAsync(session.sessionKey(), userMessage, RunConfig.builder().build())
.toList()
.blockingGet();

Expand Down Expand Up @@ -149,7 +151,8 @@ public ChatResponse call(Prompt prompt) {

// when
Runner runner = new InMemoryRunner(agent);
Session session = runner.sessionService().createSession("test-app", "test-user").blockingGet();
Session session =
runner.sessionService().createSession(agent.name(), "test-user").blockingGet();

Content userMessage =
Content.builder()
Expand All @@ -159,7 +162,7 @@ public ChatResponse call(Prompt prompt) {

List<Event> events =
runner
.runAsync(session, userMessage, com.google.adk.agents.RunConfig.builder().build())
.runAsync(session.userId(), session.id(), userMessage, RunConfig.builder().build())
.toList()
.blockingGet();

Expand Down Expand Up @@ -217,7 +220,8 @@ public Flux<ChatResponse> stream(Prompt prompt) {

// when
Runner runner = new InMemoryRunner(agent);
Session session = runner.sessionService().createSession("test-app", "test-user").blockingGet();
Session session =
runner.sessionService().createSession(agent.name(), "test-user").blockingGet();

Content userMessage =
Content.builder()
Expand All @@ -228,11 +232,10 @@ public Flux<ChatResponse> stream(Prompt prompt) {
List<Event> events =
runner
.runAsync(
session,
session.userId(),
session.id(),
userMessage,
com.google.adk.agents.RunConfig.builder()
.setStreamingMode(com.google.adk.agents.RunConfig.StreamingMode.SSE)
.build())
RunConfig.builder().setStreamingMode(RunConfig.StreamingMode.SSE).build())
.toList()
.blockingGet();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public static List<Event> askAgent(BaseAgent agent, boolean streaming, Object...
allEvents.addAll(
runner
.runAsync(
session,
session.sessionKey(),
messageContent,
RunConfig.builder()
.setStreamingMode(
Expand All @@ -67,13 +67,17 @@ public static List<Event> askBlockingAgent(BaseAgent agent, Object... messages)
}

Runner runner = new InMemoryRunner(agent);
Session session = runner.sessionService().createSession("test-app", "test-user").blockingGet();
Session session =
runner.sessionService().createSession(agent.name(), "test-user").blockingGet();

List<Event> events = new ArrayList<>();

for (Content content : contents) {
List<Event> batchEvents =
runner.runAsync(session, content, RunConfig.builder().build()).toList().blockingGet();
runner
.runAsync(session.userId(), session.id(), content, RunConfig.builder().build())
.toList()
.blockingGet();
events.addAll(batchEvents);
}

Expand All @@ -88,15 +92,17 @@ public static List<Event> askAgentStreaming(BaseAgent agent, Object... messages)
}

Runner runner = new InMemoryRunner(agent);
Session session = runner.sessionService().createSession("test-app", "test-user").blockingGet();
Session session =
runner.sessionService().createSession(agent.name(), "test-user").blockingGet();

List<Event> events = new ArrayList<>();

for (Content content : contents) {
List<Event> batchEvents =
runner
.runAsync(
session,
session.userId(),
session.id(),
content,
RunConfig.builder().setStreamingMode(RunConfig.StreamingMode.SSE).build())
.toList()
Expand Down
15 changes: 8 additions & 7 deletions dev/src/main/java/com/google/adk/web/service/RunnerService.java
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,14 @@ public Runner getRunner(String appName) {
"RunnerService: Creating Runner for appName: {}, using agent definition: {}",
appName,
agent.name());
return new Runner(
agent,
appName,
this.artifactService,
this.sessionService,
this.memoryService,
this.extraPlugins);
return Runner.builder()
.agent(agent)
.appName(appName)
.artifactService(this.artifactService)
.sessionService(this.sessionService)
.memoryService(this.memoryService)
.plugins(this.extraPlugins)
.build();
} catch (java.util.NoSuchElementException e) {
log.error(
"Agent/App named '{}' not found in registry. Available apps: {}",
Expand Down
Loading