[Fix #869] Splitting ExpressionFactory from ModelFactory (#870)

Signed-off-by: fjtirado <ftirados@redhat.com>

Author: fjtirado

experimental/agentic/pom.xml

@@ -11,6 +11,10 @@
         <dependency>
             <groupId>io.serverlessworkflow</groupId>
             <artifactId>serverlessworkflow-experimental-lambda</artifactId>
+        </dependency>
+         <dependency>
+            <groupId>io.serverlessworkflow</groupId>
+            <artifactId>serverlessworkflow-experimental-model</artifactId>
         </dependency>
          <dependency>
             <groupId>dev.langchain4j</groupId>

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

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.impl.expressions.agentic;
+package io.serverlessworkflow.impl.model.agentic;
 
 import dev.langchain4j.agentic.scope.AgenticScope;
 import io.serverlessworkflow.impl.WorkflowModel;
-import io.serverlessworkflow.impl.expressions.func.JavaModel;
+import io.serverlessworkflow.impl.model.func.JavaModel;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;

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

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.impl.expressions.agentic;
+package io.serverlessworkflow.impl.model.agentic;
 
 import dev.langchain4j.agentic.scope.AgenticScope;
 import dev.langchain4j.agentic.scope.ResultWithAgenticScope;
 import io.serverlessworkflow.impl.WorkflowModel;
-import io.serverlessworkflow.impl.expressions.func.JavaModelCollection;
+import io.serverlessworkflow.impl.model.func.JavaModelCollection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;

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

@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.impl.expressions.agentic;
+package io.serverlessworkflow.impl.model.agentic;
 
 import dev.langchain4j.agentic.scope.AgenticScope;
 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.agentic.langchain4j.AgenticScopeRegistryAssessor;
+import io.serverlessworkflow.impl.model.agentic.langchain4j.AgenticScopeRegistryAssessor;
 import java.time.OffsetDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
-class AgenticModelFactory implements WorkflowModelFactory {
+public class AgenticModelFactory implements WorkflowModelFactory {
 
   static final String DEFAULT_AGENTIC_SCOPE_STATE_KEY = "input";
   private final AgenticScopeRegistryAssessor scopeRegistryAssessor =
@@ -126,4 +126,11 @@ public WorkflowModel fromOther(Object value) {
     }
     return newAgenticModel(value);
   }
+
+  public AgenticModelFactory() {}
+
+  @Override
+  public int priority() {
+    return DEFAULT_PRIORITY - 1;
+  }
 }

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.impl.expressions.agentic;
+package io.serverlessworkflow.impl.model.agentic;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;

experimental/agentic/src/main/java/io/serverlessworkflow/impl/expressions/agentic/AgenticScopeCloudEventsHandler.java renamed to experimental/agentic/src/main/java/io/serverlessworkflow/impl/model/agentic/AgenticScopeCloudEventsHandler.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.impl.expressions.agentic.langchain4j;
+package io.serverlessworkflow.impl.model.agentic.langchain4j;
 
 import dev.langchain4j.agentic.internal.AgenticScopeOwner;
 import dev.langchain4j.agentic.scope.AgenticScope;

experimental/agentic/src/main/java/io/serverlessworkflow/impl/expressions/agentic/langchain4j/AgenticScopeRegistryAssessor.java renamed to experimental/agentic/src/main/java/io/serverlessworkflow/impl/model/agentic/langchain4j/AgenticScopeRegistryAssessor.java

@@ -0,0 +1 @@
+io.serverlessworkflow.impl.model.agentic.AgenticModelFactory

experimental/agentic/src/main/resources/META-INF/services/io.serverlessworkflow.impl.WorkflowModelFactory

@@ -27,7 +27,7 @@
 import dev.langchain4j.service.MemoryId;
 import io.serverlessworkflow.api.types.Workflow;
 import io.serverlessworkflow.impl.WorkflowApplication;
-import io.serverlessworkflow.impl.expressions.agentic.langchain4j.AgenticScopeRegistryAssessor;
+import io.serverlessworkflow.impl.model.agentic.langchain4j.AgenticScopeRegistryAssessor;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;