Review comments

Author: fjtirado

experimental/ai/impl/pom.xml

@@ -11,18 +11,10 @@
     <artifactId>serverlessworkflow-experimental-ai-impl</artifactId>
     <name>ServelessWorkflow:: Experimental:: AI:: Impl</name>
     <dependencies>
-        <dependency>
-            <groupId>io.serverlessworkflow</groupId>
-            <artifactId>serverlessworkflow-experimental-types</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.serverlessworkflow</groupId>
             <artifactId>serverlessworkflow-impl-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.serverlessworkflow</groupId>
-            <artifactId>serverlessworkflow-experimental-types</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.serverlessworkflow</groupId>
             <artifactId>serverlessworkflow-experimental-ai-types</artifactId>
@@ -31,7 +23,6 @@
             <groupId>dev.langchain4j</groupId>
             <artifactId>langchain4j</artifactId>
             <version>1.1.0</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>

experimental/ai/impl/src/main/java/io/serverlessworkflow/impl/executors/ai/AIChatModelCallExecutor.java

@@ -16,10 +16,10 @@
 
 package io.serverlessworkflow.impl.executors.ai;
 
-import io.serverlessworkflow.ai.api.types.CallAILangChainChatModel;
 import io.serverlessworkflow.api.types.TaskBase;
 import io.serverlessworkflow.api.types.ai.AbstractCallAIChatModelTask;
 import io.serverlessworkflow.api.types.ai.CallAIChatModel;
+import io.serverlessworkflow.api.types.ai.CallAILangChainChatModel;
 import io.serverlessworkflow.impl.TaskContext;
 import io.serverlessworkflow.impl.WorkflowApplication;
 import io.serverlessworkflow.impl.WorkflowContext;
@@ -31,27 +31,24 @@
 
 public class AIChatModelCallExecutor implements CallableTask<AbstractCallAIChatModelTask> {
 
+  private AIChatModelExecutor executor;
+
   @Override
   public void init(
-      AbstractCallAIChatModelTask task, WorkflowApplication application, ResourceLoader loader) {}
+      AbstractCallAIChatModelTask task, WorkflowApplication application, ResourceLoader loader) {
+    if (task instanceof CallAILangChainChatModel model) {
+      executor = new CallAILangChainChatModelExecutor(model);
+    } else if (task instanceof CallAIChatModel model) {
+      executor = new CallAIChatModelExecutor(model);
+    }
+  }
 
   @Override
   public CompletableFuture<WorkflowModel> apply(
       WorkflowContext workflowContext, TaskContext taskContext, WorkflowModel input) {
     WorkflowModelFactory modelFactory = workflowContext.definition().application().modelFactory();
-    if (taskContext.task() instanceof CallAILangChainChatModel callAILangChainChatModel) {
-      return CompletableFuture.completedFuture(
-          modelFactory.fromAny(
-              new CallAILangChainChatModelExecutor()
-                  .apply(callAILangChainChatModel, input.asJavaObject())));
-    } else if (taskContext.task() instanceof CallAIChatModel callAIChatModel) {
-      return CompletableFuture.completedFuture(
-          modelFactory.fromAny(
-              new CallAIChatModelExecutor().apply(callAIChatModel, input.asJavaObject())));
-    }
-    throw new IllegalArgumentException(
-        "AIChatModelCallExecutor can only process CallAIChatModel tasks, but received: "
-            + taskContext.task().getClass().getName());
+    return CompletableFuture.completedFuture(
+        modelFactory.fromAny(executor.apply(input.asJavaObject())));
   }
 
   @Override

…/ai/AbstractCallAIChatModelExecutor.java …pl/executors/ai/AIChatModelExecutor.javaexperimental/ai/impl/src/main/java/io/serverlessworkflow/impl/executors/ai/AbstractCallAIChatModelExecutor.java renamed to experimental/ai/impl/src/main/java/io/serverlessworkflow/impl/executors/ai/AIChatModelExecutor.java experimental/ai/impl/src/main/java/io/serverlessworkflow/impl/executors/ai/AbstractCallAIChatModelExecutor.java renamed to experimental/ai/impl/src/main/java/io/serverlessworkflow/impl/executors/ai/AIChatModelExecutor.java

@@ -16,7 +16,6 @@
 
 package io.serverlessworkflow.impl.executors.ai;
 
-public abstract class AbstractCallAIChatModelExecutor<T> {
+import java.util.function.UnaryOperator;
 
-  public abstract Object apply(T callAIChatModel, Object javaObject);
-}
+public interface AIChatModelExecutor extends UnaryOperator<Object> {}

experimental/ai/impl/src/main/java/io/serverlessworkflow/impl/executors/ai/CallAIChatModelExecutor.java

@@ -35,12 +35,18 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class CallAIChatModelExecutor extends AbstractCallAIChatModelExecutor<CallAIChatModel> {
+public class CallAIChatModelExecutor implements AIChatModelExecutor {
 
   private static final Pattern VARIABLE_PATTERN = Pattern.compile("\\{\\{\\s*(.+?)\\s*\\}\\}");
 
+  private final CallAIChatModel callAIChatModel;
+
+  public CallAIChatModelExecutor(CallAIChatModel callAIChatModel) {
+    this.callAIChatModel = callAIChatModel;
+  }
+
   @Override
-  public Object apply(CallAIChatModel callAIChatModel, Object javaObject) {
+  public Object apply(Object javaObject) {
     validate(callAIChatModel, javaObject);
 
     ChatModel chatModel = createChatModel(callAIChatModel);

experimental/ai/impl/src/main/java/io/serverlessworkflow/impl/executors/ai/CallAILangChainChatModelExecutor.java

@@ -19,18 +19,23 @@
 import dev.langchain4j.model.chat.ChatModel;
 import dev.langchain4j.service.AiServices;
 import dev.langchain4j.service.V;
-import io.serverlessworkflow.ai.api.types.CallAILangChainChatModel;
+import io.serverlessworkflow.api.types.ai.CallAILangChainChatModel;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-public class CallAILangChainChatModelExecutor
-    extends AbstractCallAIChatModelExecutor<CallAILangChainChatModel> {
+public class CallAILangChainChatModelExecutor implements AIChatModelExecutor {
+
+  private final CallAILangChainChatModel callAIChatModel;
+
+  public CallAILangChainChatModelExecutor(CallAILangChainChatModel callAIChatModel) {
+    this.callAIChatModel = callAIChatModel;
+  }
 
   @Override
-  public Object apply(CallAILangChainChatModel callAIChatModel, Object javaObject) {
+  public Object apply(Object javaObject) {
     ChatModel chatModel = callAIChatModel.getChatModel();
     Class<?> chatModelRequest = callAIChatModel.getChatModelRequest();
     Map<String, Object> substitutions = (Map<String, Object>) javaObject;

experimental/ai/impl/src/main/java/io/serverlessworkflow/impl/services/ChatModelService.java

@@ -20,6 +20,5 @@
 import io.serverlessworkflow.api.types.ai.CallAIChatModel;
 
 public interface ChatModelService {
-
   ChatModel getChatModel(CallAIChatModel.ChatModelPreferences chatModelPreferences);
 }

experimental/ai/impl/src/main/resources/META-INF/services/io.serverlessworkflow.impl.executors.TaskExecutorFactory

@@ -16,15 +16,10 @@
             <groupId>io.serverlessworkflow</groupId>
             <artifactId>serverlessworkflow-experimental-types</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.serverlessworkflow</groupId>
-            <artifactId>serverlessworkflow-impl-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>dev.langchain4j</groupId>
             <artifactId>langchain4j</artifactId>
             <version>1.1.0</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>