From b3e990f45805d8d095a3c6137fef56e70e9fe6f9 Mon Sep 17 00:00:00 2001 From: Arnab Nandy Date: Wed, 9 Sep 2026 14:46:22 +0530 Subject: [PATCH] fix: migrate to Spring Shell 4 Signed-off-by: Arnab Nandy --- pom.xml | 2 +- .../com/embabel/prepper/agent/PrepperConfig.java | 2 +- .../com/embabel/prepper/shell/PrepperShell.java | 13 +++++++------ .../agent/agent/PrepperAgentIntegrationTest.java | 2 +- .../prepper/agent/agent/PrepperAgentTest.java | 12 ++++++------ 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index b245e30..a2bdd9b 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 21 - 0.1.4-SNAPSHOT + 1.5.2-SNAPSHOT diff --git a/src/main/java/com/embabel/prepper/agent/PrepperConfig.java b/src/main/java/com/embabel/prepper/agent/PrepperConfig.java index 77b2383..5b3d2c9 100644 --- a/src/main/java/com/embabel/prepper/agent/PrepperConfig.java +++ b/src/main/java/com/embabel/prepper/agent/PrepperConfig.java @@ -1,6 +1,6 @@ package com.embabel.prepper.agent; -import com.embabel.agent.prompt.persona.Actor; +import com.embabel.agent.api.common.Actor; import com.embabel.agent.prompt.persona.RoleGoalBackstory; import jakarta.validation.constraints.NotNull; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/embabel/prepper/shell/PrepperShell.java b/src/main/java/com/embabel/prepper/shell/PrepperShell.java index 869acf8..879be61 100644 --- a/src/main/java/com/embabel/prepper/shell/PrepperShell.java +++ b/src/main/java/com/embabel/prepper/shell/PrepperShell.java @@ -1,20 +1,21 @@ package com.embabel.prepper.shell; -import com.embabel.agent.api.common.autonomy.AgentInvocation; +import com.embabel.agent.api.invocation.AgentInvocation; import com.embabel.agent.core.AgentPlatform; import com.embabel.agent.core.ProcessOptions; +import com.embabel.agent.core.Verbosity; import com.embabel.prepper.agent.Domain; -import org.springframework.shell.standard.ShellComponent; -import org.springframework.shell.standard.ShellMethod; +import org.springframework.shell.core.command.annotation.Command; +import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.List; import java.util.Scanner; -@ShellComponent +@Component record PrepperShell(AgentPlatform agentPlatform) { - @ShellMethod("prep") + @Command(name = "prep", description = "Prepare a meeting briefing") String prep() { var scanner = new Scanner(System.in); @@ -53,7 +54,7 @@ String prep() { var meeting = new Domain.Meeting(context, objective, participants); var briefing = AgentInvocation.builder(agentPlatform) - .options(ProcessOptions.builder().verbosity(v -> v.showPrompts(true)).build()) + .options(ProcessOptions.DEFAULT.withVerbosity(new Verbosity(true))) .build(Domain.Briefing.class) .invoke(meeting); return briefing.briefing(); diff --git a/src/test/java/com/embabel/prepper/agent/agent/PrepperAgentIntegrationTest.java b/src/test/java/com/embabel/prepper/agent/agent/PrepperAgentIntegrationTest.java index c84c0ea..a59a61f 100644 --- a/src/test/java/com/embabel/prepper/agent/agent/PrepperAgentIntegrationTest.java +++ b/src/test/java/com/embabel/prepper/agent/agent/PrepperAgentIntegrationTest.java @@ -1,6 +1,6 @@ package com.embabel.prepper.agent.agent; -import com.embabel.agent.testing.integration.EmbabelMockitoIntegrationTest; +import com.embabel.agent.test.integration.EmbabelMockitoIntegrationTest; import org.junit.jupiter.api.BeforeAll; /** diff --git a/src/test/java/com/embabel/prepper/agent/agent/PrepperAgentTest.java b/src/test/java/com/embabel/prepper/agent/agent/PrepperAgentTest.java index 739e1da..67b0881 100644 --- a/src/test/java/com/embabel/prepper/agent/agent/PrepperAgentTest.java +++ b/src/test/java/com/embabel/prepper/agent/agent/PrepperAgentTest.java @@ -1,6 +1,6 @@ package com.embabel.prepper.agent.agent; -import com.embabel.agent.prompt.persona.Actor; +import com.embabel.agent.api.common.Actor; import com.embabel.agent.prompt.persona.RoleGoalBackstory; import com.embabel.common.ai.model.LlmOptions; import com.embabel.prepper.agent.PrepperConfig; @@ -11,10 +11,10 @@ class PrepperAgentTest { final LlmOptions llm = LlmOptions.withAutoLlm(); final PrepperConfig config = new PrepperConfig( - new Actor<>(RoleGoalBackstory.withRole("researcher").andGoal("perform reseearch").andBackstory("i am clever"), llm), - new Actor<>(RoleGoalBackstory.withRole("industry analyzer").andGoal("goal").andBackstory("i am thorough"), llm), - new Actor<>(RoleGoalBackstory.withRole("meeting strategist").andGoal("goal").andBackstory("i am strategic"), llm), - new Actor<>(RoleGoalBackstory.withRole("briefing writer").andGoal("goal").andBackstory("i am eloquent"), llm), + new Actor<>(new RoleGoalBackstory("researcher", "perform reseearch", "i am clever"), llm), + new Actor<>(new RoleGoalBackstory("industry analyzer", "goal", "i am thorough"), llm), + new Actor<>(new RoleGoalBackstory("meeting strategist", "goal", "i am strategic"), llm), + new Actor<>(new RoleGoalBackstory("briefing writer", "goal", "i am eloquent"), llm), 2 ); @@ -35,4 +35,4 @@ void testPrepper() { } -} \ No newline at end of file +}