refactor(agentexecutor): rename package

agent-executor/src/main/java/dev/langchain4j/agentexecutor/Agent.java → agent-executor/src/main/java/org/bsc/langgraph4j/agentexecutor/Agent.java

@@ -7,12 +7,11 @@
 import dev.langchain4j.model.output.Response;
 import lombok.Builder;
 import lombok.Singular;
-import lombok.var;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
-import static org.bsc.langgraph4j.utils.CollectionsUtils.mapOf;
 
 @Builder
 public class Agent {
@@ -23,7 +22,7 @@ public class Agent {
 
     public Response<AiMessage> execute( String input, List<IntermediateStep> intermediateSteps ) {
         var userMessageTemplate = PromptTemplate.from( "{{input}}" )
-                                                    .apply( mapOf( "input", input));
+                                                    .apply(Map.of("input", input));
 
         var messages = new ArrayList<ChatMessage>();
 

agent-executor/src/main/java/org/bsc/langgraph4j/agentexecutor/AgentAction.java

@@ -0,0 +1,11 @@
+package dev.langchain4j.agentexecutor;
+
+import dev.langchain4j.agent.tool.ToolExecutionRequest;
+import lombok.NonNull;
+
+public record AgentAction(
+    @NonNull
+    ToolExecutionRequest toolExecutionRequest,
+    String log ) {
+
+}

agent-executor/src/main/java/dev/langchain4j/agentexecutor/AgentExecutor.java → agent-executor/src/main/java/org/bsc/langgraph4j/agentexecutor/AgentExecutor.java

@@ -8,9 +8,8 @@
 import dev.langchain4j.data.message.ToolExecutionResultMessage;
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.output.FinishReason;
-import lombok.var;
 import org.bsc.langgraph4j.*;
-import org.bsc.langgraph4j.serializer.BaseSerializer;
+import org.bsc.langgraph4j.serializer.StateSerializer;
 import org.bsc.langgraph4j.state.AgentState;
 import org.bsc.langgraph4j.state.AppenderChannel;
 import org.bsc.langgraph4j.state.Channel;
@@ -74,10 +73,10 @@ public StateGraph<State> build() throws GraphStateException {
     }
 
     public AgentExecutor() {
-        BaseSerializer.register(IntermediateStep.class, new IntermediateStepSerializer());
-        BaseSerializer.register(AgentAction.class, new AgentActionSerializer());
-        BaseSerializer.register(AgentFinish.class, new AgentFinishSerializer());
-        BaseSerializer.register(AgentOutcome.class, new AgentOutcomeSerializer());
+        StateSerializer.register(IntermediateStep.class, new IntermediateStepSerializer());
+        StateSerializer.register(AgentAction.class, new AgentActionSerializer());
+        StateSerializer.register(AgentFinish.class, new AgentFinishSerializer());
+        StateSerializer.register(AgentOutcome.class, new AgentOutcomeSerializer());
     }
 
     public final GraphBuilder graphBuilder() {
@@ -105,7 +104,7 @@ List<IntermediateStep> intermediateSteps() {
 
     }
 
-    Map<String,Object> runAgent( Agent agentRunnable, State state ) throws Exception {
+    Map<String,Object> runAgent( Agent agentRunnable, State state )  {
 
         var input = state.input()
                         .orElseThrow(() -> new IllegalArgumentException("no input provided!"));
@@ -130,7 +129,7 @@ Map<String,Object> runAgent( Agent agentRunnable, State state ) throws Exception
         }
 
     }
-    Map<String,Object> executeTools( ToolNode toolNode, State state ) throws Exception {
+    Map<String,Object> executeTools( ToolNode toolNode, State state )  {
 
         var agentOutcome = state.agentOutcome().orElseThrow(() -> new IllegalArgumentException("no agentOutcome provided!"));
 
@@ -144,7 +143,7 @@ Map<String,Object> executeTools( ToolNode toolNode, State state ) throws Excepti
                 .map( ToolExecutionResultMessage::text )
                 .orElseThrow(() -> new IllegalStateException("no tool found for: " + toolExecutionRequest.name()));;
 
-        return mapOf("intermediate_steps", new IntermediateStep( agentOutcome.action(), result ) );
+        return Map.of("intermediate_steps", new IntermediateStep( agentOutcome.action(), result ) );
 
     }
 

agent-executor/src/main/java/org/bsc/langgraph4j/agentexecutor/AgentFinish.java

@@ -0,0 +1,8 @@
+package dev.langchain4j.agentexecutor;
+
+import java.util.Map;
+
+public record AgentFinish (
+    Map<String, Object> returnValues,
+    String log
+) {}

agent-executor/src/main/java/org/bsc/langgraph4j/agentexecutor/AgentOutcome.java

@@ -0,0 +1,6 @@
+package dev.langchain4j.agentexecutor;
+
+public record AgentOutcome(
+    AgentAction action,
+    AgentFinish finish
+) {}

agent-executor/src/main/java/org/bsc/langgraph4j/agentexecutor/IntermediateStep.java

@@ -0,0 +1,7 @@
+package dev.langchain4j.agentexecutor;
+
+public record IntermediateStep(
+    AgentAction action,
+    String observation
+) {}
+

agent-executor/src/test/java/dev/langchain4j/agentexecutor/AgentExecutorTest.java → agent-executor/src/test/java/org/bsc/langgraph4j/agentexecutor/AgentExecutorTest.java

@@ -2,8 +2,8 @@
 
 import dev.langchain4j.DotEnvConfig;
 import dev.langchain4j.model.openai.OpenAiChatModel;
-import lombok.var;
 import org.bsc.langgraph4j.*;
+import org.bsc.langgraph4j.agentexecutor.AgentExecutor;
 import org.bsc.langgraph4j.checkpoint.BaseCheckpointSaver;
 import org.bsc.langgraph4j.checkpoint.MemorySaver;
 import org.bsc.langgraph4j.state.AgentState;

agent-executor/src/test/java/dev/langchain4j/agentexecutor/AgentTest.java → agent-executor/src/test/java/org/bsc/langgraph4j/agentexecutor/AgentTest.java

@@ -3,7 +3,7 @@
 import dev.langchain4j.DotEnvConfig;
 import dev.langchain4j.model.openai.OpenAiChatModel;
 import dev.langchain4j.model.output.FinishReason;
-import lombok.var;
+import org.bsc.langgraph4j.agentexecutor.Agent;
 import org.bsc.langgraph4j.langchain4j.tool.ToolNode;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;