Fix things

Signed-off-by: sirivarma <[email protected]>

Author: siri-varma

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

@@ -13,6 +13,7 @@
 
 package io.dapr.client;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Strings;
 import com.google.protobuf.Any;
 import com.google.protobuf.ByteString;
@@ -21,14 +22,15 @@
 import io.dapr.client.domain.ActorMetadata;
 import io.dapr.client.domain.AppConnectionPropertiesHealthMetadata;
 import io.dapr.client.domain.AppConnectionPropertiesMetadata;
+import io.dapr.client.domain.AssistantMessage;
 import io.dapr.client.domain.BulkPublishEntry;
 import io.dapr.client.domain.BulkPublishRequest;
 import io.dapr.client.domain.BulkPublishResponse;
 import io.dapr.client.domain.BulkPublishResponseFailedEntry;
 import io.dapr.client.domain.CloudEvent;
 import io.dapr.client.domain.ComponentMetadata;
 import io.dapr.client.domain.ConfigurationItem;
-import io.dapr.client.domain.ConversationFunction;
+import io.dapr.client.domain.ConversationToolsFunction;
 import io.dapr.client.domain.ConversationInput;
 import io.dapr.client.domain.ConversationInputAlpha2;
 import io.dapr.client.domain.ConversationMessage;
@@ -42,7 +44,7 @@
 import io.dapr.client.domain.ConversationResultChoices;
 import io.dapr.client.domain.ConversationResultMessage;
 import io.dapr.client.domain.ConversationToolCalls;
-import io.dapr.client.domain.ConversationToolCallsFunction;
+import io.dapr.client.domain.ConversationToolCallsOfFunction;
 import io.dapr.client.domain.ConversationTools;
 import io.dapr.client.domain.DaprMetadata;
 import io.dapr.client.domain.DeleteJobRequest;
@@ -73,6 +75,7 @@
 import io.dapr.client.domain.SubscribeConfigurationRequest;
 import io.dapr.client.domain.SubscribeConfigurationResponse;
 import io.dapr.client.domain.SubscriptionMetadata;
+import io.dapr.client.domain.ToolMessage;
 import io.dapr.client.domain.TransactionalStateOperation;
 import io.dapr.client.domain.UnlockRequest;
 import io.dapr.client.domain.UnlockResponseStatus;
