address comments

GreatEugenius · GreatEugenius · commit 8d04d7f0020e · 2025-11-17T17:39:42.000+08:00
diff --git a/api/src/main/java/org/apache/flink/agents/api/prompt/Prompt.java b/api/src/main/java/org/apache/flink/agents/api/prompt/Prompt.java
@@ -77,6 +77,21 @@ public String formatString(Map<String, String> kwargs) {
                 });
     }
 
+    /**
+     * Formats messages with the given default role and arguments.
+     *
+     * <p><strong>Note:</strong> This method is primarily designed for Python interoperability.
+     * Python code may pass arguments of various types (integers, floats, booleans, etc.) which are
+     * automatically converted to strings for template processing.
+     *
+     * <p>For Java code, prefer using {@link #formatMessages(MessageRole, Map)} directly with a
+     * {@code Map<String, String>} for better type safety.
+     *
+     * @param defaultRoleValue The default message role as a string value
+     * @param kwargs A map of template arguments where values can be of any type and will be
+     *     converted to strings using {@link Object#toString()}
+     * @return A list of formatted chat messages
+     */
     public List<ChatMessage> formatMessages(String defaultRoleValue, Map<String, Object> kwargs) {
         Map<String, String> arguments = new HashMap<>();
         for (Map.Entry<String, Object> entry : kwargs.entrySet()) {
diff --git a/api/src/main/java/org/apache/flink/agents/api/resource/python/PythonChatModelConnection.java b/api/src/main/java/org/apache/flink/agents/api/resource/python/PythonChatModelConnection.java
@@ -38,6 +38,15 @@ public class PythonChatModelConnection extends BaseChatModelConnection
         implements PythonResourceWrapper {
     private PyObject chatModel;
 
+    /**
+     * Creates a new PythonChatModelConnection.
+     *
+     * @param adapter The Python resource adapter (required by PythonResourceProvider's
+     *     reflection-based instantiation but not used directly in this implementation)
+     * @param chatModel The Python chat model object
+     * @param descriptor The resource descriptor
+     * @param getResource Function to retrieve resources by name and type
+     */
     public PythonChatModelConnection(
             PythonResourceAdapter adapter,
             PyObject chatModel,
diff --git a/api/src/main/java/org/apache/flink/agents/api/resource/python/PythonChatModelSetup.java b/api/src/main/java/org/apache/flink/agents/api/resource/python/PythonChatModelSetup.java
@@ -18,6 +18,7 @@
 package org.apache.flink.agents.api.resource.python;
 
 import org.apache.flink.agents.api.chat.messages.ChatMessage;
+import org.apache.flink.agents.api.chat.messages.MessageRole;
 import org.apache.flink.agents.api.chat.model.BaseChatModelSetup;
 import org.apache.flink.agents.api.resource.Resource;
 import org.apache.flink.agents.api.resource.ResourceDescriptor;
@@ -36,6 +37,11 @@
  * compatibility while delegating actual chat operations to the underlying Python implementation.
  */
 public class PythonChatModelSetup extends BaseChatModelSetup implements PythonResourceWrapper {
+    private static final String FROM_JAVA_CHAT_MESSAGE = "python_java_utils.from_java_chat_message";
+
+    private static final String UPDATE_JAVA_CHAT_MESSAGE =
+            "python_java_utils.update_java_chat_message";
+
     private final PyObject chatModelSetup;
     private final PythonResourceAdapter adapter;
 
@@ -55,13 +61,40 @@ public ChatMessage chat(List<ChatMessage> messages, Map<String, Object> paramete
 
         List<Object> pythonMessages = new ArrayList<>();
         for (ChatMessage message : messages) {
-            pythonMessages.add(adapter.toPythonChatMessage(message));
+            pythonMessages.add(toPythonChatMessage(message));
         }
 
         kwargs.put("messages", pythonMessages);
 
         Object pythonMessageResponse = adapter.callMethod(chatModelSetup, "chat", kwargs);
-        return adapter.fromPythonChatMessage(pythonMessageResponse);
+        return fromPythonChatMessage(pythonMessageResponse);
+    }
+
+    /**
+     * Converts a Java ChatMessage object to its Python equivalent.
+     *
+     * @param message the Java ChatMessage to convert
+     * @return the Python representation of the chat message
+     */
+    private Object toPythonChatMessage(ChatMessage message) {
+        return adapter.invoke(FROM_JAVA_CHAT_MESSAGE, message);
+    }
+
+    /**
+     * Converts a Python chat message object back to a Java ChatMessage.
+     *
+     * @param pythonChatMessage the Python chat message object to convert
+     * @return the Java ChatMessage representation
+     */
+    private ChatMessage fromPythonChatMessage(Object pythonChatMessage) {
+        ChatMessage message = new ChatMessage();
+
+        String roleValue =
+                (String) adapter.invoke(UPDATE_JAVA_CHAT_MESSAGE, pythonChatMessage, message);
+
+        message.setRole(MessageRole.fromValue(roleValue));
+
+        return message;
     }
 
     @Override
diff --git a/api/src/main/java/org/apache/flink/agents/api/resource/python/PythonResourceAdapter.java b/api/src/main/java/org/apache/flink/agents/api/resource/python/PythonResourceAdapter.java
@@ -18,7 +18,6 @@
 
 package org.apache.flink.agents.api.resource.python;
 
-import org.apache.flink.agents.api.chat.messages.ChatMessage;
 import pemja.core.object.PyObject;
 
 import java.util.Map;
@@ -60,18 +59,11 @@ public interface PythonResourceAdapter {
     Object callMethod(Object obj, String methodName, Map<String, Object> kwargs);
 
     /**
-     * Converts a Java ChatMessage object to its Python equivalent.
+     * Invokes a method with the specified name and arguments.
      *
-     * @param message the Java ChatMessage to convert
-     * @return the Python representation of the chat message
-     */
-    Object toPythonChatMessage(ChatMessage message);
-
-    /**
-     * Converts a Python chat message object back to a Java ChatMessage.
-     *
-     * @param pythonChatMessage the Python chat message object to convert
-     * @return the Java ChatMessage representation
+     * @param name the name of the method to invoke
+     * @param args the arguments to pass to the method
+     * @return the result of the method invocation
      */
-    ChatMessage fromPythonChatMessage(Object pythonChatMessage);
+    Object invoke(String name, Object... args);
 }
diff --git a/plan/src/main/java/org/apache/flink/agents/plan/AgentPlan.java b/plan/src/main/java/org/apache/flink/agents/plan/AgentPlan.java
@@ -79,7 +79,7 @@ public class AgentPlan implements Serializable {
 
     private AgentConfiguration config;
 
-    private PythonResourceAdapter pythonResourceAdapter;
+    private transient PythonResourceAdapter pythonResourceAdapter;
 
     /** Cache for instantiated resources. */
     private transient Map<ResourceType, Map<String, Resource>> resourceCache;
diff --git a/plan/src/main/java/org/apache/flink/agents/plan/resourceprovider/PythonResourceProvider.java b/plan/src/main/java/org/apache/flink/agents/plan/resourceprovider/PythonResourceProvider.java
@@ -68,6 +68,8 @@ public PythonResourceProvider(String name, ResourceType type, ResourceDescriptor
             throw new IllegalArgumentException("clazz should not be null or empty.");
         }
         this.kwargs = new HashMap<>(descriptor.getInitialArguments());
+        this.kwargs.remove("module");
+        this.kwargs.remove("clazz");
         this.descriptor = descriptor;
     }
 
@@ -92,7 +94,6 @@ public Resource provide(BiFunction<String, ResourceType, Resource> getResource)
             throws Exception {
         if (pythonResourceAdapter != null) {
             Class<?> clazz = Class.forName(descriptor.getClazz());
-            Map<String, Object> kwargs = new HashMap<>(descriptor.getInitialArguments());
             PyObject pyResource =
                     pythonResourceAdapter.initPythonResource(this.module, this.clazz, kwargs);
             Constructor<?> constructor =
diff --git a/plan/src/main/java/org/apache/flink/agents/plan/serializer/ResourceProviderJsonDeserializer.java b/plan/src/main/java/org/apache/flink/agents/plan/serializer/ResourceProviderJsonDeserializer.java
@@ -77,9 +77,9 @@ private PythonResourceProvider deserializePythonResourceProvider(JsonNode node)
         String name = node.get("name").asText();
         String type = node.get("type").asText();
         try {
-            ResourceDescriptor descriptor =
-                    mapper.treeToValue(node.get("descriptor"), ResourceDescriptor.class);
-            if (descriptor != null) {
+            if (node.has("descriptor")) {
+                ResourceDescriptor descriptor =
+                        mapper.treeToValue(node.get("descriptor"), ResourceDescriptor.class);
                 return new PythonResourceProvider(name, ResourceType.fromValue(type), descriptor);
             }
         } catch (JsonProcessingException e) {
diff --git a/plan/src/main/java/org/apache/flink/agents/plan/serializer/ResourceProviderJsonSerializer.java b/plan/src/main/java/org/apache/flink/agents/plan/serializer/ResourceProviderJsonSerializer.java
@@ -68,10 +68,13 @@ private void serializePythonResourceProvider(JsonGenerator gen, PythonResourcePr
             throws IOException {
         gen.writeStringField("name", provider.getName());
         gen.writeStringField("type", provider.getType().getValue());
-        gen.writeObjectField("descriptor", provider.getDescriptor());
         gen.writeStringField("module", provider.getModule());
         gen.writeStringField("clazz", provider.getClazz());
 
+        if (provider.getDescriptor() != null) {
+            gen.writeObjectField("descriptor", provider.getDescriptor());
+        }
+
         gen.writeFieldName("kwargs");
         gen.writeStartObject();
         provider.getKwargs()
diff --git a/plan/src/test/resources/resource_providers/python_resource_provider.json b/plan/src/test/resources/resource_providers/python_resource_provider.json
@@ -3,7 +3,6 @@
   "type" : "chat_model",
   "module" : "flink_agents.plan.tests.test_resource_provider",
   "clazz" : "MockChatModelImpl",
-  "descriptor" :null,
   "kwargs" : {
     "host" : "8.8.8.8",
     "desc" : "mock chat model"
diff --git a/python/flink_agents/api/prompts/prompt.py b/python/flink_agents/api/prompts/prompt.py
@@ -22,10 +22,10 @@
 
 from flink_agents.api.chat_message import ChatMessage, MessageRole
 from flink_agents.api.prompts.utils import format_string
-from flink_agents.api.resource import Resource, ResourceType, SerializableResource
+from flink_agents.api.resource import ResourceType, SerializableResource
 
 
-class Prompt(Resource, ABC):
+class Prompt(SerializableResource, ABC):
     """Base prompt abstract."""
 
     @staticmethod
@@ -55,7 +55,7 @@ def resource_type(cls) -> ResourceType:
         return ResourceType.PROMPT
 
 
-class LocalPrompt(Prompt, SerializableResource):
+class LocalPrompt(Prompt):
     """Prompt for a language model.
 
     Attributes:
diff --git a/python/flink_agents/runtime/java/java_resource_wrapper.py b/python/flink_agents/runtime/java/java_resource_wrapper.py
@@ -17,6 +17,7 @@
 #################################################################################
 from typing import Any, List
 
+from pydantic import Field
 from typing_extensions import override
 
 from flink_agents.api.chat_message import ChatMessage, MessageRole
@@ -42,7 +43,7 @@ def call(self, *args: Any, **kwargs: Any) -> Any:
 class JavaPrompt(Prompt):
     """Python wrapper for Java's Prompt."""
 
-    j_prompt: Any
+    j_prompt: Any= Field(exclude=True)
 
     @override
     def format_string(self, **kwargs: str) -> str:
diff --git a/python/flink_agents/runtime/python_java_utils.py b/python/flink_agents/runtime/python_java_utils.py
@@ -25,7 +25,7 @@
 from flink_agents.api.resource import Resource
 from flink_agents.api.tools.tool import ToolMetadata
 from flink_agents.api.tools.utils import create_model_from_java_tool_schema_str
-from flink_agents.runtime.java.java_resourse_wrapper import (
+from flink_agents.runtime.java.java_resource_wrapper import (
     JavaGetResourceWrapper,
     JavaPrompt,
     JavaTool,
diff --git a/runtime/src/main/java/org/apache/flink/agents/runtime/python/utils/PythonResourceAdapterImpl.java b/runtime/src/main/java/org/apache/flink/agents/runtime/python/utils/PythonResourceAdapterImpl.java
@@ -17,8 +17,6 @@
  */
 package org.apache.flink.agents.runtime.python.utils;
 
-import org.apache.flink.agents.api.chat.messages.ChatMessage;
-import org.apache.flink.agents.api.chat.messages.MessageRole;
 import org.apache.flink.agents.api.prompt.Prompt;
 import org.apache.flink.agents.api.resource.Resource;
 import org.apache.flink.agents.api.resource.ResourceType;
@@ -109,25 +107,13 @@ private Object convertToPythonPrompt(Prompt prompt) {
     }
 
     @Override
-    public Object toPythonChatMessage(ChatMessage message) {
-        return interpreter.invoke(FROM_JAVA_CHAT_MESSAGE, message);
-    }
-
-    @Override
-    public ChatMessage fromPythonChatMessage(Object pythonChatMessage) {
-        ChatMessage message = new ChatMessage();
-
-        String roleValue =
-                (String) interpreter.invoke(UPDATE_JAVA_CHAT_MESSAGE, pythonChatMessage, message);
-
-        message.setRole(MessageRole.fromValue(roleValue));
-
-        return message;
+    public Object callMethod(Object obj, String methodName, Map<String, Object> kwargs) {
+        return interpreter.invoke(CALL_METHOD, obj, methodName, kwargs);
     }
 
     @Override
-    public Object callMethod(Object obj, String methodName, Map<String, Object> kwargs) {
-        return interpreter.invoke(CALL_METHOD, obj, methodName, kwargs);
+    public Object invoke(String name, Object... args) {
+        return interpreter.invoke(name, args);
     }
 
     public void close() {
