code refactoring

Author: alexcheng1982

examples/observation-docker/observation.yaml

@@ -1,6 +1,5 @@
 services:
 
-  # And put them in an OTEL collector pipeline...
   otel-collector:
     image: otel/opentelemetry-collector:0.97.0
     command: [ "--config=/etc/otel-collector.yaml" ]
@@ -9,7 +8,6 @@ services:
     ports:
       - "4318:4318"
 
-  # To eventually offload to Tempo...
   tempo:
     image: grafana/tempo:main-13885de
     command: [ "-config.file=/etc/tempo.yaml" ]

examples/src/main/java/com/javaaidev/agenticpatterns/examples/chainworkflow/ArticleWritingAgent.java

@@ -2,30 +2,25 @@
 
 import com.javaaidev.agenticpatterns.examples.chainworkflow.ArticleWritingAgent.ArticleWritingRequest;
 import com.javaaidev.agenticpatterns.examples.chainworkflow.ArticleWritingAgent.ArticleWritingResponse;
-import com.javaaidev.agenticpatterns.taskexecution.TaskExecutionAgent;
+import com.javaaidev.agenticpatterns.taskexecution.NoLLMTaskExecutionAgent;
 import io.micrometer.observation.ObservationRegistry;
 import org.jspecify.annotations.Nullable;
 import org.springframework.ai.chat.client.ChatClient;
 
 public class ArticleWritingAgent extends
-    TaskExecutionAgent<ArticleWritingRequest, ArticleWritingResponse> {
+    NoLLMTaskExecutionAgent<ArticleWritingRequest, ArticleWritingResponse> {
 
   private final ArticleGenerationAgent articleGenerationAgent;
   private final ArticleImprovementChainAgent articleImprovementChainAgent;
 
   protected ArticleWritingAgent(ChatClient chatClient,
       @Nullable ObservationRegistry observationRegistry) {
-    super(chatClient, ArticleWritingResponse.class, observationRegistry);
+    super(ArticleWritingResponse.class, observationRegistry);
     articleGenerationAgent = new ArticleGenerationAgent(chatClient, observationRegistry);
     articleImprovementChainAgent = new ArticleImprovementChainAgent(chatClient,
         observationRegistry);
   }
 
-  @Override
-  protected String getPromptTemplate() {
-    return "";
-  }
-
   @Override
   public ArticleWritingResponse call(@Nullable ArticleWritingRequest articleWritingRequest) {
     var initialArticle = articleGenerationAgent.call(articleWritingRequest);

examples/src/main/java/com/javaaidev/agenticpatterns/examples/routingworkflow/CustomerSupportAgent.java

@@ -8,7 +8,6 @@
 import com.javaaidev.agenticpatterns.taskexecution.TaskExecutionAgent;
 import io.micrometer.observation.ObservationRegistry;
 import java.lang.reflect.Type;
-import java.util.Map;
 import org.jspecify.annotations.Nullable;
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.chat.client.ChatClient.ChatClientRequestSpec;
@@ -66,15 +65,6 @@ protected String getPromptTemplate() {
       return "{question}";
     }
 
-    @Override
-    protected @Nullable Map<String, Object> getPromptContext(
-        @Nullable CustomerSupportRequest request) {
-      return Map.of(
-          "question",
-          AgentUtils.safeGet(request, CustomerSupportRequest::question, "")
-      );
-    }
-
     @Override
     protected void updateChatClientRequest(ChatClientRequestSpec spec) {
       spec.system("You are a customer support agent for payment, be polite and helpful");
@@ -94,15 +84,6 @@ protected String getPromptTemplate() {
       return "{question}";
     }
 
-    @Override
-    protected Map<String, Object> getPromptContext(
-        @Nullable CustomerSupportRequest request) {
-      return Map.of(
-          "question",
-          AgentUtils.safeGet(request, CustomerSupportRequest::question, "")
-      );
-    }
-
     @Override
     protected void updateChatClientRequest(ChatClientRequestSpec spec) {
       spec.system("You are a customer support agent for shipping, be polite and helpful");
@@ -122,15 +103,6 @@ protected String getPromptTemplate() {
       return "{question}";
     }
 
-    @Override
-    protected @Nullable Map<String, Object> getPromptContext(
-        @Nullable CustomerSupportRequest request) {
-      return Map.of(
-          "question",
-          AgentUtils.safeGet(request, CustomerSupportRequest::question, "")
-      );
-    }
-
     @Override
     protected void updateChatClientRequest(ChatClientRequestSpec spec) {
       spec.system(

routing-workflow/src/main/java/com/javaaidev/agenticpatterns/routingworkflow/RoutingChoice.java

@@ -11,8 +11,9 @@
  * @param <Request>   Task input type
  * @param <Response>  Task output type
  */
-public record RoutingChoice<Request, Response>(String name,
-                                               String description,
-                                               TaskExecutionAgent<Request, Response> agent) {
+public record RoutingChoice<Request, Response>(
+    String name,
+    String description,
+    TaskExecutionAgent<Request, Response> agent) {
 
 }

routing-workflow/src/main/java/com/javaaidev/agenticpatterns/routingworkflow/RoutingRequest.java

@@ -1,6 +1,7 @@
 package com.javaaidev.agenticpatterns.routingworkflow;
 
 import java.util.List;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Routing request
@@ -10,7 +11,8 @@
  * @param <Request>  Task input type
  * @param <Response> Task output type
  */
-public record RoutingRequest<Request, Response>(Request request,
-                                                List<RoutingChoice<Request, Response>> choices) {
+public record RoutingRequest<Request, Response>(
+    @Nullable Request request,
+    List<RoutingChoice<Request, Response>> choices) {
 
 }