From 663d66fdea774d7f56d471f208de84eb8eac6009 Mon Sep 17 00:00:00 2001 From: slhafzjw Date: Fri, 10 Apr 2026 14:31:56 +0800 Subject: [PATCH] chore: remove legacy exception handler and adjust runtime class location --- .../main/java/work/slhaf/partner/Main.java | 2 +- .../slhaf/partner/common/config/Config.java | 24 ------ .../exception/ConfigLoadFailedException.java | 13 --- .../exception/ServiceLoadFailedException.java | 13 --- .../core/action/entity/GeneratedData.java | 16 ---- .../partner/core/action/entity/McpData.java | 5 -- .../action/entity/cache/CacheAdjustData.java | 11 --- .../entity/cache/CacheAdjustMetaData.java | 10 --- .../ActionDataNotFoundException.java | 13 --- .../exception/ActionLoadFailedException.java | 13 --- .../runner/mcp/DynamicActionMcpManager.java | 2 +- .../action/runner/mcp/McpConfigWatcher.java | 2 +- .../action/runner/mcp/McpDescWatcher.java | 2 +- .../partner/core/cognition/CognitionCore.java | 2 +- .../exception/NullSliceListException.java | 7 -- .../partner/core/memory/pojo/SliceRef.java | 11 +-- .../core/memory/pojo/node/MemoryNode.java | 82 ------------------- .../core/memory/pojo/node/TopicNode.java | 20 ----- .../partner/core/perceive/pojo/User.java | 53 ------------ .../ActionExecutingFailedException.java | 14 ---- .../module/action/planner/ActionPlanner.java | 2 +- .../communication/CommunicationProducer.java | 2 +- .../module/memory/runtime/MemoryRuntime.java | 4 +- .../UnExistedDateIndexException.java | 2 +- .../exception/UnExistedTopicException.java | 2 +- .../memory/selector/ActivatedMemorySlice.java | 10 +-- .../memory/selector/MemorySelector.java | 6 +- .../module/memory/updater/MemoryUpdater.java | 2 +- .../UnExpectedMessageCountException.java | 7 -- .../module/perceive/PerceiveMonitor.java | 2 +- .../context => }/PartnerRunningFlowContext.kt | 4 +- .../exception/PartnerExceptionCallback.java | 54 ------------ .../exception/pojo/GlobalException.java | 23 ------ .../exception/pojo/GlobalExceptionData.java | 17 ---- .../WebSocketGateway.java | 4 +- .../WebSocketGatewayRegistration.kt | 2 +- .../common/entity/PersistableObject.java | 6 -- .../framework/agent/config/ConfigCenter.kt | 2 +- .../exception/AgentExceptionCallback.java | 7 -- .../exception/GlobalExceptionHandler.java | 39 --------- .../exception/LogAgentExceptionCallback.java | 17 ---- .../ExternalModulePathNotExistException.java | 11 --- .../framework/agent/model/pojo/Message.kt | 8 +- .../support/DirectoryWatchSupport.java | 2 +- .../support/DirectoryWatchSupportTest.java | 2 +- 45 files changed, 27 insertions(+), 525 deletions(-) delete mode 100644 Partner-Core/src/main/java/work/slhaf/partner/common/config/Config.java delete mode 100644 Partner-Core/src/main/java/work/slhaf/partner/common/exception/ConfigLoadFailedException.java delete mode 100644 Partner-Core/src/main/java/work/slhaf/partner/common/exception/ServiceLoadFailedException.java delete mode 100644 Partner-Core/src/main/java/work/slhaf/partner/core/action/entity/GeneratedData.java delete mode 100644 Partner-Core/src/main/java/work/slhaf/partner/core/action/entity/McpData.java delete mode 100644 Partner-Core/src/main/java/work/slhaf/partner/core/action/entity/cache/CacheAdjustData.java delete mode 100644 Partner-Core/src/main/java/work/slhaf/partner/core/action/entity/cache/CacheAdjustMetaData.java delete mode 100644 Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionDataNotFoundException.java delete mode 100644 Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionLoadFailedException.java delete mode 100644 Partner-Core/src/main/java/work/slhaf/partner/core/memory/exception/NullSliceListException.java delete mode 100644 Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/node/MemoryNode.java delete mode 100644 Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/node/TopicNode.java delete mode 100644 Partner-Core/src/main/java/work/slhaf/partner/core/perceive/pojo/User.java delete mode 100644 Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/exception/ActionExecutingFailedException.java rename Partner-Core/src/main/java/work/slhaf/partner/{core/memory => module/memory/runtime}/exception/UnExistedDateIndexException.java (72%) rename Partner-Core/src/main/java/work/slhaf/partner/{core/memory => module/memory/runtime}/exception/UnExistedTopicException.java (71%) delete mode 100644 Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/exception/UnExpectedMessageCountException.java rename Partner-Core/src/main/java/work/slhaf/partner/runtime/{interaction/data/context => }/PartnerRunningFlowContext.kt (95%) delete mode 100644 Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/PartnerExceptionCallback.java delete mode 100644 Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/pojo/GlobalException.java delete mode 100644 Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/pojo/GlobalExceptionData.java rename Partner-Core/src/main/java/work/slhaf/partner/runtime/{interaction => gateway}/WebSocketGateway.java (97%) rename Partner-Core/src/main/java/work/slhaf/partner/runtime/{interaction => gateway}/WebSocketGatewayRegistration.kt (95%) delete mode 100644 Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/common/entity/PersistableObject.java delete mode 100644 Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/AgentExceptionCallback.java delete mode 100644 Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/GlobalExceptionHandler.java delete mode 100644 Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/LogAgentExceptionCallback.java delete mode 100644 Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/exception/ExternalModulePathNotExistException.java rename Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/{common => }/support/DirectoryWatchSupport.java (99%) diff --git a/Partner-Core/src/main/java/work/slhaf/partner/Main.java b/Partner-Core/src/main/java/work/slhaf/partner/Main.java index f8e512a2..2f3581ef 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/Main.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/Main.java @@ -1,7 +1,7 @@ package work.slhaf.partner; import work.slhaf.partner.framework.agent.Agent; -import work.slhaf.partner.runtime.interaction.WebSocketGatewayRegistration; +import work.slhaf.partner.runtime.gateway.WebSocketGatewayRegistration; public class Main { public static void main(String[] args) { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/common/config/Config.java b/Partner-Core/src/main/java/work/slhaf/partner/common/config/Config.java deleted file mode 100644 index 273f83e8..00000000 --- a/Partner-Core/src/main/java/work/slhaf/partner/common/config/Config.java +++ /dev/null @@ -1,24 +0,0 @@ -package work.slhaf.partner.common.config; - -import lombok.Data; - -@Data -public class Config { - private String agentId; - private WebSocketConfig webSocketConfig; - private VectorConfig vectorConfig; - - @Data - public static class VectorConfig { - private int type; - private String ollamaEmbeddingUrl; - private String ollamaEmbeddingModel; - private String tokenizerPath; - private String embeddingModelPath; - } - - @Data - public static class WebSocketConfig { - private int port; - } -} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/common/exception/ConfigLoadFailedException.java b/Partner-Core/src/main/java/work/slhaf/partner/common/exception/ConfigLoadFailedException.java deleted file mode 100644 index 21a765ad..00000000 --- a/Partner-Core/src/main/java/work/slhaf/partner/common/exception/ConfigLoadFailedException.java +++ /dev/null @@ -1,13 +0,0 @@ -package work.slhaf.partner.common.exception; - -import work.slhaf.partner.framework.agent.factory.config.exception.ConfigFactoryInitFailedException; - -public class ConfigLoadFailedException extends ConfigFactoryInitFailedException { - public ConfigLoadFailedException(String message, Throwable cause) { - super(message, cause); - } - - public ConfigLoadFailedException(String message) { - super(message); - } -} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/common/exception/ServiceLoadFailedException.java b/Partner-Core/src/main/java/work/slhaf/partner/common/exception/ServiceLoadFailedException.java deleted file mode 100644 index 58fa5662..00000000 --- a/Partner-Core/src/main/java/work/slhaf/partner/common/exception/ServiceLoadFailedException.java +++ /dev/null @@ -1,13 +0,0 @@ -package work.slhaf.partner.common.exception; - -import work.slhaf.partner.framework.agent.exception.AgentLaunchFailedException; - -public class ServiceLoadFailedException extends AgentLaunchFailedException { - public ServiceLoadFailedException(String message, Throwable cause) { - super(message, cause); - } - - public ServiceLoadFailedException(String message) { - super(message); - } -} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/action/entity/GeneratedData.java b/Partner-Core/src/main/java/work/slhaf/partner/core/action/entity/GeneratedData.java deleted file mode 100644 index 49de01d0..00000000 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/action/entity/GeneratedData.java +++ /dev/null @@ -1,16 +0,0 @@ -package work.slhaf.partner.core.action.entity; - -import com.alibaba.fastjson2.JSONObject; -import lombok.Data; - -import java.util.List; - -@Data -public class GeneratedData { - private List dependencies; - private String code; - private String codeType; - private String launcher; - private boolean serialize; - private JSONObject responseSchema; -} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/action/entity/McpData.java b/Partner-Core/src/main/java/work/slhaf/partner/core/action/entity/McpData.java deleted file mode 100644 index aa8121a7..00000000 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/action/entity/McpData.java +++ /dev/null @@ -1,5 +0,0 @@ -package work.slhaf.partner.core.action.entity; - -public class McpData { - -} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/action/entity/cache/CacheAdjustData.java b/Partner-Core/src/main/java/work/slhaf/partner/core/action/entity/cache/CacheAdjustData.java deleted file mode 100644 index d2fadd26..00000000 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/action/entity/cache/CacheAdjustData.java +++ /dev/null @@ -1,11 +0,0 @@ -package work.slhaf.partner.core.action.entity.cache; - -import lombok.Data; - -import java.util.List; - -@Data -public class CacheAdjustData { - private String input; - private List metaDataList; -} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/action/entity/cache/CacheAdjustMetaData.java b/Partner-Core/src/main/java/work/slhaf/partner/core/action/entity/cache/CacheAdjustMetaData.java deleted file mode 100644 index 04cb8dff..00000000 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/action/entity/cache/CacheAdjustMetaData.java +++ /dev/null @@ -1,10 +0,0 @@ -package work.slhaf.partner.core.action.entity.cache; - -import lombok.Data; - -@Data -public class CacheAdjustMetaData { - private String tendency; - private boolean passed; - private boolean hit; -} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionDataNotFoundException.java b/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionDataNotFoundException.java deleted file mode 100644 index 22491332..00000000 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionDataNotFoundException.java +++ /dev/null @@ -1,13 +0,0 @@ -package work.slhaf.partner.core.action.exception; - -import work.slhaf.partner.framework.agent.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-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionLoadFailedException.java b/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionLoadFailedException.java deleted file mode 100644 index 1db26051..00000000 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/action/exception/ActionLoadFailedException.java +++ /dev/null @@ -1,13 +0,0 @@ -package work.slhaf.partner.core.action.exception; - -import work.slhaf.partner.framework.agent.exception.AgentRuntimeException; - -public class ActionLoadFailedException extends AgentRuntimeException { - public ActionLoadFailedException(String message) { - super(message); - } - - public ActionLoadFailedException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/DynamicActionMcpManager.java b/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/DynamicActionMcpManager.java index abf8ed23..4fa6084c 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/DynamicActionMcpManager.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/DynamicActionMcpManager.java @@ -15,7 +15,7 @@ import work.slhaf.partner.common.mcp.InProcessMcpTransport; import work.slhaf.partner.core.action.entity.MetaActionInfo; import work.slhaf.partner.core.action.exception.ActionInitFailedException; import work.slhaf.partner.core.action.runner.execution.CommandExecutionService; -import work.slhaf.partner.framework.agent.common.support.DirectoryWatchSupport; +import work.slhaf.partner.framework.agent.support.DirectoryWatchSupport; import java.io.File; import java.io.IOException; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/McpConfigWatcher.java b/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/McpConfigWatcher.java index 82ec9d88..e1bfdaf2 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/McpConfigWatcher.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/McpConfigWatcher.java @@ -10,7 +10,7 @@ import work.slhaf.partner.core.action.entity.MetaActionInfo; import work.slhaf.partner.core.action.runner.LocalRunnerClient; import work.slhaf.partner.core.action.runner.policy.ExecutionPolicy; import work.slhaf.partner.core.action.runner.policy.RunnerExecutionPolicyListener; -import work.slhaf.partner.framework.agent.common.support.DirectoryWatchSupport; +import work.slhaf.partner.framework.agent.support.DirectoryWatchSupport; import java.io.File; import java.io.IOException; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/McpDescWatcher.java b/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/McpDescWatcher.java index b8669a30..e2eaf75a 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/McpDescWatcher.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/mcp/McpDescWatcher.java @@ -1,7 +1,7 @@ package work.slhaf.partner.core.action.runner.mcp; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.framework.agent.common.support.DirectoryWatchSupport; +import work.slhaf.partner.framework.agent.support.DirectoryWatchSupport; import java.io.IOException; import java.nio.file.Files; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/CognitionCore.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/CognitionCore.java index ff185122..5cacfa3c 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/CognitionCore.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/CognitionCore.java @@ -13,7 +13,7 @@ import work.slhaf.partner.framework.agent.model.pojo.Message; import work.slhaf.partner.framework.agent.state.State; import work.slhaf.partner.framework.agent.state.StateSerializable; import work.slhaf.partner.framework.agent.state.StateValue; -import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; +import work.slhaf.partner.runtime.PartnerRunningFlowContext; import java.nio.file.Path; import java.util.ArrayList; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/exception/NullSliceListException.java b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/exception/NullSliceListException.java deleted file mode 100644 index 3884da49..00000000 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/exception/NullSliceListException.java +++ /dev/null @@ -1,7 +0,0 @@ -package work.slhaf.partner.core.memory.exception; - -public class NullSliceListException extends RuntimeException { - public NullSliceListException(String message) { - super(message); - } -} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/SliceRef.java b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/SliceRef.java index a063ca57..9bb39ee6 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/SliceRef.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/SliceRef.java @@ -2,21 +2,12 @@ package work.slhaf.partner.core.memory.pojo; import lombok.AllArgsConstructor; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import work.slhaf.partner.framework.agent.common.entity.PersistableObject; -import java.io.Serial; - -@EqualsAndHashCode(callSuper = true) @Data @NoArgsConstructor @AllArgsConstructor -public class SliceRef extends PersistableObject { - - @Serial - private static final long serialVersionUID = 1L; - +public class SliceRef { private String unitId; private String sliceId; } diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/node/MemoryNode.java b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/node/MemoryNode.java deleted file mode 100644 index 148d0520..00000000 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/node/MemoryNode.java +++ /dev/null @@ -1,82 +0,0 @@ -package work.slhaf.partner.core.memory.pojo.node; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.core.memory.exception.NullSliceListException; -import work.slhaf.partner.core.memory.pojo.MemorySlice; -import work.slhaf.partner.framework.agent.common.entity.PersistableObject; - -import java.io.*; -import java.nio.file.Files; -import java.nio.file.Path; -import java.time.LocalDate; -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; - -@EqualsAndHashCode(callSuper = true) -@Data -@Slf4j -public class MemoryNode extends PersistableObject implements Comparable { - - @Serial - private static final long serialVersionUID = 1L; - - private static String SLICE_DATA_DIR = "./data/memory/slice/"; - - /** - * 记忆节点唯一标识, 用于作为实际文件名, 如(xxxx-xxxxx-xxxxx.slice) - */ - private String memoryNodeId; - - /** - * 记忆节点所属日期 - */ - private LocalDate localDate; - - /** - * 该日期对应的全部记忆切片 - */ - private CopyOnWriteArrayList memorySliceList; - - @Override - public int compareTo(MemoryNode memoryNode) { - if (memoryNode.getLocalDate().isAfter(this.localDate)) { - return -1; - } else if (memoryNode.getLocalDate().isBefore(this.localDate)) { - return 1; - } - return 0; - } - - public List loadMemorySliceList() throws IOException, ClassNotFoundException { - //检查是否存在对应文件 - File file = new File(SLICE_DATA_DIR + this.getMemoryNodeId() + ".slice"); - if (file.exists()) { - this.memorySliceList = deserialize(file); - } else { - //逻辑正常的话，这部分应该不会出现，除非在insertMemory中进行save操作之前出现异常，中断了方法，但程序却没有结束 - this.memorySliceList = new CopyOnWriteArrayList<>(); - } - return this.memorySliceList; - } - - public void saveMemorySliceList() throws IOException { - if (memorySliceList == null) { - throw new NullSliceListException("memorySliceList为NULL! 检查实现逻辑!"); - } - File file = new File(SLICE_DATA_DIR + this.getMemoryNodeId() + ".slice"); - Files.createDirectories(Path.of(SLICE_DATA_DIR)); - try (ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(file))) { - oos.writeObject(this.memorySliceList); - } - //取消切片挂载, 释放内存 - this.memorySliceList = null; - } - - private CopyOnWriteArrayList deserialize(File file) throws IOException, ClassNotFoundException { - try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(file))) { - return (CopyOnWriteArrayList) ois.readObject(); - } - } -} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/node/TopicNode.java b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/node/TopicNode.java deleted file mode 100644 index 8bb9b98e..00000000 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/node/TopicNode.java +++ /dev/null @@ -1,20 +0,0 @@ -package work.slhaf.partner.core.memory.pojo.node; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import work.slhaf.partner.framework.agent.common.entity.PersistableObject; - -import java.io.Serial; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; - -@EqualsAndHashCode(callSuper = true) -@Data -public class TopicNode extends PersistableObject { - - @Serial - private static final long serialVersionUID = 1L; - - private ConcurrentHashMap topicNodes = new ConcurrentHashMap<>(); - private CopyOnWriteArrayList memoryNodes = new CopyOnWriteArrayList<>(); -} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/perceive/pojo/User.java b/Partner-Core/src/main/java/work/slhaf/partner/core/perceive/pojo/User.java deleted file mode 100644 index b5dd85bc..00000000 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/perceive/pojo/User.java +++ /dev/null @@ -1,53 +0,0 @@ -package work.slhaf.partner.core.perceive.pojo; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import work.slhaf.partner.framework.agent.common.entity.PersistableObject; - -import java.io.Serial; -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; - -@EqualsAndHashCode(callSuper = true) -@Data -public class User extends PersistableObject { - - @Serial - private static final long serialVersionUID = 1L; - - private String uuid; - private String nickName; - private HashMap info = new HashMap<>(); - - private String relation = Constant.Relation.STRANGER; - // private HashMap events = new HashMap<>(); - private List impressions = new ArrayList<>(); - private List attitude = new ArrayList<>(); - private LinkedHashMap relationChange = new LinkedHashMap<>(); - private HashMap staticMemory = new HashMap<>(); - - public void addInfo(String platform, String userInfo) { - this.info.put(platform, userInfo); - } - - public void updateRelationChange(String changeReason) { - relationChange.put(LocalDate.now(), changeReason); - } - - public void updateRelationChange(LocalDate date, String changeReason) { - relationChange.put(date, changeReason); - } - - public void updateRelationChange(LinkedHashMap tempRelationChange) { - relationChange.putAll(tempRelationChange); - } - - public static class Constant { - public static class Relation { - public static final String STRANGER = "陌生"; - } - } -} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/exception/ActionExecutingFailedException.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/exception/ActionExecutingFailedException.java deleted file mode 100644 index 5912505a..00000000 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/exception/ActionExecutingFailedException.java +++ /dev/null @@ -1,14 +0,0 @@ -package work.slhaf.partner.module.action.executor.exception; - -import work.slhaf.partner.framework.agent.exception.AgentRuntimeException; - -public class ActionExecutingFailedException extends AgentRuntimeException { - - public ActionExecutingFailedException(String message) { - super(message); - } - - public ActionExecutingFailedException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/ActionPlanner.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/ActionPlanner.java index baa0edb5..75224a2e 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/ActionPlanner.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/ActionPlanner.java @@ -22,7 +22,7 @@ import work.slhaf.partner.module.action.planner.evaluator.entity.EvaluatorResult import work.slhaf.partner.module.action.planner.extractor.ActionExtractor; import work.slhaf.partner.module.action.planner.extractor.entity.ExtractorResult; import work.slhaf.partner.module.action.scheduler.ActionScheduler; -import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; +import work.slhaf.partner.runtime.PartnerRunningFlowContext; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/communication/CommunicationProducer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/communication/CommunicationProducer.java index 5bc2fa96..c6ab7a27 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/communication/CommunicationProducer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/communication/CommunicationProducer.java @@ -12,7 +12,7 @@ import work.slhaf.partner.framework.agent.factory.component.annotation.Init; import work.slhaf.partner.framework.agent.model.ActivateModel; import work.slhaf.partner.framework.agent.model.StreamChatMessageConsumer; import work.slhaf.partner.framework.agent.model.pojo.Message; -import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; +import work.slhaf.partner.runtime.PartnerRunningFlowContext; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.OutputKeys; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/runtime/MemoryRuntime.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/runtime/MemoryRuntime.java index ec0e08fe..d7274f2b 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/runtime/MemoryRuntime.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/runtime/MemoryRuntime.java @@ -7,8 +7,6 @@ import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.memory.MemoryCapability; -import work.slhaf.partner.core.memory.exception.UnExistedDateIndexException; -import work.slhaf.partner.core.memory.exception.UnExistedTopicException; import work.slhaf.partner.core.memory.pojo.MemorySlice; import work.slhaf.partner.core.memory.pojo.MemoryUnit; import work.slhaf.partner.core.memory.pojo.SliceRef; @@ -19,6 +17,8 @@ import work.slhaf.partner.framework.agent.model.pojo.Message; import work.slhaf.partner.framework.agent.state.State; import work.slhaf.partner.framework.agent.state.StateSerializable; import work.slhaf.partner.framework.agent.state.StateValue; +import work.slhaf.partner.module.memory.runtime.exception.UnExistedDateIndexException; +import work.slhaf.partner.module.memory.runtime.exception.UnExistedTopicException; import work.slhaf.partner.module.memory.selector.ActivatedMemorySlice; import java.nio.file.Path; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/exception/UnExistedDateIndexException.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/runtime/exception/UnExistedDateIndexException.java similarity index 72% rename from Partner-Core/src/main/java/work/slhaf/partner/core/memory/exception/UnExistedDateIndexException.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/memory/runtime/exception/UnExistedDateIndexException.java index 4c45070b..001cf1ad 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/exception/UnExistedDateIndexException.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/runtime/exception/UnExistedDateIndexException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.core.memory.exception; +package work.slhaf.partner.module.memory.runtime.exception; public class UnExistedDateIndexException extends RuntimeException { public UnExistedDateIndexException(String message) { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/exception/UnExistedTopicException.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/runtime/exception/UnExistedTopicException.java similarity index 71% rename from Partner-Core/src/main/java/work/slhaf/partner/core/memory/exception/UnExistedTopicException.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/memory/runtime/exception/UnExistedTopicException.java index 57700c9b..4769f5ff 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/exception/UnExistedTopicException.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/runtime/exception/UnExistedTopicException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.core.memory.exception; +package work.slhaf.partner.module.memory.runtime.exception; public class UnExistedTopicException extends RuntimeException { public UnExistedTopicException(String message) { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/ActivatedMemorySlice.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/ActivatedMemorySlice.java index df5d6711..005394af 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/ActivatedMemorySlice.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/ActivatedMemorySlice.java @@ -2,22 +2,14 @@ package work.slhaf.partner.module.memory.selector; import lombok.Builder; import lombok.Data; -import lombok.EqualsAndHashCode; -import work.slhaf.partner.framework.agent.common.entity.PersistableObject; import work.slhaf.partner.framework.agent.model.pojo.Message; -import java.io.Serial; import java.time.LocalDate; import java.util.List; -@EqualsAndHashCode(callSuper = true) @Data @Builder -public class ActivatedMemorySlice extends PersistableObject { - - @Serial - private static final long serialVersionUID = 1L; - +public class ActivatedMemorySlice { private String unitId; private String sliceId; private LocalDate date; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/MemorySelector.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/MemorySelector.java index 0f965f49..00350f24 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/MemorySelector.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/MemorySelector.java @@ -11,20 +11,20 @@ import work.slhaf.partner.core.action.ActionCore; import work.slhaf.partner.core.cognition.BlockContent; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.cognition.ContextBlock; -import work.slhaf.partner.core.memory.exception.UnExistedDateIndexException; -import work.slhaf.partner.core.memory.exception.UnExistedTopicException; import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.framework.agent.factory.component.annotation.InjectModule; import work.slhaf.partner.framework.agent.model.pojo.Message; import work.slhaf.partner.module.memory.runtime.MemoryRuntime; +import work.slhaf.partner.module.memory.runtime.exception.UnExistedDateIndexException; +import work.slhaf.partner.module.memory.runtime.exception.UnExistedTopicException; import work.slhaf.partner.module.memory.selector.evaluator.SliceSelectEvaluator; import work.slhaf.partner.module.memory.selector.evaluator.entity.EvaluatorInput; import work.slhaf.partner.module.memory.selector.extractor.MemorySelectExtractor; import work.slhaf.partner.module.memory.selector.extractor.entity.ExtractorInput; import work.slhaf.partner.module.memory.selector.extractor.entity.ExtractorMatchData; import work.slhaf.partner.module.memory.selector.extractor.entity.ExtractorResult; -import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; +import work.slhaf.partner.runtime.PartnerRunningFlowContext; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/MemoryUpdater.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/MemoryUpdater.java index a8e813e8..a713d122 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/MemoryUpdater.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/MemoryUpdater.java @@ -26,7 +26,7 @@ import work.slhaf.partner.module.memory.updater.summarizer.MultiSummarizer; import work.slhaf.partner.module.memory.updater.summarizer.SingleSummarizer; import work.slhaf.partner.module.memory.updater.summarizer.entity.SummarizeInput; import work.slhaf.partner.module.memory.updater.summarizer.entity.SummarizeResult; -import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; +import work.slhaf.partner.runtime.PartnerRunningFlowContext; import java.util.List; import java.util.concurrent.ExecutorService; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/exception/UnExpectedMessageCountException.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/exception/UnExpectedMessageCountException.java deleted file mode 100644 index e286e0d1..00000000 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/exception/UnExpectedMessageCountException.java +++ /dev/null @@ -1,7 +0,0 @@ -package work.slhaf.partner.module.memory.updater.exception; - -public class UnExpectedMessageCountException extends RuntimeException { - public UnExpectedMessageCountException(String message) { - super(message); - } -} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/perceive/PerceiveMonitor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/perceive/PerceiveMonitor.java index 8a7ae668..3c333d16 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/perceive/PerceiveMonitor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/perceive/PerceiveMonitor.java @@ -10,7 +10,7 @@ import work.slhaf.partner.core.cognition.ContextBlock; import work.slhaf.partner.core.perceive.PerceiveCapability; import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; +import work.slhaf.partner.runtime.PartnerRunningFlowContext; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/runtime/interaction/data/context/PartnerRunningFlowContext.kt b/Partner-Core/src/main/java/work/slhaf/partner/runtime/PartnerRunningFlowContext.kt similarity index 95% rename from Partner-Core/src/main/java/work/slhaf/partner/runtime/interaction/data/context/PartnerRunningFlowContext.kt rename to Partner-Core/src/main/java/work/slhaf/partner/runtime/PartnerRunningFlowContext.kt index 7c66fa3b..1aaca05b 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/runtime/interaction/data/context/PartnerRunningFlowContext.kt +++ b/Partner-Core/src/main/java/work/slhaf/partner/runtime/PartnerRunningFlowContext.kt @@ -1,4 +1,4 @@ -package work.slhaf.partner.runtime.interaction.data.context +package work.slhaf.partner.runtime import work.slhaf.partner.framework.agent.interaction.flow.RunningFlowContext @@ -38,4 +38,4 @@ class PartnerRunningFlowContext private constructor( putUserInfo(InfoKeys.NICKNAME, SOURCE_SELF_NICKNAME) } } -} +} \ No newline at end of file diff --git a/Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/PartnerExceptionCallback.java b/Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/PartnerExceptionCallback.java deleted file mode 100644 index eb9eee88..00000000 --- a/Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/PartnerExceptionCallback.java +++ /dev/null @@ -1,54 +0,0 @@ -package work.slhaf.partner.runtime.exception; - -import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.framework.agent.exception.AgentExceptionCallback; -import work.slhaf.partner.framework.agent.exception.AgentLaunchFailedException; -import work.slhaf.partner.framework.agent.exception.AgentRuntimeException; -import work.slhaf.partner.runtime.exception.pojo.GlobalExceptionData; - -import java.io.*; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; - -@Slf4j -public class PartnerExceptionCallback implements AgentExceptionCallback { - - private static final String EXCEPTION_SNAPSHOTS_PATH = "./data/exception/snapshots/"; - private static final String EXCEPTION_LOG_PATH = "./data/exception/log/"; - - @Override - public void onRuntimeException(AgentRuntimeException exception) { - GlobalExceptionData exceptionData = new GlobalExceptionData(); - Path filePath = Paths.get(EXCEPTION_SNAPSHOTS_PATH, exceptionData.getExceptionTime() + ".dat"); - try { - Files.createDirectories(Path.of(EXCEPTION_SNAPSHOTS_PATH)); - ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(filePath.toFile())); - oos.writeObject(exceptionData); - oos.close(); - BufferedWriter logWriter = new BufferedWriter(new FileWriter(EXCEPTION_LOG_PATH + exceptionData.getExceptionTime() + ".log")); - logWriter.write(exception.getMessage()); - logWriter.close(); - log.warn("[GlobalExceptionHandler] 捕获异常, 状态快照已保存到: {}", filePath); - log.warn("[GlobalExceptionHandler] 捕获异常, 异常日志已保存到: {}", EXCEPTION_LOG_PATH + exceptionData.getExceptionTime() + ".log"); - } catch (IOException e) { - log.error("[GlobalExceptionHandler] 捕获异常, 保存失败: ", e); - } - - } - - @Override - public void onFailedException(AgentLaunchFailedException exception) { - Path filepath = Paths.get(EXCEPTION_LOG_PATH, System.currentTimeMillis() + ".log"); - try { - Files.createDirectories(Path.of(EXCEPTION_LOG_PATH)); - BufferedWriter logWriter = new BufferedWriter(new FileWriter(EXCEPTION_LOG_PATH + System.currentTimeMillis() + ".log")); - logWriter.write(exception.getMessage()); - logWriter.close(); - log.warn("[GlobalExceptionHandler] 捕获启动失败异常, 异常日志已保存到: {}", filepath); - } catch (IOException ex) { - log.error("[GlobalExceptionHandler] 捕获启动失败异常, 保存失败: ", ex); - } - } - -} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/pojo/GlobalException.java b/Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/pojo/GlobalException.java deleted file mode 100644 index 218ef1f9..00000000 --- a/Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/pojo/GlobalException.java +++ /dev/null @@ -1,23 +0,0 @@ -package work.slhaf.partner.runtime.exception.pojo; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.extern.slf4j.Slf4j; - -@EqualsAndHashCode(callSuper = true) -@Slf4j -@Data -public class GlobalException extends RuntimeException { - - private GlobalExceptionData data; - - public GlobalException(String message) { - super(message); - try { - this.data = new GlobalExceptionData(); - } catch (Exception e) { - log.error("[GlobalException] 捕获异常, 获取数据失败"); - } - } - -} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/pojo/GlobalExceptionData.java b/Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/pojo/GlobalExceptionData.java deleted file mode 100644 index aa468700..00000000 --- a/Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/pojo/GlobalExceptionData.java +++ /dev/null @@ -1,17 +0,0 @@ -package work.slhaf.partner.runtime.exception.pojo; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import work.slhaf.partner.framework.agent.common.entity.PersistableObject; - -import java.io.Serial; - -@EqualsAndHashCode(callSuper = true) -@Data -public class GlobalExceptionData extends PersistableObject { - - @Serial - private static final long serialVersionUID = 1L; - protected Long exceptionTime = System.currentTimeMillis(); - private String exceptionMessage; -} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/runtime/interaction/WebSocketGateway.java b/Partner-Core/src/main/java/work/slhaf/partner/runtime/gateway/WebSocketGateway.java similarity index 97% rename from Partner-Core/src/main/java/work/slhaf/partner/runtime/interaction/WebSocketGateway.java rename to Partner-Core/src/main/java/work/slhaf/partner/runtime/gateway/WebSocketGateway.java index be77649c..0aad6dbb 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/runtime/interaction/WebSocketGateway.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/runtime/gateway/WebSocketGateway.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.runtime.interaction; +package work.slhaf.partner.runtime.gateway; import com.alibaba.fastjson2.JSONObject; import lombok.ToString; @@ -13,7 +13,7 @@ import work.slhaf.partner.framework.agent.interaction.AgentGatewayRegistration; import work.slhaf.partner.framework.agent.interaction.AgentRuntime; import work.slhaf.partner.framework.agent.interaction.data.InputData; import work.slhaf.partner.framework.agent.interaction.data.InteractionEvent; -import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; +import work.slhaf.partner.runtime.PartnerRunningFlowContext; import java.net.InetSocketAddress; import java.util.concurrent.ConcurrentHashMap; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/runtime/interaction/WebSocketGatewayRegistration.kt b/Partner-Core/src/main/java/work/slhaf/partner/runtime/gateway/WebSocketGatewayRegistration.kt similarity index 95% rename from Partner-Core/src/main/java/work/slhaf/partner/runtime/interaction/WebSocketGatewayRegistration.kt rename to Partner-Core/src/main/java/work/slhaf/partner/runtime/gateway/WebSocketGatewayRegistration.kt index f7abff5c..3d93131b 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/runtime/interaction/WebSocketGatewayRegistration.kt +++ b/Partner-Core/src/main/java/work/slhaf/partner/runtime/gateway/WebSocketGatewayRegistration.kt @@ -1,4 +1,4 @@ -package work.slhaf.partner.runtime.interaction +package work.slhaf.partner.runtime.gateway import work.slhaf.partner.framework.agent.interaction.AgentGateway import work.slhaf.partner.framework.agent.interaction.AgentGatewayRegistration diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/common/entity/PersistableObject.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/common/entity/PersistableObject.java deleted file mode 100644 index e98a1766..00000000 --- a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/common/entity/PersistableObject.java +++ /dev/null @@ -1,6 +0,0 @@ -package work.slhaf.partner.framework.agent.common.entity; - -import java.io.Serializable; - -public abstract class PersistableObject implements Serializable { -} diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/config/ConfigCenter.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/config/ConfigCenter.kt index 88967f14..b37e6be7 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/config/ConfigCenter.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/config/ConfigCenter.kt @@ -3,8 +3,8 @@ package work.slhaf.partner.framework.agent.config import com.alibaba.fastjson2.JSON import com.alibaba.fastjson2.JSONObject import org.slf4j.LoggerFactory -import work.slhaf.partner.framework.agent.common.support.DirectoryWatchSupport import work.slhaf.partner.framework.agent.exception.AgentLaunchFailedException +import work.slhaf.partner.framework.agent.support.DirectoryWatchSupport import java.io.IOException import java.lang.reflect.Field import java.lang.reflect.Modifier diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/AgentExceptionCallback.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/AgentExceptionCallback.java deleted file mode 100644 index ca448fd5..00000000 --- a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/AgentExceptionCallback.java +++ /dev/null @@ -1,7 +0,0 @@ -package work.slhaf.partner.framework.agent.exception; - -public interface AgentExceptionCallback { - void onRuntimeException(AgentRuntimeException e); - - void onFailedException(AgentLaunchFailedException e); -} diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/GlobalExceptionHandler.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/GlobalExceptionHandler.java deleted file mode 100644 index bb9475f1..00000000 --- a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/GlobalExceptionHandler.java +++ /dev/null @@ -1,39 +0,0 @@ -package work.slhaf.partner.framework.agent.exception; - -import lombok.extern.slf4j.Slf4j; - -@Slf4j -public class GlobalExceptionHandler { - - public static GlobalExceptionHandler INSTANCE = new GlobalExceptionHandler(); - - private AgentExceptionCallback exceptionCallback = new LogAgentExceptionCallback(); - - public static void setExceptionCallback(AgentExceptionCallback callback) { - INSTANCE.exceptionCallback = callback; - } - - public boolean handle(Throwable e) { - boolean exit; - Throwable cause = e.getCause(); - switch (cause) { - case AgentRunningFailedException arfe -> { - exit = true; - exceptionCallback.onRuntimeException((AgentRuntimeException) cause); - } - case AgentRuntimeException are -> { - exit = false; - exceptionCallback.onRuntimeException((AgentRuntimeException) cause); - } - case AgentLaunchFailedException alfe -> { - exit = true; - exceptionCallback.onFailedException((AgentLaunchFailedException) cause); - } - default -> { - exit = true; - log.error("意外异常: ", cause); - } - } - return exit; - } -} diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/LogAgentExceptionCallback.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/LogAgentExceptionCallback.java deleted file mode 100644 index 79b68fe4..00000000 --- a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/exception/LogAgentExceptionCallback.java +++ /dev/null @@ -1,17 +0,0 @@ -package work.slhaf.partner.framework.agent.exception; - -import lombok.extern.slf4j.Slf4j; - -@Slf4j -public class LogAgentExceptionCallback implements AgentExceptionCallback { - - @Override - public void onRuntimeException(AgentRuntimeException e) { - log.error("Agent 运行异常: ", e); - } - - @Override - public void onFailedException(AgentLaunchFailedException e) { - throw e; - } -} diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/exception/ExternalModulePathNotExistException.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/exception/ExternalModulePathNotExistException.java deleted file mode 100644 index 1a6cf073..00000000 --- a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/exception/ExternalModulePathNotExistException.java +++ /dev/null @@ -1,11 +0,0 @@ -package work.slhaf.partner.framework.agent.factory.exception; - -public class ExternalModulePathNotExistException extends AgentRegisterFactoryFailedException { - public ExternalModulePathNotExistException(String message) { - super(message); - } - - public ExternalModulePathNotExistException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/pojo/Message.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/pojo/Message.kt index a4638079..2c5e59c4 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/pojo/Message.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/model/pojo/Message.kt @@ -4,13 +4,11 @@ import com.alibaba.fastjson2.annotation.JSONCreator import com.alibaba.fastjson2.annotation.JSONField import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonValue -import work.slhaf.partner.framework.agent.common.entity.PersistableObject -import java.io.Serial data class Message( val role: Character, val content: String -) : PersistableObject() { +) { fun roleValue(): String = role.value @@ -34,8 +32,4 @@ data class Message( } } - companion object { - @Serial - private const val serialVersionUID = 1L - } } diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/common/support/DirectoryWatchSupport.java b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/support/DirectoryWatchSupport.java similarity index 99% rename from Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/common/support/DirectoryWatchSupport.java rename to Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/support/DirectoryWatchSupport.java index 85f1b100..631129b1 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/common/support/DirectoryWatchSupport.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/support/DirectoryWatchSupport.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.framework.agent.common.support; +package work.slhaf.partner.framework.agent.support; import lombok.extern.slf4j.Slf4j; diff --git a/Partner-Framework/src/test/java/work/slhaf/partner/framework/common/support/DirectoryWatchSupportTest.java b/Partner-Framework/src/test/java/work/slhaf/partner/framework/common/support/DirectoryWatchSupportTest.java index 2522a4d4..a12e5ded 100644 --- a/Partner-Framework/src/test/java/work/slhaf/partner/framework/common/support/DirectoryWatchSupportTest.java +++ b/Partner-Framework/src/test/java/work/slhaf/partner/framework/common/support/DirectoryWatchSupportTest.java @@ -3,7 +3,7 @@ package work.slhaf.partner.framework.common.support; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import work.slhaf.partner.framework.agent.common.support.DirectoryWatchSupport; +import work.slhaf.partner.framework.agent.support.DirectoryWatchSupport; import java.io.IOException; import java.nio.file.Files;