diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/MemoryCapability.java b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/MemoryCapability.java index 33acf027..03cc5e9f 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/MemoryCapability.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/MemoryCapability.java @@ -1,22 +1,14 @@ package work.slhaf.partner.core.memory; import work.slhaf.partner.api.agent.factory.capability.annotation.Capability; -import work.slhaf.partner.core.memory.pojo.ActivatedMemorySlice; import work.slhaf.partner.core.memory.pojo.MemorySlice; import work.slhaf.partner.core.memory.pojo.MemoryUnit; import java.util.Collection; -import java.util.List; @Capability(value = "memory") public interface MemoryCapability { - void clearActivatedSlices(); - - void updateActivatedSlices(List memorySlices); - - List getActivatedSlices(); - void saveMemoryUnit(MemoryUnit memoryUnit); MemoryUnit getMemoryUnit(String unitId); diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/MemoryCore.java b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/MemoryCore.java index 8a29a5b1..e4229c73 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/MemoryCore.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/MemoryCore.java @@ -7,16 +7,17 @@ import lombok.extern.slf4j.Slf4j; import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityCore; import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityMethod; import work.slhaf.partner.core.PartnerCore; -import work.slhaf.partner.core.memory.pojo.ActivatedMemorySlice; import work.slhaf.partner.core.memory.pojo.MemorySlice; import work.slhaf.partner.core.memory.pojo.MemoryUnit; import java.io.IOException; import java.io.Serial; import java.time.Instant; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; @@ -32,7 +33,6 @@ public class MemoryCore extends PartnerCore { private final Lock memoryLock = new ReentrantLock(); private ConcurrentHashMap memoryUnits = new ConcurrentHashMap<>(); - private List activatedSlices = new CopyOnWriteArrayList<>(); // 默认值一般只存在于智能体初次启动时 private String memorySessionId = UUID.randomUUID().toString(); @@ -41,21 +41,6 @@ public class MemoryCore extends PartnerCore { public MemoryCore() throws IOException, ClassNotFoundException { } - @CapabilityMethod - public void clearActivatedSlices() { - activatedSlices.clear(); - } - - @CapabilityMethod - public void updateActivatedSlices(List memorySlices) { - activatedSlices = new CopyOnWriteArrayList<>(memorySlices); - } - - @CapabilityMethod - public List getActivatedSlices() { - return new ArrayList<>(activatedSlices); - } - @CapabilityMethod public void saveMemoryUnit(MemoryUnit memoryUnit) { memoryLock.lock(); diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/entity/EvaluatorBatchInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/entity/EvaluatorBatchInput.java index 4f49eb47..08bce2e7 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/entity/EvaluatorBatchInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/entity/EvaluatorBatchInput.java @@ -2,7 +2,7 @@ package work.slhaf.partner.module.action.planner.evaluator.entity; import lombok.Data; import work.slhaf.partner.api.chat.pojo.Message; -import work.slhaf.partner.core.memory.pojo.ActivatedMemorySlice; +import work.slhaf.partner.module.memory.selector.ActivatedMemorySlice; import java.util.List; import java.util.Map; 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 08f5baf5..0d458488 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 @@ -13,10 +13,10 @@ 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.ActivatedMemorySlice; import work.slhaf.partner.core.memory.pojo.MemorySlice; import work.slhaf.partner.core.memory.pojo.MemoryUnit; import work.slhaf.partner.core.memory.pojo.SliceRef; +import work.slhaf.partner.module.memory.selector.ActivatedMemorySlice; import java.io.*; import java.nio.file.Files; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/ActivatedMemorySlice.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/ActivatedMemorySlice.java similarity index 92% rename from Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/ActivatedMemorySlice.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/ActivatedMemorySlice.java index 3dfdb54e..5d86ee9e 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/ActivatedMemorySlice.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/ActivatedMemorySlice.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.core.memory.pojo; +package work.slhaf.partner.module.memory.selector; import lombok.Builder; import lombok.Data; 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 c148d48c..5b6016d5 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 @@ -17,7 +17,6 @@ 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.core.memory.pojo.ActivatedMemorySlice; import work.slhaf.partner.module.memory.runtime.MemoryRuntime; import work.slhaf.partner.module.memory.selector.evaluator.SliceSelectEvaluator; import work.slhaf.partner.module.memory.selector.evaluator.entity.EvaluatorInput; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/SliceSelectEvaluator.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/SliceSelectEvaluator.java index b1413d47..b2ef836b 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/SliceSelectEvaluator.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/SliceSelectEvaluator.java @@ -15,8 +15,8 @@ import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.ActionCore; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.cognition.ContextBlock; -import work.slhaf.partner.core.memory.pojo.ActivatedMemorySlice; import work.slhaf.partner.module.TaskBlock; +import work.slhaf.partner.module.memory.selector.ActivatedMemorySlice; import work.slhaf.partner.module.memory.selector.evaluator.entity.EvaluatorBatchInput; import work.slhaf.partner.module.memory.selector.evaluator.entity.EvaluatorBatchResult; import work.slhaf.partner.module.memory.selector.evaluator.entity.EvaluatorInput; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/entity/EvaluatorBatchInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/entity/EvaluatorBatchInput.java index fa20cd52..779ff7f3 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/entity/EvaluatorBatchInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/entity/EvaluatorBatchInput.java @@ -2,7 +2,7 @@ package work.slhaf.partner.module.memory.selector.evaluator.entity; import lombok.AllArgsConstructor; import lombok.Data; -import work.slhaf.partner.core.memory.pojo.ActivatedMemorySlice; +import work.slhaf.partner.module.memory.selector.ActivatedMemorySlice; import java.time.LocalDateTime; import java.util.Map; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/entity/EvaluatorInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/entity/EvaluatorInput.java index 1dfcd59f..7ec3e696 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/entity/EvaluatorInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/entity/EvaluatorInput.java @@ -2,7 +2,7 @@ package work.slhaf.partner.module.memory.selector.evaluator.entity; import lombok.Builder; import lombok.Data; -import work.slhaf.partner.core.memory.pojo.ActivatedMemorySlice; +import work.slhaf.partner.module.memory.selector.ActivatedMemorySlice; import java.time.LocalDateTime; import java.util.List;