@@ -1572,6 +1575,7 @@ public Mono<DaprMetadata> getMetadata() {
   /**
    * {@inheritDoc}
    */
+  @Deprecated(forRemoval = true)
   @Override
   public Mono<ConversationResponse> converse(ConversationRequest conversationRequest) {
 
@@ -1685,7 +1689,7 @@ public Mono<ConversationResponseAlpha2> converseAlpha2(ConversationRequestAlpha2
   }
 
   private DaprProtos.ConversationRequestAlpha2 buildConversationRequestProto(ConversationRequestAlpha2 request,
-                                                                             DaprProtos.ConversationRequestAlpha2.Builder builder) {
+                                           DaprProtos.ConversationRequestAlpha2.Builder builder) {
     if (request.getTools() != null) {
       buildConversationTools(request.getTools(), builder);
     }
@@ -1694,13 +1698,21 @@ private DaprProtos.ConversationRequestAlpha2 buildConversationRequestProto(Conve
       builder.putAllMetadata(request.getMetadata());
     }
 
+
     if (request.getParameters() != null) {
       Map<String, Any> parameters = request.getParameters()
           .entrySet().stream()
           .collect(Collectors.toMap(
               Map.Entry::getKey,
-              e -> Any.pack((Message) e.getValue())
-          ));
+              e -> {
+                try {
+                  return Any.newBuilder().setValue(ByteString.copyFrom(objectSerializer.serialize(e.getValue())))
+                      .build();
+                } catch (IOException ex) {
+                  throw new RuntimeException(ex);
+                }
+              })
+          );
       builder.putAllParameters(parameters);
     }
 
@@ -1727,7 +1739,7 @@ private DaprProtos.ConversationRequestAlpha2 buildConversationRequestProto(Conve
   private void buildConversationTools(List<ConversationTools> tools, 
                                      DaprProtos.ConversationRequestAlpha2.Builder builder) {
     for (ConversationTools tool : tools) {
-      ConversationFunction function = tool.getFunction();
+      ConversationToolsFunction function = tool.getFunction();
 
       DaprProtos.ConversationToolsFunction.Builder protoFunction = DaprProtos.ConversationToolsFunction.newBuilder()
           .setName(function.getName());
@@ -1741,7 +1753,14 @@ private void buildConversationTools(List<ConversationTools> tools,
             .entrySet().stream()
             .collect(Collectors.toMap(
                 Map.Entry::getKey,
-                e -> Any.pack((Message) e.getValue())
+                e -> {
+                  try {
+                    return Any.newBuilder().setValue(ByteString.copyFrom(objectSerializer.serialize(e.getValue())))
+                        .build();
+                  } catch (IOException ex) {
+                    throw new RuntimeException(ex);
+                  }
+                }
             ));
 
         protoFunction.putAllParameters(functionParams);
@@ -1766,8 +1785,8 @@ private DaprProtos.ConversationMessage buildConversationMessage(ConversationMess
         if (message.getContent() != null) {
           toolMessage.addAllContent(getConversationMessageContent(message));
         }
-        if (message.getToolId() != null) {
-          toolMessage.setToolId(message.getToolId());
+        if (((ToolMessage)message).getToolId() != null) {
+          toolMessage.setToolId(((ToolMessage)message).getToolId());
         }
         messageBuilder.setOfTool(toolMessage);
         break;
@@ -1785,14 +1804,15 @@ private DaprProtos.ConversationMessage buildConversationMessage(ConversationMess
       case ASSISTANT:
         DaprProtos.ConversationMessageOfAssistant.Builder assistantMessage =
             DaprProtos.ConversationMessageOfAssistant.newBuilder();
+
         if (message.getName() != null) {
           assistantMessage.setName(message.getName());
         }
         if (message.getContent() != null) {
           assistantMessage.addAllContent(getConversationMessageContent(message));
         }
-        if (message.getToolCalls() != null) {
-          assistantMessage.addAllToolCalls(getConversationToolCalls(message));
+        if (((AssistantMessage)message).getToolCalls() != null) {
+          assistantMessage.addAllToolCalls(getConversationToolCalls((AssistantMessage)message));
         }
         messageBuilder.setOfAssistant(assistantMessage);
         break;
@@ -1851,15 +1871,18 @@ private ConversationResultMessage buildConversationResultMessage(DaprProtos.Conv
     List<ConversationToolCalls> toolCalls = new ArrayList<>();
 
     for (DaprProtos.ConversationToolCalls protoToolCall : protoChoice.getMessage().getToolCallsList()) {
-      ConversationToolCallsFunction function = null;
+      ConversationToolCallsOfFunction function = null;
       if (protoToolCall.hasFunction()) {
-        function = new ConversationToolCallsFunction(
+        function = new ConversationToolCallsOfFunction(
             protoToolCall.getFunction().getName(),
             protoToolCall.getFunction().getArguments()
         );
       }
-      
-      toolCalls.add(new ConversationToolCalls(protoToolCall.getId(), function));
+
+      ConversationToolCalls conversationToolCalls = new ConversationToolCalls(function);
+      conversationToolCalls.setId(protoToolCall.getId());
+
+      toolCalls.add(conversationToolCalls);
     }
 
     return new ConversationResultMessage(
@@ -1882,16 +1905,19 @@ private List<DaprProtos.ConversationMessageContent> getConversationMessageConten
   }
 
   private List<DaprProtos.ConversationToolCalls> getConversationToolCalls(
-      ConversationMessage conversationMessage) {
+      AssistantMessage assistantMessage) {
     List<DaprProtos.ConversationToolCalls> conversationToolCalls = new ArrayList<>();
-    for (ConversationToolCalls conversationToolCall: conversationMessage.getToolCalls()) {
-      conversationToolCalls.add(DaprProtos.ConversationToolCalls.newBuilder()
-          .setId(conversationToolCall.getId())
+    for (ConversationToolCalls conversationToolCall: assistantMessage.getToolCalls()) {
+      DaprProtos.ConversationToolCalls.Builder toolCallsBuilder = DaprProtos.ConversationToolCalls.newBuilder()
           .setFunction(DaprProtos.ConversationToolCallsOfFunction.newBuilder()
-              .setName(conversationToolCall.getFunction().getName())
-              .setArguments(conversationToolCall.getFunction().getArguments())
-              .build())
-          .build());
+                  .setName(conversationToolCall.getFunction().getName())
+                  .setArguments(conversationToolCall.getFunction().getArguments())
+                  .build());
+      if (conversationToolCall.getId() != null) {
+        toolCallsBuilder.setId(conversationToolCall.getId());
+      }
+
+      conversationToolCalls.add(toolCallsBuilder.build());
     }
 
     return conversationToolCalls;

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

@@ -315,6 +315,7 @@ <T> Subscription subscribeToEvents(
    * @param conversationRequest request to be passed to the LLM.
    * @return {@link ConversationResponse}.
    */
+  @Deprecated
   public Mono<ConversationResponse> converse(ConversationRequest conversationRequest);
 
   /*

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

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2025 The Dapr Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package io.dapr.client.domain;
+
+import java.util.List;
+
+/**
+ * Assistant message containing responses from the AI model.
+ * Can include regular content and/or tool calls that the model wants to make.
+ */
+public class AssistantMessage implements ConversationMessage {
+
+  private String name;
+  private final List<ConversationMessageContent> content;
+  private final List<ConversationToolCalls> toolCalls;
+
+  /**
+   * Creates an assistant message with content and optional tool calls.
+   * @param content the content of the assistant message.
+   * @param toolCalls the tool calls requested by the assistant.
+   */
+  public AssistantMessage(List<ConversationMessageContent> content, List<ConversationToolCalls> toolCalls) {
+    this.content = content != null ? List.copyOf(content) : null;
+    this.toolCalls = toolCalls != null ? List.copyOf(toolCalls) : null;
+  }
+
+  @Override
+  public ConversationMessageRole getRole() {
+    return ConversationMessageRole.ASSISTANT;
+  }
+
+  @Override
+  public String getName() {
+    return name;
+  }
+
+  /**
+   * Sets the name of the assistant participant.
+   *
+   * @param name the name to set
+   */
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  @Override
+  public List<ConversationMessageContent> getContent() {
+    return content;
+  }
+
+  public List<ConversationToolCalls> getToolCalls() {
+    return toolCalls;
+  }
+}

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

@@ -16,118 +16,29 @@
 import java.util.List;
 
 /**
- * Represents a conversation message with role-specific content.
+ * Interface representing a conversation message with role-specific content.
  * Supports different message types: system, user, assistant, developer, and tool.
  */
-public class ConversationMessage {
-
-  /**
-   * Enum representing the different roles a message can have.
-   */
-  public enum Role {
-    SYSTEM,
-    USER, 
-    ASSISTANT,
-    DEVELOPER,
-    TOOL
-  }
-
-  private final Role role;
-  private final String name;
-  private final List<ConversationMessageContent> content;
-  private final List<ConversationToolCalls> toolCalls;
-  private final String toolId;
-
-  /**
-   * Constructor for creating a message with basic content.
-   *
-   * @param role the role of the message sender
-   * @param content the content of the message
-   */
-  public ConversationMessage(Role role, List<ConversationMessageContent> content) {
-    this(role, null, content, null, null);
-  }
-
-  /**
-   * Constructor for creating a message with name and content.
-   *
-   * @param role the role of the message sender
-   * @param name the name of the participant (optional)
-   * @param content the content of the message
-   */
-  public ConversationMessage(Role role, String name, List<ConversationMessageContent> content) {
-    this(role, name, content, null, null);
-  }
-
-  /**
-   * Full constructor for creating a message with all properties.
-   *
-   * @param role the role of the message sender
-   * @param name the name of the participant (optional)
-   * @param content the content of the message
-   * @param toolCalls tool calls for assistant messages (optional)
-   * @param toolId tool ID for tool messages (optional)
-   */
-  public ConversationMessage(Role role, String name, List<ConversationMessageContent> content, 
-                           List<ConversationToolCalls> toolCalls, String toolId) {
-    this.role = role;
-    this.name = name;
-    this.content = content != null ? List.copyOf(content) : null;
-    this.toolCalls = toolCalls != null ? List.copyOf(toolCalls) : null;
-    this.toolId = toolId;
-  }
+public interface ConversationMessage {
 
   /**
    * Gets the role of the message sender.
    *
    * @return the message role
    */
-  public Role getRole() {
-    return role;
-  }
+  ConversationMessageRole getRole();
 
   /**
    * Gets the name of the participant in the message.
    *
    * @return the participant name, or null if not specified
    */
-  public String getName() {
-    return name;
-  }
+  String getName();
 
   /**
    * Gets the content of the message.
    *
    * @return the message content
    */
-  public List<ConversationMessageContent> getContent() {
-    return content;
-  }
-
-  /**
-   * Gets the tool calls generated by the model (for assistant messages).
-   *
-   * @return the tool calls, or null if none
-   */
-  public List<ConversationToolCalls> getToolCalls() {
-    return toolCalls;
-  }
-
-  /**
-   * Gets the tool ID (for tool messages).
-   *
-   * @return the tool ID, or null if not a tool message
-   */
-  public String getToolId() {
-    return toolId;
-  }
-
-  /**
-   * Checks if this message has tool calls.
-   *
-   * @return true if the message has tool calls, false otherwise
-   */
-  public boolean hasToolCalls() {
-    return toolCalls != null && !toolCalls.isEmpty();
-  }
+  List<ConversationMessageContent> getContent();
 }