Moving to cognisphere as input

Signed-off-by: Ricardo Zanini <[email protected]>

Author: ricardozanini

experimental/agentic/src/main/java/io/serverlessworkflow/impl/expressions/agentic/AgenticModel.java

@@ -16,20 +16,15 @@
 package io.serverlessworkflow.impl.expressions.agentic;
 
 import dev.langchain4j.agentic.cognisphere.Cognisphere;
-import dev.langchain4j.agentic.cognisphere.ResultWithCognisphere;
 import io.serverlessworkflow.impl.WorkflowModel;
 import io.serverlessworkflow.impl.expressions.func.JavaModel;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Optional;
 
 class AgenticModel extends JavaModel {
 
-  private final Cognisphere cognisphere;
-
-  AgenticModel(Object object, Cognisphere cognisphere) {
-    super(object);
-    this.cognisphere = cognisphere;
+  AgenticModel(Cognisphere cognisphere) {
+    super(cognisphere);
   }
 
   @Override
@@ -39,17 +34,13 @@ public void setObject(Object obj) {
 
   @Override
   public Collection<WorkflowModel> asCollection() {
-    return object instanceof Collection value
-        ? new AgenticModelCollection(value, cognisphere)
-        : Collections.emptyList();
+    throw new UnsupportedOperationException("Not supported yet.");
   }
 
   @Override
   public <T> Optional<T> as(Class<T> clazz) {
     if (Cognisphere.class.isAssignableFrom(clazz)) {
-      return Optional.of(clazz.cast(cognisphere));
-    } else if (ResultWithCognisphere.class.isAssignableFrom(clazz)) {
-      return Optional.of(clazz.cast(new ResultWithCognisphere<>(cognisphere, object)));
+      return Optional.of(clazz.cast(object));
     } else {
       return super.as(clazz);
     }

experimental/agentic/src/main/java/io/serverlessworkflow/impl/expressions/agentic/AgenticModelCollection.java

@@ -37,7 +37,7 @@ class AgenticModelCollection extends JavaModelCollection {
 
   @Override
   protected WorkflowModel nextItem(Object obj) {
-    return new AgenticModel(obj, cognisphere);
+    return new AgenticModel((Cognisphere) obj);
   }
 
   @Override

experimental/agentic/src/main/java/io/serverlessworkflow/impl/expressions/agentic/AgenticModelFactory.java

@@ -16,27 +16,17 @@
 package io.serverlessworkflow.impl.expressions.agentic;
 
 import dev.langchain4j.agentic.cognisphere.Cognisphere;
-import dev.langchain4j.agentic.cognisphere.CognisphereRegistry;
 import io.cloudevents.CloudEvent;
 import io.cloudevents.CloudEventData;
 import io.serverlessworkflow.impl.WorkflowModel;
 import io.serverlessworkflow.impl.WorkflowModelCollection;
 import io.serverlessworkflow.impl.WorkflowModelFactory;
+import io.serverlessworkflow.impl.expressions.func.JavaModel;
 import java.time.OffsetDateTime;
 import java.util.Map;
 
 class AgenticModelFactory implements WorkflowModelFactory {
 
-  private Cognisphere cognisphere = CognisphereRegistry.createEphemeralCognisphere();
-
-  private final AgenticModel TrueModel = new AgenticModel(Boolean.TRUE, cognisphere);
-  private final AgenticModel FalseModel = new AgenticModel(Boolean.FALSE, cognisphere);
-  private final AgenticModel NullModel = new AgenticModel(null, cognisphere);
-
-  public void setCognishere(Cognisphere cognisphere) {
-    this.cognisphere = cognisphere;
-  }
-
   @Override
   public WorkflowModel fromAny(WorkflowModel prev, Object obj) {
     ((AgenticModel) prev).setObject(obj);
@@ -45,57 +35,59 @@ public WorkflowModel fromAny(WorkflowModel prev, Object obj) {
 
   @Override
   public WorkflowModel combine(Map<String, WorkflowModel> workflowVariables) {
-    return new AgenticModel(workflowVariables, cognisphere);
+    throw new UnsupportedOperationException();
   }
 
   @Override
   public WorkflowModelCollection createCollection() {
-    return new AgenticModelCollection(cognisphere);
+    throw new UnsupportedOperationException();
   }
 
   @Override
   public WorkflowModel from(boolean value) {
-    return value ? TrueModel : FalseModel;
+    return new JavaModel(value);
   }
 
   @Override
   public WorkflowModel from(Number value) {
-    return new AgenticModel(value, cognisphere);
+    return new JavaModel(value);
   }
 
   @Override
   public WorkflowModel from(String value) {
-    return new AgenticModel(value, cognisphere);
+    return new JavaModel(value);
   }
 
   @Override
   public WorkflowModel from(CloudEvent ce) {
-    return new AgenticModel(ce, cognisphere);
+    return new JavaModel(ce);
   }
 
   @Override
   public WorkflowModel from(CloudEventData ce) {
-    return new AgenticModel(ce, cognisphere);
+    return new JavaModel(ce);
   }
 
   @Override
   public WorkflowModel from(OffsetDateTime value) {
-    return new AgenticModel(value, cognisphere);
+    return new JavaModel(value);
   }
 
   @Override
   public WorkflowModel from(Map<String, Object> map) {
-    cognisphere.writeStates(map);
-    return new AgenticModel(map, cognisphere);
+    return new JavaModel(map);
   }
 
   @Override
   public WorkflowModel fromNull() {
-    return NullModel;
+    return new JavaModel(null);
   }
 
   @Override
   public WorkflowModel fromOther(Object value) {
-    return new AgenticModel(value, cognisphere);
+    if (value instanceof Cognisphere) {
+      return new AgenticModel((Cognisphere) value);
+    }
+    return new JavaModel(value);
   }
 }

experimental/lambda/src/main/java/io/serverlessworkflow/impl/expressions/func/JavaModel.java

@@ -29,7 +29,7 @@ public class JavaModel implements WorkflowModel {
 
   protected Object object;
 
-  protected JavaModel(Object object) {
+  public JavaModel(Object object) {
     this.object = asJavaObject(object);
   }
 

fluent/agentic-langchain4j/src/main/java/io/serverlessworkflow/fluent/agentic/langchain4j/WorkflowInvocationHandler.java

@@ -33,7 +33,6 @@
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -68,20 +67,6 @@ private static void writeCognisphereState(Cognisphere cognisphere, Method method
     }
   }
 
-  @SuppressWarnings("unchecked")
-  private static void writeWorkflowInputState(final Map<String, Object> input, Method method, Object[] args) {
-    if (method.getDeclaringClass() == UntypedAgent.class) {
-      input.putAll(((Map<String, Object>) args[0]));
-    } else {
-      Parameter[] parameters = method.getParameters();
-      for (int i = 0; i < parameters.length; i++) {
-        int index = i;
-        AgentInvoker.optionalParameterName(parameters[i])
-                .ifPresent(argName -> input.put(argName, args[index]));
-      }
-    }
-  }
-
   private String agentId() {
     return workflow.getDocument().getName();
   }
@@ -128,23 +113,14 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
     }
 
     // invoke
-    return executeWorkflow(method, args);
+    return executeWorkflow(currentCognisphere(cognisphereRegistry(), method, args), method, args);
   }
 
-  private Object executeWorkflow(Method method, Object[] args) {
-    Object input;
-    if (args == null || args.length == 0) {
-      input = new HashMap<>();
-    } else if (args.length == 1) {
-      input = args[0];
-    } else {
-      Map<String, Object> inputMap = new HashMap<>();
-      writeWorkflowInputState(inputMap, method, args);
-      input = inputMap;
-    }
+  private Object executeWorkflow(DefaultCognisphere cognisphere, Method method, Object[] args) {
+    writeCognisphereState(cognisphere, method, args);
 
     try (WorkflowApplication app = workflowApplicationBuilder.build()) {
-      CompletableFuture<WorkflowModel> workflowInstance = app.workflowDefinition(workflow).instance(input).start();
+      CompletableFuture<WorkflowModel> workflowInstance = app.workflowDefinition(workflow).instance(cognisphere).start();
 
       if (method.getReturnType().equals(ResultWithCognisphere.class)) {
         return workflowInstance.get().as(ResultWithCognisphere.class);
@@ -162,7 +138,7 @@ private CognisphereRegistry cognisphereRegistry() {
     return cognisphereRegistry.get();
   }
 
-  private Cognisphere currentCognisphere(CognisphereRegistry registry, Method method, Object[] args) {
+  private DefaultCognisphere currentCognisphere(CognisphereRegistry registry, Method method, Object[] args) {
     if (cognisphere != null) {
       return cognisphere;
     }

fluent/agentic-langchain4j/src/test/java/io/serverlessworkflow/fluent/agentic/langchain4j/WorkflowAgentsIT.java

@@ -4,7 +4,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import dev.langchain4j.agentic.AgentServices;
+import dev.langchain4j.agentic.AgenticServices;
 import dev.langchain4j.agentic.UntypedAgent;
 import dev.langchain4j.agentic.workflow.WorkflowAgentsBuilder;
 
@@ -23,17 +23,17 @@ public class WorkflowAgentsIT {
     void sequential_agents_tests() {
         WorkflowAgentsBuilder builder = new LC4JWorkflowBuilder();
 
-        CreativeWriter creativeWriter = spy(AgentServices.agentBuilder(CreativeWriter.class)
+        CreativeWriter creativeWriter = spy(AgenticServices.agentBuilder(CreativeWriter.class)
                 .chatModel(BASE_MODEL)
                 .outputName("story")
                 .build());
 
-        AudienceEditor audienceEditor = spy(AgentServices.agentBuilder(AudienceEditor.class)
+        AudienceEditor audienceEditor = spy(AgenticServices.agentBuilder(AudienceEditor.class)
                 .chatModel(BASE_MODEL)
                 .outputName("story")
                 .build());
 
-        StyleEditor styleEditor = spy(AgentServices.agentBuilder(StyleEditor.class)
+        StyleEditor styleEditor = spy(AgenticServices.agentBuilder(StyleEditor.class)
                 .chatModel(BASE_MODEL)
                 .outputName("story")
                 .build());

fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentAdapters.java

@@ -18,8 +18,9 @@
 import static dev.langchain4j.agentic.internal.AgentUtil.agentsToExecutors;
 
 import dev.langchain4j.agentic.cognisphere.Cognisphere;
+import dev.langchain4j.agentic.cognisphere.DefaultCognisphere;
 import dev.langchain4j.agentic.internal.AgentExecutor;
-import dev.langchain4j.agentic.internal.AgentInstance;
+import dev.langchain4j.agentic.internal.AgentSpecification;
 import io.serverlessworkflow.impl.expressions.LoopPredicateIndex;
 import java.util.List;
 import java.util.function.Function;
@@ -31,11 +32,11 @@ public final class AgentAdapters {
   private AgentAdapters() {}
 
   public static List<AgentExecutor> toExecutors(Object... agents) {
-    return agentsToExecutors(Stream.of(agents).map(AgentInstance.class::cast).toArray());
+    return agentsToExecutors(Stream.of(agents).map(AgentSpecification.class::cast).toArray());
   }
 
-  public static Function<Cognisphere, Object> toFunction(AgentExecutor exec) {
-    return exec::invoke;
+  public static Function<DefaultCognisphere, Object> toFunction(AgentExecutor exec) {
+    return exec::execute;
   }
 
   public static LoopPredicateIndex<Cognisphere, Object> toWhile(Predicate<Cognisphere> exit) {

fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentTaskItemListBuilder.java

@@ -15,7 +15,7 @@
  */
 package io.serverlessworkflow.fluent.agentic;
 
-import dev.langchain4j.agentic.cognisphere.Cognisphere;
+import dev.langchain4j.agentic.cognisphere.DefaultCognisphere;
 import dev.langchain4j.agentic.internal.AgentExecutor;
 import io.serverlessworkflow.api.types.Task;
 import io.serverlessworkflow.api.types.TaskItem;
@@ -57,7 +57,8 @@ public AgentTaskItemListBuilder agent(String name, Object agent) {
         .forEach(
             exec ->
                 this.delegate.callFn(
-                    name, fn -> fn.function(AgentAdapters.toFunction(exec), Cognisphere.class)));
+                    name,
+                    fn -> fn.function(AgentAdapters.toFunction(exec), DefaultCognisphere.class)));
     return self();
   }
 
@@ -92,7 +93,7 @@ public AgentTaskItemListBuilder parallel(String name, Object... agents) {
           for (int i = 0; i < execs.size(); i++) {
             AgentExecutor ex = execs.get(i);
             fork.branch(
-                "branch-" + i + "-" + name, AgentAdapters.toFunction(ex), Cognisphere.class);
+                "branch-" + i + "-" + name, AgentAdapters.toFunction(ex), DefaultCognisphere.class);
           }
         });
     return self();

fluent/agentic/src/test/java/io/serverlessworkflow/fluent/agentic/AgentWorkflowBuilderTest.java

@@ -24,7 +24,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.mockito.Mockito.spy;
 
-import dev.langchain4j.agentic.AgentServices;
+import dev.langchain4j.agentic.AgenticServices;
 import dev.langchain4j.agentic.cognisphere.Cognisphere;
 import io.serverlessworkflow.api.types.ForkTask;
 import io.serverlessworkflow.api.types.Task;
@@ -43,7 +43,7 @@ class AgentWorkflowBuilderTest {
   public void verifyAgentCall() {
     Agents.MovieExpert movieExpert =
         spy(
-            AgentServices.agentBuilder(Agents.MovieExpert.class)
+            AgenticServices.agentBuilder(Agents.MovieExpert.class)
                 .outputName("movies")
                 .chatModel(BASE_MODEL)
                 .build());