From 8c04566243904c888679d6f54bcd47af357df583 Mon Sep 17 00:00:00 2001 From: slhafzjw Date: Mon, 6 Apr 2026 20:16:51 +0800 Subject: [PATCH] chore(framework): reorganize Partner-Framework --- .../main/java/work/slhaf/partner/Main.java | 2 +- .../config/PartnerAgentConfigLoader.java | 4 +-- .../exception/ConfigLoadFailedException.java | 2 +- .../exception/ServiceLoadFailedException.java | 2 +- .../common/vector/VectorClientRegistry.java | 6 ++-- .../partner/common/vector/VectorConfig.java | 2 +- .../VectorClientExecuteException.java | 2 +- .../VectorClientLoadFailedException.java | 2 +- .../work/slhaf/partner/core/PartnerCore.java | 4 +-- .../partner/core/action/ActionCapability.java | 2 +- .../slhaf/partner/core/action/ActionCore.java | 6 ++-- .../ActionDataNotFoundException.java | 2 +- .../exception/ActionInitFailedException.java | 2 +- .../exception/ActionLoadFailedException.java | 2 +- .../ActionSerializeFailedException.java | 2 +- .../MetaActionNotFoundException.java | 2 +- .../runner/mcp/DynamicActionMcpManager.java | 2 +- .../action/runner/mcp/McpConfigWatcher.java | 2 +- .../action/runner/mcp/McpDescWatcher.java | 2 +- .../core/cognition/CognitionCapability.java | 4 +-- .../partner/core/cognition/CognitionCore.java | 8 +++--- .../partner/core/cognition/ResolvedContext.kt | 2 +- .../partner/core/memory/MemoryCapability.java | 2 +- .../slhaf/partner/core/memory/MemoryCore.java | 4 +-- .../partner/core/memory/pojo/MemorySlice.java | 2 +- .../partner/core/memory/pojo/MemoryUnit.java | 4 +-- .../partner/core/memory/pojo/SliceRef.java | 2 +- .../core/memory/pojo/node/MemoryNode.java | 2 +- .../core/memory/pojo/node/TopicNode.java | 2 +- .../core/perceive/PerceiveCapability.java | 2 +- .../partner/core/perceive/PerceiveCore.java | 4 +-- .../partner/core/perceive/pojo/User.java | 2 +- .../work/slhaf/partner/module/TaskBlock.kt | 2 +- .../action/builtin/BuiltinActionRegistry.java | 6 ++-- .../BuiltinCapabilityActionProvider.java | 4 +-- .../builtin/BuiltinDynamicActionProvider.java | 6 ++-- .../BuiltinInterventionActionProvider.java | 4 +-- .../executor/ActionCorrectionRecognizer.java | 8 +++--- .../action/executor/ActionCorrector.java | 8 +++--- .../action/executor/ActionExecutor.java | 8 +++--- .../action/executor/ParamsExtractor.java | 8 +++--- .../ActionExecutingFailedException.java | 2 +- .../module/action/planner/ActionPlanner.java | 8 +++--- .../planner/evaluator/ActionEvaluator.java | 10 +++---- .../evaluator/entity/EvaluatorBatchInput.java | 2 +- .../planner/extractor/ActionExtractor.java | 8 +++--- .../extractor/entity/ExtractorInput.java | 2 +- .../action/scheduler/ActionScheduler.kt | 8 +++--- .../communication/CommunicationProducer.java | 12 ++++---- .../communication/DialogRollingService.java | 8 +++--- .../module/communication/ReplyDispatcher.kt | 8 +++--- .../module/memory/runtime/MemoryRuntime.java | 12 ++++---- .../memory/selector/ActivatedMemorySlice.java | 4 +-- .../memory/selector/MemorySelector.java | 8 +++--- .../evaluator/SliceSelectEvaluator.java | 10 +++---- .../extractor/MemorySelectExtractor.java | 10 +++---- .../module/memory/updater/MemoryUpdater.java | 10 +++---- .../updater/summarizer/MultiSummarizer.java | 6 ++-- .../updater/summarizer/SingleSummarizer.java | 10 +++---- .../updater/summarizer/TotalSummarizer.java | 6 ++-- .../summarizer/entity/SummarizeInput.java | 2 +- .../module/perceive/PerceiveMonitor.java | 4 +-- .../exception/PartnerExceptionCallback.java | 6 ++-- .../exception/pojo/GlobalExceptionData.java | 2 +- .../runtime/interaction/WebSocketGateway.java | 6 ++-- .../interaction/WebSocketGatewayRegistry.java | 8 +++--- .../data/context/PartnerRunningFlowContext.kt | 2 +- .../partner/core/memory/MemoryCoreTest.java | 4 +-- .../memory/runtime/MemoryRuntimeTest.java | 4 +-- .../memory/updater/MemoryUpdaterTest.java | 2 +- .../{api => framework}/agent/Agent.java | 14 +++++----- .../common/entity/PersistableObject.java | 2 +- .../common/support/DirectoryWatchSupport.java | 2 +- .../agent}/config/AgentConfigLoader.java | 4 +-- .../agent}/config/ConfigCenter.kt | 6 ++-- .../agent}/config/FileAgentConfigLoader.java | 10 +++---- .../agent}/config/path.kt | 2 +- .../agent}/config/reflect.kt | 28 +++++++++++++------ .../exception/AgentExceptionCallback.java | 2 +- .../exception/AgentLaunchFailedException.java | 2 +- .../AgentRunningFailedException.java | 2 +- .../exception/AgentRuntimeException.java | 2 +- .../exception/GlobalExceptionHandler.java | 2 +- .../exception/LogAgentExceptionCallback.java | 2 +- .../agent/factory/AgentBaseFactory.kt | 4 +-- .../agent/factory/AgentRegisterFactory.kt | 26 ++++++++--------- .../CapabilityAnnotationValidatorFactory.kt | 26 ++++++++--------- .../capability/CapabilityInjectorFactory.kt | 14 +++++----- .../capability/CapabilityRegisterFactory.kt | 20 ++++++------- .../capability/annotation/Capability.java | 2 +- .../capability/annotation/CapabilityCore.java | 2 +- .../annotation/CapabilityMethod.java | 2 +- .../annotation/InjectCapability.java | 4 +-- .../CapabilityCheckFailedException.java | 4 +-- ...ityCoreInstancesCreateFailedException.java | 2 +- ...pabilityFactoryExecuteFailedException.java | 4 +-- .../CapabilityProxySetFailedException.java | 2 +- .../DuplicateCapabilityException.java | 2 +- .../exception/DuplicateMethodException.java | 2 +- .../EmptyCapabilityHolderException.java | 2 +- .../UnMatchedCapabilityException.java | 2 +- .../UnMatchedCapabilityMethodException.java | 2 +- .../UnMatchedCoordinatedMethodException.java | 2 +- .../ComponentAnnotationValidatorFactory.kt | 18 ++++++------ .../ComponentInitHookExecutorFactory.kt | 16 +++++------ .../component/ComponentInjectorFactory.kt | 12 ++++---- .../component/ComponentRegisterFactory.kt | 20 ++++++------- .../component/abstracts/AgentModule.kt | 6 ++-- .../component/annotation/AgentComponent.java | 2 +- .../factory/component/annotation/Init.java | 2 +- .../component/annotation/InjectModule.java | 2 +- .../exception/ModuleCheckException.java | 2 +- .../ModuleFactoryInitFailedException.java | 2 +- .../ModuleInitHookExecuteFailedException.java | 2 +- ...ModuleInstanceGenerateFailedException.java | 2 +- .../ModuleProxyGenerateFailedException.java | 2 +- .../ProxiedModuleRunningException.java | 4 +-- .../factory/config/ConfigLoaderFactory.kt | 12 ++++---- .../exception/ConfigDirNotExistException.java | 2 +- .../ConfigFactoryInitFailedException.java | 4 +-- .../ConfigFactoryRuntimeException.java | 4 +-- .../ConfigGenerateFailedException.java | 2 +- .../exception/ConfigNotExistException.java | 2 +- .../ConfigUpdateFailedException.java | 2 +- .../exception/PromptDirNotExistException.java | 2 +- .../exception/PromptNotExistException.java | 2 +- .../agent/factory/config/pojo/ModelConfig.kt | 2 +- .../config/pojo/PrimaryModelConfig.java | 2 +- .../agent/factory/context/AgentContext.kt | 14 +++++----- .../factory/context/AgentRegisterContext.kt | 4 +-- .../context/ShutdownHookCollectorFactory.kt | 12 ++++---- .../AgentRegisterFactoryFailedException.java | 2 +- .../ExternalModuleLoadFailedException.java | 2 +- .../ExternalModulePathNotExistException.java | 2 +- .../agent}/interaction/AgentGateway.java | 6 ++-- .../agent}/interaction/AgentRuntime.kt | 12 ++++---- .../agent}/interaction/ResponseChannel.kt | 4 +-- .../agent}/interaction/data/InputData.kt | 2 +- .../interaction/data/InteractionEvent.kt | 2 +- .../interaction/flow/RunningFlowContext.kt | 2 +- .../agent/model/ActivateModel.kt | 6 ++-- .../agent/model/ModelRuntimeRegistry.kt | 18 ++++++------ .../model/StreamChatMessageConsumer.java | 2 +- .../agent/model/pojo/Message.kt | 4 +-- .../agent/model/provider/ModelProvider.kt | 6 ++-- .../openai/OpenAiCompatibleProvider.java | 10 +++---- .../provider/openai/OpenAiMessageAdapter.java | 4 +-- .../agent/util/AgentUtil.java | 2 +- .../runtime/config/ConfigCenterTest.java | 6 +++- .../agent/runtime/config/KotlinDocConfig.kt | 5 +++- .../support/DirectoryWatchSupportTest.java | 11 ++++---- .../model/pojo/MessageTest.java | 6 ++-- 152 files changed, 411 insertions(+), 393 deletions(-) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/Agent.java (91%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework/agent}/common/entity/PersistableObject.java (63%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework/agent}/common/support/DirectoryWatchSupport.java (99%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api/agent/runtime => framework/agent}/config/AgentConfigLoader.java (87%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api/agent/runtime => framework/agent}/config/ConfigCenter.kt (97%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api/agent/runtime => framework/agent}/config/FileAgentConfigLoader.java (78%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api/agent/runtime => framework/agent}/config/path.kt (95%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api/agent/runtime => framework/agent}/config/reflect.kt (83%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api/agent/runtime => framework/agent}/exception/AgentExceptionCallback.java (73%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api/agent/runtime => framework/agent}/exception/AgentLaunchFailedException.java (84%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api/agent/runtime => framework/agent}/exception/AgentRunningFailedException.java (83%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api/agent/runtime => framework/agent}/exception/AgentRuntimeException.java (84%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api/agent/runtime => framework/agent}/exception/GlobalExceptionHandler.java (95%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api/agent/runtime => framework/agent}/exception/LogAgentExceptionCallback.java (86%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/AgentBaseFactory.kt (67%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/AgentRegisterFactory.kt (72%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/capability/CapabilityAnnotationValidatorFactory.kt (84%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/capability/CapabilityInjectorFactory.kt (84%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/capability/CapabilityRegisterFactory.kt (87%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/capability/annotation/Capability.java (83%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/capability/annotation/CapabilityCore.java (83%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/capability/annotation/CapabilityMethod.java (78%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/capability/annotation/InjectCapability.java (67%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/capability/exception/CapabilityCheckFailedException.java (69%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/capability/exception/CapabilityCoreInstancesCreateFailedException.java (82%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/capability/exception/CapabilityFactoryExecuteFailedException.java (72%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/capability/exception/CapabilityProxySetFailedException.java (80%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/capability/exception/DuplicateCapabilityException.java (79%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/capability/exception/DuplicateMethodException.java (79%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/capability/exception/EmptyCapabilityHolderException.java (80%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/capability/exception/UnMatchedCapabilityException.java (79%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/capability/exception/UnMatchedCapabilityMethodException.java (80%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/capability/exception/UnMatchedCoordinatedMethodException.java (80%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/component/ComponentAnnotationValidatorFactory.kt (78%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/component/ComponentInitHookExecutorFactory.kt (78%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/component/ComponentInjectorFactory.kt (88%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/component/ComponentRegisterFactory.kt (87%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/component/abstracts/AgentModule.kt (71%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/component/annotation/AgentComponent.java (66%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/component/annotation/Init.java (82%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/component/annotation/InjectModule.java (81%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/component/exception/ModuleCheckException.java (78%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/component/exception/ModuleFactoryInitFailedException.java (82%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/component/exception/ModuleInitHookExecuteFailedException.java (81%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/component/exception/ModuleInstanceGenerateFailedException.java (81%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/component/exception/ModuleProxyGenerateFailedException.java (81%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/component/exception/ProxiedModuleRunningException.java (65%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/config/ConfigLoaderFactory.kt (83%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/config/exception/ConfigDirNotExistException.java (80%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/config/exception/ConfigFactoryInitFailedException.java (71%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/config/exception/ConfigFactoryRuntimeException.java (70%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/config/exception/ConfigGenerateFailedException.java (80%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/config/exception/ConfigNotExistException.java (79%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/config/exception/ConfigUpdateFailedException.java (80%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/config/exception/PromptDirNotExistException.java (80%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/config/exception/PromptNotExistException.java (79%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/config/pojo/ModelConfig.kt (66%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/config/pojo/PrimaryModelConfig.java (66%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/context/AgentContext.kt (93%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/context/AgentRegisterContext.kt (90%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/context/ShutdownHookCollectorFactory.kt (81%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/exception/AgentRegisterFactoryFailedException.java (85%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/exception/ExternalModuleLoadFailedException.java (83%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/factory/exception/ExternalModulePathNotExistException.java (83%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api/agent/runtime => framework/agent}/interaction/AgentGateway.java (61%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api/agent/runtime => framework/agent}/interaction/AgentRuntime.kt (85%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api/agent/runtime => framework/agent}/interaction/ResponseChannel.kt (81%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api/agent/runtime => framework/agent}/interaction/data/InputData.kt (81%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api/agent/runtime => framework/agent}/interaction/data/InteractionEvent.kt (96%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api/agent/runtime => framework/agent}/interaction/flow/RunningFlowContext.kt (96%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/model/ActivateModel.kt (84%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/model/ModelRuntimeRegistry.kt (91%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/model/StreamChatMessageConsumer.java (88%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/model/pojo/Message.kt (89%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/model/provider/ModelProvider.kt (75%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/model/provider/openai/OpenAiCompatibleProvider.java (92%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/model/provider/openai/OpenAiMessageAdapter.java (91%) rename Partner-Framework/src/main/java/work/slhaf/partner/{api => framework}/agent/util/AgentUtil.java (98%) rename Partner-Framework/src/test/java/work/slhaf/partner/{api => framework}/agent/runtime/config/ConfigCenterTest.java (97%) rename Partner-Framework/src/test/java/work/slhaf/partner/{api => framework}/agent/runtime/config/KotlinDocConfig.kt (66%) rename Partner-Framework/src/test/java/work/slhaf/partner/{api => framework}/common/support/DirectoryWatchSupportTest.java (90%) rename Partner-Framework/src/test/java/work/slhaf/partner/{api => framework}/model/pojo/MessageTest.java (85%) diff --git a/Partner-Core/src/main/java/work/slhaf/partner/Main.java b/Partner-Core/src/main/java/work/slhaf/partner/Main.java index 4b09895f..d78eb590 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/Main.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/Main.java @@ -1,7 +1,7 @@ package work.slhaf.partner; -import work.slhaf.partner.api.agent.Agent; import work.slhaf.partner.common.config.PartnerAgentConfigLoader; +import work.slhaf.partner.framework.agent.Agent; import work.slhaf.partner.runtime.exception.PartnerExceptionCallback; import work.slhaf.partner.runtime.interaction.WebSocketGateway; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/common/config/PartnerAgentConfigLoader.java b/Partner-Core/src/main/java/work/slhaf/partner/common/config/PartnerAgentConfigLoader.java index 3ca2497f..0ca0f5a4 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/common/config/PartnerAgentConfigLoader.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/config/PartnerAgentConfigLoader.java @@ -3,9 +3,9 @@ package work.slhaf.partner.common.config; import cn.hutool.json.JSONUtil; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.partner.api.agent.factory.config.exception.ConfigNotExistException; -import work.slhaf.partner.api.agent.runtime.config.FileAgentConfigLoader; import work.slhaf.partner.common.exception.ConfigLoadFailedException; +import work.slhaf.partner.framework.agent.config.FileAgentConfigLoader; +import work.slhaf.partner.framework.agent.factory.config.exception.ConfigNotExistException; import java.io.File; import java.nio.charset.StandardCharsets; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/common/exception/ConfigLoadFailedException.java b/Partner-Core/src/main/java/work/slhaf/partner/common/exception/ConfigLoadFailedException.java index 1410f663..21a765ad 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/common/exception/ConfigLoadFailedException.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/exception/ConfigLoadFailedException.java @@ -1,6 +1,6 @@ package work.slhaf.partner.common.exception; -import work.slhaf.partner.api.agent.factory.config.exception.ConfigFactoryInitFailedException; +import work.slhaf.partner.framework.agent.factory.config.exception.ConfigFactoryInitFailedException; public class ConfigLoadFailedException extends ConfigFactoryInitFailedException { public ConfigLoadFailedException(String message, Throwable cause) { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/common/exception/ServiceLoadFailedException.java b/Partner-Core/src/main/java/work/slhaf/partner/common/exception/ServiceLoadFailedException.java index 20fda42e..58fa5662 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/common/exception/ServiceLoadFailedException.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/exception/ServiceLoadFailedException.java @@ -1,6 +1,6 @@ package work.slhaf.partner.common.exception; -import work.slhaf.partner.api.agent.runtime.exception.AgentLaunchFailedException; +import work.slhaf.partner.framework.agent.exception.AgentLaunchFailedException; public class ServiceLoadFailedException extends AgentLaunchFailedException { public ServiceLoadFailedException(String message, Throwable cause) { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/common/vector/VectorClientRegistry.java b/Partner-Core/src/main/java/work/slhaf/partner/common/vector/VectorClientRegistry.java index 0ebda1db..cadc898a 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/common/vector/VectorClientRegistry.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/vector/VectorClientRegistry.java @@ -3,9 +3,9 @@ package work.slhaf.partner.common.vector; import com.alibaba.fastjson2.JSONObject; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import work.slhaf.partner.api.agent.runtime.config.Config; -import work.slhaf.partner.api.agent.runtime.config.ConfigRegistration; -import work.slhaf.partner.api.agent.runtime.config.Configurable; +import work.slhaf.partner.framework.agent.config.Config; +import work.slhaf.partner.framework.agent.config.ConfigRegistration; +import work.slhaf.partner.framework.agent.config.Configurable; import java.nio.file.Path; import java.util.Map; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/common/vector/VectorConfig.java b/Partner-Core/src/main/java/work/slhaf/partner/common/vector/VectorConfig.java index 3a448ffe..f4fb9f18 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/common/vector/VectorConfig.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/vector/VectorConfig.java @@ -1,6 +1,6 @@ package work.slhaf.partner.common.vector; -import work.slhaf.partner.api.agent.runtime.config.Config; +import work.slhaf.partner.framework.agent.config.Config; public sealed class VectorConfig extends Config permits VectorConfig.Ollama, VectorConfig.Onnx { final boolean enabled; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/common/vector/exception/VectorClientExecuteException.java b/Partner-Core/src/main/java/work/slhaf/partner/common/vector/exception/VectorClientExecuteException.java index 4cdfc5f2..cfefcd90 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/common/vector/exception/VectorClientExecuteException.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/vector/exception/VectorClientExecuteException.java @@ -1,6 +1,6 @@ package work.slhaf.partner.common.vector.exception; -import work.slhaf.partner.api.agent.runtime.exception.AgentRuntimeException; +import work.slhaf.partner.framework.agent.exception.AgentRuntimeException; public class VectorClientExecuteException extends AgentRuntimeException { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/common/vector/exception/VectorClientLoadFailedException.java b/Partner-Core/src/main/java/work/slhaf/partner/common/vector/exception/VectorClientLoadFailedException.java index 2b4f1b4a..53c58cea 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/common/vector/exception/VectorClientLoadFailedException.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/vector/exception/VectorClientLoadFailedException.java @@ -1,6 +1,6 @@ package work.slhaf.partner.common.vector.exception; -import work.slhaf.partner.api.agent.runtime.exception.AgentRuntimeException; +import work.slhaf.partner.framework.agent.exception.AgentRuntimeException; public class VectorClientLoadFailedException extends AgentRuntimeException { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/PartnerCore.java b/Partner-Core/src/main/java/work/slhaf/partner/core/PartnerCore.java index 2ca1e516..194acf12 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/PartnerCore.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/PartnerCore.java @@ -3,9 +3,9 @@ package work.slhaf.partner.core; import cn.hutool.core.bean.BeanUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; -import work.slhaf.partner.api.agent.runtime.config.AgentConfigLoader; -import work.slhaf.partner.api.common.entity.PersistableObject; import work.slhaf.partner.common.config.PartnerAgentConfigLoader; +import work.slhaf.partner.framework.agent.common.entity.PersistableObject; +import work.slhaf.partner.framework.agent.config.AgentConfigLoader; import java.io.*; import java.nio.file.Files; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/action/ActionCapability.java b/Partner-Core/src/main/java/work/slhaf/partner/core/action/ActionCapability.java index ab6633e5..bf498f39 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/action/ActionCapability.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/action/ActionCapability.java @@ -2,12 +2,12 @@ package work.slhaf.partner.core.action; import lombok.NonNull; import org.jetbrains.annotations.Nullable; -import work.slhaf.partner.api.agent.factory.capability.annotation.Capability; import work.slhaf.partner.core.action.entity.ExecutableAction; import work.slhaf.partner.core.action.entity.MetaAction; import work.slhaf.partner.core.action.entity.MetaActionInfo; import work.slhaf.partner.core.action.entity.intervention.MetaIntervention; import work.slhaf.partner.core.action.runner.RunnerClient; +import work.slhaf.partner.framework.agent.factory.capability.annotation.Capability; import java.util.List; import java.util.Map; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/action/ActionCore.java b/Partner-Core/src/main/java/work/slhaf/partner/core/action/ActionCore.java index 7396b18b..0c05e82a 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/action/ActionCore.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/action/ActionCore.java @@ -4,9 +4,6 @@ import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.jetbrains.annotations.Nullable; -import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityCore; -import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityMethod; -import work.slhaf.partner.api.agent.runtime.config.ConfigCenter; import work.slhaf.partner.core.PartnerCore; import work.slhaf.partner.core.action.entity.ExecutableAction; import work.slhaf.partner.core.action.entity.MetaAction; @@ -16,6 +13,9 @@ import work.slhaf.partner.core.action.entity.intervention.MetaIntervention; import work.slhaf.partner.core.action.exception.MetaActionNotFoundException; import work.slhaf.partner.core.action.runner.LocalRunnerClient; import work.slhaf.partner.core.action.runner.RunnerClient; +import work.slhaf.partner.framework.agent.config.ConfigCenter; +import work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityCore; +import work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityMethod; import java.io.IOException; import java.util.*; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionDataNotFoundException.java b/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionDataNotFoundException.java index 8fd351bd..22491332 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionDataNotFoundException.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionDataNotFoundException.java @@ -1,6 +1,6 @@ package work.slhaf.partner.core.action.exception; -import work.slhaf.partner.api.agent.runtime.exception.AgentRuntimeException; +import work.slhaf.partner.framework.agent.exception.AgentRuntimeException; public class ActionDataNotFoundException extends AgentRuntimeException { public ActionDataNotFoundException(String message) { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionInitFailedException.java b/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionInitFailedException.java index 4e3e2849..26c6db12 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionInitFailedException.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionInitFailedException.java @@ -1,6 +1,6 @@ package work.slhaf.partner.core.action.exception; -import work.slhaf.partner.api.agent.runtime.exception.AgentLaunchFailedException; +import work.slhaf.partner.framework.agent.exception.AgentLaunchFailedException; public class ActionInitFailedException extends AgentLaunchFailedException { public ActionInitFailedException(String message, Throwable cause) { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionLoadFailedException.java b/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionLoadFailedException.java index 7cded2a6..1db26051 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionLoadFailedException.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionLoadFailedException.java @@ -1,6 +1,6 @@ package work.slhaf.partner.core.action.exception; -import work.slhaf.partner.api.agent.runtime.exception.AgentRuntimeException; +import work.slhaf.partner.framework.agent.exception.AgentRuntimeException; public class ActionLoadFailedException extends AgentRuntimeException { public ActionLoadFailedException(String message) { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionSerializeFailedException.java b/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionSerializeFailedException.java index 1f6d411f..409ec19e 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionSerializeFailedException.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionSerializeFailedException.java @@ -1,6 +1,6 @@ package work.slhaf.partner.core.action.exception; -import work.slhaf.partner.api.agent.runtime.exception.AgentRuntimeException; +import work.slhaf.partner.framework.agent.exception.AgentRuntimeException; public class ActionSerializeFailedException extends AgentRuntimeException { public ActionSerializeFailedException(String message) { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/MetaActionNotFoundException.java b/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/MetaActionNotFoundException.java index 0c59e0b7..13074a2e 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/MetaActionNotFoundException.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/MetaActionNotFoundException.java @@ -1,6 +1,6 @@ package work.slhaf.partner.core.action.exception; -import work.slhaf.partner.api.agent.runtime.exception.AgentRuntimeException; +import work.slhaf.partner.framework.agent.exception.AgentRuntimeException; public class MetaActionNotFoundException extends AgentRuntimeException { public MetaActionNotFoundException(String message) { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/DynamicActionMcpManager.java b/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/DynamicActionMcpManager.java index 957ccc4e..abf8ed23 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/DynamicActionMcpManager.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/DynamicActionMcpManager.java @@ -11,11 +11,11 @@ import io.modelcontextprotocol.spec.McpSchema; import lombok.extern.slf4j.Slf4j; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; -import work.slhaf.partner.api.common.support.DirectoryWatchSupport; import work.slhaf.partner.common.mcp.InProcessMcpTransport; import work.slhaf.partner.core.action.entity.MetaActionInfo; import work.slhaf.partner.core.action.exception.ActionInitFailedException; import work.slhaf.partner.core.action.runner.execution.CommandExecutionService; +import work.slhaf.partner.framework.agent.common.support.DirectoryWatchSupport; import java.io.File; import java.io.IOException; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/McpConfigWatcher.java b/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/McpConfigWatcher.java index 31ffc557..82ec9d88 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/McpConfigWatcher.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/McpConfigWatcher.java @@ -6,11 +6,11 @@ import io.modelcontextprotocol.client.McpSyncClient; import io.modelcontextprotocol.spec.McpSchema; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; -import work.slhaf.partner.api.common.support.DirectoryWatchSupport; import work.slhaf.partner.core.action.entity.MetaActionInfo; import work.slhaf.partner.core.action.runner.LocalRunnerClient; import work.slhaf.partner.core.action.runner.policy.ExecutionPolicy; import work.slhaf.partner.core.action.runner.policy.RunnerExecutionPolicyListener; +import work.slhaf.partner.framework.agent.common.support.DirectoryWatchSupport; import java.io.File; import java.io.IOException; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/McpDescWatcher.java b/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/McpDescWatcher.java index 96303065..b8669a30 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/McpDescWatcher.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/McpDescWatcher.java @@ -1,7 +1,7 @@ package work.slhaf.partner.core.action.runner.mcp; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.common.support.DirectoryWatchSupport; +import work.slhaf.partner.framework.agent.common.support.DirectoryWatchSupport; import java.io.IOException; import java.nio.file.Files; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/CognitionCapability.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/CognitionCapability.java index 094af895..1d4264ca 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/CognitionCapability.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/CognitionCapability.java @@ -1,7 +1,7 @@ package work.slhaf.partner.core.cognition; -import work.slhaf.partner.api.agent.factory.capability.annotation.Capability; -import work.slhaf.partner.api.agent.model.pojo.Message; +import work.slhaf.partner.framework.agent.factory.capability.annotation.Capability; +import work.slhaf.partner.framework.agent.model.pojo.Message; import java.util.List; import java.util.concurrent.locks.Lock; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/CognitionCore.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/CognitionCore.java index 2df921eb..d18a84c2 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/CognitionCore.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/CognitionCore.java @@ -4,11 +4,11 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityCore; -import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityMethod; -import work.slhaf.partner.api.agent.model.pojo.Message; -import work.slhaf.partner.api.agent.runtime.interaction.AgentRuntime; import work.slhaf.partner.core.PartnerCore; +import work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityCore; +import work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityMethod; +import work.slhaf.partner.framework.agent.interaction.AgentRuntime; +import work.slhaf.partner.framework.agent.model.pojo.Message; import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; import java.io.IOException; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/ResolvedContext.kt b/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/ResolvedContext.kt index 0caa4679..261246d1 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/ResolvedContext.kt +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/ResolvedContext.kt @@ -1,7 +1,7 @@ package work.slhaf.partner.core.cognition import org.w3c.dom.Document -import work.slhaf.partner.api.agent.model.pojo.Message +import work.slhaf.partner.framework.agent.model.pojo.Message import java.io.StringWriter import javax.xml.parsers.DocumentBuilderFactory import javax.xml.transform.OutputKeys diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/MemoryCapability.java b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/MemoryCapability.java index 03cc5e9f..692536d9 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/MemoryCapability.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/MemoryCapability.java @@ -1,8 +1,8 @@ package work.slhaf.partner.core.memory; -import work.slhaf.partner.api.agent.factory.capability.annotation.Capability; import work.slhaf.partner.core.memory.pojo.MemorySlice; import work.slhaf.partner.core.memory.pojo.MemoryUnit; +import work.slhaf.partner.framework.agent.factory.capability.annotation.Capability; import java.util.Collection; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/MemoryCore.java b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/MemoryCore.java index bc7b03fc..f0970daa 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/MemoryCore.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/MemoryCore.java @@ -4,11 +4,11 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityCore; -import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityMethod; import work.slhaf.partner.core.PartnerCore; import work.slhaf.partner.core.memory.pojo.MemorySlice; import work.slhaf.partner.core.memory.pojo.MemoryUnit; +import work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityCore; +import work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityMethod; import java.io.IOException; import java.io.Serial; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/MemorySlice.java b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/MemorySlice.java index 1ca07cc5..a3fd28a9 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/MemorySlice.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/MemorySlice.java @@ -2,7 +2,7 @@ package work.slhaf.partner.core.memory.pojo; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.partner.api.common.entity.PersistableObject; +import work.slhaf.partner.framework.agent.common.entity.PersistableObject; import java.io.Serial; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/MemoryUnit.java b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/MemoryUnit.java index 8aac71c7..412cecc7 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/MemoryUnit.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/MemoryUnit.java @@ -2,8 +2,8 @@ package work.slhaf.partner.core.memory.pojo; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.partner.api.agent.model.pojo.Message; -import work.slhaf.partner.api.common.entity.PersistableObject; +import work.slhaf.partner.framework.agent.common.entity.PersistableObject; +import work.slhaf.partner.framework.agent.model.pojo.Message; import java.io.Serial; import java.util.ArrayList; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/SliceRef.java b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/SliceRef.java index f25881ff..a063ca57 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/SliceRef.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/SliceRef.java @@ -4,7 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import work.slhaf.partner.api.common.entity.PersistableObject; +import work.slhaf.partner.framework.agent.common.entity.PersistableObject; import java.io.Serial; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/node/MemoryNode.java b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/node/MemoryNode.java index fb75001f..148d0520 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/node/MemoryNode.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/node/MemoryNode.java @@ -3,9 +3,9 @@ package work.slhaf.partner.core.memory.pojo.node; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.common.entity.PersistableObject; import work.slhaf.partner.core.memory.exception.NullSliceListException; import work.slhaf.partner.core.memory.pojo.MemorySlice; +import work.slhaf.partner.framework.agent.common.entity.PersistableObject; import java.io.*; import java.nio.file.Files; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/node/TopicNode.java b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/node/TopicNode.java index 34140c96..8bb9b98e 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/node/TopicNode.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/node/TopicNode.java @@ -2,7 +2,7 @@ package work.slhaf.partner.core.memory.pojo.node; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.partner.api.common.entity.PersistableObject; +import work.slhaf.partner.framework.agent.common.entity.PersistableObject; import java.io.Serial; import java.util.concurrent.ConcurrentHashMap; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/perceive/PerceiveCapability.java b/Partner-Core/src/main/java/work/slhaf/partner/core/perceive/PerceiveCapability.java index 1d621b7b..c31a76d1 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/perceive/PerceiveCapability.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/perceive/PerceiveCapability.java @@ -1,6 +1,6 @@ package work.slhaf.partner.core.perceive; -import work.slhaf.partner.api.agent.factory.capability.annotation.Capability; +import work.slhaf.partner.framework.agent.factory.capability.annotation.Capability; import java.time.Instant; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/perceive/PerceiveCore.java b/Partner-Core/src/main/java/work/slhaf/partner/core/perceive/PerceiveCore.java index 39b980e5..ff16043f 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/perceive/PerceiveCore.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/perceive/PerceiveCore.java @@ -3,9 +3,9 @@ package work.slhaf.partner.core.perceive; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityCore; -import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityMethod; import work.slhaf.partner.core.PartnerCore; +import work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityCore; +import work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityMethod; import java.io.IOException; import java.io.Serial; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/perceive/pojo/User.java b/Partner-Core/src/main/java/work/slhaf/partner/core/perceive/pojo/User.java index 0b9d4024..b5dd85bc 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/perceive/pojo/User.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/perceive/pojo/User.java @@ -2,7 +2,7 @@ package work.slhaf.partner.core.perceive.pojo; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.partner.api.common.entity.PersistableObject; +import work.slhaf.partner.framework.agent.common.entity.PersistableObject; import java.io.Serial; import java.time.LocalDate; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/TaskBlock.kt b/Partner-Core/src/main/java/work/slhaf/partner/module/TaskBlock.kt index fd116494..ad9a527e 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/TaskBlock.kt +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/TaskBlock.kt @@ -1,7 +1,7 @@ package work.slhaf.partner.module -import work.slhaf.partner.api.agent.model.pojo.Message import work.slhaf.partner.common.base.Block +import work.slhaf.partner.framework.agent.model.pojo.Message abstract class TaskBlock @JvmOverloads constructor( blockName: String = "task_input" diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinActionRegistry.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinActionRegistry.java index 5d3f44dd..c432cf1e 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinActionRegistry.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinActionRegistry.java @@ -2,12 +2,12 @@ package work.slhaf.partner.module.action.builtin; import lombok.Getter; import lombok.NonNull; -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.agent.factory.component.annotation.Init; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.entity.MetaActionInfo; import work.slhaf.partner.core.action.exception.MetaActionNotFoundException; +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; +import work.slhaf.partner.framework.agent.factory.component.annotation.Init; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinCapabilityActionProvider.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinCapabilityActionProvider.java index e94dadbb..18e3abf0 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinCapabilityActionProvider.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinCapabilityActionProvider.java @@ -5,8 +5,6 @@ import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.component.annotation.AgentComponent; import work.slhaf.partner.core.action.entity.MetaActionInfo; import work.slhaf.partner.core.cognition.BlockContent; import work.slhaf.partner.core.cognition.CognitionCapability; @@ -14,6 +12,8 @@ import work.slhaf.partner.core.cognition.ContextBlock; import work.slhaf.partner.core.memory.MemoryCapability; import work.slhaf.partner.core.memory.pojo.MemorySlice; import work.slhaf.partner.core.memory.pojo.MemoryUnit; +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.framework.agent.factory.component.annotation.AgentComponent; import java.util.*; import java.util.function.Function; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinDynamicActionProvider.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinDynamicActionProvider.java index 71bfdcc3..bf00efc7 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinDynamicActionProvider.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinDynamicActionProvider.java @@ -3,11 +3,11 @@ package work.slhaf.partner.module.action.builtin; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import kotlin.Unit; -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.component.annotation.AgentComponent; -import work.slhaf.partner.api.agent.factory.component.annotation.InjectModule; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.entity.*; +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.framework.agent.factory.component.annotation.AgentComponent; +import work.slhaf.partner.framework.agent.factory.component.annotation.InjectModule; import work.slhaf.partner.module.action.scheduler.ActionScheduler; import java.nio.file.Files; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinInterventionActionProvider.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinInterventionActionProvider.java index 8ac7eaaa..d890b230 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinInterventionActionProvider.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinInterventionActionProvider.java @@ -5,8 +5,6 @@ import com.alibaba.fastjson2.JSONObject; import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.component.annotation.AgentComponent; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.entity.Action; import work.slhaf.partner.core.action.entity.ExecutableAction; @@ -17,6 +15,8 @@ import work.slhaf.partner.core.cognition.BlockContent; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.cognition.ContextBlock; import work.slhaf.partner.core.cognition.ContextWorkspace; +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.framework.agent.factory.component.annotation.AgentComponent; import java.util.*; import java.util.function.Function; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrectionRecognizer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrectionRecognizer.java index 4a214ef7..5381edd6 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrectionRecognizer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrectionRecognizer.java @@ -4,12 +4,12 @@ import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.agent.model.ActivateModel; -import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.cognition.ContextBlock; +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; +import work.slhaf.partner.framework.agent.model.ActivateModel; +import work.slhaf.partner.framework.agent.model.pojo.Message; import work.slhaf.partner.module.TaskBlock; import work.slhaf.partner.module.action.executor.entity.CorrectionRecognizerInput; import work.slhaf.partner.module.action.executor.entity.CorrectionRecognizerResult; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrector.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrector.java index 2b59bbc1..00fa4ffb 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrector.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrector.java @@ -4,12 +4,12 @@ import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.agent.model.ActivateModel; -import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.cognition.ContextBlock; +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; +import work.slhaf.partner.framework.agent.model.ActivateModel; +import work.slhaf.partner.framework.agent.model.pojo.Message; import work.slhaf.partner.module.TaskBlock; import work.slhaf.partner.module.action.executor.entity.CorrectorInput; import work.slhaf.partner.module.action.executor.entity.CorrectorResult; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionExecutor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionExecutor.java index 83adbf98..6ecab4fa 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionExecutor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionExecutor.java @@ -2,15 +2,15 @@ package work.slhaf.partner.module.action.executor; import lombok.val; import org.jetbrains.annotations.NotNull; -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.agent.factory.component.annotation.Init; -import work.slhaf.partner.api.agent.factory.component.annotation.InjectModule; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.ActionCore; import work.slhaf.partner.core.action.entity.*; import work.slhaf.partner.core.action.runner.RunnerClient; import work.slhaf.partner.core.cognition.CognitionCapability; +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; +import work.slhaf.partner.framework.agent.factory.component.annotation.Init; +import work.slhaf.partner.framework.agent.factory.component.annotation.InjectModule; import work.slhaf.partner.module.action.executor.entity.*; import java.util.*; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ParamsExtractor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ParamsExtractor.java index f78cfa06..9ea61efb 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ParamsExtractor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ParamsExtractor.java @@ -4,13 +4,13 @@ import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.agent.model.ActivateModel; -import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.action.entity.MetaActionInfo; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.cognition.ContextBlock; +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; +import work.slhaf.partner.framework.agent.model.ActivateModel; +import work.slhaf.partner.framework.agent.model.pojo.Message; import work.slhaf.partner.module.TaskBlock; import work.slhaf.partner.module.action.executor.entity.ExtractorInput; import work.slhaf.partner.module.action.executor.entity.ExtractorResult; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/exception/ActionExecutingFailedException.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/exception/ActionExecutingFailedException.java index 59b4a078..5912505a 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/exception/ActionExecutingFailedException.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/exception/ActionExecutingFailedException.java @@ -1,6 +1,6 @@ package work.slhaf.partner.module.action.executor.exception; -import work.slhaf.partner.api.agent.runtime.exception.AgentRuntimeException; +import work.slhaf.partner.framework.agent.exception.AgentRuntimeException; public class ActionExecutingFailedException extends AgentRuntimeException { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/ActionPlanner.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/ActionPlanner.java index 0e2aa40e..ab7d9575 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/ActionPlanner.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/ActionPlanner.java @@ -4,10 +4,6 @@ import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.agent.factory.component.annotation.Init; -import work.slhaf.partner.api.agent.factory.component.annotation.InjectModule; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.ActionCore; import work.slhaf.partner.core.action.entity.*; @@ -15,6 +11,10 @@ import work.slhaf.partner.core.cognition.BlockContent; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.cognition.CommunicationBlockContent; import work.slhaf.partner.core.cognition.ContextBlock; +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; +import work.slhaf.partner.framework.agent.factory.component.annotation.Init; +import work.slhaf.partner.framework.agent.factory.component.annotation.InjectModule; import work.slhaf.partner.module.action.executor.ActionExecutor; import work.slhaf.partner.module.action.planner.evaluator.ActionEvaluator; import work.slhaf.partner.module.action.planner.evaluator.entity.EvaluatorInput; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/ActionEvaluator.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/ActionEvaluator.java index b637279c..1de158c4 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/ActionEvaluator.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/ActionEvaluator.java @@ -4,17 +4,17 @@ import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.agent.factory.component.annotation.Init; -import work.slhaf.partner.api.agent.model.ActivateModel; -import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.ActionCore; import work.slhaf.partner.core.cognition.BlockContent; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.cognition.ContextBlock; import work.slhaf.partner.core.cognition.ResolvedContext; +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; +import work.slhaf.partner.framework.agent.factory.component.annotation.Init; +import work.slhaf.partner.framework.agent.model.ActivateModel; +import work.slhaf.partner.framework.agent.model.pojo.Message; import work.slhaf.partner.module.action.planner.evaluator.entity.EvaluatorInput; import work.slhaf.partner.module.action.planner.evaluator.entity.EvaluatorResult; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/entity/EvaluatorBatchInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/entity/EvaluatorBatchInput.java index 4ba7308e..c46a596b 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/entity/EvaluatorBatchInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/entity/EvaluatorBatchInput.java @@ -1,7 +1,7 @@ package work.slhaf.partner.module.action.planner.evaluator.entity; import lombok.Data; -import work.slhaf.partner.api.agent.model.pojo.Message; +import work.slhaf.partner.framework.agent.model.pojo.Message; import work.slhaf.partner.module.memory.selector.ActivatedMemorySlice; import java.util.List; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/ActionExtractor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/ActionExtractor.java index d1b83f1a..1b7bbf86 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/ActionExtractor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/ActionExtractor.java @@ -1,12 +1,12 @@ package work.slhaf.partner.module.action.planner.extractor; import org.jetbrains.annotations.NotNull; -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.agent.model.ActivateModel; -import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.cognition.ContextBlock; +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; +import work.slhaf.partner.framework.agent.model.ActivateModel; +import work.slhaf.partner.framework.agent.model.pojo.Message; import work.slhaf.partner.module.action.planner.extractor.entity.ExtractorResult; import java.util.List; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/entity/ExtractorInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/entity/ExtractorInput.java index 7ee08881..41c6cf3e 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/entity/ExtractorInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/entity/ExtractorInput.java @@ -1,7 +1,7 @@ package work.slhaf.partner.module.action.planner.extractor.entity; import lombok.Data; -import work.slhaf.partner.api.agent.model.pojo.Message; +import work.slhaf.partner.framework.agent.model.pojo.Message; import java.util.List; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/scheduler/ActionScheduler.kt b/Partner-Core/src/main/java/work/slhaf/partner/module/action/scheduler/ActionScheduler.kt index d194f03d..57caf009 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/scheduler/ActionScheduler.kt +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/scheduler/ActionScheduler.kt @@ -11,14 +11,14 @@ import kotlinx.coroutines.flow.first import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import org.slf4j.LoggerFactory -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule -import work.slhaf.partner.api.agent.factory.component.annotation.Init -import work.slhaf.partner.api.agent.factory.component.annotation.InjectModule import work.slhaf.partner.core.action.ActionCapability import work.slhaf.partner.core.action.entity.Action import work.slhaf.partner.core.action.entity.Schedulable import work.slhaf.partner.core.action.entity.SchedulableExecutableAction +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule +import work.slhaf.partner.framework.agent.factory.component.annotation.Init +import work.slhaf.partner.framework.agent.factory.component.annotation.InjectModule import work.slhaf.partner.module.action.executor.ActionExecutor import java.io.Closeable import java.time.Duration diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/communication/CommunicationProducer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/communication/CommunicationProducer.java index 2b802c02..0489e3d2 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/communication/CommunicationProducer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/communication/CommunicationProducer.java @@ -6,13 +6,13 @@ import lombok.EqualsAndHashCode; import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.agent.factory.component.annotation.Init; -import work.slhaf.partner.api.agent.model.ActivateModel; -import work.slhaf.partner.api.agent.model.StreamChatMessageConsumer; -import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.cognition.*; +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; +import work.slhaf.partner.framework.agent.factory.component.annotation.Init; +import work.slhaf.partner.framework.agent.model.ActivateModel; +import work.slhaf.partner.framework.agent.model.StreamChatMessageConsumer; +import work.slhaf.partner.framework.agent.model.pojo.Message; import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/communication/DialogRollingService.java b/Partner-Core/src/main/java/work/slhaf/partner/module/communication/DialogRollingService.java index 25ac9705..3fe1c664 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/communication/DialogRollingService.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/communication/DialogRollingService.java @@ -5,13 +5,13 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.w3c.dom.Document; import org.w3c.dom.Element; -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.agent.model.ActivateModel; -import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.cognition.BlockContent; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.cognition.ContextBlock; +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; +import work.slhaf.partner.framework.agent.model.ActivateModel; +import work.slhaf.partner.framework.agent.model.pojo.Message; import work.slhaf.partner.module.TaskBlock; import java.time.ZonedDateTime; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/communication/ReplyDispatcher.kt b/Partner-Core/src/main/java/work/slhaf/partner/module/communication/ReplyDispatcher.kt index 891ca7bd..3a889094 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/communication/ReplyDispatcher.kt +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/communication/ReplyDispatcher.kt @@ -2,10 +2,10 @@ package work.slhaf.partner.module.communication import kotlinx.coroutines.* import kotlinx.coroutines.channels.Channel -import work.slhaf.partner.api.agent.model.StreamChatMessageConsumer -import work.slhaf.partner.api.agent.runtime.interaction.AgentRuntime -import work.slhaf.partner.api.agent.runtime.interaction.data.InteractionEvent.EventStatus -import work.slhaf.partner.api.agent.runtime.interaction.data.Reply +import work.slhaf.partner.framework.agent.interaction.AgentRuntime +import work.slhaf.partner.framework.agent.interaction.data.InteractionEvent.EventStatus +import work.slhaf.partner.framework.agent.interaction.data.Reply +import work.slhaf.partner.framework.agent.model.StreamChatMessageConsumer import kotlin.time.Duration.Companion.milliseconds object ReplyDispatcher { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/runtime/MemoryRuntime.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/runtime/MemoryRuntime.java index f482b361..305b3e75 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/runtime/MemoryRuntime.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/runtime/MemoryRuntime.java @@ -3,12 +3,6 @@ package work.slhaf.partner.module.memory.runtime; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.agent.factory.component.annotation.Init; -import work.slhaf.partner.api.agent.model.pojo.Message; -import work.slhaf.partner.api.agent.runtime.config.AgentConfigLoader; -import work.slhaf.partner.api.common.entity.PersistableObject; import work.slhaf.partner.common.config.PartnerAgentConfigLoader; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.memory.MemoryCapability; @@ -17,6 +11,12 @@ import work.slhaf.partner.core.memory.exception.UnExistedTopicException; import work.slhaf.partner.core.memory.pojo.MemorySlice; import work.slhaf.partner.core.memory.pojo.MemoryUnit; import work.slhaf.partner.core.memory.pojo.SliceRef; +import work.slhaf.partner.framework.agent.common.entity.PersistableObject; +import work.slhaf.partner.framework.agent.config.AgentConfigLoader; +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; +import work.slhaf.partner.framework.agent.factory.component.annotation.Init; +import work.slhaf.partner.framework.agent.model.pojo.Message; import work.slhaf.partner.module.memory.selector.ActivatedMemorySlice; import java.io.*; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/ActivatedMemorySlice.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/ActivatedMemorySlice.java index 472d78d6..df5d6711 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/ActivatedMemorySlice.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/ActivatedMemorySlice.java @@ -3,8 +3,8 @@ package work.slhaf.partner.module.memory.selector; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.partner.api.agent.model.pojo.Message; -import work.slhaf.partner.api.common.entity.PersistableObject; +import work.slhaf.partner.framework.agent.common.entity.PersistableObject; +import work.slhaf.partner.framework.agent.model.pojo.Message; import java.io.Serial; import java.time.LocalDate; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/MemorySelector.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/MemorySelector.java index ac4c038c..0f965f49 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/MemorySelector.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/MemorySelector.java @@ -6,10 +6,6 @@ import lombok.EqualsAndHashCode; import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.agent.factory.component.annotation.InjectModule; -import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.ActionCore; import work.slhaf.partner.core.cognition.BlockContent; @@ -17,6 +13,10 @@ import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.cognition.ContextBlock; import work.slhaf.partner.core.memory.exception.UnExistedDateIndexException; import work.slhaf.partner.core.memory.exception.UnExistedTopicException; +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; +import work.slhaf.partner.framework.agent.factory.component.annotation.InjectModule; +import work.slhaf.partner.framework.agent.model.pojo.Message; import work.slhaf.partner.module.memory.runtime.MemoryRuntime; import work.slhaf.partner.module.memory.selector.evaluator.SliceSelectEvaluator; import work.slhaf.partner.module.memory.selector.evaluator.entity.EvaluatorInput; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/SliceSelectEvaluator.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/SliceSelectEvaluator.java index 55f07e35..58067995 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/SliceSelectEvaluator.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/SliceSelectEvaluator.java @@ -6,15 +6,15 @@ import lombok.EqualsAndHashCode; import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.agent.factory.component.annotation.Init; -import work.slhaf.partner.api.agent.model.ActivateModel; -import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.ActionCore; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.cognition.ContextBlock; +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; +import work.slhaf.partner.framework.agent.factory.component.annotation.Init; +import work.slhaf.partner.framework.agent.model.ActivateModel; +import work.slhaf.partner.framework.agent.model.pojo.Message; import work.slhaf.partner.module.TaskBlock; import work.slhaf.partner.module.memory.selector.ActivatedMemorySlice; import work.slhaf.partner.module.memory.selector.evaluator.entity.EvaluatorBatchInput; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/MemorySelectExtractor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/MemorySelectExtractor.java index d5116328..dfaf9bb7 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/MemorySelectExtractor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/MemorySelectExtractor.java @@ -6,13 +6,13 @@ import lombok.EqualsAndHashCode; import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.agent.factory.component.annotation.InjectModule; -import work.slhaf.partner.api.agent.model.ActivateModel; -import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.cognition.ContextBlock; +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; +import work.slhaf.partner.framework.agent.factory.component.annotation.InjectModule; +import work.slhaf.partner.framework.agent.model.ActivateModel; +import work.slhaf.partner.framework.agent.model.pojo.Message; import work.slhaf.partner.module.TaskBlock; import work.slhaf.partner.module.memory.runtime.MemoryRuntime; import work.slhaf.partner.module.memory.selector.extractor.entity.ExtractorInput; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/MemoryUpdater.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/MemoryUpdater.java index 58848276..35e643a6 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/MemoryUpdater.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/MemoryUpdater.java @@ -5,11 +5,6 @@ import kotlin.Unit; import lombok.Data; import lombok.EqualsAndHashCode; import org.jetbrains.annotations.NotNull; -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.agent.factory.component.annotation.Init; -import work.slhaf.partner.api.agent.factory.component.annotation.InjectModule; -import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.ActionCore; import work.slhaf.partner.core.action.entity.Schedulable; @@ -19,6 +14,11 @@ import work.slhaf.partner.core.memory.MemoryCapability; import work.slhaf.partner.core.memory.pojo.MemorySlice; import work.slhaf.partner.core.memory.pojo.MemoryUnit; import work.slhaf.partner.core.perceive.PerceiveCapability; +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; +import work.slhaf.partner.framework.agent.factory.component.annotation.Init; +import work.slhaf.partner.framework.agent.factory.component.annotation.InjectModule; +import work.slhaf.partner.framework.agent.model.pojo.Message; import work.slhaf.partner.module.action.scheduler.ActionScheduler; import work.slhaf.partner.module.communication.DialogRollingService; import work.slhaf.partner.module.memory.runtime.MemoryRuntime; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/MultiSummarizer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/MultiSummarizer.java index 9b0c0ece..abfe0e52 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/MultiSummarizer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/MultiSummarizer.java @@ -4,9 +4,9 @@ import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.agent.model.ActivateModel; -import work.slhaf.partner.api.agent.model.pojo.Message; +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; +import work.slhaf.partner.framework.agent.model.ActivateModel; +import work.slhaf.partner.framework.agent.model.pojo.Message; import work.slhaf.partner.module.memory.updater.summarizer.entity.SummarizeInput; import work.slhaf.partner.module.memory.updater.summarizer.entity.SummarizeResult; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/SingleSummarizer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/SingleSummarizer.java index 8f5c2e49..83eb31ba 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/SingleSummarizer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/SingleSummarizer.java @@ -3,13 +3,13 @@ package work.slhaf.partner.module.memory.updater.summarizer; import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.agent.factory.component.annotation.Init; -import work.slhaf.partner.api.agent.model.ActivateModel; -import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.ActionCore; +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; +import work.slhaf.partner.framework.agent.factory.component.annotation.Init; +import work.slhaf.partner.framework.agent.model.ActivateModel; +import work.slhaf.partner.framework.agent.model.pojo.Message; import java.util.List; import java.util.concurrent.CountDownLatch; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/TotalSummarizer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/TotalSummarizer.java index ad805e3c..10cb871f 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/TotalSummarizer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/TotalSummarizer.java @@ -3,9 +3,9 @@ package work.slhaf.partner.module.memory.updater.summarizer; import cn.hutool.json.JSONUtil; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.agent.model.ActivateModel; -import work.slhaf.partner.api.agent.model.pojo.Message; +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; +import work.slhaf.partner.framework.agent.model.ActivateModel; +import work.slhaf.partner.framework.agent.model.pojo.Message; import java.util.HashMap; import java.util.List; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/entity/SummarizeInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/entity/SummarizeInput.java index bc4ecb3c..b34884fc 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/entity/SummarizeInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/entity/SummarizeInput.java @@ -2,7 +2,7 @@ package work.slhaf.partner.module.memory.updater.summarizer.entity; import lombok.AllArgsConstructor; import lombok.Data; -import work.slhaf.partner.api.agent.model.pojo.Message; +import work.slhaf.partner.framework.agent.model.pojo.Message; import java.util.List; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/perceive/PerceiveMonitor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/perceive/PerceiveMonitor.java index 46b43dfc..8a7ae668 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/perceive/PerceiveMonitor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/perceive/PerceiveMonitor.java @@ -3,13 +3,13 @@ package work.slhaf.partner.module.perceive; import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.core.cognition.BlockContent; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.cognition.CommunicationBlockContent; import work.slhaf.partner.core.cognition.ContextBlock; import work.slhaf.partner.core.perceive.PerceiveCapability; +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; import java.time.ZonedDateTime; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/PartnerExceptionCallback.java b/Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/PartnerExceptionCallback.java index abe9f00e..eb9eee88 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/PartnerExceptionCallback.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/PartnerExceptionCallback.java @@ -1,9 +1,9 @@ package work.slhaf.partner.runtime.exception; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.agent.runtime.exception.AgentExceptionCallback; -import work.slhaf.partner.api.agent.runtime.exception.AgentLaunchFailedException; -import work.slhaf.partner.api.agent.runtime.exception.AgentRuntimeException; +import work.slhaf.partner.framework.agent.exception.AgentExceptionCallback; +import work.slhaf.partner.framework.agent.exception.AgentLaunchFailedException; +import work.slhaf.partner.framework.agent.exception.AgentRuntimeException; import work.slhaf.partner.runtime.exception.pojo.GlobalExceptionData; import java.io.*; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/pojo/GlobalExceptionData.java b/Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/pojo/GlobalExceptionData.java index a638319e..aa468700 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/pojo/GlobalExceptionData.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/pojo/GlobalExceptionData.java @@ -2,7 +2,7 @@ package work.slhaf.partner.runtime.exception.pojo; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.partner.api.common.entity.PersistableObject; +import work.slhaf.partner.framework.agent.common.entity.PersistableObject; import java.io.Serial; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/runtime/interaction/WebSocketGateway.java b/Partner-Core/src/main/java/work/slhaf/partner/runtime/interaction/WebSocketGateway.java index 6637ce21..9babbdc7 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/runtime/interaction/WebSocketGateway.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/runtime/interaction/WebSocketGateway.java @@ -8,9 +8,9 @@ import org.java_websocket.framing.Framedata; import org.java_websocket.handshake.ClientHandshake; import org.java_websocket.server.WebSocketServer; import org.jetbrains.annotations.NotNull; -import work.slhaf.partner.api.agent.runtime.interaction.AgentGateway; -import work.slhaf.partner.api.agent.runtime.interaction.data.InputData; -import work.slhaf.partner.api.agent.runtime.interaction.data.InteractionEvent; +import work.slhaf.partner.framework.agent.interaction.AgentGateway; +import work.slhaf.partner.framework.agent.interaction.data.InputData; +import work.slhaf.partner.framework.agent.interaction.data.InteractionEvent; import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; import java.net.InetSocketAddress; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/runtime/interaction/WebSocketGatewayRegistry.java b/Partner-Core/src/main/java/work/slhaf/partner/runtime/interaction/WebSocketGatewayRegistry.java index 3a56dbd1..f65899a9 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/runtime/interaction/WebSocketGatewayRegistry.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/runtime/interaction/WebSocketGatewayRegistry.java @@ -3,10 +3,10 @@ package work.slhaf.partner.runtime.interaction; import com.alibaba.fastjson2.JSONObject; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import work.slhaf.partner.api.agent.runtime.config.Config; -import work.slhaf.partner.api.agent.runtime.config.ConfigDoc; -import work.slhaf.partner.api.agent.runtime.config.ConfigRegistration; -import work.slhaf.partner.api.agent.runtime.config.Configurable; +import work.slhaf.partner.framework.agent.config.Config; +import work.slhaf.partner.framework.agent.config.ConfigDoc; +import work.slhaf.partner.framework.agent.config.ConfigRegistration; +import work.slhaf.partner.framework.agent.config.Configurable; import java.nio.file.Path; import java.util.Map; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/runtime/interaction/data/context/PartnerRunningFlowContext.kt b/Partner-Core/src/main/java/work/slhaf/partner/runtime/interaction/data/context/PartnerRunningFlowContext.kt index a5ee9575..150d6ee1 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/runtime/interaction/data/context/PartnerRunningFlowContext.kt +++ b/Partner-Core/src/main/java/work/slhaf/partner/runtime/interaction/data/context/PartnerRunningFlowContext.kt @@ -1,7 +1,7 @@ package work.slhaf.partner.runtime.interaction.data.context import com.alibaba.fastjson2.JSONObject -import work.slhaf.partner.api.agent.runtime.interaction.flow.RunningFlowContext +import work.slhaf.partner.framework.agent.interaction.flow.RunningFlowContext class PartnerRunningFlowContext private constructor( override val source: String, diff --git a/Partner-Core/src/test/java/work/slhaf/partner/core/memory/MemoryCoreTest.java b/Partner-Core/src/test/java/work/slhaf/partner/core/memory/MemoryCoreTest.java index b5ea2872..664015c3 100644 --- a/Partner-Core/src/test/java/work/slhaf/partner/core/memory/MemoryCoreTest.java +++ b/Partner-Core/src/test/java/work/slhaf/partner/core/memory/MemoryCoreTest.java @@ -2,12 +2,12 @@ package work.slhaf.partner.core.memory; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; -import work.slhaf.partner.api.agent.model.pojo.Message; -import work.slhaf.partner.api.agent.runtime.config.AgentConfigLoader; import work.slhaf.partner.common.config.Config; import work.slhaf.partner.common.config.PartnerAgentConfigLoader; import work.slhaf.partner.core.memory.pojo.MemorySlice; import work.slhaf.partner.core.memory.pojo.MemoryUnit; +import work.slhaf.partner.framework.agent.config.AgentConfigLoader; +import work.slhaf.partner.framework.agent.model.pojo.Message; import java.nio.file.Files; import java.nio.file.Path; diff --git a/Partner-Core/src/test/java/work/slhaf/partner/module/memory/runtime/MemoryRuntimeTest.java b/Partner-Core/src/test/java/work/slhaf/partner/module/memory/runtime/MemoryRuntimeTest.java index ef3fb504..e0213ac7 100644 --- a/Partner-Core/src/test/java/work/slhaf/partner/module/memory/runtime/MemoryRuntimeTest.java +++ b/Partner-Core/src/test/java/work/slhaf/partner/module/memory/runtime/MemoryRuntimeTest.java @@ -2,14 +2,14 @@ package work.slhaf.partner.module.memory.runtime; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; -import work.slhaf.partner.api.agent.model.pojo.Message; -import work.slhaf.partner.api.agent.runtime.config.AgentConfigLoader; import work.slhaf.partner.common.config.Config; import work.slhaf.partner.common.config.PartnerAgentConfigLoader; import work.slhaf.partner.core.memory.MemoryCapability; import work.slhaf.partner.core.memory.pojo.MemorySlice; import work.slhaf.partner.core.memory.pojo.MemoryUnit; import work.slhaf.partner.core.memory.pojo.SliceRef; +import work.slhaf.partner.framework.agent.config.AgentConfigLoader; +import work.slhaf.partner.framework.agent.model.pojo.Message; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/Partner-Core/src/test/java/work/slhaf/partner/module/memory/updater/MemoryUpdaterTest.java b/Partner-Core/src/test/java/work/slhaf/partner/module/memory/updater/MemoryUpdaterTest.java index faca37ae..f5aee76a 100644 --- a/Partner-Core/src/test/java/work/slhaf/partner/module/memory/updater/MemoryUpdaterTest.java +++ b/Partner-Core/src/test/java/work/slhaf/partner/module/memory/updater/MemoryUpdaterTest.java @@ -1,10 +1,10 @@ package work.slhaf.partner.module.memory.updater; import org.junit.jupiter.api.Test; -import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.memory.MemoryCapability; import work.slhaf.partner.core.memory.pojo.MemorySlice; import work.slhaf.partner.core.memory.pojo.MemoryUnit; +import work.slhaf.partner.framework.agent.model.pojo.Message; import work.slhaf.partner.module.memory.updater.summarizer.entity.SummarizeResult; import java.lang.reflect.Field; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/Agent.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/Agent.java similarity index 91% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/Agent.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/Agent.java index f4d22ed8..63030023 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/Agent.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/Agent.java @@ -1,12 +1,12 @@ -package work.slhaf.partner.api.agent; +package work.slhaf.partner.framework.agent; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.agent.factory.AgentRegisterFactory; -import work.slhaf.partner.api.agent.runtime.config.AgentConfigLoader; -import work.slhaf.partner.api.agent.runtime.exception.AgentExceptionCallback; -import work.slhaf.partner.api.agent.runtime.exception.AgentLaunchFailedException; -import work.slhaf.partner.api.agent.runtime.exception.GlobalExceptionHandler; -import work.slhaf.partner.api.agent.runtime.interaction.AgentGateway; +import work.slhaf.partner.framework.agent.config.AgentConfigLoader; +import work.slhaf.partner.framework.agent.exception.AgentExceptionCallback; +import work.slhaf.partner.framework.agent.exception.AgentLaunchFailedException; +import work.slhaf.partner.framework.agent.exception.GlobalExceptionHandler; +import work.slhaf.partner.framework.agent.factory.AgentRegisterFactory; +import work.slhaf.partner.framework.agent.interaction.AgentGateway; import java.util.ArrayList; import java.util.List; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/common/entity/PersistableObject.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/common/entity/PersistableObject.java similarity index 63% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/common/entity/PersistableObject.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/common/entity/PersistableObject.java index ff9b55c6..e98a1766 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/common/entity/PersistableObject.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/common/entity/PersistableObject.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.common.entity; +package work.slhaf.partner.framework.agent.common.entity; import java.io.Serializable; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/common/support/DirectoryWatchSupport.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/common/support/DirectoryWatchSupport.java similarity index 99% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/common/support/DirectoryWatchSupport.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/common/support/DirectoryWatchSupport.java index e02108b4..85f1b100 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/common/support/DirectoryWatchSupport.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/common/support/DirectoryWatchSupport.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.common.support; +package work.slhaf.partner.framework.agent.common.support; import lombok.extern.slf4j.Slf4j; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/config/AgentConfigLoader.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/config/AgentConfigLoader.java similarity index 87% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/config/AgentConfigLoader.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/config/AgentConfigLoader.java index 62493d60..ad3c7040 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/config/AgentConfigLoader.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/config/AgentConfigLoader.java @@ -1,9 +1,9 @@ -package work.slhaf.partner.api.agent.runtime.config; +package work.slhaf.partner.framework.agent.config; import lombok.Data; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.agent.factory.config.pojo.ModelConfig; +import work.slhaf.partner.framework.agent.factory.config.pojo.ModelConfig; import java.util.HashMap; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/config/ConfigCenter.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/config/ConfigCenter.kt similarity index 97% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/config/ConfigCenter.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/config/ConfigCenter.kt index 70bb408b..88967f14 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/config/ConfigCenter.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/config/ConfigCenter.kt @@ -1,10 +1,10 @@ -package work.slhaf.partner.api.agent.runtime.config +package work.slhaf.partner.framework.agent.config import com.alibaba.fastjson2.JSON import com.alibaba.fastjson2.JSONObject import org.slf4j.LoggerFactory -import work.slhaf.partner.api.agent.runtime.exception.AgentLaunchFailedException -import work.slhaf.partner.api.common.support.DirectoryWatchSupport +import work.slhaf.partner.framework.agent.common.support.DirectoryWatchSupport +import work.slhaf.partner.framework.agent.exception.AgentLaunchFailedException import java.io.IOException import java.lang.reflect.Field import java.lang.reflect.Modifier diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/config/FileAgentConfigLoader.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/config/FileAgentConfigLoader.java similarity index 78% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/config/FileAgentConfigLoader.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/config/FileAgentConfigLoader.java index 2542d1c2..7b2d7eb7 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/config/FileAgentConfigLoader.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/config/FileAgentConfigLoader.java @@ -1,11 +1,11 @@ -package work.slhaf.partner.api.agent.runtime.config; +package work.slhaf.partner.framework.agent.config; import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.agent.factory.config.exception.ConfigDirNotExistException; -import work.slhaf.partner.api.agent.factory.config.exception.ConfigNotExistException; -import work.slhaf.partner.api.agent.factory.config.pojo.ModelConfig; -import work.slhaf.partner.api.agent.factory.config.pojo.PrimaryModelConfig; +import work.slhaf.partner.framework.agent.factory.config.exception.ConfigDirNotExistException; +import work.slhaf.partner.framework.agent.factory.config.exception.ConfigNotExistException; +import work.slhaf.partner.framework.agent.factory.config.pojo.ModelConfig; +import work.slhaf.partner.framework.agent.factory.config.pojo.PrimaryModelConfig; import java.io.File; import java.nio.charset.StandardCharsets; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/config/path.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/config/path.kt similarity index 95% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/config/path.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/config/path.kt index 6fb1164e..7e737abe 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/config/path.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/config/path.kt @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.runtime.config +package work.slhaf.partner.framework.agent.config import java.nio.file.Files import java.nio.file.Path diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/config/reflect.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/config/reflect.kt similarity index 83% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/config/reflect.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/config/reflect.kt index 4239401a..23e07119 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/config/reflect.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/config/reflect.kt @@ -1,7 +1,17 @@ -package work.slhaf.partner.api.agent.runtime.config +package work.slhaf.partner.framework.agent.config import net.bytebuddy.jar.asm.* +import java.lang.Byte +import java.lang.Double +import java.lang.Float +import java.lang.Long +import java.lang.Short import java.lang.reflect.Field +import kotlin.Any +import kotlin.Boolean +import kotlin.Int +import kotlin.Metadata +import kotlin.String import kotlin.reflect.KProperty1 internal fun Class<*>.isKotlinClass(): Boolean { @@ -13,14 +23,14 @@ internal fun resolveDisplayType(type: Class<*>): String { return "${resolveDisplayType(type.componentType)}[]" } return when (type) { - java.lang.Integer.TYPE, java.lang.Integer::class.java -> "Int" - java.lang.Long.TYPE, java.lang.Long::class.java -> "Long" + Integer.TYPE, Integer::class.java -> "Int" + Long.TYPE, Long::class.java -> "Long" java.lang.Boolean.TYPE, java.lang.Boolean::class.java -> "Boolean" - java.lang.Double.TYPE, java.lang.Double::class.java -> "Double" - java.lang.Float.TYPE, java.lang.Float::class.java -> "Float" - java.lang.Short.TYPE, java.lang.Short::class.java -> "Short" - java.lang.Byte.TYPE, java.lang.Byte::class.java -> "Byte" - java.lang.Character.TYPE, java.lang.Character::class.java -> "Char" + Double.TYPE, Double::class.java -> "Double" + Float.TYPE, Float::class.java -> "Float" + Short.TYPE, Short::class.java -> "Short" + Byte.TYPE, Byte::class.java -> "Byte" + Character.TYPE, Character::class.java -> "Char" String::class.java -> "String" else -> type.simpleName } @@ -76,7 +86,7 @@ private fun resolveJavaFieldAnnotationNames(ownerType: Class, field: override fun visitTypeAnnotation( typeRef: Int, - typePath: net.bytebuddy.jar.asm.TypePath?, + typePath: TypePath?, descriptor: String, visible: Boolean ): AnnotationVisitor? { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/exception/AgentExceptionCallback.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/AgentExceptionCallback.java similarity index 73% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/exception/AgentExceptionCallback.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/AgentExceptionCallback.java index bdde9990..ca448fd5 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/exception/AgentExceptionCallback.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/AgentExceptionCallback.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.runtime.exception; +package work.slhaf.partner.framework.agent.exception; public interface AgentExceptionCallback { void onRuntimeException(AgentRuntimeException e); diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/exception/AgentLaunchFailedException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/AgentLaunchFailedException.java similarity index 84% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/exception/AgentLaunchFailedException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/AgentLaunchFailedException.java index 744483eb..934f565f 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/exception/AgentLaunchFailedException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/AgentLaunchFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.runtime.exception; +package work.slhaf.partner.framework.agent.exception; public class AgentLaunchFailedException extends RuntimeException { public AgentLaunchFailedException(String message, Throwable cause) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/exception/AgentRunningFailedException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/AgentRunningFailedException.java similarity index 83% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/exception/AgentRunningFailedException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/AgentRunningFailedException.java index a3395fd2..ded2fbe9 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/exception/AgentRunningFailedException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/AgentRunningFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.runtime.exception; +package work.slhaf.partner.framework.agent.exception; public class AgentRunningFailedException extends AgentRuntimeException { public AgentRunningFailedException(String message) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/exception/AgentRuntimeException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/AgentRuntimeException.java similarity index 84% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/exception/AgentRuntimeException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/AgentRuntimeException.java index 89d60fc9..d3a46cbe 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/exception/AgentRuntimeException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/AgentRuntimeException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.runtime.exception; +package work.slhaf.partner.framework.agent.exception; public class AgentRuntimeException extends RuntimeException { public AgentRuntimeException(String message) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/exception/GlobalExceptionHandler.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/GlobalExceptionHandler.java similarity index 95% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/exception/GlobalExceptionHandler.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/GlobalExceptionHandler.java index 8e98ff4b..bb9475f1 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/exception/GlobalExceptionHandler.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.runtime.exception; +package work.slhaf.partner.framework.agent.exception; import lombok.extern.slf4j.Slf4j; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/exception/LogAgentExceptionCallback.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/LogAgentExceptionCallback.java similarity index 86% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/exception/LogAgentExceptionCallback.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/LogAgentExceptionCallback.java index 056650b5..79b68fe4 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/exception/LogAgentExceptionCallback.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/LogAgentExceptionCallback.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.runtime.exception; +package work.slhaf.partner.framework.agent.exception; import lombok.extern.slf4j.Slf4j; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/AgentBaseFactory.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/AgentBaseFactory.kt similarity index 67% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/AgentBaseFactory.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/AgentBaseFactory.kt index fce23891..f6a2dd9b 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/AgentBaseFactory.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/AgentBaseFactory.kt @@ -1,6 +1,6 @@ -package work.slhaf.partner.api.agent.factory +package work.slhaf.partner.framework.agent.factory -import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext +import work.slhaf.partner.framework.agent.factory.context.AgentRegisterContext /** * 所有注册链工厂的统一抽象。 diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/AgentRegisterFactory.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/AgentRegisterFactory.kt similarity index 72% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/AgentRegisterFactory.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/AgentRegisterFactory.kt index 47406ae3..ff3c1a1e 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/AgentRegisterFactory.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/AgentRegisterFactory.kt @@ -1,18 +1,18 @@ -package work.slhaf.partner.api.agent.factory +package work.slhaf.partner.framework.agent.factory import org.reflections.util.ClasspathHelper -import work.slhaf.partner.api.agent.factory.capability.CapabilityAnnotationValidatorFactory -import work.slhaf.partner.api.agent.factory.capability.CapabilityInjectorFactory -import work.slhaf.partner.api.agent.factory.capability.CapabilityRegisterFactory -import work.slhaf.partner.api.agent.factory.component.ComponentAnnotationValidatorFactory -import work.slhaf.partner.api.agent.factory.component.ComponentInitHookExecutorFactory -import work.slhaf.partner.api.agent.factory.component.ComponentInjectorFactory -import work.slhaf.partner.api.agent.factory.component.ComponentRegisterFactory -import work.slhaf.partner.api.agent.factory.config.ConfigLoaderFactory -import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext -import work.slhaf.partner.api.agent.factory.context.ShutdownHookCollectorFactory -import work.slhaf.partner.api.agent.factory.exception.ExternalModuleLoadFailedException -import work.slhaf.partner.api.agent.factory.exception.ExternalModulePathNotExistException +import work.slhaf.partner.framework.agent.factory.capability.CapabilityAnnotationValidatorFactory +import work.slhaf.partner.framework.agent.factory.capability.CapabilityInjectorFactory +import work.slhaf.partner.framework.agent.factory.capability.CapabilityRegisterFactory +import work.slhaf.partner.framework.agent.factory.component.ComponentAnnotationValidatorFactory +import work.slhaf.partner.framework.agent.factory.component.ComponentInitHookExecutorFactory +import work.slhaf.partner.framework.agent.factory.component.ComponentInjectorFactory +import work.slhaf.partner.framework.agent.factory.component.ComponentRegisterFactory +import work.slhaf.partner.framework.agent.factory.config.ConfigLoaderFactory +import work.slhaf.partner.framework.agent.factory.context.AgentRegisterContext +import work.slhaf.partner.framework.agent.factory.context.ShutdownHookCollectorFactory +import work.slhaf.partner.framework.agent.factory.exception.ExternalModuleLoadFailedException +import work.slhaf.partner.framework.agent.factory.exception.ExternalModulePathNotExistException import java.io.File import java.net.URL diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityAnnotationValidatorFactory.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/CapabilityAnnotationValidatorFactory.kt similarity index 84% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityAnnotationValidatorFactory.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/CapabilityAnnotationValidatorFactory.kt index 628d7632..ea798e15 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityAnnotationValidatorFactory.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/CapabilityAnnotationValidatorFactory.kt @@ -1,19 +1,19 @@ -package work.slhaf.partner.api.agent.factory.capability +package work.slhaf.partner.framework.agent.factory.capability import cn.hutool.core.util.ClassUtil import org.reflections.Reflections -import work.slhaf.partner.api.agent.factory.AgentBaseFactory -import work.slhaf.partner.api.agent.factory.capability.annotation.Capability -import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityCore -import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityMethod -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability -import work.slhaf.partner.api.agent.factory.capability.exception.DuplicateCapabilityException -import work.slhaf.partner.api.agent.factory.capability.exception.UnMatchedCapabilityException -import work.slhaf.partner.api.agent.factory.capability.exception.UnMatchedCapabilityMethodException -import work.slhaf.partner.api.agent.factory.component.annotation.AgentComponent -import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext -import work.slhaf.partner.api.agent.util.AgentUtil.isAssignableFromAnnotation -import work.slhaf.partner.api.agent.util.AgentUtil.methodSignature +import work.slhaf.partner.framework.agent.factory.AgentBaseFactory +import work.slhaf.partner.framework.agent.factory.capability.annotation.Capability +import work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityCore +import work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityMethod +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability +import work.slhaf.partner.framework.agent.factory.capability.exception.DuplicateCapabilityException +import work.slhaf.partner.framework.agent.factory.capability.exception.UnMatchedCapabilityException +import work.slhaf.partner.framework.agent.factory.capability.exception.UnMatchedCapabilityMethodException +import work.slhaf.partner.framework.agent.factory.component.annotation.AgentComponent +import work.slhaf.partner.framework.agent.factory.context.AgentRegisterContext +import work.slhaf.partner.framework.agent.util.AgentUtil.isAssignableFromAnnotation +import work.slhaf.partner.framework.agent.util.AgentUtil.methodSignature /** * 校验 Capability 体系注解关系，并将扫描结果写入 `CapabilityFactoryContext`。 diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityInjectorFactory.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/CapabilityInjectorFactory.kt similarity index 84% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityInjectorFactory.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/CapabilityInjectorFactory.kt index b90fc87b..73c6c637 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityInjectorFactory.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/CapabilityInjectorFactory.kt @@ -1,11 +1,11 @@ -package work.slhaf.partner.api.agent.factory.capability +package work.slhaf.partner.framework.agent.factory.capability -import work.slhaf.partner.api.agent.factory.AgentBaseFactory -import work.slhaf.partner.api.agent.factory.capability.annotation.Capability -import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability -import work.slhaf.partner.api.agent.factory.capability.exception.CapabilityProxySetFailedException -import work.slhaf.partner.api.agent.factory.context.AgentContext -import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext +import work.slhaf.partner.framework.agent.factory.AgentBaseFactory +import work.slhaf.partner.framework.agent.factory.capability.annotation.Capability +import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability +import work.slhaf.partner.framework.agent.factory.capability.exception.CapabilityProxySetFailedException +import work.slhaf.partner.framework.agent.factory.context.AgentContext +import work.slhaf.partner.framework.agent.factory.context.AgentRegisterContext import java.lang.reflect.Field import java.lang.reflect.Modifier diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityRegisterFactory.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/CapabilityRegisterFactory.kt similarity index 87% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityRegisterFactory.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/CapabilityRegisterFactory.kt index 925fbfc9..c12595df 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityRegisterFactory.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/CapabilityRegisterFactory.kt @@ -1,14 +1,14 @@ -package work.slhaf.partner.api.agent.factory.capability +package work.slhaf.partner.framework.agent.factory.capability -import work.slhaf.partner.api.agent.factory.AgentBaseFactory -import work.slhaf.partner.api.agent.factory.capability.annotation.Capability -import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityCore -import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityMethod -import work.slhaf.partner.api.agent.factory.capability.exception.CapabilityCoreInstancesCreateFailedException -import work.slhaf.partner.api.agent.factory.capability.exception.CapabilityFactoryExecuteFailedException -import work.slhaf.partner.api.agent.factory.capability.exception.DuplicateMethodException -import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext -import work.slhaf.partner.api.agent.util.AgentUtil.methodSignature +import work.slhaf.partner.framework.agent.factory.AgentBaseFactory +import work.slhaf.partner.framework.agent.factory.capability.annotation.Capability +import work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityCore +import work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityMethod +import work.slhaf.partner.framework.agent.factory.capability.exception.CapabilityCoreInstancesCreateFailedException +import work.slhaf.partner.framework.agent.factory.capability.exception.CapabilityFactoryExecuteFailedException +import work.slhaf.partner.framework.agent.factory.capability.exception.DuplicateMethodException +import work.slhaf.partner.framework.agent.factory.context.AgentRegisterContext +import work.slhaf.partner.framework.agent.util.AgentUtil.methodSignature import java.lang.reflect.Method import java.lang.reflect.Proxy import java.util.function.Function diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/Capability.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/annotation/Capability.java similarity index 83% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/Capability.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/annotation/Capability.java index 3417a2aa..70125b4a 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/Capability.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/annotation/Capability.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.capability.annotation; +package work.slhaf.partner.framework.agent.factory.capability.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/CapabilityCore.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/annotation/CapabilityCore.java similarity index 83% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/CapabilityCore.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/annotation/CapabilityCore.java index 521ec5bf..7213bca8 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/CapabilityCore.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/annotation/CapabilityCore.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.capability.annotation; +package work.slhaf.partner.framework.agent.factory.capability.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/CapabilityMethod.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/annotation/CapabilityMethod.java similarity index 78% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/CapabilityMethod.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/annotation/CapabilityMethod.java index fa6667ff..83b7d304 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/CapabilityMethod.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/annotation/CapabilityMethod.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.capability.annotation; +package work.slhaf.partner.framework.agent.factory.capability.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/InjectCapability.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/annotation/InjectCapability.java similarity index 67% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/InjectCapability.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/annotation/InjectCapability.java index 734000fb..c8d967c2 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/InjectCapability.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/annotation/InjectCapability.java @@ -1,6 +1,6 @@ -package work.slhaf.partner.api.agent.factory.capability.annotation; +package work.slhaf.partner.framework.agent.factory.capability.annotation; -import work.slhaf.partner.api.agent.factory.component.annotation.AgentComponent; +import work.slhaf.partner.framework.agent.factory.component.annotation.AgentComponent; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/CapabilityCheckFailedException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/CapabilityCheckFailedException.java similarity index 69% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/CapabilityCheckFailedException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/CapabilityCheckFailedException.java index 8049ca75..4800957e 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/CapabilityCheckFailedException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/CapabilityCheckFailedException.java @@ -1,6 +1,6 @@ -package work.slhaf.partner.api.agent.factory.capability.exception; +package work.slhaf.partner.framework.agent.factory.capability.exception; -import work.slhaf.partner.api.agent.runtime.exception.AgentLaunchFailedException; +import work.slhaf.partner.framework.agent.exception.AgentLaunchFailedException; public class CapabilityCheckFailedException extends AgentLaunchFailedException { public CapabilityCheckFailedException(String message) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/CapabilityCoreInstancesCreateFailedException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/CapabilityCoreInstancesCreateFailedException.java similarity index 82% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/CapabilityCoreInstancesCreateFailedException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/CapabilityCoreInstancesCreateFailedException.java index e4f66246..bedcee74 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/CapabilityCoreInstancesCreateFailedException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/CapabilityCoreInstancesCreateFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.capability.exception; +package work.slhaf.partner.framework.agent.factory.capability.exception; public class CapabilityCoreInstancesCreateFailedException extends CapabilityFactoryExecuteFailedException { public CapabilityCoreInstancesCreateFailedException(String message) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/CapabilityFactoryExecuteFailedException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/CapabilityFactoryExecuteFailedException.java similarity index 72% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/CapabilityFactoryExecuteFailedException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/CapabilityFactoryExecuteFailedException.java index 60f18666..c179d6d1 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/CapabilityFactoryExecuteFailedException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/CapabilityFactoryExecuteFailedException.java @@ -1,6 +1,6 @@ -package work.slhaf.partner.api.agent.factory.capability.exception; +package work.slhaf.partner.framework.agent.factory.capability.exception; -import work.slhaf.partner.api.agent.runtime.exception.AgentLaunchFailedException; +import work.slhaf.partner.framework.agent.exception.AgentLaunchFailedException; public class CapabilityFactoryExecuteFailedException extends AgentLaunchFailedException { public CapabilityFactoryExecuteFailedException(String message) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/CapabilityProxySetFailedException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/CapabilityProxySetFailedException.java similarity index 80% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/CapabilityProxySetFailedException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/CapabilityProxySetFailedException.java index 1a154ae3..9c17663e 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/CapabilityProxySetFailedException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/CapabilityProxySetFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.capability.exception; +package work.slhaf.partner.framework.agent.factory.capability.exception; public class CapabilityProxySetFailedException extends CapabilityFactoryExecuteFailedException { public CapabilityProxySetFailedException(String message) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/DuplicateCapabilityException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/DuplicateCapabilityException.java similarity index 79% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/DuplicateCapabilityException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/DuplicateCapabilityException.java index 6fc92733..e90902d0 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/DuplicateCapabilityException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/DuplicateCapabilityException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.capability.exception; +package work.slhaf.partner.framework.agent.factory.capability.exception; public class DuplicateCapabilityException extends CapabilityCheckFailedException { public DuplicateCapabilityException(String message) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/DuplicateMethodException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/DuplicateMethodException.java similarity index 79% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/DuplicateMethodException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/DuplicateMethodException.java index cc938837..ef5f293d 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/DuplicateMethodException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/DuplicateMethodException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.capability.exception; +package work.slhaf.partner.framework.agent.factory.capability.exception; public class DuplicateMethodException extends CapabilityCheckFailedException { public DuplicateMethodException(String message) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/EmptyCapabilityHolderException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/EmptyCapabilityHolderException.java similarity index 80% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/EmptyCapabilityHolderException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/EmptyCapabilityHolderException.java index 91b0d92d..dcf383cd 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/EmptyCapabilityHolderException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/EmptyCapabilityHolderException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.capability.exception; +package work.slhaf.partner.framework.agent.factory.capability.exception; public class EmptyCapabilityHolderException extends CapabilityCheckFailedException { public EmptyCapabilityHolderException(String message) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/UnMatchedCapabilityException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/UnMatchedCapabilityException.java similarity index 79% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/UnMatchedCapabilityException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/UnMatchedCapabilityException.java index d213b698..c3e14a05 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/UnMatchedCapabilityException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/UnMatchedCapabilityException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.capability.exception; +package work.slhaf.partner.framework.agent.factory.capability.exception; public class UnMatchedCapabilityException extends CapabilityCheckFailedException { public UnMatchedCapabilityException(String message) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/UnMatchedCapabilityMethodException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/UnMatchedCapabilityMethodException.java similarity index 80% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/UnMatchedCapabilityMethodException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/UnMatchedCapabilityMethodException.java index eda9eb68..89306403 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/UnMatchedCapabilityMethodException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/UnMatchedCapabilityMethodException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.capability.exception; +package work.slhaf.partner.framework.agent.factory.capability.exception; public class UnMatchedCapabilityMethodException extends CapabilityCheckFailedException { public UnMatchedCapabilityMethodException(String message) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/UnMatchedCoordinatedMethodException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/UnMatchedCoordinatedMethodException.java similarity index 80% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/UnMatchedCoordinatedMethodException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/UnMatchedCoordinatedMethodException.java index d5e26214..5cd0eaf8 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/UnMatchedCoordinatedMethodException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/capability/exception/UnMatchedCoordinatedMethodException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.capability.exception; +package work.slhaf.partner.framework.agent.factory.capability.exception; public class UnMatchedCoordinatedMethodException extends CapabilityCheckFailedException { public UnMatchedCoordinatedMethodException(String message) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/ComponentAnnotationValidatorFactory.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/ComponentAnnotationValidatorFactory.kt similarity index 78% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/ComponentAnnotationValidatorFactory.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/ComponentAnnotationValidatorFactory.kt index ca7d043d..c78c63f8 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/ComponentAnnotationValidatorFactory.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/ComponentAnnotationValidatorFactory.kt @@ -1,13 +1,13 @@ -package work.slhaf.partner.api.agent.factory.component +package work.slhaf.partner.framework.agent.factory.component -import work.slhaf.partner.api.agent.factory.AgentBaseFactory -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule -import work.slhaf.partner.api.agent.factory.component.annotation.AgentComponent -import work.slhaf.partner.api.agent.factory.component.annotation.Init -import work.slhaf.partner.api.agent.factory.component.annotation.InjectModule -import work.slhaf.partner.api.agent.factory.component.exception.ModuleCheckException -import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext -import work.slhaf.partner.api.agent.util.AgentUtil +import work.slhaf.partner.framework.agent.factory.AgentBaseFactory +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule +import work.slhaf.partner.framework.agent.factory.component.annotation.AgentComponent +import work.slhaf.partner.framework.agent.factory.component.annotation.Init +import work.slhaf.partner.framework.agent.factory.component.annotation.InjectModule +import work.slhaf.partner.framework.agent.factory.component.exception.ModuleCheckException +import work.slhaf.partner.framework.agent.factory.context.AgentRegisterContext +import work.slhaf.partner.framework.agent.util.AgentUtil /** * 校验 Component 层面的注解约束，并缓存 Init 方法扫描结果。 diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/ComponentInitHookExecutorFactory.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/ComponentInitHookExecutorFactory.kt similarity index 78% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/ComponentInitHookExecutorFactory.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/ComponentInitHookExecutorFactory.kt index 521010da..879a9558 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/ComponentInitHookExecutorFactory.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/ComponentInitHookExecutorFactory.kt @@ -1,17 +1,17 @@ -package work.slhaf.partner.api.agent.factory.component +package work.slhaf.partner.framework.agent.factory.component -import work.slhaf.partner.api.agent.factory.AgentBaseFactory -import work.slhaf.partner.api.agent.factory.component.annotation.Init -import work.slhaf.partner.api.agent.factory.component.exception.ModuleInitHookExecuteFailedException -import work.slhaf.partner.api.agent.factory.context.AgentContext -import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext -import work.slhaf.partner.api.agent.util.AgentUtil.methodSignature +import work.slhaf.partner.framework.agent.factory.AgentBaseFactory +import work.slhaf.partner.framework.agent.factory.component.annotation.Init +import work.slhaf.partner.framework.agent.factory.component.exception.ModuleInitHookExecuteFailedException +import work.slhaf.partner.framework.agent.factory.context.AgentContext +import work.slhaf.partner.framework.agent.factory.context.AgentRegisterContext +import work.slhaf.partner.framework.agent.util.AgentUtil.methodSignature import java.lang.reflect.Method /** * 执行 Component 的 `@Init` 生命周期方法。 * - * `@Init` 方法来源于 [work.slhaf.partner.api.agent.factory.context.ComponentFactoryContext]， + * `@Init` 方法来源于 [work.slhaf.partner.framework.agent.factory.context.ComponentFactoryContext]， * 执行目标包括 modules 与 additionalComponents，按 `order` 升序执行。 */ class ComponentInitHookExecutorFactory : AgentBaseFactory() { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/ComponentInjectorFactory.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/ComponentInjectorFactory.kt similarity index 88% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/ComponentInjectorFactory.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/ComponentInjectorFactory.kt index 310eb4ad..7863339c 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/ComponentInjectorFactory.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/ComponentInjectorFactory.kt @@ -1,10 +1,10 @@ -package work.slhaf.partner.api.agent.factory.component +package work.slhaf.partner.framework.agent.factory.component -import work.slhaf.partner.api.agent.factory.AgentBaseFactory -import work.slhaf.partner.api.agent.factory.component.annotation.InjectModule -import work.slhaf.partner.api.agent.factory.component.exception.ModuleInstanceGenerateFailedException -import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext -import work.slhaf.partner.api.agent.factory.context.ModuleContextData +import work.slhaf.partner.framework.agent.factory.AgentBaseFactory +import work.slhaf.partner.framework.agent.factory.component.annotation.InjectModule +import work.slhaf.partner.framework.agent.factory.component.exception.ModuleInstanceGenerateFailedException +import work.slhaf.partner.framework.agent.factory.context.AgentRegisterContext +import work.slhaf.partner.framework.agent.factory.context.ModuleContextData import java.lang.reflect.Field import java.lang.reflect.Modifier diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/ComponentRegisterFactory.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/ComponentRegisterFactory.kt similarity index 87% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/ComponentRegisterFactory.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/ComponentRegisterFactory.kt index cccf19af..0a47e12a 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/ComponentRegisterFactory.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/ComponentRegisterFactory.kt @@ -1,17 +1,17 @@ -package work.slhaf.partner.api.agent.factory.component +package work.slhaf.partner.framework.agent.factory.component import com.alibaba.fastjson2.JSONArray import com.alibaba.fastjson2.JSONObject import org.slf4j.LoggerFactory -import work.slhaf.partner.api.agent.factory.AgentBaseFactory -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule -import work.slhaf.partner.api.agent.factory.component.annotation.AgentComponent -import work.slhaf.partner.api.agent.factory.component.exception.ModuleFactoryInitFailedException -import work.slhaf.partner.api.agent.factory.config.pojo.ModelConfig -import work.slhaf.partner.api.agent.factory.context.AgentContext -import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext -import work.slhaf.partner.api.agent.factory.context.ModuleContextData -import work.slhaf.partner.api.agent.model.ActivateModel +import work.slhaf.partner.framework.agent.factory.AgentBaseFactory +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule +import work.slhaf.partner.framework.agent.factory.component.annotation.AgentComponent +import work.slhaf.partner.framework.agent.factory.component.exception.ModuleFactoryInitFailedException +import work.slhaf.partner.framework.agent.factory.config.pojo.ModelConfig +import work.slhaf.partner.framework.agent.factory.context.AgentContext +import work.slhaf.partner.framework.agent.factory.context.AgentRegisterContext +import work.slhaf.partner.framework.agent.factory.context.ModuleContextData +import work.slhaf.partner.framework.agent.model.ActivateModel import java.lang.reflect.Modifier import java.time.ZonedDateTime diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/abstracts/AgentModule.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/abstracts/AgentModule.kt similarity index 71% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/abstracts/AgentModule.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/abstracts/AgentModule.kt index ac943f3c..277fe168 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/abstracts/AgentModule.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/abstracts/AgentModule.kt @@ -1,9 +1,9 @@ -package work.slhaf.partner.api.agent.factory.component.abstracts +package work.slhaf.partner.framework.agent.factory.component.abstracts import org.slf4j.Logger import org.slf4j.LoggerFactory -import work.slhaf.partner.api.agent.factory.component.annotation.AgentComponent -import work.slhaf.partner.api.agent.runtime.interaction.flow.RunningFlowContext +import work.slhaf.partner.framework.agent.factory.component.annotation.AgentComponent +import work.slhaf.partner.framework.agent.interaction.flow.RunningFlowContext /** * 模块基类 diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/annotation/AgentComponent.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/annotation/AgentComponent.java similarity index 66% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/annotation/AgentComponent.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/annotation/AgentComponent.java index 3cd740f3..3670eb6e 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/annotation/AgentComponent.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/annotation/AgentComponent.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.component.annotation; +package work.slhaf.partner.framework.agent.factory.component.annotation; import java.lang.annotation.*; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/annotation/Init.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/annotation/Init.java similarity index 82% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/annotation/Init.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/annotation/Init.java index 1dd90a0e..8faefdd2 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/annotation/Init.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/annotation/Init.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.component.annotation; +package work.slhaf.partner.framework.agent.factory.component.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/annotation/InjectModule.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/annotation/InjectModule.java similarity index 81% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/annotation/InjectModule.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/annotation/InjectModule.java index a43162a7..f3abfaaa 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/annotation/InjectModule.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/annotation/InjectModule.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.component.annotation; +package work.slhaf.partner.framework.agent.factory.component.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/exception/ModuleCheckException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/exception/ModuleCheckException.java similarity index 78% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/exception/ModuleCheckException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/exception/ModuleCheckException.java index c2b55d5d..66c90566 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/exception/ModuleCheckException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/exception/ModuleCheckException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.component.exception; +package work.slhaf.partner.framework.agent.factory.component.exception; public class ModuleCheckException extends ModuleFactoryInitFailedException { public ModuleCheckException(String message) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/exception/ModuleFactoryInitFailedException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/exception/ModuleFactoryInitFailedException.java similarity index 82% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/exception/ModuleFactoryInitFailedException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/exception/ModuleFactoryInitFailedException.java index 20a722b1..cc4a1e81 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/exception/ModuleFactoryInitFailedException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/exception/ModuleFactoryInitFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.component.exception; +package work.slhaf.partner.framework.agent.factory.component.exception; public class ModuleFactoryInitFailedException extends RuntimeException { public ModuleFactoryInitFailedException(String message) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/exception/ModuleInitHookExecuteFailedException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/exception/ModuleInitHookExecuteFailedException.java similarity index 81% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/exception/ModuleInitHookExecuteFailedException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/exception/ModuleInitHookExecuteFailedException.java index f49a79c7..f2264b85 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/exception/ModuleInitHookExecuteFailedException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/exception/ModuleInitHookExecuteFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.component.exception; +package work.slhaf.partner.framework.agent.factory.component.exception; public class ModuleInitHookExecuteFailedException extends ModuleFactoryInitFailedException { public ModuleInitHookExecuteFailedException(String message) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/exception/ModuleInstanceGenerateFailedException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/exception/ModuleInstanceGenerateFailedException.java similarity index 81% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/exception/ModuleInstanceGenerateFailedException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/exception/ModuleInstanceGenerateFailedException.java index 09c1b577..f86edf8d 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/exception/ModuleInstanceGenerateFailedException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/exception/ModuleInstanceGenerateFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.component.exception; +package work.slhaf.partner.framework.agent.factory.component.exception; public class ModuleInstanceGenerateFailedException extends ModuleFactoryInitFailedException { public ModuleInstanceGenerateFailedException(String message) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/exception/ModuleProxyGenerateFailedException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/exception/ModuleProxyGenerateFailedException.java similarity index 81% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/exception/ModuleProxyGenerateFailedException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/exception/ModuleProxyGenerateFailedException.java index 4a842250..7f1d7147 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/exception/ModuleProxyGenerateFailedException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/exception/ModuleProxyGenerateFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.component.exception; +package work.slhaf.partner.framework.agent.factory.component.exception; public class ModuleProxyGenerateFailedException extends ModuleFactoryInitFailedException { public ModuleProxyGenerateFailedException(String message) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/exception/ProxiedModuleRunningException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/exception/ProxiedModuleRunningException.java similarity index 65% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/exception/ProxiedModuleRunningException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/exception/ProxiedModuleRunningException.java index a06fef58..b7e34d6f 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/exception/ProxiedModuleRunningException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/exception/ProxiedModuleRunningException.java @@ -1,6 +1,6 @@ -package work.slhaf.partner.api.agent.factory.component.exception; +package work.slhaf.partner.framework.agent.factory.component.exception; -import work.slhaf.partner.api.agent.runtime.exception.AgentRuntimeException; +import work.slhaf.partner.framework.agent.exception.AgentRuntimeException; public class ProxiedModuleRunningException extends AgentRuntimeException { public ProxiedModuleRunningException(String message) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/ConfigLoaderFactory.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/ConfigLoaderFactory.kt similarity index 83% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/ConfigLoaderFactory.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/ConfigLoaderFactory.kt index 639cf8da..eb0dcf73 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/ConfigLoaderFactory.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/ConfigLoaderFactory.kt @@ -1,11 +1,11 @@ -package work.slhaf.partner.api.agent.factory.config +package work.slhaf.partner.framework.agent.factory.config import org.slf4j.LoggerFactory -import work.slhaf.partner.api.agent.factory.AgentBaseFactory -import work.slhaf.partner.api.agent.factory.config.exception.ConfigNotExistException -import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext -import work.slhaf.partner.api.agent.runtime.config.AgentConfigLoader -import work.slhaf.partner.api.agent.runtime.config.FileAgentConfigLoader +import work.slhaf.partner.framework.agent.config.AgentConfigLoader +import work.slhaf.partner.framework.agent.config.FileAgentConfigLoader +import work.slhaf.partner.framework.agent.factory.AgentBaseFactory +import work.slhaf.partner.framework.agent.factory.config.exception.ConfigNotExistException +import work.slhaf.partner.framework.agent.factory.context.AgentRegisterContext import java.lang.reflect.Modifier /** diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ConfigDirNotExistException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/ConfigDirNotExistException.java similarity index 80% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ConfigDirNotExistException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/ConfigDirNotExistException.java index 277f40ff..5ab80b45 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ConfigDirNotExistException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/ConfigDirNotExistException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.config.exception; +package work.slhaf.partner.framework.agent.factory.config.exception; public class ConfigDirNotExistException extends ConfigFactoryInitFailedException { public ConfigDirNotExistException(String message, Throwable cause) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ConfigFactoryInitFailedException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/ConfigFactoryInitFailedException.java similarity index 71% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ConfigFactoryInitFailedException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/ConfigFactoryInitFailedException.java index b3869b94..1445dc6d 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ConfigFactoryInitFailedException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/ConfigFactoryInitFailedException.java @@ -1,6 +1,6 @@ -package work.slhaf.partner.api.agent.factory.config.exception; +package work.slhaf.partner.framework.agent.factory.config.exception; -import work.slhaf.partner.api.agent.runtime.exception.AgentLaunchFailedException; +import work.slhaf.partner.framework.agent.exception.AgentLaunchFailedException; public class ConfigFactoryInitFailedException extends AgentLaunchFailedException { public ConfigFactoryInitFailedException(String message, Throwable cause) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ConfigFactoryRuntimeException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/ConfigFactoryRuntimeException.java similarity index 70% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ConfigFactoryRuntimeException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/ConfigFactoryRuntimeException.java index 88a8d220..711d9d0a 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ConfigFactoryRuntimeException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/ConfigFactoryRuntimeException.java @@ -1,6 +1,6 @@ -package work.slhaf.partner.api.agent.factory.config.exception; +package work.slhaf.partner.framework.agent.factory.config.exception; -import work.slhaf.partner.api.agent.runtime.exception.AgentRuntimeException; +import work.slhaf.partner.framework.agent.exception.AgentRuntimeException; public class ConfigFactoryRuntimeException extends AgentRuntimeException { public ConfigFactoryRuntimeException(String message, Throwable cause) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ConfigGenerateFailedException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/ConfigGenerateFailedException.java similarity index 80% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ConfigGenerateFailedException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/ConfigGenerateFailedException.java index cd4c16df..b95fc2c9 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ConfigGenerateFailedException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/ConfigGenerateFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.config.exception; +package work.slhaf.partner.framework.agent.factory.config.exception; public class ConfigGenerateFailedException extends ConfigFactoryInitFailedException { public ConfigGenerateFailedException(String message, Throwable cause) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ConfigNotExistException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/ConfigNotExistException.java similarity index 79% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ConfigNotExistException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/ConfigNotExistException.java index 7643bd41..43700d97 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ConfigNotExistException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/ConfigNotExistException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.config.exception; +package work.slhaf.partner.framework.agent.factory.config.exception; public class ConfigNotExistException extends ConfigFactoryInitFailedException { public ConfigNotExistException(String message, Throwable e) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ConfigUpdateFailedException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/ConfigUpdateFailedException.java similarity index 80% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ConfigUpdateFailedException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/ConfigUpdateFailedException.java index 0caf5655..e50d6e1d 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ConfigUpdateFailedException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/ConfigUpdateFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.config.exception; +package work.slhaf.partner.framework.agent.factory.config.exception; public class ConfigUpdateFailedException extends ConfigFactoryRuntimeException { public ConfigUpdateFailedException(String message, Throwable cause) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/PromptDirNotExistException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/PromptDirNotExistException.java similarity index 80% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/PromptDirNotExistException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/PromptDirNotExistException.java index 3bf8d417..e51be6f7 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/PromptDirNotExistException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/PromptDirNotExistException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.config.exception; +package work.slhaf.partner.framework.agent.factory.config.exception; public class PromptDirNotExistException extends ConfigFactoryInitFailedException { public PromptDirNotExistException(String message, Throwable cause) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/PromptNotExistException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/PromptNotExistException.java similarity index 79% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/PromptNotExistException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/PromptNotExistException.java index a4edb2f4..e83235bd 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/PromptNotExistException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/exception/PromptNotExistException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.config.exception; +package work.slhaf.partner.framework.agent.factory.config.exception; public class PromptNotExistException extends ConfigFactoryInitFailedException { public PromptNotExistException(String message) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/pojo/ModelConfig.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/pojo/ModelConfig.kt similarity index 66% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/pojo/ModelConfig.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/pojo/ModelConfig.kt index efdfd789..bf69de9d 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/pojo/ModelConfig.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/pojo/ModelConfig.kt @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.config.pojo +package work.slhaf.partner.framework.agent.factory.config.pojo import lombok.Data diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/pojo/PrimaryModelConfig.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/pojo/PrimaryModelConfig.java similarity index 66% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/pojo/PrimaryModelConfig.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/pojo/PrimaryModelConfig.java index 352487f1..e1ee9903 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/config/pojo/PrimaryModelConfig.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/config/pojo/PrimaryModelConfig.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.config.pojo; +package work.slhaf.partner.framework.agent.factory.config.pojo; import lombok.Data; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/context/AgentContext.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/context/AgentContext.kt similarity index 93% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/context/AgentContext.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/context/AgentContext.kt index bf864a2e..0eafe4c2 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/context/AgentContext.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/context/AgentContext.kt @@ -1,13 +1,13 @@ -package work.slhaf.partner.api.agent.factory.context +package work.slhaf.partner.framework.agent.factory.context import com.alibaba.fastjson2.JSONArray import com.alibaba.fastjson2.JSONObject import org.slf4j.LoggerFactory -import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityCore -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule -import work.slhaf.partner.api.agent.factory.component.annotation.AgentComponent -import work.slhaf.partner.api.agent.runtime.exception.AgentRunningFailedException -import work.slhaf.partner.api.agent.runtime.interaction.flow.RunningFlowContext +import work.slhaf.partner.framework.agent.exception.AgentRunningFailedException +import work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityCore +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule +import work.slhaf.partner.framework.agent.factory.component.annotation.AgentComponent +import work.slhaf.partner.framework.agent.interaction.flow.RunningFlowContext import java.lang.reflect.Method import java.time.ZonedDateTime @@ -225,7 +225,7 @@ sealed class ModuleContextData { /** * # Shutdown Hook 注解 - * - 可用于[AgentComponent]相关类、[work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityCore]相关类。 + * - 可用于[AgentComponent]相关类、[work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityCore]相关类。 * - 关闭时将按照：Running -> Additional -> Standalone -> Sub -> Capability 的顺序执行 * - [order] 仅在同一层级内起顺序对比作用，数值越小，执行越早。 */ diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/context/AgentRegisterContext.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/context/AgentRegisterContext.kt similarity index 90% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/context/AgentRegisterContext.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/context/AgentRegisterContext.kt index 69c93e56..40e13c6d 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/context/AgentRegisterContext.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/context/AgentRegisterContext.kt @@ -1,9 +1,9 @@ -package work.slhaf.partner.api.agent.factory.context +package work.slhaf.partner.framework.agent.factory.context import org.reflections.Reflections import org.reflections.scanners.Scanners import org.reflections.util.ConfigurationBuilder -import work.slhaf.partner.api.agent.factory.config.pojo.ModelConfig +import work.slhaf.partner.framework.agent.factory.config.pojo.ModelConfig import java.lang.reflect.Method import java.net.URL diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/context/ShutdownHookCollectorFactory.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/context/ShutdownHookCollectorFactory.kt similarity index 81% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/context/ShutdownHookCollectorFactory.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/context/ShutdownHookCollectorFactory.kt index b8a4229e..65659bd9 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/context/ShutdownHookCollectorFactory.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/context/ShutdownHookCollectorFactory.kt @@ -1,10 +1,10 @@ -package work.slhaf.partner.api.agent.factory.context +package work.slhaf.partner.framework.agent.factory.context -import work.slhaf.partner.api.agent.factory.AgentBaseFactory -import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityCore -import work.slhaf.partner.api.agent.factory.component.annotation.AgentComponent -import work.slhaf.partner.api.agent.factory.component.exception.ModuleCheckException -import work.slhaf.partner.api.agent.util.AgentUtil +import work.slhaf.partner.framework.agent.factory.AgentBaseFactory +import work.slhaf.partner.framework.agent.factory.capability.annotation.CapabilityCore +import work.slhaf.partner.framework.agent.factory.component.annotation.AgentComponent +import work.slhaf.partner.framework.agent.factory.component.exception.ModuleCheckException +import work.slhaf.partner.framework.agent.util.AgentUtil /** * 校验并收集 `@Shutdown` 方法。 diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/exception/AgentRegisterFactoryFailedException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/exception/AgentRegisterFactoryFailedException.java similarity index 85% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/exception/AgentRegisterFactoryFailedException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/exception/AgentRegisterFactoryFailedException.java index 6821807a..e0cb9e45 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/exception/AgentRegisterFactoryFailedException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/exception/AgentRegisterFactoryFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.exception; +package work.slhaf.partner.framework.agent.factory.exception; public class AgentRegisterFactoryFailedException extends RuntimeException { public AgentRegisterFactoryFailedException(String message, Throwable cause) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/exception/ExternalModuleLoadFailedException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/exception/ExternalModuleLoadFailedException.java similarity index 83% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/exception/ExternalModuleLoadFailedException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/exception/ExternalModuleLoadFailedException.java index 40f17ad8..033456f4 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/exception/ExternalModuleLoadFailedException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/exception/ExternalModuleLoadFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.exception; +package work.slhaf.partner.framework.agent.factory.exception; public class ExternalModuleLoadFailedException extends AgentRegisterFactoryFailedException { public ExternalModuleLoadFailedException(String message, Throwable cause) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/exception/ExternalModulePathNotExistException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/exception/ExternalModulePathNotExistException.java similarity index 83% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/exception/ExternalModulePathNotExistException.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/exception/ExternalModulePathNotExistException.java index 80df5514..1a6cf073 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/exception/ExternalModulePathNotExistException.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/exception/ExternalModulePathNotExistException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.factory.exception; +package work.slhaf.partner.framework.agent.factory.exception; public class ExternalModulePathNotExistException extends AgentRegisterFactoryFailedException { public ExternalModulePathNotExistException(String message) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/AgentGateway.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/interaction/AgentGateway.java similarity index 61% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/AgentGateway.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/interaction/AgentGateway.java index c2071945..56888660 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/AgentGateway.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/interaction/AgentGateway.java @@ -1,7 +1,7 @@ -package work.slhaf.partner.api.agent.runtime.interaction; +package work.slhaf.partner.framework.agent.interaction; -import work.slhaf.partner.api.agent.runtime.interaction.data.InputData; -import work.slhaf.partner.api.agent.runtime.interaction.flow.RunningFlowContext; +import work.slhaf.partner.framework.agent.interaction.data.InputData; +import work.slhaf.partner.framework.agent.interaction.flow.RunningFlowContext; public interface AgentGateway extends ResponseChannel { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/AgentRuntime.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/interaction/AgentRuntime.kt similarity index 85% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/AgentRuntime.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/interaction/AgentRuntime.kt index 2101ec3f..24a39c75 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/AgentRuntime.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/interaction/AgentRuntime.kt @@ -1,12 +1,12 @@ -package work.slhaf.partner.api.agent.runtime.interaction +package work.slhaf.partner.framework.agent.interaction import kotlinx.coroutines.* import kotlinx.coroutines.channels.Channel -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule -import work.slhaf.partner.api.agent.factory.context.AgentContext -import work.slhaf.partner.api.agent.factory.context.ModuleContextData -import work.slhaf.partner.api.agent.runtime.interaction.data.InteractionEvent -import work.slhaf.partner.api.agent.runtime.interaction.flow.RunningFlowContext +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule +import work.slhaf.partner.framework.agent.factory.context.AgentContext +import work.slhaf.partner.framework.agent.factory.context.ModuleContextData +import work.slhaf.partner.framework.agent.interaction.data.InteractionEvent +import work.slhaf.partner.framework.agent.interaction.flow.RunningFlowContext object AgentRuntime { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/ResponseChannel.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/interaction/ResponseChannel.kt similarity index 81% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/ResponseChannel.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/interaction/ResponseChannel.kt index c0aa40e5..2257467f 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/ResponseChannel.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/interaction/ResponseChannel.kt @@ -1,8 +1,8 @@ -package work.slhaf.partner.api.agent.runtime.interaction +package work.slhaf.partner.framework.agent.interaction import com.alibaba.fastjson2.JSONObject import org.slf4j.LoggerFactory -import work.slhaf.partner.api.agent.runtime.interaction.data.InteractionEvent +import work.slhaf.partner.framework.agent.interaction.data.InteractionEvent interface ResponseChannel { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/data/InputData.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/interaction/data/InputData.kt similarity index 81% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/data/InputData.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/interaction/data/InputData.kt index 636ee51d..155eeb61 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/data/InputData.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/interaction/data/InputData.kt @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.runtime.interaction.data +package work.slhaf.partner.framework.agent.interaction.data open class InputData( val source: String, diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/data/InteractionEvent.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/interaction/data/InteractionEvent.kt similarity index 96% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/data/InteractionEvent.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/interaction/data/InteractionEvent.kt index 4050d3cd..43059f2e 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/data/InteractionEvent.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/interaction/data/InteractionEvent.kt @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.runtime.interaction.data +package work.slhaf.partner.framework.agent.interaction.data import java.time.ZonedDateTime import java.time.format.DateTimeFormatter diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/flow/RunningFlowContext.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/interaction/flow/RunningFlowContext.kt similarity index 96% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/flow/RunningFlowContext.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/interaction/flow/RunningFlowContext.kt index 5597489c..2c9e97c3 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/runtime/interaction/flow/RunningFlowContext.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/interaction/flow/RunningFlowContext.kt @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.runtime.interaction.flow +package work.slhaf.partner.framework.agent.interaction.flow import com.alibaba.fastjson2.JSONObject import java.time.LocalDateTime diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/ActivateModel.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/ActivateModel.kt similarity index 84% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/ActivateModel.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/ActivateModel.kt index ecd5338b..16aa7fd7 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/ActivateModel.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/ActivateModel.kt @@ -1,7 +1,7 @@ -package work.slhaf.partner.api.agent.model +package work.slhaf.partner.framework.agent.model -import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule -import work.slhaf.partner.api.agent.model.pojo.Message +import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule +import work.slhaf.partner.framework.agent.model.pojo.Message interface ActivateModel { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/ModelRuntimeRegistry.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/ModelRuntimeRegistry.kt similarity index 91% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/ModelRuntimeRegistry.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/ModelRuntimeRegistry.kt index da5b8f45..a8bb18ca 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/ModelRuntimeRegistry.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/ModelRuntimeRegistry.kt @@ -1,15 +1,15 @@ -package work.slhaf.partner.api.agent.model +package work.slhaf.partner.framework.agent.model import com.alibaba.fastjson2.JSONObject import org.slf4j.LoggerFactory -import work.slhaf.partner.api.agent.model.ProviderConfig.ProviderType.OPENAI_COMPATIBLE -import work.slhaf.partner.api.agent.model.provider.ModelProvider -import work.slhaf.partner.api.agent.model.provider.ProviderOverride -import work.slhaf.partner.api.agent.model.provider.openai.OpenAiCompatibleProvider -import work.slhaf.partner.api.agent.runtime.config.Config -import work.slhaf.partner.api.agent.runtime.config.ConfigDoc -import work.slhaf.partner.api.agent.runtime.config.ConfigRegistration -import work.slhaf.partner.api.agent.runtime.config.Configurable +import work.slhaf.partner.framework.agent.config.Config +import work.slhaf.partner.framework.agent.config.ConfigDoc +import work.slhaf.partner.framework.agent.config.ConfigRegistration +import work.slhaf.partner.framework.agent.config.Configurable +import work.slhaf.partner.framework.agent.model.ProviderConfig.ProviderType.OPENAI_COMPATIBLE +import work.slhaf.partner.framework.agent.model.provider.ModelProvider +import work.slhaf.partner.framework.agent.model.provider.ProviderOverride +import work.slhaf.partner.framework.agent.model.provider.openai.OpenAiCompatibleProvider import java.nio.file.Path import java.util.Locale.getDefault import java.util.concurrent.locks.ReentrantLock diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/StreamChatMessageConsumer.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/StreamChatMessageConsumer.java similarity index 88% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/StreamChatMessageConsumer.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/StreamChatMessageConsumer.java index 09dcf849..ddbec356 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/StreamChatMessageConsumer.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/StreamChatMessageConsumer.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.model; +package work.slhaf.partner.framework.agent.model; public abstract class StreamChatMessageConsumer { private final StringBuilder responseText = new StringBuilder(); diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/pojo/Message.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/pojo/Message.kt similarity index 89% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/pojo/Message.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/pojo/Message.kt index a31165dd..a4638079 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/pojo/Message.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/pojo/Message.kt @@ -1,10 +1,10 @@ -package work.slhaf.partner.api.agent.model.pojo +package work.slhaf.partner.framework.agent.model.pojo import com.alibaba.fastjson2.annotation.JSONCreator import com.alibaba.fastjson2.annotation.JSONField import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonValue -import work.slhaf.partner.api.common.entity.PersistableObject +import work.slhaf.partner.framework.agent.common.entity.PersistableObject import java.io.Serial data class Message( diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/provider/ModelProvider.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/provider/ModelProvider.kt similarity index 75% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/provider/ModelProvider.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/provider/ModelProvider.kt index 5a981ad3..96762077 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/provider/ModelProvider.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/provider/ModelProvider.kt @@ -1,8 +1,8 @@ -package work.slhaf.partner.api.agent.model.provider +package work.slhaf.partner.framework.agent.model.provider import com.alibaba.fastjson2.JSONObject -import work.slhaf.partner.api.agent.model.StreamChatMessageConsumer -import work.slhaf.partner.api.agent.model.pojo.Message +import work.slhaf.partner.framework.agent.model.StreamChatMessageConsumer +import work.slhaf.partner.framework.agent.model.pojo.Message abstract class ModelProvider @JvmOverloads constructor( val override: ProviderOverride? = null diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/provider/openai/OpenAiCompatibleProvider.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/provider/openai/OpenAiCompatibleProvider.java similarity index 92% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/provider/openai/OpenAiCompatibleProvider.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/provider/openai/OpenAiCompatibleProvider.java index 2e795863..28042a77 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/provider/openai/OpenAiCompatibleProvider.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/provider/openai/OpenAiCompatibleProvider.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.model.provider.openai; +package work.slhaf.partner.framework.agent.model.provider.openai; import com.alibaba.fastjson2.JSONObject; import com.openai.client.OpenAIClient; @@ -7,10 +7,10 @@ import com.openai.core.JsonValue; import com.openai.core.http.StreamResponse; import com.openai.models.chat.completions.*; import org.jetbrains.annotations.NotNull; -import work.slhaf.partner.api.agent.model.StreamChatMessageConsumer; -import work.slhaf.partner.api.agent.model.pojo.Message; -import work.slhaf.partner.api.agent.model.provider.ModelProvider; -import work.slhaf.partner.api.agent.model.provider.ProviderOverride; +import work.slhaf.partner.framework.agent.model.StreamChatMessageConsumer; +import work.slhaf.partner.framework.agent.model.pojo.Message; +import work.slhaf.partner.framework.agent.model.provider.ModelProvider; +import work.slhaf.partner.framework.agent.model.provider.ProviderOverride; import java.time.Duration; import java.util.List; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/provider/openai/OpenAiMessageAdapter.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/provider/openai/OpenAiMessageAdapter.java similarity index 91% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/provider/openai/OpenAiMessageAdapter.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/provider/openai/OpenAiMessageAdapter.java index bcc3b077..f2885e45 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/provider/openai/OpenAiMessageAdapter.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/provider/openai/OpenAiMessageAdapter.java @@ -1,10 +1,10 @@ -package work.slhaf.partner.api.agent.model.provider.openai; +package work.slhaf.partner.framework.agent.model.provider.openai; import com.openai.models.chat.completions.ChatCompletionAssistantMessageParam; import com.openai.models.chat.completions.ChatCompletionMessageParam; import com.openai.models.chat.completions.ChatCompletionSystemMessageParam; import com.openai.models.chat.completions.ChatCompletionUserMessageParam; -import work.slhaf.partner.api.agent.model.pojo.Message; +import work.slhaf.partner.framework.agent.model.pojo.Message; import java.util.ArrayList; import java.util.List; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/util/AgentUtil.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/util/AgentUtil.java similarity index 98% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/util/AgentUtil.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/util/AgentUtil.java index 3a9ee941..fc63019c 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/util/AgentUtil.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/util/AgentUtil.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.agent.util; +package work.slhaf.partner.framework.agent.util; import org.reflections.Reflections; diff --git a/Partner-Framework/src/test/java/work/slhaf/partner/api/agent/runtime/config/ConfigCenterTest.java b/Partner-Framework/src/test/java/work/slhaf/partner/framework/agent/runtime/config/ConfigCenterTest.java similarity index 97% rename from Partner-Framework/src/test/java/work/slhaf/partner/api/agent/runtime/config/ConfigCenterTest.java rename to Partner-Framework/src/test/java/work/slhaf/partner/framework/agent/runtime/config/ConfigCenterTest.java index eb677525..19387652 100644 --- a/Partner-Framework/src/test/java/work/slhaf/partner/api/agent/runtime/config/ConfigCenterTest.java +++ b/Partner-Framework/src/test/java/work/slhaf/partner/framework/agent/runtime/config/ConfigCenterTest.java @@ -1,9 +1,13 @@ -package work.slhaf.partner.api.agent.runtime.config; +package work.slhaf.partner.framework.agent.runtime.config; import com.alibaba.fastjson2.JSONObject; import org.jetbrains.annotations.Nullable; import org.junit.jupiter.api.*; import org.junit.jupiter.api.io.TempDir; +import work.slhaf.partner.framework.agent.config.Config; +import work.slhaf.partner.framework.agent.config.ConfigCenter; +import work.slhaf.partner.framework.agent.config.ConfigDoc; +import work.slhaf.partner.framework.agent.config.ConfigRegistration; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/Partner-Framework/src/test/java/work/slhaf/partner/api/agent/runtime/config/KotlinDocConfig.kt b/Partner-Framework/src/test/java/work/slhaf/partner/framework/agent/runtime/config/KotlinDocConfig.kt similarity index 66% rename from Partner-Framework/src/test/java/work/slhaf/partner/api/agent/runtime/config/KotlinDocConfig.kt rename to Partner-Framework/src/test/java/work/slhaf/partner/framework/agent/runtime/config/KotlinDocConfig.kt index f495bebe..0b45fbce 100644 --- a/Partner-Framework/src/test/java/work/slhaf/partner/api/agent/runtime/config/KotlinDocConfig.kt +++ b/Partner-Framework/src/test/java/work/slhaf/partner/framework/agent/runtime/config/KotlinDocConfig.kt @@ -1,4 +1,7 @@ -package work.slhaf.partner.api.agent.runtime.config +package work.slhaf.partner.framework.agent.runtime.config + +import work.slhaf.partner.framework.agent.config.Config +import work.slhaf.partner.framework.agent.config.ConfigDoc class KotlinDocConfig : Config() { @ConfigDoc(description = "WebSocket 监听端口", example = "29600") diff --git a/Partner-Framework/src/test/java/work/slhaf/partner/api/common/support/DirectoryWatchSupportTest.java b/Partner-Framework/src/test/java/work/slhaf/partner/framework/common/support/DirectoryWatchSupportTest.java similarity index 90% rename from Partner-Framework/src/test/java/work/slhaf/partner/api/common/support/DirectoryWatchSupportTest.java rename to Partner-Framework/src/test/java/work/slhaf/partner/framework/common/support/DirectoryWatchSupportTest.java index 76f6b35a..2522a4d4 100644 --- a/Partner-Framework/src/test/java/work/slhaf/partner/api/common/support/DirectoryWatchSupportTest.java +++ b/Partner-Framework/src/test/java/work/slhaf/partner/framework/common/support/DirectoryWatchSupportTest.java @@ -1,8 +1,9 @@ -package work.slhaf.partner.api.common.support; +package work.slhaf.partner.framework.common.support; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; +import work.slhaf.partner.framework.agent.common.support.DirectoryWatchSupport; import java.io.IOException; import java.nio.file.Files; @@ -19,9 +20,9 @@ class DirectoryWatchSupportTest { @Test void testWatchDepthRejectsInvalidValue(@TempDir Path tempDir) throws IOException { try (ExecutorService executor = Executors.newVirtualThreadPerTaskExecutor()) { - work.slhaf.partner.api.common.support.DirectoryWatchSupport.Context context = new work.slhaf.partner.api.common.support.DirectoryWatchSupport.Context(tempDir); + DirectoryWatchSupport.Context context = new DirectoryWatchSupport.Context(tempDir); Assertions.assertThrows(IllegalArgumentException.class, - () -> new work.slhaf.partner.api.common.support.DirectoryWatchSupport(context, executor, -2, null)); + () -> new DirectoryWatchSupport(context, executor, -2, null)); } } @@ -115,7 +116,7 @@ class DirectoryWatchSupportTest { } private WatchHarness createWatchSupport(Path root, ExecutorService executor, int watchDepth) throws IOException { - work.slhaf.partner.api.common.support.DirectoryWatchSupport watchSupport = new work.slhaf.partner.api.common.support.DirectoryWatchSupport(new work.slhaf.partner.api.common.support.DirectoryWatchSupport.Context(root), executor, watchDepth, null); + DirectoryWatchSupport watchSupport = new DirectoryWatchSupport(new DirectoryWatchSupport.Context(root), executor, watchDepth, null); List events = new CopyOnWriteArrayList<>(); watchSupport.onCreate((thisDir, context) -> record(root, context, events)); watchSupport.onModify((thisDir, context) -> record(root, context, events)); @@ -153,7 +154,7 @@ class DirectoryWatchSupportTest { } } - private record WatchHarness(work.slhaf.partner.api.common.support.DirectoryWatchSupport watchSupport, + private record WatchHarness(DirectoryWatchSupport watchSupport, List events) implements AutoCloseable { @Override public void close() throws IOException { diff --git a/Partner-Framework/src/test/java/work/slhaf/partner/api/model/pojo/MessageTest.java b/Partner-Framework/src/test/java/work/slhaf/partner/framework/model/pojo/MessageTest.java similarity index 85% rename from Partner-Framework/src/test/java/work/slhaf/partner/api/model/pojo/MessageTest.java rename to Partner-Framework/src/test/java/work/slhaf/partner/framework/model/pojo/MessageTest.java index dcb104bd..05a2a59c 100644 --- a/Partner-Framework/src/test/java/work/slhaf/partner/api/model/pojo/MessageTest.java +++ b/Partner-Framework/src/test/java/work/slhaf/partner/framework/model/pojo/MessageTest.java @@ -1,9 +1,9 @@ -package work.slhaf.partner.api.model.pojo; +package work.slhaf.partner.framework.model.pojo; import com.alibaba.fastjson2.JSON; import org.junit.jupiter.api.Test; -import work.slhaf.partner.api.agent.model.pojo.Message; -import work.slhaf.partner.api.agent.model.provider.openai.OpenAiMessageAdapter; +import work.slhaf.partner.framework.agent.model.pojo.Message; +import work.slhaf.partner.framework.agent.model.provider.openai.OpenAiMessageAdapter; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows;