Fix tool calling

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

Author: siri-varma

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

@@ -17,6 +17,8 @@
 import com.google.protobuf.Any;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Empty;
+import com.google.protobuf.Struct;
+import com.google.protobuf.Value;
 import io.dapr.client.domain.ActorMetadata;
 import io.dapr.client.domain.AppConnectionPropertiesHealthMetadata;
 import io.dapr.client.domain.AppConnectionPropertiesMetadata;
@@ -1811,21 +1813,20 @@ private void buildConversationTools(List<ConversationTools> tools,
       }
 
       if (function.getParameters() != null) {
-        Map<String, Any> functionParams = function.getParameters()
+        Map<String, Value> functionParams = function.getParameters()
             .entrySet().stream()
             .collect(Collectors.toMap(
                 Map.Entry::getKey,
                 e -> {
                   try {
-                    return Any.newBuilder().setValue(ByteString.copyFrom(objectSerializer.serialize(e.getValue())))
-                        .build();
+                    return ProtobufValueHelper.toProtobufValue(e.getValue());
                   } catch (IOException ex) {
                     throw new RuntimeException(ex);
                   }
                 }
             ));
 
-        protoFunction.putAllParameters(functionParams);
+        protoFunction.setParameters(Struct.newBuilder().putAllFields(functionParams).build());
       }
 
       builder.addTools(DaprProtos.ConversationTools.newBuilder()

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

@@ -0,0 +1,76 @@
+/*
+ * Copyright 2021 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;
+
+import com.google.protobuf.ListValue;
+import com.google.protobuf.NullValue;
+import com.google.protobuf.Struct;
+import com.google.protobuf.Value;
+import io.dapr.serializer.DaprObjectSerializer;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Helper class to convert Java objects to Google Protobuf Value types.
+ */
+public class ProtobufValueHelper {
+
+  /**
+   * Converts a Java object to a Google Protobuf Value.
+   *
+   * @param obj the Java object to convert
+   * @return the corresponding Protobuf Value
+   * @throws IOException if serialization fails
+   */
+  public static Value toProtobufValue(Object obj) throws IOException {
+    if (obj == null) {
+      return Value.newBuilder().setNullValue(NullValue.NULL_VALUE).build();
+    }
+
+    if (obj instanceof Boolean) {
+      return Value.newBuilder().setBoolValue((Boolean) obj).build();
+    }
+
+    if (obj instanceof String) {
+      return Value.newBuilder().setStringValue((String) obj).build();
+    }
+
+    if (obj instanceof Number) {
+      return Value.newBuilder().setNumberValue(((Number) obj).doubleValue()).build();
+    }
+
+    if (obj instanceof List) {
+      ListValue.Builder listBuilder = ListValue.newBuilder();
+      for (Object item : (List<?>) obj) {
+        listBuilder.addValues(toProtobufValue(item));
+      }
+      return Value.newBuilder().setListValue(listBuilder.build()).build();
+    }
+
+    if (obj instanceof Map) {
+      Struct.Builder structBuilder = Struct.newBuilder();
+      for (Map.Entry<?, ?> entry : ((Map<?, ?>) obj).entrySet()) {
+        String key = entry.getKey().toString();
+        Value value = toProtobufValue(entry.getValue());
+        structBuilder.putFields(key, value);
+      }
+      return Value.newBuilder().setStructValue(structBuilder.build()).build();
+    }
+
+    // Fallback: convert to string
+    return Value.newBuilder().setStringValue(obj.toString()).build();
+  }
+}