Adjusting the chatBotIT to add when handlers to emit

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

Author: ricardozanini

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

@@ -58,6 +58,8 @@ public <T> Optional<T> as(Class<T> clazz) {
       return Optional.of(clazz.cast(agenticScope));
     } else if (ResultWithAgenticScope.class.isAssignableFrom(clazz)) {
       return Optional.of(clazz.cast(new ResultWithAgenticScope<>(agenticScope, object)));
+    } else if (Map.class.isAssignableFrom(clazz)) {
+      return Optional.of(clazz.cast(agenticScope.state()));
     } else {
       return super.as(clazz);
     }

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

@@ -27,7 +27,7 @@ interface ChatBot {
     @UserMessage(
         """
             You are a happy chat bot, reply to my message:
-            {userInput}.
+            {{userInput}}.
             """)
     @Agent
     String chat(@V("userInput") String userInput);
@@ -39,7 +39,7 @@ interface MovieExpert {
         """
                                 You are a great evening planner.
                                 Propose a list of 3 movies matching the given mood.
-                                The mood is {mood}.
+                                The mood is {{mood}}.
                                 Provide a list with the 3 items and nothing else.
                                 """)
     @Agent

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

@@ -60,7 +60,8 @@ void chat_bot() {
                 // .chatMemoryProvider(memoryId -> MessageWindowChatMemory.withMaxMessages(10))
                 .outputName("conversation")
                 .build());
-    BlockingQueue<CloudEvent> publishedEvents = new LinkedBlockingQueue<>();
+    BlockingQueue<CloudEvent> replyEvents = new LinkedBlockingQueue<>();
+    BlockingQueue<CloudEvent> finishedEvents = new LinkedBlockingQueue<>();
 
     // 1. listen to an event containing `message` key in the body
     // 2. if contains, call the agent, if not end the workflow
@@ -71,7 +72,13 @@ void chat_bot() {
                 t ->
                     t.listen(
                             l ->
-                                l.until(message -> "".equals(message.get("userInput")), Map.class)
+                                l.until(
+                                        message ->
+                                            !message
+                                                .getOrDefault("userInput", "")
+                                                .toString()
+                                                .isEmpty(),
+                                        Map.class)
                                     .any(
                                         c ->
                                             c.with(event -> event.type("org.acme.chatbot.request")))
@@ -87,7 +94,16 @@ void chat_bot() {
                                                                     e ->
                                                                         e.type(
                                                                             "org.acme.chatbot.reply"))))))
-                        .emit(emit -> emit.event(e -> e.type("org.acme.chatbot.finished"))))
+                        .emit(
+                            emit ->
+                                emit.when(
+                                        message ->
+                                            message
+                                                .getOrDefault("userInput", "")
+                                                .toString()
+                                                .isEmpty(),
+                                        Map.class)
+                                    .event(e -> e.type("org.acme.chatbot.finished"))))
             .build();
 
     try (WorkflowApplication app = WorkflowApplication.builder().build()) {
@@ -98,7 +114,7 @@ void chat_bot() {
                       new EventFilter()
                           .withWith(new EventProperties().withType("org.acme.chatbot.reply")),
                       app),
-              ce -> publishedEvents.add((CloudEvent) ce));
+              ce -> replyEvents.add((CloudEvent) ce));
 
       app.eventConsumer()
           .register(
@@ -107,7 +123,7 @@ void chat_bot() {
                       new EventFilter()
                           .withWith(new EventProperties().withType("org.acme.chatbot.finished")),
                       app),
-              ce -> publishedEvents.add((CloudEvent) ce));
+              ce -> finishedEvents.add((CloudEvent) ce));
 
       final WorkflowInstance waitingInstance =
           app.workflowDefinition(listenWorkflow).instance(Map.of());
@@ -118,12 +134,12 @@ void chat_bot() {
 
       // Publish the event
       app.eventPublisher().publish(newMessageEvent("Hello World!"));
-      CloudEvent reply = publishedEvents.poll(60, TimeUnit.SECONDS);
+      CloudEvent reply = replyEvents.poll(60, TimeUnit.SECONDS);
       assertNotNull(reply);
 
       // Empty message completes the workflow
       app.eventPublisher().publish(newMessageEvent(""));
-      CloudEvent finished = publishedEvents.poll(60, TimeUnit.SECONDS);
+      CloudEvent finished = finishedEvents.poll(60, TimeUnit.SECONDS);
       assertNotNull(finished);
 
       assertThat(runningModel).isCompleted();
@@ -158,7 +174,7 @@ void mixed_workflow() {
             AgenticServices.agentBuilder(Agents.ChatBot.class)
                 .chatModel(Models.BASE_MODEL)
                 .chatMemoryProvider(memoryId -> MessageWindowChatMemory.withMaxMessages(10))
-                .outputName("message")
+                .outputName("userInput")
                 .build());
 
     final Workflow mixedWorkflow =
@@ -170,7 +186,7 @@ void mixed_workflow() {
                                 callJ.function(
                                     input -> {
                                       System.out.println(input);
-                                      return Map.of("message", input);
+                                      return Map.of("userInput", input);
                                     },
                                     String.class))
                         .agent(chatBot)