This is an automated email from the ASF dual-hosted git repository. xtsong pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/flink-agents.git
commit 3bbb5af2fc93f558c2476236c2b54a7acefd014c Author: WenjinXie <[email protected]> AuthorDate: Thu Dec 25 16:39:29 2025 +0800 [api] Move agent api to agents module. [api] Move agent api to agnets module in java. fix --- api/src/main/java/org/apache/flink/agents/api/AgentBuilder.java | 1 + api/src/main/java/org/apache/flink/agents/api/{ => agents}/Agent.java | 3 ++- api/src/main/java/org/apache/flink/agents/api/agents/ReActAgent.java | 1 - .../org/apache/flink/agents/api/resource/ResourceDescriptorTest.java | 2 +- .../flink/agents/integration/test/ChatModelIntegrationAgent.java | 2 +- .../flink/agents/integration/test/EmbeddingIntegrationAgent.java | 2 +- .../apache/flink/agents/integration/test/FlinkIntegrationAgent.java | 2 +- .../org/apache/flink/agents/integration/test/MemoryObjectAgent.java | 2 +- .../java/org/apache/flink/agents/integration/test/ReActAgentTest.java | 2 +- .../flink/agents/integration/test/VectorStoreIntegrationAgent.java | 2 +- .../apache/flink/agents/resource/test/ChatModelCrossLanguageAgent.java | 2 +- .../apache/flink/agents/examples/agents/ProductSuggestionAgent.java | 2 +- .../org/apache/flink/agents/examples/agents/ReviewAnalysisAgent.java | 2 +- plan/src/main/java/org/apache/flink/agents/plan/AgentPlan.java | 2 +- .../org/apache/flink/agents/plan/AgentPlanDeclareChatModelTest.java | 2 +- .../org/apache/flink/agents/plan/AgentPlanDeclareMCPServerTest.java | 2 +- .../org/apache/flink/agents/plan/AgentPlanDeclareToolFieldTest.java | 2 +- .../org/apache/flink/agents/plan/AgentPlanDeclareToolMethodTest.java | 2 +- plan/src/test/java/org/apache/flink/agents/plan/AgentPlanTest.java | 2 +- .../test/java/org/apache/flink/agents/plan/FunctionToolPlanTest.java | 2 +- .../apache/flink/agents/plan/compatibility/GenerateAgentPlanJson.java | 2 +- .../flink/agents/plan/serializer/AgentPlanJsonSerializerTest.java | 2 +- python/flink_agents/api/{ => agents}/agent.py | 0 python/flink_agents/api/agents/react_agent.py | 2 +- python/flink_agents/api/execution_environment.py | 2 +- .../e2e_tests/e2e_tests_integration/chat_model_integration_agent.py | 2 +- .../e2e_tests/e2e_tests_integration/e2e_tests_mcp/mcp_test.py | 2 +- .../e2e_tests/e2e_tests_integration/flink_integration_agent.py | 2 +- .../e2e_tests/e2e_tests_integration/python_event_logging_test.py | 2 +- python/flink_agents/e2e_tests/e2e_tests_integration/workflow_test.py | 2 +- .../chat_model_cross_language_agent.py | 2 +- python/flink_agents/e2e_tests/long_term_memory_test.py | 2 +- .../examples/quickstart/agents/product_suggestion_agent.py | 2 +- .../flink_agents/examples/quickstart/agents/review_analysis_agent.py | 2 +- python/flink_agents/examples/rag/rag_agent_example.py | 2 +- python/flink_agents/plan/agent_plan.py | 2 +- .../tests/compatibility/python_agent_plan_compatibility_test_agent.py | 2 +- python/flink_agents/plan/tests/test_agent_plan.py | 2 +- python/flink_agents/runtime/local_execution_environment.py | 2 +- python/flink_agents/runtime/local_runner.py | 2 +- python/flink_agents/runtime/remote_execution_environment.py | 2 +- python/flink_agents/runtime/tests/test_built_in_actions.py | 2 +- python/flink_agents/runtime/tests/test_get_resource_in_action.py | 2 +- python/flink_agents/runtime/tests/test_local_execution_environment.py | 2 +- .../apache/flink/agents/runtime/env/RemoteExecutionEnvironment.java | 2 +- .../src/test/java/org/apache/flink/agents/runtime/RescalingTest.java | 2 +- 46 files changed, 45 insertions(+), 44 deletions(-) diff --git a/api/src/main/java/org/apache/flink/agents/api/AgentBuilder.java b/api/src/main/java/org/apache/flink/agents/api/AgentBuilder.java index 3d317c6..6621142 100644 --- a/api/src/main/java/org/apache/flink/agents/api/AgentBuilder.java +++ b/api/src/main/java/org/apache/flink/agents/api/AgentBuilder.java @@ -18,6 +18,7 @@ package org.apache.flink.agents.api; +import org.apache.flink.agents.api.agents.Agent; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.table.api.Schema; import org.apache.flink.table.api.Table; diff --git a/api/src/main/java/org/apache/flink/agents/api/Agent.java b/api/src/main/java/org/apache/flink/agents/api/agents/Agent.java similarity index 97% rename from api/src/main/java/org/apache/flink/agents/api/Agent.java rename to api/src/main/java/org/apache/flink/agents/api/agents/Agent.java index 5b5f57a..ae046b0 100644 --- a/api/src/main/java/org/apache/flink/agents/api/Agent.java +++ b/api/src/main/java/org/apache/flink/agents/api/agents/Agent.java @@ -16,8 +16,9 @@ * limitations under the License. */ -package org.apache.flink.agents.api; +package org.apache.flink.agents.api.agents; +import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.resource.ResourceDescriptor; import org.apache.flink.agents.api.resource.ResourceType; import org.apache.flink.agents.api.resource.SerializableResource; diff --git a/api/src/main/java/org/apache/flink/agents/api/agents/ReActAgent.java b/api/src/main/java/org/apache/flink/agents/api/agents/ReActAgent.java index 19f8f7c..c073f54 100644 --- a/api/src/main/java/org/apache/flink/agents/api/agents/ReActAgent.java +++ b/api/src/main/java/org/apache/flink/agents/api/agents/ReActAgent.java @@ -32,7 +32,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import com.fasterxml.jackson.databind.ser.std.StdSerializer; import org.apache.commons.lang3.ClassUtils; -import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.api.OutputEvent; import org.apache.flink.agents.api.annotation.Action; diff --git a/api/src/test/java/org/apache/flink/agents/api/resource/ResourceDescriptorTest.java b/api/src/test/java/org/apache/flink/agents/api/resource/ResourceDescriptorTest.java index 85a5473..ea821d8 100644 --- a/api/src/test/java/org/apache/flink/agents/api/resource/ResourceDescriptorTest.java +++ b/api/src/test/java/org/apache/flink/agents/api/resource/ResourceDescriptorTest.java @@ -20,8 +20,8 @@ package org.apache.flink.agents.api.resource; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.InputEvent; +import org.apache.flink.agents.api.agents.Agent; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/ChatModelIntegrationAgent.java b/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/ChatModelIntegrationAgent.java index c13541a..23a50b5 100644 --- a/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/ChatModelIntegrationAgent.java +++ b/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/ChatModelIntegrationAgent.java @@ -18,9 +18,9 @@ package org.apache.flink.agents.integration.test; -import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.api.OutputEvent; +import org.apache.flink.agents.api.agents.Agent; import org.apache.flink.agents.api.annotation.Action; import org.apache.flink.agents.api.annotation.ChatModelConnection; import org.apache.flink.agents.api.annotation.ChatModelSetup; diff --git a/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/EmbeddingIntegrationAgent.java b/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/EmbeddingIntegrationAgent.java index e20354b..a5ee7a4 100644 --- a/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/EmbeddingIntegrationAgent.java +++ b/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/EmbeddingIntegrationAgent.java @@ -19,9 +19,9 @@ package org.apache.flink.agents.integration.test; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.api.OutputEvent; +import org.apache.flink.agents.api.agents.Agent; import org.apache.flink.agents.api.annotation.Action; import org.apache.flink.agents.api.annotation.EmbeddingModelConnection; import org.apache.flink.agents.api.annotation.EmbeddingModelSetup; diff --git a/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/FlinkIntegrationAgent.java b/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/FlinkIntegrationAgent.java index 9aaf135..5a69499 100644 --- a/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/FlinkIntegrationAgent.java +++ b/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/FlinkIntegrationAgent.java @@ -17,10 +17,10 @@ */ package org.apache.flink.agents.integration.test; -import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.api.OutputEvent; +import org.apache.flink.agents.api.agents.Agent; import org.apache.flink.agents.api.annotation.Action; import org.apache.flink.agents.api.context.MemoryObject; import org.apache.flink.agents.api.context.MemoryRef; diff --git a/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/MemoryObjectAgent.java b/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/MemoryObjectAgent.java index da1a03a..0f8642e 100644 --- a/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/MemoryObjectAgent.java +++ b/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/MemoryObjectAgent.java @@ -17,10 +17,10 @@ */ package org.apache.flink.agents.integration.test; -import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.api.OutputEvent; +import org.apache.flink.agents.api.agents.Agent; import org.apache.flink.agents.api.annotation.Action; import org.apache.flink.agents.api.context.MemoryObject; import org.apache.flink.agents.api.context.RunnerContext; diff --git a/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/ReActAgentTest.java b/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/ReActAgentTest.java index 510c451..648b1b1 100644 --- a/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/ReActAgentTest.java +++ b/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/ReActAgentTest.java @@ -18,8 +18,8 @@ package org.apache.flink.agents.integration.test; -import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.AgentsExecutionEnvironment; +import org.apache.flink.agents.api.agents.Agent; import org.apache.flink.agents.api.agents.ReActAgent; import org.apache.flink.agents.api.agents.ReActAgentConfigOptions; import org.apache.flink.agents.api.annotation.ToolParam; diff --git a/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/VectorStoreIntegrationAgent.java b/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/VectorStoreIntegrationAgent.java index ed20f10..94dbb1d 100644 --- a/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/VectorStoreIntegrationAgent.java +++ b/e2e-test/flink-agents-end-to-end-tests-integration/src/test/java/org/apache/flink/agents/integration/test/VectorStoreIntegrationAgent.java @@ -18,9 +18,9 @@ package org.apache.flink.agents.integration.test; -import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.api.OutputEvent; +import org.apache.flink.agents.api.agents.Agent; import org.apache.flink.agents.api.annotation.Action; import org.apache.flink.agents.api.annotation.EmbeddingModelConnection; import org.apache.flink.agents.api.annotation.EmbeddingModelSetup; diff --git a/e2e-test/flink-agents-end-to-end-tests-resource-cross-language/src/test/java/org/apache/flink/agents/resource/test/ChatModelCrossLanguageAgent.java b/e2e-test/flink-agents-end-to-end-tests-resource-cross-language/src/test/java/org/apache/flink/agents/resource/test/ChatModelCrossLanguageAgent.java index 27106e9..251492e 100644 --- a/e2e-test/flink-agents-end-to-end-tests-resource-cross-language/src/test/java/org/apache/flink/agents/resource/test/ChatModelCrossLanguageAgent.java +++ b/e2e-test/flink-agents-end-to-end-tests-resource-cross-language/src/test/java/org/apache/flink/agents/resource/test/ChatModelCrossLanguageAgent.java @@ -18,9 +18,9 @@ package org.apache.flink.agents.resource.test; -import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.api.OutputEvent; +import org.apache.flink.agents.api.agents.Agent; import org.apache.flink.agents.api.annotation.Action; import org.apache.flink.agents.api.annotation.ChatModelConnection; import org.apache.flink.agents.api.annotation.ChatModelSetup; diff --git a/examples/src/main/java/org/apache/flink/agents/examples/agents/ProductSuggestionAgent.java b/examples/src/main/java/org/apache/flink/agents/examples/agents/ProductSuggestionAgent.java index d59ac8b..2a020b5 100644 --- a/examples/src/main/java/org/apache/flink/agents/examples/agents/ProductSuggestionAgent.java +++ b/examples/src/main/java/org/apache/flink/agents/examples/agents/ProductSuggestionAgent.java @@ -20,9 +20,9 @@ package org.apache.flink.agents.examples.agents; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.api.OutputEvent; +import org.apache.flink.agents.api.agents.Agent; import org.apache.flink.agents.api.annotation.Action; import org.apache.flink.agents.api.annotation.ChatModelSetup; import org.apache.flink.agents.api.annotation.Prompt; diff --git a/examples/src/main/java/org/apache/flink/agents/examples/agents/ReviewAnalysisAgent.java b/examples/src/main/java/org/apache/flink/agents/examples/agents/ReviewAnalysisAgent.java index bbba3c8..77dfe2d 100644 --- a/examples/src/main/java/org/apache/flink/agents/examples/agents/ReviewAnalysisAgent.java +++ b/examples/src/main/java/org/apache/flink/agents/examples/agents/ReviewAnalysisAgent.java @@ -20,9 +20,9 @@ package org.apache.flink.agents.examples.agents; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.api.OutputEvent; +import org.apache.flink.agents.api.agents.Agent; import org.apache.flink.agents.api.annotation.Action; import org.apache.flink.agents.api.annotation.ChatModelSetup; import org.apache.flink.agents.api.annotation.Prompt; 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 index 1122482..b27525b 100644 --- a/plan/src/main/java/org/apache/flink/agents/plan/AgentPlan.java +++ b/plan/src/main/java/org/apache/flink/agents/plan/AgentPlan.java @@ -21,8 +21,8 @@ package org.apache.flink.agents.plan; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.Event; +import org.apache.flink.agents.api.agents.Agent; import org.apache.flink.agents.api.annotation.*; import org.apache.flink.agents.api.resource.Resource; import org.apache.flink.agents.api.resource.ResourceDescriptor; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareChatModelTest.java b/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareChatModelTest.java index e85eeaa..a829def 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareChatModelTest.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareChatModelTest.java @@ -21,9 +21,9 @@ package org.apache.flink.agents.plan; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.InputEvent; +import org.apache.flink.agents.api.agents.Agent; import org.apache.flink.agents.api.annotation.Action; import org.apache.flink.agents.api.annotation.ChatModelSetup; import org.apache.flink.agents.api.chat.messages.ChatMessage; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareMCPServerTest.java b/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareMCPServerTest.java index 37a06a5..0be116f 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareMCPServerTest.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareMCPServerTest.java @@ -19,9 +19,9 @@ package org.apache.flink.agents.plan; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.InputEvent; +import org.apache.flink.agents.api.agents.Agent; import org.apache.flink.agents.api.annotation.Action; import org.apache.flink.agents.api.context.RunnerContext; import org.apache.flink.agents.api.prompt.Prompt; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareToolFieldTest.java b/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareToolFieldTest.java index 895e900..7a96b5d 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareToolFieldTest.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareToolFieldTest.java @@ -20,9 +20,9 @@ package org.apache.flink.agents.plan; -import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.InputEvent; +import org.apache.flink.agents.api.agents.Agent; import org.apache.flink.agents.api.annotation.Action; import org.apache.flink.agents.api.annotation.ToolParam; import org.apache.flink.agents.api.context.RunnerContext; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareToolMethodTest.java b/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareToolMethodTest.java index b9cf481..cbe88b2 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareToolMethodTest.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanDeclareToolMethodTest.java @@ -21,9 +21,9 @@ package org.apache.flink.agents.plan; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.InputEvent; +import org.apache.flink.agents.api.agents.Agent; import org.apache.flink.agents.api.annotation.Action; import org.apache.flink.agents.api.annotation.ToolParam; import org.apache.flink.agents.api.context.RunnerContext; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanTest.java b/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanTest.java index b19ef40..9179ea2 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanTest.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/AgentPlanTest.java @@ -18,10 +18,10 @@ package org.apache.flink.agents.plan; -import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.api.OutputEvent; +import org.apache.flink.agents.api.agents.Agent; import org.apache.flink.agents.api.annotation.ChatModelSetup; import org.apache.flink.agents.api.annotation.Tool; import org.apache.flink.agents.api.chat.messages.ChatMessage; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/FunctionToolPlanTest.java b/plan/src/test/java/org/apache/flink/agents/plan/FunctionToolPlanTest.java index 9d78a58..4e99464 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/FunctionToolPlanTest.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/FunctionToolPlanTest.java @@ -22,7 +22,7 @@ package org.apache.flink.agents.plan; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.flink.agents.api.Agent; +import org.apache.flink.agents.api.agents.Agent; import org.apache.flink.agents.api.annotation.Tool; import org.apache.flink.agents.api.annotation.ToolParam; import org.apache.flink.agents.api.resource.ResourceType; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/compatibility/GenerateAgentPlanJson.java b/plan/src/test/java/org/apache/flink/agents/plan/compatibility/GenerateAgentPlanJson.java index a8d4b63..1bc079c 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/compatibility/GenerateAgentPlanJson.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/compatibility/GenerateAgentPlanJson.java @@ -19,9 +19,9 @@ package org.apache.flink.agents.plan.compatibility; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.InputEvent; +import org.apache.flink.agents.api.agents.Agent; import org.apache.flink.agents.api.annotation.Action; import org.apache.flink.agents.api.context.RunnerContext; import org.apache.flink.agents.plan.AgentPlan; diff --git a/plan/src/test/java/org/apache/flink/agents/plan/serializer/AgentPlanJsonSerializerTest.java b/plan/src/test/java/org/apache/flink/agents/plan/serializer/AgentPlanJsonSerializerTest.java index f928173..a02498f 100644 --- a/plan/src/test/java/org/apache/flink/agents/plan/serializer/AgentPlanJsonSerializerTest.java +++ b/plan/src/test/java/org/apache/flink/agents/plan/serializer/AgentPlanJsonSerializerTest.java @@ -19,10 +19,10 @@ package org.apache.flink.agents.plan.serializer; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.api.OutputEvent; +import org.apache.flink.agents.api.agents.Agent; import org.apache.flink.agents.api.context.RunnerContext; import org.apache.flink.agents.plan.AgentConfiguration; import org.apache.flink.agents.plan.AgentPlan; diff --git a/python/flink_agents/api/agent.py b/python/flink_agents/api/agents/agent.py similarity index 100% rename from python/flink_agents/api/agent.py rename to python/flink_agents/api/agents/agent.py diff --git a/python/flink_agents/api/agents/react_agent.py b/python/flink_agents/api/agents/react_agent.py index a8f0b4e..63d319e 100644 --- a/python/flink_agents/api/agents/react_agent.py +++ b/python/flink_agents/api/agents/react_agent.py @@ -30,7 +30,7 @@ from pydantic import ( from pyflink.common import Row from pyflink.common.typeinfo import BasicType, BasicTypeInfo, RowTypeInfo -from flink_agents.api.agent import Agent +from flink_agents.api.agents.agent import Agent from flink_agents.api.chat_message import ChatMessage, MessageRole from flink_agents.api.configuration import ConfigOption from flink_agents.api.decorators import action diff --git a/python/flink_agents/api/execution_environment.py b/python/flink_agents/api/execution_environment.py index e632de3..21e6175 100644 --- a/python/flink_agents/api/execution_environment.py +++ b/python/flink_agents/api/execution_environment.py @@ -24,7 +24,7 @@ from pyflink.common import TypeInformation from pyflink.datastream import DataStream, KeySelector, StreamExecutionEnvironment from pyflink.table import Schema, StreamTableEnvironment, Table -from flink_agents.api.agent import Agent +from flink_agents.api.agents.agent import Agent from flink_agents.api.configuration import Configuration from flink_agents.api.resource import ( ResourceDescriptor, diff --git a/python/flink_agents/e2e_tests/e2e_tests_integration/chat_model_integration_agent.py b/python/flink_agents/e2e_tests/e2e_tests_integration/chat_model_integration_agent.py index 0eaa9fc..92d2d07 100644 --- a/python/flink_agents/e2e_tests/e2e_tests_integration/chat_model_integration_agent.py +++ b/python/flink_agents/e2e_tests/e2e_tests_integration/chat_model_integration_agent.py @@ -17,7 +17,7 @@ ################################################################################# import os -from flink_agents.api.agent import Agent +from flink_agents.api.agents.agent import Agent from flink_agents.api.chat_message import ChatMessage, MessageRole from flink_agents.api.decorators import ( action, diff --git a/python/flink_agents/e2e_tests/e2e_tests_integration/e2e_tests_mcp/mcp_test.py b/python/flink_agents/e2e_tests/e2e_tests_integration/e2e_tests_mcp/mcp_test.py index ea54c40..0389fbf 100644 --- a/python/flink_agents/e2e_tests/e2e_tests_integration/e2e_tests_mcp/mcp_test.py +++ b/python/flink_agents/e2e_tests/e2e_tests_integration/e2e_tests_mcp/mcp_test.py @@ -35,7 +35,7 @@ from pathlib import Path import pytest from pydantic import BaseModel -from flink_agents.api.agent import Agent +from flink_agents.api.agents.agent import Agent from flink_agents.api.chat_message import ChatMessage, MessageRole from flink_agents.api.decorators import ( action, diff --git a/python/flink_agents/e2e_tests/e2e_tests_integration/flink_integration_agent.py b/python/flink_agents/e2e_tests/e2e_tests_integration/flink_integration_agent.py index 4086a17..8892631 100644 --- a/python/flink_agents/e2e_tests/e2e_tests_integration/flink_integration_agent.py +++ b/python/flink_agents/e2e_tests/e2e_tests_integration/flink_integration_agent.py @@ -24,7 +24,7 @@ from pydantic import BaseModel from pyflink.common import Row from pyflink.datastream import KeySelector -from flink_agents.api.agent import Agent +from flink_agents.api.agents.agent import Agent from flink_agents.api.decorators import action, tool from flink_agents.api.events.event import Event, InputEvent, OutputEvent from flink_agents.api.resource import ResourceType diff --git a/python/flink_agents/e2e_tests/e2e_tests_integration/python_event_logging_test.py b/python/flink_agents/e2e_tests/e2e_tests_integration/python_event_logging_test.py index ae3677a..ee85aeb 100644 --- a/python/flink_agents/e2e_tests/e2e_tests_integration/python_event_logging_test.py +++ b/python/flink_agents/e2e_tests/e2e_tests_integration/python_event_logging_test.py @@ -31,7 +31,7 @@ from pyflink.datastream.connectors.file_system import ( StreamFormat, ) -from flink_agents.api.agent import Agent +from flink_agents.api.agents.agent import Agent from flink_agents.api.decorators import action from flink_agents.api.events.event import InputEvent, OutputEvent from flink_agents.api.execution_environment import AgentsExecutionEnvironment diff --git a/python/flink_agents/e2e_tests/e2e_tests_integration/workflow_test.py b/python/flink_agents/e2e_tests/e2e_tests_integration/workflow_test.py index 1cabe92..1731551 100644 --- a/python/flink_agents/e2e_tests/e2e_tests_integration/workflow_test.py +++ b/python/flink_agents/e2e_tests/e2e_tests_integration/workflow_test.py @@ -21,7 +21,7 @@ from typing import TYPE_CHECKING, Any from pydantic import BaseModel -from flink_agents.api.agent import Agent +from flink_agents.api.agents.agent import Agent from flink_agents.api.decorators import action from flink_agents.api.events.event import Event, InputEvent, OutputEvent from flink_agents.api.execution_environment import AgentsExecutionEnvironment diff --git a/python/flink_agents/e2e_tests/e2e_tests_resource_cross_language/chat_model_cross_language_agent.py b/python/flink_agents/e2e_tests/e2e_tests_resource_cross_language/chat_model_cross_language_agent.py index 2159068..796ab80 100644 --- a/python/flink_agents/e2e_tests/e2e_tests_resource_cross_language/chat_model_cross_language_agent.py +++ b/python/flink_agents/e2e_tests/e2e_tests_resource_cross_language/chat_model_cross_language_agent.py @@ -17,7 +17,7 @@ ################################################################################# import os -from flink_agents.api.agent import Agent +from flink_agents.api.agents.agent import Agent from flink_agents.api.chat_message import ChatMessage, MessageRole from flink_agents.api.chat_models.java_chat_model import ( JavaChatModelConnection, diff --git a/python/flink_agents/e2e_tests/long_term_memory_test.py b/python/flink_agents/e2e_tests/long_term_memory_test.py index 5a24181..beb91b3 100644 --- a/python/flink_agents/e2e_tests/long_term_memory_test.py +++ b/python/flink_agents/e2e_tests/long_term_memory_test.py @@ -35,7 +35,7 @@ from pyflink.datastream.connectors.file_system import ( StreamingFileSink, ) -from flink_agents.api.agent import Agent +from flink_agents.api.agents.agent import Agent from flink_agents.api.core_options import AgentConfigOptions from flink_agents.api.decorators import ( action, diff --git a/python/flink_agents/examples/quickstart/agents/product_suggestion_agent.py b/python/flink_agents/examples/quickstart/agents/product_suggestion_agent.py index f3ad307..57655dc 100644 --- a/python/flink_agents/examples/quickstart/agents/product_suggestion_agent.py +++ b/python/flink_agents/examples/quickstart/agents/product_suggestion_agent.py @@ -19,7 +19,7 @@ import json import logging from typing import TYPE_CHECKING -from flink_agents.api.agent import Agent +from flink_agents.api.agents.agent import Agent from flink_agents.api.chat_message import ChatMessage, MessageRole from flink_agents.api.decorators import ( action, diff --git a/python/flink_agents/examples/quickstart/agents/review_analysis_agent.py b/python/flink_agents/examples/quickstart/agents/review_analysis_agent.py index ddd620b..d5b2345 100644 --- a/python/flink_agents/examples/quickstart/agents/review_analysis_agent.py +++ b/python/flink_agents/examples/quickstart/agents/review_analysis_agent.py @@ -19,7 +19,7 @@ import json import logging from typing import TYPE_CHECKING -from flink_agents.api.agent import Agent +from flink_agents.api.agents.agent import Agent from flink_agents.api.chat_message import ChatMessage, MessageRole from flink_agents.api.decorators import ( action, diff --git a/python/flink_agents/examples/rag/rag_agent_example.py b/python/flink_agents/examples/rag/rag_agent_example.py index 92da5bd..1109905 100644 --- a/python/flink_agents/examples/rag/rag_agent_example.py +++ b/python/flink_agents/examples/rag/rag_agent_example.py @@ -17,7 +17,7 @@ ################################################################################ import os -from flink_agents.api.agent import Agent +from flink_agents.api.agents.agent import Agent from flink_agents.api.chat_message import ChatMessage, MessageRole from flink_agents.api.decorators import ( action, diff --git a/python/flink_agents/plan/agent_plan.py b/python/flink_agents/plan/agent_plan.py index 7ff2f6d..3a802ee 100644 --- a/python/flink_agents/plan/agent_plan.py +++ b/python/flink_agents/plan/agent_plan.py @@ -19,7 +19,7 @@ from typing import Any, Dict, List, cast from pydantic import BaseModel, field_serializer, model_validator -from flink_agents.api.agent import Agent +from flink_agents.api.agents.agent import Agent from flink_agents.api.resource import Resource, ResourceType from flink_agents.api.tools.mcp import MCPServer from flink_agents.plan.actions.action import Action diff --git a/python/flink_agents/plan/tests/compatibility/python_agent_plan_compatibility_test_agent.py b/python/flink_agents/plan/tests/compatibility/python_agent_plan_compatibility_test_agent.py index e8d388f..1379b87 100644 --- a/python/flink_agents/plan/tests/compatibility/python_agent_plan_compatibility_test_agent.py +++ b/python/flink_agents/plan/tests/compatibility/python_agent_plan_compatibility_test_agent.py @@ -17,7 +17,7 @@ ################################################################################# from typing import Any, Dict, Sequence -from flink_agents.api.agent import Agent +from flink_agents.api.agents.agent import Agent from flink_agents.api.chat_message import ChatMessage from flink_agents.api.chat_models.chat_model import BaseChatModelSetup from flink_agents.api.decorators import action, chat_model_setup, tool diff --git a/python/flink_agents/plan/tests/test_agent_plan.py b/python/flink_agents/plan/tests/test_agent_plan.py index 9d87358..0b28de6 100644 --- a/python/flink_agents/plan/tests/test_agent_plan.py +++ b/python/flink_agents/plan/tests/test_agent_plan.py @@ -21,7 +21,7 @@ from typing import Any, Dict, List, Sequence import pytest -from flink_agents.api.agent import Agent +from flink_agents.api.agents.agent import Agent from flink_agents.api.chat_message import ChatMessage, MessageRole from flink_agents.api.chat_models.chat_model import BaseChatModelSetup from flink_agents.api.decorators import ( diff --git a/python/flink_agents/runtime/local_execution_environment.py b/python/flink_agents/runtime/local_execution_environment.py index ebaf78c..63930ef 100644 --- a/python/flink_agents/runtime/local_execution_environment.py +++ b/python/flink_agents/runtime/local_execution_environment.py @@ -21,7 +21,7 @@ from pyflink.common import TypeInformation from pyflink.datastream import DataStream, KeySelector, StreamExecutionEnvironment from pyflink.table import Schema, StreamTableEnvironment, Table -from flink_agents.api.agent import Agent +from flink_agents.api.agents.agent import Agent from flink_agents.api.execution_environment import ( AgentBuilder, AgentsExecutionEnvironment, diff --git a/python/flink_agents/runtime/local_runner.py b/python/flink_agents/runtime/local_runner.py index b54eb96..21307f3 100644 --- a/python/flink_agents/runtime/local_runner.py +++ b/python/flink_agents/runtime/local_runner.py @@ -22,7 +22,7 @@ from typing import Any, Callable, Dict, Generator, List from typing_extensions import override -from flink_agents.api.agent import Agent +from flink_agents.api.agents.agent import Agent from flink_agents.api.events.event import Event, InputEvent, OutputEvent from flink_agents.api.memory.long_term_memory import BaseLongTermMemory from flink_agents.api.memory_object import MemoryObject, MemoryType diff --git a/python/flink_agents/runtime/remote_execution_environment.py b/python/flink_agents/runtime/remote_execution_environment.py index 7117970..c34a7e8 100644 --- a/python/flink_agents/runtime/remote_execution_environment.py +++ b/python/flink_agents/runtime/remote_execution_environment.py @@ -34,7 +34,7 @@ from pyflink.datastream import ( from pyflink.table import Schema, StreamTableEnvironment, Table from pyflink.util.java_utils import invoke_method -from flink_agents.api.agent import Agent +from flink_agents.api.agents.agent import Agent from flink_agents.api.execution_environment import ( AgentBuilder, AgentsExecutionEnvironment, diff --git a/python/flink_agents/runtime/tests/test_built_in_actions.py b/python/flink_agents/runtime/tests/test_built_in_actions.py index 560a625..240dbac 100644 --- a/python/flink_agents/runtime/tests/test_built_in_actions.py +++ b/python/flink_agents/runtime/tests/test_built_in_actions.py @@ -18,7 +18,7 @@ import uuid from typing import Any, Dict, List, Sequence -from flink_agents.api.agent import Agent +from flink_agents.api.agents.agent import Agent from flink_agents.api.chat_message import ChatMessage, MessageRole from flink_agents.api.chat_models.chat_model import ( BaseChatModelConnection, diff --git a/python/flink_agents/runtime/tests/test_get_resource_in_action.py b/python/flink_agents/runtime/tests/test_get_resource_in_action.py index 8adf473..e4cc9f8 100644 --- a/python/flink_agents/runtime/tests/test_get_resource_in_action.py +++ b/python/flink_agents/runtime/tests/test_get_resource_in_action.py @@ -17,7 +17,7 @@ ################################################################################# from typing import Any, Dict, Sequence -from flink_agents.api.agent import Agent +from flink_agents.api.agents.agent import Agent from flink_agents.api.chat_message import ChatMessage, MessageRole from flink_agents.api.chat_models.chat_model import BaseChatModelSetup from flink_agents.api.decorators import action, chat_model_setup, tool diff --git a/python/flink_agents/runtime/tests/test_local_execution_environment.py b/python/flink_agents/runtime/tests/test_local_execution_environment.py index 64a464f..3c15926 100644 --- a/python/flink_agents/runtime/tests/test_local_execution_environment.py +++ b/python/flink_agents/runtime/tests/test_local_execution_environment.py @@ -19,7 +19,7 @@ import time import pytest -from flink_agents.api.agent import Agent +from flink_agents.api.agents.agent import Agent from flink_agents.api.decorators import action from flink_agents.api.events.event import Event, InputEvent, OutputEvent from flink_agents.api.execution_environment import AgentsExecutionEnvironment diff --git a/runtime/src/main/java/org/apache/flink/agents/runtime/env/RemoteExecutionEnvironment.java b/runtime/src/main/java/org/apache/flink/agents/runtime/env/RemoteExecutionEnvironment.java index 8b2eb29..c1294b3 100644 --- a/runtime/src/main/java/org/apache/flink/agents/runtime/env/RemoteExecutionEnvironment.java +++ b/runtime/src/main/java/org/apache/flink/agents/runtime/env/RemoteExecutionEnvironment.java @@ -18,9 +18,9 @@ package org.apache.flink.agents.runtime.env; -import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.AgentBuilder; import org.apache.flink.agents.api.AgentsExecutionEnvironment; +import org.apache.flink.agents.api.agents.Agent; import org.apache.flink.agents.api.resource.ResourceType; import org.apache.flink.agents.plan.AgentConfiguration; import org.apache.flink.agents.plan.AgentPlan; diff --git a/runtime/src/test/java/org/apache/flink/agents/runtime/RescalingTest.java b/runtime/src/test/java/org/apache/flink/agents/runtime/RescalingTest.java index c3c376f..0b2e56f 100644 --- a/runtime/src/test/java/org/apache/flink/agents/runtime/RescalingTest.java +++ b/runtime/src/test/java/org/apache/flink/agents/runtime/RescalingTest.java @@ -18,10 +18,10 @@ package org.apache.flink.agents.runtime; -import org.apache.flink.agents.api.Agent; import org.apache.flink.agents.api.Event; import org.apache.flink.agents.api.InputEvent; import org.apache.flink.agents.api.OutputEvent; +import org.apache.flink.agents.api.agents.Agent; import org.apache.flink.agents.api.annotation.Action; import org.apache.flink.agents.api.context.RunnerContext; import org.apache.flink.agents.plan.AgentPlan;
