Address comments

Signed-off-by: siri-varma <[email protected]>

Author: siri-varma

examples/src/main/java/io/dapr/examples/conversation/DemoConversationAI.java

@@ -20,8 +20,7 @@
 import io.dapr.client.domain.ConversationResponse;
 import reactor.core.publisher.Mono;
 
-import java.util.ArrayList;
-import java.util.Collections;
+import java.util.List;
 
 public class DemoConversationAI {
   /**
@@ -31,18 +30,20 @@ public class DemoConversationAI {
    */
   public static void main(String[] args) {
     try (DaprPreviewClient client = new DaprClientBuilder().buildPreviewClient()) {
+      System.out.println("Sending the following input to LLM: Hello How are you? This is the my number 672-123-4567");
+
       ConversationInput daprConversationInput = new ConversationInput("Hello How are you? "
-          + "This is the my number 672-123-4567");
+              + "This is the my number 672-123-4567");
 
       // Component name is the name provided in the metadata block of the conversation.yaml file.
       Mono<ConversationResponse> responseMono = client.converse(new ConversationRequest("echo",
-          new ArrayList<>(Collections.singleton(daprConversationInput)))
-            .setContextId("contextId")
-            .setScrubPii(true).setTemperature(1.1d));
+              List.of(daprConversationInput))
+              .setContextId("contextId")
+              .setScrubPii(true).setTemperature(1.1d));
       ConversationResponse response = responseMono.block();
       System.out.printf("Conversation output: %s", response.getConversationOutpus().get(0).getResult());
     } catch (Exception e) {
       throw new RuntimeException(e);
     }
   }
-}
+}

examples/src/main/java/io/dapr/examples/conversation/README.md

@@ -1,6 +1,6 @@
-## Manage Dapr Jobs via the Conversation API
+## Manage Dapr via the Conversation API
 
-This example provides the different capabilities provided by Dapr Java SDK for Conversation. For further information about Job APIs please refer to [this link](https://docs.dapr.io/developing-applications/building-blocks/conversation/conversation-overview/)
+This example provides the different capabilities provided by Dapr Java SDK for Conversation. For further information about Conversation APIs please refer to [this link](https://docs.dapr.io/developing-applications/building-blocks/conversation/conversation-overview/)
 
 ### Using the Conversation API
 
@@ -57,14 +57,16 @@ public class DemoConversationAI {
    */
   public static void main(String[] args) {
     try (DaprPreviewClient client = new DaprClientBuilder().buildPreviewClient()) {
+      System.out.println("Sending the following input to LLM: Hello How are you? This is the my number 672-123-4567");
+
       ConversationInput daprConversationInput = new ConversationInput("Hello How are you? "
-          + "This is the my number 672-123-4567");
+              + "This is the my number 672-123-4567");
 
       // Component name is the name provided in the metadata block of the conversation.yaml file.
       Mono<ConversationResponse> responseMono = client.converse(new ConversationRequest("echo",
-          new ArrayList<>(Collections.singleton(daprConversationInput)))
-            .setContextId("contextId")
-            .setScrubPii(true).setTemperature(1.1d));
+              List.of(daprConversationInput))
+              .setContextId("contextId")
+              .setScrubPii(true).setTemperature(1.1d));
       ConversationResponse response = responseMono.block();
       System.out.printf("Conversation output: %s", response.getConversationOutpus().get(0).getResult());
     } catch (Exception e) {

sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprConversationIT.java

@@ -128,4 +128,4 @@ public void testConversationSDKShouldScrubPIIOnlyForTheInputWhereScrubPIIIsSet()
         Assertions.assertEquals("input this <PHONE_NUMBER>",
                 response.getConversationOutpus().get(1).getResult());
     }
-}
+}

sdk-tests/src/test/java/io/dapr/it/testcontainers/TestConversationApplication.java

@@ -22,5 +22,4 @@ public class TestConversationApplication {
     public static void main(String[] args) {
         SpringApplication.run(TestConversationApplication.class, args);
     }
-
-}
+}

sdk-tests/src/test/java/io/dapr/it/testcontainers/TestDaprConversationConfiguration.java

@@ -38,4 +38,4 @@ public DaprPreviewClient daprPreviewClient(
 
         return new DaprClientBuilder().withPropertyOverrides(overrides).buildPreviewClient();
     }
-}
+}

sdk/src/main/java/io/dapr/client/DaprClientImpl.java

@@ -103,7 +103,6 @@
 import java.io.IOException;
 import java.time.Duration;
 import java.time.Instant;
