Skip to content

fix: migrate to Spring Shell 4 #2

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
arnabnandy7 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: migrate to Spring Shell 4 #2

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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<properties>
<java.version>21</java.version>
<embabel-agent.version>0.1.4-SNAPSHOT</embabel-agent.version>
<embabel-agent.version>1.5.2-SNAPSHOT</embabel-agent.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/embabel/prepper/agent/PrepperConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
13 changes: 7 additions & 6 deletions src/main/java/com/embabel/prepper/shell/PrepperShell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);

Expand Down Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/embabel/prepper/agent/agent/PrepperAgentIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand Down
12 changes: 6 additions & 6 deletions src/test/java/com/embabel/prepper/agent/agent/PrepperAgentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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
);

Expand All @@ -35,4 +35,4 @@ void testPrepper() {
}


}
}