From f9c3cacfeac3f317bb744fe5febef4e6a7a6fb8a Mon Sep 17 00:00:00 2001 From: slhafzjw Date: Tue, 28 Oct 2025 23:23:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E8=BF=9B=20ActionExecutor=20=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=9A=84=E5=8A=A8=E6=80=81=E6=8F=92=E6=8B=94=E5=BC=8F?= =?UTF-8?q?=E8=A1=8C=E5=8A=A8=E8=B0=83=E5=BA=A6=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除先前构想的 SpecializedPartnerInputData 及相关类，无论是自反思、向用户求助还是用户主动干预，都应当通过语义识别来作用于对应行动事件，使用固定行动id的机制不足以支撑这种机制 - 在 ActionCore 中新增执行中行动的 phaser 管理逻辑 - 新增几个异常类，适用于行动数据加载的异常情况 - 新增 ActionIdentifier 负责行动干预意图的识别 - --- .../partner/core/action/ActionCapability.java | 12 ++++ .../slhaf/partner/core/action/ActionCore.java | 56 ++++++++++++++++- .../core/action/ActionWatchService.java | 8 +-- .../core/action/entity/ActionData.java | 1 + .../core/action/entity/MetaAction.java | 6 +- .../ActionDataNotFoundException.java | 13 ++++ .../MetaActionNotFoundException.java | 13 ++++ .../slhaf/partner/core/memory/MemoryCore.java | 2 +- .../dispatcher/executor/ActionExecutor.java | 63 ++++++++++--------- .../action/identifier/ActionIdentifier.java | 40 ++++++++++++ .../PartnerInteractionAdapter.java | 5 -- .../runtime/interaction/WebSocketGateway.java | 10 +-- .../interaction/data/PartnerInputData.java | 1 - .../interaction/data/PartnerInputType.java | 5 -- .../data/SpecializedPartnerInputData.java | 12 ---- .../data/SpecializedPayloadConstant.java | 7 --- .../context/PartnerRunningFlowContext.java | 5 -- 17 files changed, 177 insertions(+), 82 deletions(-) create mode 100644 Partner-Main/src/main/java/work/slhaf/partner/core/action/exception/ActionDataNotFoundException.java create mode 100644 Partner-Main/src/main/java/work/slhaf/partner/core/action/exception/MetaActionNotFoundException.java create mode 100644 Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/identifier/ActionIdentifier.java delete mode 100644 Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/data/PartnerInputType.java delete mode 100644 Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/data/SpecializedPartnerInputData.java delete mode 100644 Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/data/SpecializedPayloadConstant.java diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/action/ActionCapability.java b/Partner-Main/src/main/java/work/slhaf/partner/core/action/ActionCapability.java index 9a3e8627..5acccffa 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/action/ActionCapability.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/action/ActionCapability.java @@ -1,12 +1,15 @@ package work.slhaf.partner.core.action; +import lombok.NonNull; import work.slhaf.partner.api.agent.factory.capability.annotation.Capability; import work.slhaf.partner.core.action.entity.ActionData; +import work.slhaf.partner.core.action.entity.MetaAction; import work.slhaf.partner.core.action.entity.cache.CacheAdjustData; import java.util.List; import java.util.Set; import java.util.concurrent.ExecutorService; +import java.util.concurrent.Phaser; @Capability(value = "action") public interface ActionCapability { @@ -27,4 +30,13 @@ public interface ActionCapability { ExecutorService getExecutor(ActionCore.ExecutorType type); Set getExistedMetaActions(); + + void putPhaserRecord(Phaser phaser, ActionData actionData); + + void removePhaserRecord(Phaser phaser); + + ActionCore.PhaserRecord getPhaserRecord(String tendency, String source); + + MetaAction loadMetaAction(@NonNull String actionKey); + } diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/action/ActionCore.java b/Partner-Main/src/main/java/work/slhaf/partner/core/action/ActionCore.java index b7fe5a7e..da7a269d 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/action/ActionCore.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/action/ActionCore.java @@ -1,20 +1,26 @@ package work.slhaf.partner.core.action; +import cn.hutool.core.bean.BeanUtil; +import lombok.NonNull; 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.common.vector.VectorClient; import work.slhaf.partner.core.PartnerCore; import work.slhaf.partner.core.action.entity.ActionData; +import work.slhaf.partner.core.action.entity.MetaAction; import work.slhaf.partner.core.action.entity.MetaActionInfo; import work.slhaf.partner.core.action.entity.cache.ActionCacheData; import work.slhaf.partner.core.action.entity.cache.CacheAdjustData; import work.slhaf.partner.core.action.entity.cache.CacheAdjustMetaData; +import work.slhaf.partner.core.action.exception.ActionDataNotFoundException; +import work.slhaf.partner.core.action.exception.MetaActionNotFoundException; import java.io.IOException; import java.util.*; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.Phaser; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import java.util.stream.Collectors; @@ -44,7 +50,11 @@ public class ActionCore extends PartnerCore { private final ExecutorService platformExecutor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()); private final ExecutorService virtualExecutor = Executors.newVirtualThreadPerTaskExecutor(); + /** + * 已存在的行动程序，键为目录名，值为从目录加载的行动程序元信息 + */ private final LinkedHashMap existedMetaActions = new LinkedHashMap<>(); + private final List phaserRecords = new ArrayList<>(); public ActionCore() throws IOException, ClassNotFoundException { new ActionWatchService(existedMetaActions, virtualExecutor).launch(); @@ -67,7 +77,6 @@ public class ActionCore extends PartnerCore { .collect(Collectors.toList()); } - @CapabilityMethod public synchronized void putPendingActions(String userId, ActionData actionData) { pendingActions.computeIfAbsent(userId, k -> { @@ -171,6 +180,48 @@ public class ActionCore extends PartnerCore { return existedMetaActions.keySet(); } + @CapabilityMethod + public synchronized void putPhaserRecord(Phaser phaser, ActionData actionData) { + phaserRecords.add(new PhaserRecord(phaser, actionData)); + } + + @CapabilityMethod + public synchronized void removePhaserRecord(Phaser phaser) { + PhaserRecord remove = null; + for (PhaserRecord record : phaserRecords) { + if (record.phaser.equals(phaser)) { + remove = record; + } + } + + if (remove != null) { + phaserRecords.remove(remove); + } + } + + @CapabilityMethod + public PhaserRecord getPhaserRecord(String tendency, String source) { + for (PhaserRecord record : phaserRecords) { + ActionData data = record.actionData; + if (data.getTendency().equals(tendency) && data.getSource().equals(source)) { + return record; + } + } + throw new ActionDataNotFoundException("未找到对应的 Phaser 记录: tendency=" + tendency + ", source=" + source); + } + + @CapabilityMethod + public MetaAction loadMetaAction(@NonNull String actionKey) { + for (MetaActionInfo actionInfo : existedMetaActions.values()) { + if (actionInfo.getKey().equals(actionKey)) { + MetaAction metaAction = new MetaAction(); + BeanUtil.copyProperties(actionInfo, metaAction); + return metaAction; + } + } + throw new MetaActionNotFoundException("未找到对应的行动程序信息" + actionKey); + } + /** * 命中缓存且评估通过时 * @@ -268,4 +319,7 @@ public class ActionCore extends PartnerCore { public enum ExecutorType { VIRTUAL, PLATFORM } + + public record PhaserRecord(Phaser phaser, ActionData actionData) { + } } diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/action/ActionWatchService.java b/Partner-Main/src/main/java/work/slhaf/partner/core/action/ActionWatchService.java index a10cc59d..8af7987b 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/action/ActionWatchService.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/action/ActionWatchService.java @@ -21,9 +21,9 @@ import static work.slhaf.partner.common.Constant.Path.ACTION_PROGRAM; @Slf4j class ActionWatchService { - private HashMap registeredPaths = new HashMap<>(); - private LinkedHashMap existedMetaActions; - private ExecutorService virtualExecutor; + private final HashMap registeredPaths = new HashMap<>(); + private final LinkedHashMap existedMetaActions; + private final ExecutorService virtualExecutor; public ActionWatchService(LinkedHashMap existedMetaActions, ExecutorService virtualExecutor) { this.existedMetaActions = existedMetaActions; @@ -114,7 +114,7 @@ class ActionWatchService { private boolean checkComplete(Path thisDir) { File[] files = thisDir.toFile().listFiles(); if (files == null) { - log.error("[{}]当前目录无法访问: [{}]", thisDir); + log.error("当前目录无法访问: [{}]", thisDir); return false; } boolean existedAction = false; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/ActionData.java b/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/ActionData.java index f98be7b0..eadcf315 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/ActionData.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/ActionData.java @@ -17,6 +17,7 @@ public abstract class ActionData { protected String result; protected String reason; protected String description; + protected String source; public enum ActionStatus { SUCCESS, FAILED, EXECUTING, WAITING, PREPARE diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/MetaAction.java b/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/MetaAction.java index 6d5f9ab3..fafb6840 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/MetaAction.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/MetaAction.java @@ -26,7 +26,7 @@ public class MetaAction implements Comparable, Runnable { /** * 行动结果，包括执行状态和相应内容(执行结果或者错误信息) */ - private Result result = new Result(); + private final Result result = new Result(); /** * 执行顺序，升序排列 */ @@ -49,7 +49,6 @@ public class MetaAction implements Comparable, Runnable { public void run() { File action = loadFromFile(); if (!action.exists()) { - result = new Result(); result.setSuccess(false); result.setData("Action file not found: " + action.getAbsolutePath()); } @@ -60,7 +59,6 @@ public class MetaAction implements Comparable, Runnable { case SCRIPT -> executeScript(action); } } catch (Exception e) { - result = new Result(); result.setSuccess(false); result.setData(e.getMessage()); } @@ -89,7 +87,7 @@ public class MetaAction implements Comparable, Runnable { @Data public static class Result { private boolean success = true; - private String data; + private String data = null; } } diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/action/exception/ActionDataNotFoundException.java b/Partner-Main/src/main/java/work/slhaf/partner/core/action/exception/ActionDataNotFoundException.java new file mode 100644 index 00000000..8fd351bd --- /dev/null +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/action/exception/ActionDataNotFoundException.java @@ -0,0 +1,13 @@ +package work.slhaf.partner.core.action.exception; + +import work.slhaf.partner.api.agent.runtime.exception.AgentRuntimeException; + +public class ActionDataNotFoundException extends AgentRuntimeException { + public ActionDataNotFoundException(String message) { + super(message); + } + + public ActionDataNotFoundException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/action/exception/MetaActionNotFoundException.java b/Partner-Main/src/main/java/work/slhaf/partner/core/action/exception/MetaActionNotFoundException.java new file mode 100644 index 00000000..0c59e0b7 --- /dev/null +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/action/exception/MetaActionNotFoundException.java @@ -0,0 +1,13 @@ +package work.slhaf.partner.core.action.exception; + +import work.slhaf.partner.api.agent.runtime.exception.AgentRuntimeException; + +public class MetaActionNotFoundException extends AgentRuntimeException { + public MetaActionNotFoundException(String message) { + super(message); + } + + public MetaActionNotFoundException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/memory/MemoryCore.java b/Partner-Main/src/main/java/work/slhaf/partner/core/memory/MemoryCore.java index 98c6d4b6..3bd4be03 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/memory/MemoryCore.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/memory/MemoryCore.java @@ -488,7 +488,7 @@ public class MemoryCore extends PartnerCore { return targetParentNode; } - public void updateCacheCounter(List topicPath) { + private void updateCacheCounter(List topicPath) { ConcurrentHashMap, Integer> memoryNodeCacheCounter = cache.memoryNodeCacheCounter; if (memoryNodeCacheCounter.containsKey(topicPath)) { Integer tempCount = memoryNodeCacheCounter.get(topicPath); diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionExecutor.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionExecutor.java index 541c3d24..f50dc434 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionExecutor.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionExecutor.java @@ -12,7 +12,9 @@ import work.slhaf.partner.core.action.entity.ActionData; import work.slhaf.partner.core.action.entity.ImmediateActionData; import work.slhaf.partner.core.action.entity.MetaAction; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Phaser; @@ -26,8 +28,6 @@ public class ActionExecutor extends AgentRunningSubModule phaserRecorder = new HashMap<>(); - @Init public void init() { virtualExecutor = actionCapability.getExecutor(ActionCore.ExecutorType.VIRTUAL); @@ -48,6 +48,9 @@ public class ActionExecutor extends AgentRunningSubModule> actionChain = actionData.getActionChain(); List virtual = new ArrayList<>(); List platform = new ArrayList<>(); + Phaser phaser = new Phaser(); + phaser.register(); + actionCapability.putPhaserRecord(phaser, actionData); actionChain.forEach((k, v) -> { for (MetaAction metaAction : v) { // 根据io类型放入合适的列表 @@ -57,42 +60,44 @@ public class ActionExecutor extends AgentRunningSubModule virtual, List platform, LinkedHashMap> actionChain) { - Phaser phaser = new Phaser(); - phaser.register(); - String groupId = UUID.randomUUID().toString(); - phaserRecorder.put(groupId, new PhaserActionChain(phaser, actionChain)); - runGroupAction(virtual, virtualExecutor, actionChain, phaser); - runGroupAction(platform, platformExecutor, actionChain, phaser); - phaserRecorder.remove(groupId); - phaser.arriveAndAwaitAdvance(); + private void runGroupAction(List virtual, List platform, LinkedHashMap> actionChain, Phaser phaser) { + runGroupAction(virtual, virtualExecutor, phaser); + runGroupAction(platform, platformExecutor, phaser); } - private void runGroupAction(List actions, ExecutorService executor, LinkedHashMap> actionChain, Phaser phaser) { + private void runGroupAction(List actions, ExecutorService executor, Phaser phaser) { for (MetaAction action : actions) { phaser.register(); executor.execute(() -> { - MetaAction.Result result = action.getResult(); - do { - // 该循环对应LLM的调整参数后重试 - if (!result.isSuccess()) { - //TODO LLM决策是重构参数、执行自对话反思、还是选择向用户求助(通过cognationCore暴露方法，可能需要修改其他模块以进行适应)，仅重构参数时无需结束当前循环 - // 若使用Phaser作为执行线程与反思、求助等调用流程的同步协调，应当需要额外维护Phaser全局字段，获取到反思结果或者用户反馈后， - // 调用对应的phaser注册任务，在ActionExecutor中动态添加任务至actionChain,同时启动异步执行 - // 而且由于执行与放入的为同一个MetaAction对象，所以执行结果可被当前行动链获取，但virtual、executor两个列表似乎不行，需要重构执行模式，建议将行动链直接重构为LinkedHashMap，order为键 - String input = getInput(result.getData()); + try { + MetaAction.Result result = action.getResult(); + do { + // 该循环对应LLM的调整参数后重试 + if (!result.isSuccess()) { + //TODO LLM决策是重构参数、执行自对话反思、还是选择向用户求助(通过cognationCore暴露方法，可能需要修改其他模块以进行适应)，仅重构参数时无需结束当前循环 + // 若使用Phaser作为执行线程与反思、求助等调用流程的同步协调，应当需要额外维护Phaser全局字段，获取到反思结果或者用户反馈后， + // 调用对应的phaser注册任务，在ActionExecutor中动态添加任务至actionChain,同时启动异步执行 + // 而且由于执行与放入的为同一个MetaAction对象，所以执行结果可被当前行动链获取，但virtual、executor两个列表似乎不行，需要重构执行模式，建议将行动链直接重构为LinkedHashMap，order为键 + String input = getInput(result.getData()); - } - action.run(); - } while (!result.isSuccess()); - //TODO 将执行结果写入特定对话角色记忆(cognationCore暴露方法) - phaser.arriveAndDeregister(); + } + action.run(); + } while (!result.isSuccess()); + //TODO 将执行结果写入特定对话角色记忆(cognationCore暴露方法) + } finally { + phaser.arriveAndDeregister(); + } }); } } @@ -112,6 +117,4 @@ public class ActionExecutor extends AgentRunningSubModule> actionChain) { - } } diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/identifier/ActionIdentifier.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/identifier/ActionIdentifier.java new file mode 100644 index 00000000..db5635e2 --- /dev/null +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/identifier/ActionIdentifier.java @@ -0,0 +1,40 @@ +package work.slhaf.partner.module.modules.action.identifier; + +import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.runtime.interaction.flow.abstracts.ActivateModel; +import work.slhaf.partner.module.common.module.PreRunningModule; +import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; + +import java.util.HashMap; + +/** + * 负责识别潜在的行动干预信息，作用于正在进行或已存在的行动池中内容 + */ +@AgentModule(name = "action_identifier", order = 2) +public class ActionIdentifier extends PreRunningModule implements ActivateModel { + + @Override + protected void doExecute(PartnerRunningFlowContext context) { + + } + + @Override + public String modelKey() { + return ""; + } + + @Override + public boolean withBasicPrompt() { + return false; + } + + @Override + protected HashMap getPromptDataMap(PartnerRunningFlowContext context) { + return null; + } + + @Override + protected String moduleName() { + return ""; + } +} diff --git a/Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/PartnerInteractionAdapter.java b/Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/PartnerInteractionAdapter.java index 133942ce..a2223701 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/PartnerInteractionAdapter.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/PartnerInteractionAdapter.java @@ -3,7 +3,6 @@ package work.slhaf.partner.runtime.interaction; import work.slhaf.partner.api.agent.runtime.interaction.AgentInteractionAdapter; import work.slhaf.partner.runtime.interaction.data.PartnerInputData; import work.slhaf.partner.runtime.interaction.data.PartnerOutputData; -import work.slhaf.partner.runtime.interaction.data.SpecializedPartnerInputData; import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; public class PartnerInteractionAdapter extends AgentInteractionAdapter { @@ -34,10 +33,6 @@ public class PartnerInteractionAdapter extends AgentInteractionAdapter parsedObject.to(PartnerInputData.class); - case SYSTEM, ASSIST_REQUEST, REFLECTION -> parsedObject.to(SpecializedPartnerInputData.class); - }; + PartnerInputData inputData = JSONObject.parseObject(s, PartnerInputData.class); userSessions.put(inputData.getUserInfo(), webSocket); // 注册连接 receive(inputData); } diff --git a/Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/data/PartnerInputData.java b/Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/data/PartnerInputData.java index 2156fa17..07a26c29 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/data/PartnerInputData.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/data/PartnerInputData.java @@ -10,5 +10,4 @@ public class PartnerInputData extends AgentInputData { protected String userNickName; protected String platform; protected boolean single; - protected PartnerInputType inputType; } diff --git a/Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/data/PartnerInputType.java b/Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/data/PartnerInputType.java deleted file mode 100644 index ce81229c..00000000 --- a/Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/data/PartnerInputType.java +++ /dev/null @@ -1,5 +0,0 @@ -package work.slhaf.partner.runtime.interaction.data; - -public enum PartnerInputType { - NORMAL, REFLECTION, ASSIST_REQUEST, SYSTEM -} diff --git a/Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/data/SpecializedPartnerInputData.java b/Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/data/SpecializedPartnerInputData.java deleted file mode 100644 index d7f6d5e3..00000000 --- a/Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/data/SpecializedPartnerInputData.java +++ /dev/null @@ -1,12 +0,0 @@ -package work.slhaf.partner.runtime.interaction.data; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Map; - -@EqualsAndHashCode(callSuper = true) -@Data -public class SpecializedPartnerInputData extends PartnerInputData { - protected Map payload; -} diff --git a/Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/data/SpecializedPayloadConstant.java b/Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/data/SpecializedPayloadConstant.java deleted file mode 100644 index d6d7f360..00000000 --- a/Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/data/SpecializedPayloadConstant.java +++ /dev/null @@ -1,7 +0,0 @@ -package work.slhaf.partner.runtime.interaction.data; - -public class SpecializedPayloadConstant { - public static final String TASK_ID = "taskId"; - public static final String ACTION_ID = "actionId"; - public static final String TYPE = "inputType"; -} diff --git a/Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/data/context/PartnerRunningFlowContext.java b/Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/data/context/PartnerRunningFlowContext.java index 05be0182..74c985ab 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/data/context/PartnerRunningFlowContext.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/runtime/interaction/data/context/PartnerRunningFlowContext.java @@ -5,7 +5,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import work.slhaf.partner.api.agent.runtime.interaction.flow.entity.RunningFlowContext; import work.slhaf.partner.module.common.entity.AppendPromptData; -import work.slhaf.partner.runtime.interaction.data.PartnerInputType; import work.slhaf.partner.runtime.interaction.data.context.subcontext.CoreContext; import work.slhaf.partner.runtime.interaction.data.context.subcontext.ModuleContext; @@ -13,7 +12,6 @@ import java.io.Serial; import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.UUID; @EqualsAndHashCode(callSuper = true) @@ -32,9 +30,6 @@ public class PartnerRunningFlowContext extends RunningFlowContext { protected LocalDateTime dateTime; protected boolean single; - protected PartnerInputType type; - protected Map payload; - protected String input; protected CoreContext coreContext = new CoreContext();