-import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -1568,13 +1567,13 @@ public Mono<ConversationResponse> converse(ConversationRequest conversationReque
       DaprProtos.ConversationRequest.Builder protosConversationRequestBuilder = DaprProtos.ConversationRequest
           .newBuilder().setTemperature(conversationRequest.getTemperature())
           .setScrubPII(conversationRequest.isScrubPii())
-          .setName(conversationRequest.getLlmName());
+          .setName(conversationRequest.getName());
 
       if (conversationRequest.getContextId() != null) {
         protosConversationRequestBuilder.setContextID(conversationRequest.getContextId());
       }
 
-      for (ConversationInput input : conversationRequest.getConversationInputs()) {
+      for (ConversationInput input : conversationRequest.getInputs()) {
         if (input.getContent() == null || input.getContent().isEmpty()) {
           throw new IllegalArgumentException("Conversation input content cannot be null or empty.");
         }
@@ -1619,12 +1618,12 @@ public Mono<ConversationResponse> converse(ConversationRequest conversationReque
   }
 
   private void validateConversationRequest(ConversationRequest conversationRequest) {
-    if ((conversationRequest.getLlmName() == null) || (conversationRequest.getLlmName().trim().isEmpty())) {
+    if ((conversationRequest.getName() == null) || (conversationRequest.getName().trim().isEmpty())) {
       throw new IllegalArgumentException("LLM name cannot be null or empty.");
     }
 
-    if ((conversationRequest.getConversationInputs() == null) || (conversationRequest
-        .getConversationInputs().isEmpty())) {
+    if ((conversationRequest.getInputs() == null) || (conversationRequest
+        .getInputs().isEmpty())) {
       throw new IllegalArgumentException("Conversation inputs cannot be null or empty.");
     }
   }

sdk/src/main/java/io/dapr/client/domain/ConversationInput.java

@@ -20,7 +20,7 @@ public class ConversationInput {
 
   private final String content;
 
-  private ConversationRole role;
+  private String role;
 
   private boolean scrubPii;
 
@@ -47,7 +47,7 @@ public String getContent() {
    *
    * @return this.
    */
-  public ConversationRole getRole() {
+  public String getRole() {
     return role;
   }
 
@@ -57,7 +57,7 @@ public ConversationRole getRole() {
    * @param role The role to assign to the message.
    * @return this.
    */
-  public ConversationInput setRole(ConversationRole role) {
+  public ConversationInput setRole(String role) {
     this.role = role;
     return this;
   }

sdk/src/main/java/io/dapr/client/domain/ConversationRequest.java

@@ -21,40 +21,40 @@
  */
 public class ConversationRequest {
 
-  private final String llmName;
-  private final List<ConversationInput> daprConversationInputs;
+  private final String name;
+  private final List<ConversationInput> inputs;
   private String contextId;
   private boolean scrubPii;
   private double temperature;
 
   /**
    * Constructs a DaprConversation with a component name and conversation inputs.
    *
-   * @param llmName The name of the LLM component. See a list of all available conversation components
+   * @param name The name of the Dapr conversation component. See a list of all available conversation components
    *                @see <a href="https://docs.dapr.io/reference/components-reference/supported-conversation/"></a>
-   * @param conversationInputs    the list of Dapr conversation inputs
+   * @param inputs    the list of Dapr conversation inputs
    */
-  public ConversationRequest(String llmName, List<ConversationInput> conversationInputs) {
-    this.llmName = llmName;
-    this.daprConversationInputs = conversationInputs;
+  public ConversationRequest(String name, List<ConversationInput> inputs) {
+    this.name = name;
+    this.inputs = inputs;
   }
 
   /**
    * Gets the conversation component name.
    *
    * @return the conversation component name
    */
-  public String getLlmName() {
-    return llmName;
+  public String getName() {
+    return name;
   }
 
   /**
-   * Gets the list of Dapr conversation inputs.
+   * Gets the list of Dapr conversation input.
    *
-   * @return the list of conversation inputs
+   * @return the list of conversation input
    */
-  public List<ConversationInput> getConversationInputs() {
-    return daprConversationInputs;
+  public List<ConversationInput> getInputs() {
+    return inputs;
   }
 
   /**
@@ -116,4 +116,4 @@ public ConversationRequest setTemperature(double temperature) {
     this.temperature = temperature;
     return this;
   }
-}
+}

sdk/src/main/java/io/dapr/client/domain/ConversationResponse.java

@@ -23,17 +23,17 @@ public class ConversationResponse {
 
   private String contextId;
 
-  private final List<ConversationOutput> daprConversationOutputs;
+  private final List<ConversationOutput> outputs;
 
   /**
    * Constructor.
    *
    * @param contextId context id supplied to LLM.
-   * @param daprConversationOutputs outputs from the LLM.
+   * @param outputs outputs from the LLM.
    */
-  public ConversationResponse(String contextId, List<ConversationOutput> daprConversationOutputs) {
+  public ConversationResponse(String contextId, List<ConversationOutput> outputs) {
     this.contextId = contextId;
-    this.daprConversationOutputs = daprConversationOutputs;
+    this.outputs = outputs;
   }
 
   /**
@@ -51,6 +51,6 @@ public String getContextId() {
    * @return List{@link ConversationOutput}.
    */
   public List<ConversationOutput> getConversationOutpus() {
-    return Collections.unmodifiableList(this.daprConversationOutputs);
+    return Collections.unmodifiableList(this.outputs);
   }
 }