diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/common/module/PostRunningModule.java b/Partner-Core/src/main/java/work/slhaf/partner/module/common/module/PostRunningAbstractAgentModuleAbstract.java similarity index 72% rename from Partner-Core/src/main/java/work/slhaf/partner/module/common/module/PostRunningModule.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/common/module/PostRunningAbstractAgentModuleAbstract.java index e81e1a58..3bd52734 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/common/module/PostRunningModule.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/common/module/PostRunningAbstractAgentModuleAbstract.java @@ -1,9 +1,9 @@ package work.slhaf.partner.module.common.module; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningModule; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentRunningModule; import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; -public abstract class PostRunningModule extends AgentRunningModule { +public abstract class PostRunningAbstractAgentModuleAbstract extends AbstractAgentRunningModule { @Override public final void execute(PartnerRunningFlowContext context) { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/common/module/PreRunningModule.java b/Partner-Core/src/main/java/work/slhaf/partner/module/common/module/PreRunningAbstractAgentModuleAbstract.java similarity index 86% rename from Partner-Core/src/main/java/work/slhaf/partner/module/common/module/PreRunningModule.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/common/module/PreRunningAbstractAgentModuleAbstract.java index 461221a3..ea176556 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/common/module/PreRunningModule.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/common/module/PreRunningAbstractAgentModuleAbstract.java @@ -1,7 +1,7 @@ package work.slhaf.partner.module.common.module; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningModule; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentRunningModule; import work.slhaf.partner.module.common.entity.AppendPromptData; import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; @@ -11,7 +11,7 @@ import java.util.Map; * 前置模块抽象类 */ @Slf4j -public abstract class PreRunningModule extends AgentRunningModule { +public abstract class PreRunningAbstractAgentModuleAbstract extends AbstractAgentRunningModule { private synchronized void setAppendedPrompt(PartnerRunningFlowContext context) { AppendPromptData data = new AppendPromptData(); data.setModuleName(moduleName()); diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/ActionDispatcher.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/ActionDispatcher.java index 33cac949..880c1072 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/ActionDispatcher.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/ActionDispatcher.java @@ -10,7 +10,7 @@ import work.slhaf.partner.core.action.ActionCore; import work.slhaf.partner.core.action.entity.ExecutableAction; import work.slhaf.partner.core.action.entity.ImmediateExecutableAction; import work.slhaf.partner.core.action.entity.SchedulableExecutableAction; -import work.slhaf.partner.module.common.module.PostRunningModule; +import work.slhaf.partner.module.common.module.PostRunningAbstractAgentModuleAbstract; import work.slhaf.partner.module.modules.action.dispatcher.executor.ActionExecutor; import work.slhaf.partner.module.modules.action.dispatcher.executor.entity.ActionExecutorInput; import work.slhaf.partner.module.modules.action.dispatcher.scheduler.ActionScheduler; @@ -21,7 +21,7 @@ import java.util.Set; import java.util.concurrent.ExecutorService; @AgentModule(name = "action_dispatcher", order = 7) -public class ActionDispatcher extends PostRunningModule { +public class ActionDispatcher extends PostRunningAbstractAgentModuleAbstract { @InjectCapability private ActionCapability actionCapability; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionCorrector.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionCorrector.java index c1a12a28..e3888968 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionCorrector.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionCorrector.java @@ -2,8 +2,8 @@ package work.slhaf.partner.module.modules.action.dispatcher.executor; import com.alibaba.fastjson2.JSONObject; import lombok.val; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.abstracts.ActivateModel; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.module.modules.action.dispatcher.executor.entity.CorrectorInput; import work.slhaf.partner.module.modules.action.dispatcher.executor.entity.CorrectorResult; @@ -12,7 +12,7 @@ import work.slhaf.partner.module.modules.action.dispatcher.executor.entity.Corre * 负责在单组行动执行后,根据行动意图与结果检查后续行动是否符合目的,必要时直接调整行动链,或发起自对话请求进行干预 */ @AgentSubModule -public class ActionCorrector extends AgentRunningSubModule implements ActivateModel { +public class ActionCorrector extends AbstractAgentSubModule implements ActivateModel { @Override public CorrectorResult execute(CorrectorInput input) { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionExecutor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionExecutor.java index f48d5783..6e2fac01 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionExecutor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionExecutor.java @@ -3,7 +3,7 @@ package work.slhaf.partner.module.modules.action.dispatcher.executor; import lombok.extern.slf4j.Slf4j; import lombok.val; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.Init; import work.slhaf.partner.api.agent.factory.module.annotation.InjectModule; @@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicInteger; @Slf4j @AgentSubModule -public class ActionExecutor extends AgentRunningSubModule { +public class ActionExecutor extends AbstractAgentSubModule { @InjectCapability private ActionCapability actionCapability; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionRepairer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionRepairer.java index 193c31f6..52d18ce1 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionRepairer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionRepairer.java @@ -6,8 +6,8 @@ import com.alibaba.fastjson2.TypeReference; import lombok.Data; import lombok.extern.slf4j.Slf4j; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.abstracts.ActivateModel; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.Init; import work.slhaf.partner.api.agent.factory.module.annotation.InjectModule; @@ -45,7 +45,7 @@ import java.util.concurrent.atomic.AtomicInteger; */ @Slf4j @AgentSubModule -public class ActionRepairer extends AgentRunningSubModule implements ActivateModel { +public class ActionRepairer extends AbstractAgentSubModule implements ActivateModel { @InjectCapability private ActionCapability actionCapability; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/DynamicActionGenerator.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/DynamicActionGenerator.java index cacc2ee2..1f254ec8 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/DynamicActionGenerator.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/DynamicActionGenerator.java @@ -3,8 +3,8 @@ package work.slhaf.partner.module.modules.action.dispatcher.executor; import com.alibaba.fastjson2.JSONObject; import lombok.val; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.abstracts.ActivateModel; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.Init; import work.slhaf.partner.api.chat.pojo.ChatResponse; @@ -20,7 +20,7 @@ import work.slhaf.partner.module.modules.action.dispatcher.executor.entity.Gener * 负责依据输入内容生成可执行的动态行动单元,并选择是否持久化至 SandboxRunner 容器内 */ @AgentSubModule -public class DynamicActionGenerator extends AgentRunningSubModule +public class DynamicActionGenerator extends AbstractAgentSubModule implements ActivateModel { @InjectCapability diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ParamsExtractor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ParamsExtractor.java index 98a02cc5..06776e65 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ParamsExtractor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ParamsExtractor.java @@ -3,8 +3,8 @@ package work.slhaf.partner.module.modules.action.dispatcher.executor; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import lombok.extern.slf4j.Slf4j; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.abstracts.ActivateModel; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.chat.pojo.ChatResponse; import work.slhaf.partner.core.action.entity.MetaActionInfo; @@ -20,7 +20,7 @@ import java.util.List; */ @Slf4j @AgentSubModule -public class ParamsExtractor extends AgentRunningSubModule implements ActivateModel { +public class ParamsExtractor extends AbstractAgentSubModule implements ActivateModel { @Override public ExtractorResult execute(ExtractorInput input) { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/scheduler/ActionScheduler.kt b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/scheduler/ActionScheduler.kt index 0a27bcd5..df6dc266 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/scheduler/ActionScheduler.kt +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/scheduler/ActionScheduler.kt @@ -12,7 +12,7 @@ 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.module.abstracts.AgentRunningSubModule +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule import work.slhaf.partner.api.agent.factory.module.annotation.Init import work.slhaf.partner.api.agent.factory.module.annotation.InjectModule @@ -31,7 +31,7 @@ import java.util.stream.Collectors import kotlin.jvm.optionals.getOrNull @AgentSubModule -class ActionScheduler : AgentRunningSubModule, Void>() { +class ActionScheduler : AbstractAgentSubModule, Void>() { @InjectCapability private lateinit var actionCapability: ActionCapability diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/interventor/ActionInterventor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/interventor/ActionInterventor.java index e1e9d096..44a9e0e8 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/interventor/ActionInterventor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/interventor/ActionInterventor.java @@ -13,7 +13,7 @@ import work.slhaf.partner.core.action.entity.ExecutableAction; import work.slhaf.partner.core.action.entity.PhaserRecord; import work.slhaf.partner.core.cognation.CognationCapability; import work.slhaf.partner.core.memory.MemoryCapability; -import work.slhaf.partner.module.common.module.PreRunningModule; +import work.slhaf.partner.module.common.module.PreRunningAbstractAgentModuleAbstract; import work.slhaf.partner.module.modules.action.interventor.entity.InterventionType; import work.slhaf.partner.module.modules.action.interventor.entity.MetaIntervention; import work.slhaf.partner.module.modules.action.interventor.evaluator.InterventionEvaluator; @@ -35,7 +35,7 @@ import java.util.stream.Stream; * 负责识别潜在的行动干预信息,作用于正在进行或已存在的行动池中内容 */ @AgentModule(name = "action_identifier", order = 2) -public class ActionInterventor extends PreRunningModule implements ActivateModel { +public class ActionInterventor extends PreRunningAbstractAgentModuleAbstract implements ActivateModel { @InjectModule private InterventionRecognizer interventionRecognizer; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/interventor/evaluator/InterventionEvaluator.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/interventor/evaluator/InterventionEvaluator.java index efbfabbd..588a6baf 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/interventor/evaluator/InterventionEvaluator.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/interventor/evaluator/InterventionEvaluator.java @@ -3,8 +3,8 @@ package work.slhaf.partner.module.modules.action.interventor.evaluator; import com.alibaba.fastjson2.JSONObject; import lombok.extern.slf4j.Slf4j; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.abstracts.ActivateModel; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.chat.pojo.ChatResponse; import work.slhaf.partner.api.chat.pojo.Message; @@ -23,7 +23,7 @@ import java.util.concurrent.ExecutorService; @Slf4j @AgentSubModule -public class InterventionEvaluator extends AgentRunningSubModule +public class InterventionEvaluator extends AbstractAgentSubModule implements ActivateModel { @InjectCapability diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/interventor/recognizer/InterventionRecognizer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/interventor/recognizer/InterventionRecognizer.java index f2c7feb0..e336d6ce 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/interventor/recognizer/InterventionRecognizer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/interventor/recognizer/InterventionRecognizer.java @@ -3,8 +3,8 @@ package work.slhaf.partner.module.modules.action.interventor.recognizer; import com.alibaba.fastjson2.JSONObject; import lombok.extern.slf4j.Slf4j; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.abstracts.ActivateModel; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.chat.pojo.ChatResponse; import work.slhaf.partner.core.action.ActionCapability; @@ -21,7 +21,7 @@ import java.util.concurrent.ExecutorService; @Slf4j @AgentSubModule -public class InterventionRecognizer extends AgentRunningSubModule implements ActivateModel { +public class InterventionRecognizer extends AbstractAgentSubModule implements ActivateModel { @InjectCapability private ActionCapability actionCapability; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/ActionPlanner.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/ActionPlanner.java index f45242eb..4bf421a4 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/ActionPlanner.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/ActionPlanner.java @@ -17,7 +17,7 @@ import work.slhaf.partner.core.action.entity.cache.CacheAdjustMetaData; import work.slhaf.partner.core.cognation.CognationCapability; import work.slhaf.partner.core.memory.MemoryCapability; import work.slhaf.partner.core.perceive.PerceiveCapability; -import work.slhaf.partner.module.common.module.PreRunningModule; +import work.slhaf.partner.module.common.module.PreRunningAbstractAgentModuleAbstract; import work.slhaf.partner.module.modules.action.planner.confirmer.ActionConfirmer; import work.slhaf.partner.module.modules.action.planner.confirmer.entity.ConfirmerInput; import work.slhaf.partner.module.modules.action.planner.confirmer.entity.ConfirmerResult; @@ -39,7 +39,7 @@ import java.util.concurrent.atomic.AtomicBoolean; */ @Slf4j @AgentModule(name = "action_planner", order = 2) -public class ActionPlanner extends PreRunningModule { +public class ActionPlanner extends PreRunningAbstractAgentModuleAbstract { @InjectCapability private CognationCapability cognationCapability; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/confirmer/ActionConfirmer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/confirmer/ActionConfirmer.java index 00b644ea..dd8751d5 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/confirmer/ActionConfirmer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/confirmer/ActionConfirmer.java @@ -4,8 +4,8 @@ import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import lombok.extern.slf4j.Slf4j; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.abstracts.ActivateModel; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.chat.pojo.ChatResponse; import work.slhaf.partner.api.chat.pojo.Message; @@ -23,7 +23,7 @@ import static work.slhaf.partner.common.util.ExtractUtil.extractJson; @Slf4j @AgentSubModule -public class ActionConfirmer extends AgentRunningSubModule implements ActivateModel { +public class ActionConfirmer extends AbstractAgentSubModule implements ActivateModel { @InjectCapability private ActionCapability actionCapability; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/evaluator/ActionEvaluator.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/evaluator/ActionEvaluator.java index 92965a60..e3639ab9 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/evaluator/ActionEvaluator.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/evaluator/ActionEvaluator.java @@ -4,8 +4,8 @@ import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.abstracts.ActivateModel; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.Init; import work.slhaf.partner.api.chat.pojo.ChatResponse; @@ -23,7 +23,7 @@ import java.util.Map; import java.util.concurrent.Callable; @AgentSubModule -public class ActionEvaluator extends AgentRunningSubModule> implements ActivateModel { +public class ActionEvaluator extends AbstractAgentSubModule> implements ActivateModel { @InjectCapability private ActionCapability actionCapability; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/extractor/ActionExtractor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/extractor/ActionExtractor.java index dc224cec..79d45fb9 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/extractor/ActionExtractor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/extractor/ActionExtractor.java @@ -3,8 +3,8 @@ package work.slhaf.partner.module.modules.action.planner.extractor; import com.alibaba.fastjson2.JSONObject; import lombok.extern.slf4j.Slf4j; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.abstracts.ActivateModel; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.chat.pojo.ChatResponse; import work.slhaf.partner.core.action.ActionCapability; @@ -15,7 +15,7 @@ import java.util.List; @Slf4j @AgentSubModule -public class ActionExtractor extends AgentRunningSubModule implements ActivateModel { +public class ActionExtractor extends AbstractAgentSubModule implements ActivateModel { @InjectCapability private ActionCapability actionCapability; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/core/CoreModel.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/core/CoreModel.java index e8171aa6..7836b34c 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/core/CoreModel.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/core/CoreModel.java @@ -5,8 +5,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentRunningModule; import work.slhaf.partner.api.agent.factory.module.abstracts.ActivateModel; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningModule; import work.slhaf.partner.api.agent.factory.module.annotation.CoreModule; import work.slhaf.partner.api.agent.factory.module.annotation.Init; import work.slhaf.partner.api.chat.constant.ChatConstant; @@ -29,7 +29,7 @@ import static work.slhaf.partner.common.util.ExtractUtil.extractJson; @Data @Slf4j @CoreModule -public class CoreModel extends AgentRunningModule implements ActivateModel { +public class CoreModel extends AbstractAgentRunningModule implements ActivateModel { @InjectCapability private CognationCapability cognationCapability; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/MemorySelector.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/MemorySelector.java index 954125ff..f48e8846 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/MemorySelector.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/MemorySelector.java @@ -14,7 +14,7 @@ import work.slhaf.partner.core.memory.exception.UnExistedTopicException; import work.slhaf.partner.core.memory.pojo.EvaluatedSlice; import work.slhaf.partner.core.memory.pojo.MemoryResult; import work.slhaf.partner.core.memory.pojo.MemorySlice; -import work.slhaf.partner.module.common.module.PreRunningModule; +import work.slhaf.partner.module.common.module.PreRunningAbstractAgentModuleAbstract; import work.slhaf.partner.module.modules.memory.selector.evaluator.SliceSelectEvaluator; import work.slhaf.partner.module.modules.memory.selector.evaluator.entity.EvaluatorInput; import work.slhaf.partner.module.modules.memory.selector.extractor.MemorySelectExtractor; @@ -29,7 +29,7 @@ import java.util.*; @Data @Slf4j @AgentModule(name = "memory_selector", order = 2) -public class MemorySelector extends PreRunningModule { +public class MemorySelector extends PreRunningAbstractAgentModuleAbstract { @InjectCapability private MemoryCapability memoryCapability; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/SliceSelectEvaluator.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/SliceSelectEvaluator.java index 638313ab..259b317c 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/SliceSelectEvaluator.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/SliceSelectEvaluator.java @@ -6,8 +6,8 @@ import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.abstracts.ActivateModel; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.Init; import work.slhaf.partner.common.thread.InteractionThreadPoolExecutor; @@ -32,7 +32,7 @@ import static work.slhaf.partner.common.util.ExtractUtil.extractJson; @Data @Slf4j @AgentSubModule -public class SliceSelectEvaluator extends AgentRunningSubModule> implements ActivateModel { +public class SliceSelectEvaluator extends AbstractAgentSubModule> implements ActivateModel { private InteractionThreadPoolExecutor executor; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/MemorySelectExtractor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/MemorySelectExtractor.java index b0164dd6..44b47119 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/MemorySelectExtractor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/MemorySelectExtractor.java @@ -6,8 +6,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.abstracts.ActivateModel; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.chat.pojo.Message; import work.slhaf.partner.api.chat.pojo.MetaMessage; @@ -29,7 +29,7 @@ import static work.slhaf.partner.common.util.ExtractUtil.fixTopicPath; @Data @Slf4j @AgentSubModule -public class MemorySelectExtractor extends AgentRunningSubModule +public class MemorySelectExtractor extends AbstractAgentSubModule implements ActivateModel { @InjectCapability diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/MemoryUpdater.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/MemoryUpdater.java index 616c1bf8..03f4c769 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/MemoryUpdater.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/MemoryUpdater.java @@ -15,7 +15,7 @@ import work.slhaf.partner.core.cognation.CognationCapability; import work.slhaf.partner.core.memory.MemoryCapability; import work.slhaf.partner.core.memory.pojo.MemorySlice; import work.slhaf.partner.core.perceive.PerceiveCapability; -import work.slhaf.partner.module.common.module.PostRunningModule; +import work.slhaf.partner.module.common.module.PostRunningAbstractAgentModuleAbstract; import work.slhaf.partner.module.modules.memory.updater.summarizer.MultiSummarizer; import work.slhaf.partner.module.modules.memory.updater.summarizer.SingleSummarizer; import work.slhaf.partner.module.modules.memory.updater.summarizer.TotalSummarizer; @@ -34,7 +34,7 @@ import static work.slhaf.partner.common.util.ExtractUtil.extractUserId; @Data @Slf4j @AgentModule(name = "memory_updater", order = 7) -public class MemoryUpdater extends PostRunningModule { +public class MemoryUpdater extends PostRunningAbstractAgentModuleAbstract { private static final long SCHEDULED_UPDATE_INTERVAL = 10 * 1000; private static final long UPDATE_TRIGGER_INTERVAL = 60 * 60 * 1000; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/MultiSummarizer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/MultiSummarizer.java index ee2649b9..a8f43b13 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/MultiSummarizer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/MultiSummarizer.java @@ -5,8 +5,8 @@ import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.abstracts.ActivateModel; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.Init; import work.slhaf.partner.api.chat.pojo.ChatResponse; @@ -23,7 +23,7 @@ import static work.slhaf.partner.common.util.ExtractUtil.fixTopicPath; @Data @Slf4j @AgentSubModule -public class MultiSummarizer extends AgentRunningSubModule implements ActivateModel { +public class MultiSummarizer extends AbstractAgentSubModule implements ActivateModel { @Init public void init() { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/SingleSummarizer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/SingleSummarizer.java index 9ab7881e..dcc6b3fe 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/SingleSummarizer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/SingleSummarizer.java @@ -4,8 +4,8 @@ import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.abstracts.ActivateModel; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.Init; import work.slhaf.partner.api.chat.constant.ChatConstant; @@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger; @Slf4j @Data @AgentSubModule -public class SingleSummarizer extends AgentRunningSubModule,Void> implements ActivateModel { +public class SingleSummarizer extends AbstractAgentSubModule, Void> implements ActivateModel { private InteractionThreadPoolExecutor executor; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/TotalSummarizer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/TotalSummarizer.java index 4f580244..56795346 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/TotalSummarizer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/TotalSummarizer.java @@ -5,8 +5,8 @@ import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.abstracts.ActivateModel; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.Init; import work.slhaf.partner.api.chat.pojo.ChatResponse; @@ -19,7 +19,7 @@ import static work.slhaf.partner.common.util.ExtractUtil.extractJson; @Data @Slf4j @AgentSubModule -public class TotalSummarizer extends AgentRunningSubModule, String> implements ActivateModel { +public class TotalSummarizer extends AbstractAgentSubModule, String> implements ActivateModel { @Init public void init() { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/selector/PerceiveSelector.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/selector/PerceiveSelector.java index d3f12d8e..683bfe4b 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/selector/PerceiveSelector.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/selector/PerceiveSelector.java @@ -6,7 +6,7 @@ import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapabili import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; import work.slhaf.partner.core.perceive.PerceiveCapability; import work.slhaf.partner.core.perceive.pojo.User; -import work.slhaf.partner.module.common.module.PreRunningModule; +import work.slhaf.partner.module.common.module.PreRunningAbstractAgentModuleAbstract; import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; import java.util.HashMap; @@ -15,7 +15,7 @@ import java.util.Map; @Slf4j @Setter @AgentModule(name = "perceive_selector",order = 2) -public class PerceiveSelector extends PreRunningModule { +public class PerceiveSelector extends PreRunningAbstractAgentModuleAbstract { @InjectCapability private PerceiveCapability perceiveCapability; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/PerceiveUpdater.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/PerceiveUpdater.java index 649c71d9..09c3ce71 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/PerceiveUpdater.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/PerceiveUpdater.java @@ -11,7 +11,7 @@ import work.slhaf.partner.common.thread.InteractionThreadPoolExecutor; import work.slhaf.partner.core.cognation.CognationCapability; import work.slhaf.partner.core.perceive.PerceiveCapability; import work.slhaf.partner.core.perceive.pojo.User; -import work.slhaf.partner.module.common.module.PostRunningModule; +import work.slhaf.partner.module.common.module.PostRunningAbstractAgentModuleAbstract; import work.slhaf.partner.module.modules.perceive.updater.relation_extractor.RelationExtractor; import work.slhaf.partner.module.modules.perceive.updater.relation_extractor.entity.RelationExtractResult; import work.slhaf.partner.module.modules.perceive.updater.static_extractor.StaticMemoryExtractor; @@ -30,7 +30,7 @@ import java.util.concurrent.locks.ReentrantLock; @Slf4j @Data @AgentModule(name = "perceive_updater", order = 7) -public class PerceiveUpdater extends PostRunningModule { +public class PerceiveUpdater extends PostRunningAbstractAgentModuleAbstract { @InjectCapability private PerceiveCapability perceiveCapability; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/relation_extractor/RelationExtractor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/relation_extractor/RelationExtractor.java index a2c65b24..90bdc719 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/relation_extractor/RelationExtractor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/relation_extractor/RelationExtractor.java @@ -4,8 +4,8 @@ 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.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.abstracts.ActivateModel; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.chat.pojo.ChatResponse; import work.slhaf.partner.api.chat.pojo.Message; @@ -23,7 +23,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Data @AgentSubModule -public class RelationExtractor extends AgentRunningSubModule implements ActivateModel { +public class RelationExtractor extends AbstractAgentSubModule implements ActivateModel { @InjectCapability private CognationCapability cognationCapability; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/static_extractor/StaticMemoryExtractor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/static_extractor/StaticMemoryExtractor.java index 1b7b5086..bf880b56 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/static_extractor/StaticMemoryExtractor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/static_extractor/StaticMemoryExtractor.java @@ -5,8 +5,8 @@ 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.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.abstracts.ActivateModel; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.chat.pojo.ChatResponse; import work.slhaf.partner.core.cognation.CognationCapability; @@ -19,7 +19,7 @@ import java.util.HashMap; @EqualsAndHashCode(callSuper = true) @Data @AgentSubModule -public class StaticMemoryExtractor extends AgentRunningSubModule> implements ActivateModel { +public class StaticMemoryExtractor extends AbstractAgentSubModule> implements ActivateModel { @InjectCapability private CognationCapability cognationCapability; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PostprocessExecutor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PostprocessExecutor.java index 00900cc5..b0bfd5c6 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PostprocessExecutor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PostprocessExecutor.java @@ -4,7 +4,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningModule; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentRunningModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; import work.slhaf.partner.core.cognation.CognationCapability; import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; @@ -13,7 +13,7 @@ import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowCon @Slf4j @Data @AgentModule(name = "postprocess_executor", order = 6) -public class PostprocessExecutor extends AgentRunningModule { +public class PostprocessExecutor extends AbstractAgentRunningModule { private static final int POST_PROCESS_TRIGGER_ROLL_LIMIT = 36; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PreprocessExecutor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PreprocessExecutor.java index ab4de789..f4733643 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PreprocessExecutor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PreprocessExecutor.java @@ -8,7 +8,7 @@ import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; import work.slhaf.partner.core.cognation.CognationCapability; import work.slhaf.partner.core.perceive.PerceiveCapability; import work.slhaf.partner.core.perceive.pojo.User; -import work.slhaf.partner.module.common.module.PreRunningModule; +import work.slhaf.partner.module.common.module.PreRunningAbstractAgentModuleAbstract; import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; import work.slhaf.partner.runtime.interaction.data.context.subcontext.CoreContext; @@ -21,7 +21,7 @@ import java.util.Map; @Data @Slf4j @AgentModule(name = "preprocess_executor", order = 1) -public class PreprocessExecutor extends PreRunningModule { +public class PreprocessExecutor extends PreRunningAbstractAgentModuleAbstract { @InjectCapability private CognationCapability cognationCapability; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleCheckFactory.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleCheckFactory.java index a4df89e5..407c7299 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleCheckFactory.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleCheckFactory.java @@ -4,9 +4,9 @@ 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.context.AgentRegisterContext; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentRunningModule; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.abstracts.ActivateModel; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningModule; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.AfterExecute; import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; @@ -31,7 +31,7 @@ import static work.slhaf.partner.api.agent.util.AgentUtil.getMethodAnnotationTyp *
    *
  1. *

    {@link ModuleCheckFactory#annotationAbstractCheck(Set, Class)}

    - * 所有添加了 {@link AgentModule} 注解的类都将作为Agent的执行模块,为规范模块入口,都必须实现抽象类: {@link AgentRunningModule}; {@link AgentSubModule} 注解所在类则必须实现 {@link AgentRunningSubModule} + * 所有添加了 {@link AgentModule} 注解的类都将作为Agent的执行模块,为规范模块入口,都必须实现抽象类: {@link AbstractAgentRunningModule}; {@link AgentSubModule} 注解所在类则必须实现 {@link AbstractAgentSubModule} *
  2. *
  3. *

    {@link ModuleCheckFactory#moduleConstructorsCheck(Set)}

    @@ -60,8 +60,8 @@ public class ModuleCheckFactory extends AgentBaseFactory { ExtendedModules extendedModules = getExtendedModules(); checkIfClassCorresponds(annotatedModules, extendedModules); //检查注解AgentModule或AgentSubModule所在类是否继承了对应的抽象类 - annotationAbstractCheck(annotatedModules.moduleTypes(), AgentRunningModule.class); - annotationAbstractCheck(annotatedModules.subModuleTypes(), AgentRunningSubModule.class); + annotationAbstractCheck(annotatedModules.moduleTypes(), AbstractAgentRunningModule.class); + annotationAbstractCheck(annotatedModules.subModuleTypes(), AbstractAgentSubModule.class); //检查AgentModule是否具备无参构造方法 moduleConstructorsCheck(annotatedModules.moduleTypes()); moduleConstructorsCheck(annotatedModules.subModuleTypes()); @@ -72,11 +72,11 @@ public class ModuleCheckFactory extends AgentBaseFactory { } private ExtendedModules getExtendedModules() { - Set> moduleTypes = reflections.getSubTypesOf(AgentRunningModule.class) + Set> moduleTypes = reflections.getSubTypesOf(AbstractAgentRunningModule.class) .stream() .filter(ClassUtil::isNormalClass) .collect(Collectors.toSet()); - Set> subModuleTypes = reflections.getSubTypesOf(AgentRunningSubModule.class) + Set> subModuleTypes = reflections.getSubTypesOf(AbstractAgentSubModule.class) .stream() .filter(ClassUtil::isNormalClass) .collect(Collectors.toSet()); @@ -156,10 +156,10 @@ public class ModuleCheckFactory extends AgentBaseFactory { private void checkLocation(Set> types) { for (Class type : types) { - if (AgentRunningModule.class.isAssignableFrom(type)) { + if (AbstractAgentRunningModule.class.isAssignableFrom(type)) { continue; } - if (AgentRunningSubModule.class.isAssignableFrom(type)) { + if (AbstractAgentSubModule.class.isAssignableFrom(type)) { continue; } if (ActivateModel.class.isAssignableFrom(type)) { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleInitHookExecuteFactory.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleInitHookExecuteFactory.java index bbd58304..3e43b73f 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleInitHookExecuteFactory.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleInitHookExecuteFactory.java @@ -4,9 +4,9 @@ import work.slhaf.partner.api.agent.factory.AgentBaseFactory; import work.slhaf.partner.api.agent.factory.AgentRegisterFactory; import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext; import work.slhaf.partner.api.agent.factory.context.ModuleFactoryContext; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningModule; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; -import work.slhaf.partner.api.agent.factory.module.abstracts.Module; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentModule; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentRunningModule; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.Init; import work.slhaf.partner.api.agent.factory.module.exception.ModuleInitHookExecuteFailedException; import work.slhaf.partner.api.agent.factory.module.pojo.BaseMetaModule; @@ -59,12 +59,12 @@ public class ModuleInitHookExecuteFactory extends AgentBaseFactory { protected void run() { //遍历模块列表,并向上查找@Init注解 for (MetaSubModule metaSubModule : subModuleList) { - List initHookMethods = collectInitHookMethods(metaSubModule.getClazz(),AgentRunningModule.class); + List initHookMethods = collectInitHookMethods(metaSubModule.getClazz(), AbstractAgentRunningModule.class); proceedInitMethods(metaSubModule, initHookMethods); } for (MetaModule metaModule : moduleList) { - List initHookMethods = collectInitHookMethods(metaModule.getClazz(), AgentRunningSubModule.class); + List initHookMethods = collectInitHookMethods(metaModule.getClazz(), AbstractAgentSubModule.class); proceedInitMethods(metaModule, initHookMethods); } } @@ -79,7 +79,7 @@ public class ModuleInitHookExecuteFactory extends AgentBaseFactory { } } - private List collectInitHookMethods(Class clazz, Class target) { + private List collectInitHookMethods(Class clazz, Class target) { Set> classes = collectExtendedClasses(clazz, target); return classes.stream() .map(Class::getDeclaredMethods) diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleProxyFactory.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleProxyFactory.java index 63dc4723..a5c355a8 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleProxyFactory.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleProxyFactory.java @@ -10,9 +10,9 @@ import work.slhaf.partner.api.agent.factory.capability.CapabilityCheckFactory; import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext; import work.slhaf.partner.api.agent.factory.context.CapabilityFactoryContext; import work.slhaf.partner.api.agent.factory.context.ModuleFactoryContext; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningModule; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; -import work.slhaf.partner.api.agent.factory.module.abstracts.Module; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentModule; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentRunningModule; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.AfterExecute; import work.slhaf.partner.api.agent.factory.module.annotation.BeforeExecute; import work.slhaf.partner.api.agent.factory.module.annotation.InjectModule; @@ -96,8 +96,8 @@ public class ModuleProxyFactory extends AgentBaseFactory { } private void createProxiedInstances() { - generateModuleProxy(moduleList, AgentRunningModule.class); - generateModuleProxy(subModuleList, AgentRunningSubModule.class); + generateModuleProxy(moduleList, AbstractAgentRunningModule.class); + generateModuleProxy(subModuleList, AbstractAgentSubModule.class); updateInstanceMap(moduleInstances, moduleList); updateInstanceMap(subModuleInstances, subModuleList); updateCapabilityHolderInstances(); @@ -115,7 +115,7 @@ public class ModuleProxyFactory extends AgentBaseFactory { } - private void generateModuleProxy(List list, Class overrideSource) { + private void generateModuleProxy(List list, Class overrideSource) { for (BaseMetaModule module : list) { Class clazz = module.getClazz(); try { @@ -128,10 +128,10 @@ public class ModuleProxyFactory extends AgentBaseFactory { } } - private void generateProxiedInstances(MethodsListRecord record, BaseMetaModule module, Class overrideSource) { + private void generateProxiedInstances(MethodsListRecord record, BaseMetaModule module, Class overrideSource) { try { - Class clazz = module.getClazz(); - Class proxyClass = new ByteBuddy() + Class clazz = module.getClazz(); + Class proxyClass = new ByteBuddy() .subclass(clazz) .method(ElementMatchers.isOverriddenFrom(overrideSource)) .intercept(MethodDelegation.to(new ModuleProxyInterceptor(record.post, record.pre))) @@ -159,7 +159,7 @@ public class ModuleProxyFactory extends AgentBaseFactory { //获取该类本身的hook逻辑 collectHookMethods(post, pre, clazz); //获取它所继承、实现的抽象类或接口, 以Module为终点,收集继承链上所有父类和接口 - Set> classes = collectExtendedClasses(clazz, Module.class); + Set> classes = collectExtendedClasses(clazz, AbstractAgentModule.class); //获取这些类中的hook逻辑 collectHookMethods(post, pre, classes); return new MethodsListRecord(post, pre); diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleRegisterFactory.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleRegisterFactory.java index 29bbe867..2bf791b3 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleRegisterFactory.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleRegisterFactory.java @@ -5,8 +5,8 @@ import org.reflections.Reflections; import work.slhaf.partner.api.agent.factory.AgentBaseFactory; import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext; import work.slhaf.partner.api.agent.factory.context.ModuleFactoryContext; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningModule; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentRunningModule; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.agent.factory.module.annotation.CoreModule; @@ -60,34 +60,7 @@ public class ModuleRegisterFactory extends AgentBaseFactory { setSubModuleList(); } - private void setSubModuleList() { - Set> subModules = reflections.getTypesAnnotatedWith(AgentSubModule.class); - for (Class subModule : subModules) { - if (!ClassUtil.isNormalClass(subModule)) { - continue; - } - Class clazz = subModule.asSubclass(AgentRunningSubModule.class); - MetaSubModule metaSubModule = new MetaSubModule(); - metaSubModule.setClazz(clazz); - subModuleList.add(metaSubModule); - } - } - - private void setModuleList() { - //反射扫描获取@AgentModule所在类, 该部分为Agent流程执行模块 - Set> modules = reflections.getTypesAnnotatedWith(AgentModule.class); - for (Class module : modules) { - if (!ClassUtil.isNormalClass(module)) { - continue; - } - Class clazz = module.asSubclass(AgentRunningModule.class); - MetaModule metaModule = getMetaModule(clazz); - moduleList.add(metaModule); - } - moduleList.sort(Comparator.comparing(MetaModule::getOrder)); - } - - private static MetaModule getMetaModule(Class clazz) { + private static MetaModule getMetaModule(Class clazz) { MetaModule metaModule = new MetaModule(); AgentModule agentModule; if (clazz.isAnnotationPresent(CoreModule.class)){ @@ -101,4 +74,31 @@ public class ModuleRegisterFactory extends AgentBaseFactory { return metaModule; } + private void setSubModuleList() { + Set> subModules = reflections.getTypesAnnotatedWith(AgentSubModule.class); + for (Class subModule : subModules) { + if (!ClassUtil.isNormalClass(subModule)) { + continue; + } + Class clazz = subModule.asSubclass(AbstractAgentSubModule.class); + MetaSubModule metaSubModule = new MetaSubModule(); + metaSubModule.setClazz(clazz); + subModuleList.add(metaSubModule); + } + } + + private void setModuleList() { + //反射扫描获取@AgentModule所在类, 该部分为Agent流程执行模块 + Set> modules = reflections.getTypesAnnotatedWith(AgentModule.class); + for (Class module : modules) { + if (!ClassUtil.isNormalClass(module)) { + continue; + } + Class clazz = module.asSubclass(AbstractAgentRunningModule.class); + MetaModule metaModule = getMetaModule(clazz); + moduleList.add(metaModule); + } + moduleList.sort(Comparator.comparing(MetaModule::getOrder)); + } + } diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/Module.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AbstractAgentModule.java similarity index 86% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/Module.java rename to Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AbstractAgentModule.java index 1ea32107..99a79d77 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/Module.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AbstractAgentModule.java @@ -7,7 +7,7 @@ import work.slhaf.partner.api.agent.runtime.interaction.flow.entity.Model; /** * 模块基类 */ -public abstract class Module { +public abstract class AbstractAgentModule { @Getter @Setter diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AgentRunningModule.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AbstractAgentRunningModule.java similarity index 88% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AgentRunningModule.java rename to Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AbstractAgentRunningModule.java index 51751b80..36eac3fc 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AgentRunningModule.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AbstractAgentRunningModule.java @@ -11,7 +11,7 @@ import work.slhaf.partner.api.agent.runtime.interaction.flow.entity.RunningFlowC * 流程执行模块基类 */ @Slf4j -public abstract class AgentRunningModule extends Module { +public abstract class AbstractAgentRunningModule extends AbstractAgentModule { public abstract void execute(C context); @BeforeExecute @@ -30,7 +30,7 @@ public abstract class AgentRunningModule extends M } else if (this.getClass().isAnnotationPresent(CoreModule.class)) { return CoreModule.class.getAnnotation(AgentModule.class).name(); }else { - return "Unknown Module"; + return "Unknown AbstractAgentModule"; } } } diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AbstractAgentSubModule.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AbstractAgentSubModule.java new file mode 100644 index 00000000..e042809c --- /dev/null +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AbstractAgentSubModule.java @@ -0,0 +1,11 @@ +package work.slhaf.partner.api.agent.factory.module.abstracts; + + +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public abstract class AbstractAgentSubModule extends AbstractAgentModule { + + public abstract O execute(I data); + +} diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/ActivateModel.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/ActivateModel.java index 3c4aab76..3cf52475 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/ActivateModel.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/ActivateModel.java @@ -80,11 +80,11 @@ public interface ActivateModel { * @return 持有的model实例 */ default Model getModel() { - return ((Module) this).getModel(); + return ((AbstractAgentModule) this).getModel(); } default void setModel(Model model) { - ((Module) this).setModel(model); + ((AbstractAgentModule) this).setModel(model); } /** diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AgentRunningSubModule.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AgentRunningSubModule.java deleted file mode 100644 index 2d22f01d..00000000 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/abstracts/AgentRunningSubModule.java +++ /dev/null @@ -1,15 +0,0 @@ -package work.slhaf.partner.api.agent.factory.module.abstracts; - - -import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.agent.factory.module.annotation.AfterExecute; -import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; -import work.slhaf.partner.api.agent.factory.module.annotation.BeforeExecute; -import work.slhaf.partner.api.agent.factory.module.annotation.CoreModule; - -@Slf4j -public abstract class AgentRunningSubModule extends Module { - - public abstract O execute(I data); - -} diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AfterExecute.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AfterExecute.java index 64afd2c7..bcc497e2 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AfterExecute.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AfterExecute.java @@ -10,7 +10,7 @@ import java.lang.annotation.Target; * 仅适用于以下类中的方法: * 1. @AgentModule注解所在类 * 2. ActivateModel子类 - * 3. AgentRunningModule或者AgentRunningSubModule子类 + * 3. AbstractAgentRunningModule或者AbstractAgentSubModule子类 */ @Target(ElementType.METHOD) diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/BeforeExecute.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/BeforeExecute.java index 20ccc788..00a2bc56 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/BeforeExecute.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/BeforeExecute.java @@ -9,7 +9,7 @@ import java.lang.annotation.Target; * 仅适用于以下类中的方法: * 1. @AgentModule注解所在类 * 2. ActivateModel子类 - * 3. AgentRunningModule或者AgentRunningSubModule子类 + * 3. AbstractAgentRunningModule或者AbstractAgentSubModule子类 */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/BaseMetaModule.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/BaseMetaModule.java index 5f80eff6..9e39ea38 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/BaseMetaModule.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/BaseMetaModule.java @@ -1,10 +1,10 @@ package work.slhaf.partner.api.agent.factory.module.pojo; import lombok.Data; -import work.slhaf.partner.api.agent.factory.module.abstracts.Module; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentModule; @Data -public abstract class BaseMetaModule { +public abstract class BaseMetaModule { private Class clazz; private C instance; } diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaModule.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaModule.java index a5116694..f879b21d 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaModule.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaModule.java @@ -2,11 +2,11 @@ package work.slhaf.partner.api.agent.factory.module.pojo; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningModule; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentRunningModule; @EqualsAndHashCode(callSuper = true) @Data -public class MetaModule extends BaseMetaModule{ +public class MetaModule extends BaseMetaModule { private String name; private int order; private boolean enabled = true; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaSubModule.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaSubModule.java index 784748c3..9a2f7046 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaSubModule.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaSubModule.java @@ -2,9 +2,9 @@ package work.slhaf.partner.api.agent.factory.module.pojo; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningSubModule; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentSubModule; @EqualsAndHashCode(callSuper = true) @Data -public class MetaSubModule extends BaseMetaModule{ +public class MetaSubModule extends BaseMetaModule { } diff --git a/Partner-Framework/src/test/java/module/ModuleProxyTest.java b/Partner-Framework/src/test/java/module/AbstractAgentModuleProxyTest.java similarity index 61% rename from Partner-Framework/src/test/java/module/ModuleProxyTest.java rename to Partner-Framework/src/test/java/module/AbstractAgentModuleProxyTest.java index f5838e2c..c1840739 100644 --- a/Partner-Framework/src/test/java/module/ModuleProxyTest.java +++ b/Partner-Framework/src/test/java/module/AbstractAgentModuleProxyTest.java @@ -4,21 +4,21 @@ import net.bytebuddy.ByteBuddy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.matcher.ElementMatchers; import org.junit.jupiter.api.Test; -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningModule; +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentRunningModule; import java.io.IOException; import java.lang.reflect.InvocationTargetException; -public class ModuleProxyTest { +public class AbstractAgentModuleProxyTest { @Test public void test() throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException, IOException, ClassNotFoundException { - Class clazz = new ByteBuddy().subclass(MyAgentRunningModule.class) - .method(ElementMatchers.isOverriddenFrom(AgentRunningModule.class)) + Class clazz = new ByteBuddy().subclass(MyAbstractAgentRunningAbstractAgentModule.class) + .method(ElementMatchers.isOverriddenFrom(AbstractAgentRunningModule.class)) .intercept(MethodDelegation.to( new MyModuleProxyInterceptor() )) .make() - .load(ModuleProxyTest.class.getClassLoader()) + .load(AbstractAgentModuleProxyTest.class.getClassLoader()) .getLoaded(); clazz.getConstructor().newInstance().execute(null); } diff --git a/Partner-Framework/src/test/java/module/MyAbstractAgentRunningAbstractAgentModule.java b/Partner-Framework/src/test/java/module/MyAbstractAgentRunningAbstractAgentModule.java new file mode 100644 index 00000000..edbc6e3e --- /dev/null +++ b/Partner-Framework/src/test/java/module/MyAbstractAgentRunningAbstractAgentModule.java @@ -0,0 +1,11 @@ +package module; + +import work.slhaf.partner.api.agent.factory.module.abstracts.AbstractAgentRunningModule; +import work.slhaf.partner.api.agent.runtime.interaction.flow.entity.RunningFlowContext; + +public class MyAbstractAgentRunningAbstractAgentModule extends AbstractAgentRunningModule { + @Override + public void execute(RunningFlowContext context) { + System.out.println("MyAbstractAgentRunningAbstractAgentModule"); + } +} diff --git a/Partner-Framework/src/test/java/module/MyAgentRunningModule.java b/Partner-Framework/src/test/java/module/MyAgentRunningModule.java deleted file mode 100644 index 7d72bf3a..00000000 --- a/Partner-Framework/src/test/java/module/MyAgentRunningModule.java +++ /dev/null @@ -1,11 +0,0 @@ -package module; - -import work.slhaf.partner.api.agent.factory.module.abstracts.AgentRunningModule; -import work.slhaf.partner.api.agent.runtime.interaction.flow.entity.RunningFlowContext; - -public class MyAgentRunningModule extends AgentRunningModule { - @Override - public void execute(RunningFlowContext context) { - System.out.println("MyAgentRunningModule"); - } -}