From 70a94d9c3051ee940f0df2c633c6f422702a3d6b Mon Sep 17 00:00:00 2001 From: slhafzjw Date: Sat, 16 May 2026 21:57:29 +0800 Subject: [PATCH] refactor(cognition): move context classes into context package --- .../slhaf/partner/core/cognition/CognitionCapability.java | 1 + .../partner/core/cognition/{ => context}/ContextCore.java | 2 +- .../core/cognition/{ => context}/ContextWorkspace.kt | 2 +- .../partner/core/cognition/{ => context}/ResolvedContext.kt | 2 +- .../action/builtin/BuiltinCapabilityActionProvider.java | 4 ++-- .../action/builtin/BuiltinInterventionActionProvider.java | 6 +++++- .../module/action/executor/ActionCorrectionRecognizer.java | 2 +- .../partner/module/action/executor/ActionCorrector.java | 2 +- .../module/action/executor/ExecutingActionBlockManager.java | 6 +++--- .../partner/module/action/executor/ParamsExtractor.java | 2 +- .../slhaf/partner/module/action/planner/ActionPlanner.java | 4 ++-- .../module/action/planner/evaluator/ActionEvaluator.java | 6 +++--- .../module/action/planner/extractor/ActionExtractor.java | 2 +- .../src/main/java/work/slhaf/partner/module/block.kt | 4 ++-- .../partner/module/communication/CommunicationProducer.java | 6 +++++- .../slhaf/partner/module/communication/DialogRolling.java | 4 ++-- .../partner/module/memory/selector/MemorySelector.java | 4 ++-- .../memory/selector/evaluator/MemoryRecallEvaluator.java | 2 +- .../memory/selector/extractor/MemoryRecallCueExtractor.java | 2 +- .../work/slhaf/partner/module/perceive/PerceiveMonitor.java | 6 +++--- .../slhaf/partner/module/perceive/SystemStatsMonitor.java | 4 ++-- .../partner/runtime/exception/ContextExceptionReporter.java | 4 ++-- .../slhaf/partner/core/cognition/CognitionCoreTest.java | 2 ++ .../slhaf/partner/core/cognition/ContextWorkspaceTest.kt | 3 +++ .../partner/module/action/executor/ActionExecutorTest.java | 2 +- .../module/communication/CommunicationProducerTest.java | 2 +- .../partner/module/memory/runtime/MemoryRuntimeTest.java | 5 +++-- 27 files changed, 53 insertions(+), 38 deletions(-) rename Partner-Core/src/main/java/work/slhaf/partner/core/cognition/{ => context}/ContextCore.java (99%) rename Partner-Core/src/main/java/work/slhaf/partner/core/cognition/{ => context}/ContextWorkspace.kt (99%) rename Partner-Core/src/main/java/work/slhaf/partner/core/cognition/{ => context}/ResolvedContext.kt (97%) diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/CognitionCapability.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/CognitionCapability.java index 70fd9af6..8838f532 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/CognitionCapability.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/CognitionCapability.java @@ -1,6 +1,7 @@ package work.slhaf.partner.core.cognition; import org.w3c.dom.Element; +import work.slhaf.partner.core.cognition.context.ContextWorkspace; import work.slhaf.partner.framework.agent.factory.capability.annotation.Capability; import work.slhaf.partner.framework.agent.model.pojo.Message; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/ContextCore.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/context/ContextCore.java similarity index 99% rename from Partner-Core/src/main/java/work/slhaf/partner/core/cognition/ContextCore.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognition/context/ContextCore.java index b4f7050b..0b4f131b 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/ContextCore.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/context/ContextCore.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.core.cognition; +package work.slhaf.partner.core.cognition.context; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/ContextWorkspace.kt b/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/context/ContextWorkspace.kt similarity index 99% rename from Partner-Core/src/main/java/work/slhaf/partner/core/cognition/ContextWorkspace.kt rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognition/context/ContextWorkspace.kt index 2f94f078..db67e70d 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/ContextWorkspace.kt +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/context/ContextWorkspace.kt @@ -1,4 +1,4 @@ -package work.slhaf.partner.core.cognition +package work.slhaf.partner.core.cognition.context import com.alibaba.fastjson2.JSONObject import org.w3c.dom.Document diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/ResolvedContext.kt b/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/context/ResolvedContext.kt similarity index 97% rename from Partner-Core/src/main/java/work/slhaf/partner/core/cognition/ResolvedContext.kt rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognition/context/ResolvedContext.kt index 261246d1..3f12b1a8 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/ResolvedContext.kt +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/context/ResolvedContext.kt @@ -1,4 +1,4 @@ -package work.slhaf.partner.core.cognition +package work.slhaf.partner.core.cognition.context import org.w3c.dom.Document import work.slhaf.partner.framework.agent.model.pojo.Message diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinCapabilityActionProvider.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinCapabilityActionProvider.java index 55ae3bfd..d1071263 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinCapabilityActionProvider.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinCapabilityActionProvider.java @@ -6,9 +6,9 @@ import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; import work.slhaf.partner.core.action.entity.MetaActionInfo; -import work.slhaf.partner.core.cognition.BlockContent; import work.slhaf.partner.core.cognition.CognitionCapability; -import work.slhaf.partner.core.cognition.ContextBlock; +import work.slhaf.partner.core.cognition.context.BlockContent; +import work.slhaf.partner.core.cognition.context.ContextBlock; import work.slhaf.partner.core.memory.MemoryCapability; import work.slhaf.partner.core.memory.pojo.MemorySlice; import work.slhaf.partner.core.memory.pojo.MemoryUnit; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinInterventionActionProvider.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinInterventionActionProvider.java index 56b9c3c4..52e7d19c 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinInterventionActionProvider.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinInterventionActionProvider.java @@ -12,7 +12,11 @@ import work.slhaf.partner.core.action.entity.MetaAction; import work.slhaf.partner.core.action.entity.MetaActionInfo; import work.slhaf.partner.core.action.entity.intervention.InterventionType; import work.slhaf.partner.core.action.entity.intervention.MetaIntervention; -import work.slhaf.partner.core.cognition.*; +import work.slhaf.partner.core.cognition.CognitionCapability; +import work.slhaf.partner.core.cognition.context.BlockContent; +import work.slhaf.partner.core.cognition.context.CommunicationBlockContent; +import work.slhaf.partner.core.cognition.context.ContextBlock; +import work.slhaf.partner.core.cognition.context.ContextWorkspace; import work.slhaf.partner.framework.agent.exception.AgentRuntimeException; import work.slhaf.partner.framework.agent.exception.ExceptionReporterHandler; import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrectionRecognizer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrectionRecognizer.java index e419234e..a79ccd68 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrectionRecognizer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrectionRecognizer.java @@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; import work.slhaf.partner.core.cognition.CognitionCapability; -import work.slhaf.partner.core.cognition.ContextBlock; +import work.slhaf.partner.core.cognition.context.ContextBlock; import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.framework.agent.model.ActivateModel; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrector.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrector.java index 11c1bd7d..da8cba0e 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrector.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrector.java @@ -6,7 +6,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.cognition.CognitionCapability; -import work.slhaf.partner.core.cognition.ContextBlock; +import work.slhaf.partner.core.cognition.context.ContextBlock; import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.framework.agent.model.ActivateModel; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ExecutingActionBlockManager.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ExecutingActionBlockManager.java index d029d1e8..e82eaeea 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ExecutingActionBlockManager.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ExecutingActionBlockManager.java @@ -6,9 +6,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import work.slhaf.partner.core.action.entity.*; import work.slhaf.partner.core.action.entity.intervention.MetaIntervention; -import work.slhaf.partner.core.cognition.BlockContent; -import work.slhaf.partner.core.cognition.ContextBlock; -import work.slhaf.partner.core.cognition.ContextWorkspace; +import work.slhaf.partner.core.cognition.context.BlockContent; +import work.slhaf.partner.core.cognition.context.ContextBlock; +import work.slhaf.partner.core.cognition.context.ContextWorkspace; import work.slhaf.partner.module.StateHintContent; import work.slhaf.partner.module.action.executor.entity.HistoryAction; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ParamsExtractor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ParamsExtractor.java index deabb236..ef42f43a 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ParamsExtractor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ParamsExtractor.java @@ -6,7 +6,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import work.slhaf.partner.core.action.entity.MetaActionInfo; import work.slhaf.partner.core.cognition.CognitionCapability; -import work.slhaf.partner.core.cognition.ContextBlock; +import work.slhaf.partner.core.cognition.context.ContextBlock; import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.framework.agent.model.ActivateModel; 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 9933181c..94be906d 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 @@ -8,9 +8,9 @@ import org.w3c.dom.Element; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.ActionCore; import work.slhaf.partner.core.action.entity.*; -import work.slhaf.partner.core.cognition.BlockContent; import work.slhaf.partner.core.cognition.CognitionCapability; -import work.slhaf.partner.core.cognition.ContextBlock; +import work.slhaf.partner.core.cognition.context.BlockContent; +import work.slhaf.partner.core.cognition.context.ContextBlock; import work.slhaf.partner.framework.agent.exception.AgentRuntimeException; import work.slhaf.partner.framework.agent.exception.ExceptionReporterHandler; import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/ActionEvaluator.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/ActionEvaluator.java index c345ab34..1c3605a2 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/ActionEvaluator.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/ActionEvaluator.java @@ -6,10 +6,10 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.ActionCore; -import work.slhaf.partner.core.cognition.BlockContent; import work.slhaf.partner.core.cognition.CognitionCapability; -import work.slhaf.partner.core.cognition.ContextBlock; -import work.slhaf.partner.core.cognition.ResolvedContext; +import work.slhaf.partner.core.cognition.context.BlockContent; +import work.slhaf.partner.core.cognition.context.ContextBlock; +import work.slhaf.partner.core.cognition.context.ResolvedContext; import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.framework.agent.factory.component.annotation.Init; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/ActionExtractor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/ActionExtractor.java index 2063359a..8d5d2dc4 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/ActionExtractor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/ActionExtractor.java @@ -2,7 +2,7 @@ package work.slhaf.partner.module.action.planner.extractor; import org.jetbrains.annotations.NotNull; import work.slhaf.partner.core.cognition.CognitionCapability; -import work.slhaf.partner.core.cognition.ContextBlock; +import work.slhaf.partner.core.cognition.context.ContextBlock; import work.slhaf.partner.framework.agent.exception.AgentRuntimeException; import work.slhaf.partner.framework.agent.exception.ModuleExecutionException; import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/block.kt b/Partner-Core/src/main/java/work/slhaf/partner/module/block.kt index 3e809b87..f3dcd9bb 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/block.kt +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/block.kt @@ -3,8 +3,8 @@ package work.slhaf.partner.module import org.w3c.dom.Document import org.w3c.dom.Element import work.slhaf.partner.common.base.Block -import work.slhaf.partner.core.cognition.CommunicationBlockContent -import work.slhaf.partner.core.cognition.ContextBlock +import work.slhaf.partner.core.cognition.context.CommunicationBlockContent +import work.slhaf.partner.core.cognition.context.ContextBlock import work.slhaf.partner.framework.agent.model.pojo.Message abstract class TaskBlock @JvmOverloads constructor( 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 0edd9734..19124505 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 @@ -5,7 +5,11 @@ import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; -import work.slhaf.partner.core.cognition.*; +import work.slhaf.partner.core.cognition.CognitionCapability; +import work.slhaf.partner.core.cognition.context.BlockContent; +import work.slhaf.partner.core.cognition.context.CommunicationBlockContent; +import work.slhaf.partner.core.cognition.context.ContextBlock; +import work.slhaf.partner.core.cognition.context.ResolvedContext; import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.framework.agent.factory.component.annotation.Init; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/communication/DialogRolling.java b/Partner-Core/src/main/java/work/slhaf/partner/module/communication/DialogRolling.java index 34524806..2866afa4 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/communication/DialogRolling.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/communication/DialogRolling.java @@ -9,9 +9,9 @@ import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.ActionCore; import work.slhaf.partner.core.action.entity.Schedulable; import work.slhaf.partner.core.action.entity.StateAction; -import work.slhaf.partner.core.cognition.BlockContent; import work.slhaf.partner.core.cognition.CognitionCapability; -import work.slhaf.partner.core.cognition.ContextBlock; +import work.slhaf.partner.core.cognition.context.BlockContent; +import work.slhaf.partner.core.cognition.context.ContextBlock; import work.slhaf.partner.core.memory.MemoryCapability; import work.slhaf.partner.core.memory.pojo.MemorySlice; import work.slhaf.partner.core.memory.pojo.MemoryUnit; 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 c6e38b24..66841c65 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 @@ -7,9 +7,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.ActionCore; -import work.slhaf.partner.core.cognition.BlockContent; import work.slhaf.partner.core.cognition.CognitionCapability; -import work.slhaf.partner.core.cognition.ContextBlock; +import work.slhaf.partner.core.cognition.context.BlockContent; +import work.slhaf.partner.core.cognition.context.ContextBlock; import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.framework.agent.factory.component.annotation.InjectModule; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/MemoryRecallEvaluator.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/MemoryRecallEvaluator.java index d26cad93..6c59636a 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/MemoryRecallEvaluator.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/MemoryRecallEvaluator.java @@ -7,7 +7,7 @@ import org.w3c.dom.Element; 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.cognition.context.ContextBlock; import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.framework.agent.factory.component.annotation.Init; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/MemoryRecallCueExtractor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/MemoryRecallCueExtractor.java index 09386377..6a68e3e8 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/MemoryRecallCueExtractor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/MemoryRecallCueExtractor.java @@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; import work.slhaf.partner.core.cognition.CognitionCapability; -import work.slhaf.partner.core.cognition.ContextBlock; +import work.slhaf.partner.core.cognition.context.ContextBlock; import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.framework.agent.factory.component.annotation.InjectModule; 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 290d0db2..be11efcd 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/perceive/PerceiveMonitor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/perceive/PerceiveMonitor.java @@ -3,10 +3,10 @@ package work.slhaf.partner.module.perceive; import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; -import work.slhaf.partner.core.cognition.BlockContent; import work.slhaf.partner.core.cognition.CognitionCapability; -import work.slhaf.partner.core.cognition.CommunicationBlockContent; -import work.slhaf.partner.core.cognition.ContextBlock; +import work.slhaf.partner.core.cognition.context.BlockContent; +import work.slhaf.partner.core.cognition.context.CommunicationBlockContent; +import work.slhaf.partner.core.cognition.context.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; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/perceive/SystemStatsMonitor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/perceive/SystemStatsMonitor.java index 11a5a01f..0ee8dbf5 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/perceive/SystemStatsMonitor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/perceive/SystemStatsMonitor.java @@ -4,9 +4,9 @@ import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; -import work.slhaf.partner.core.cognition.BlockContent; import work.slhaf.partner.core.cognition.CognitionCapability; -import work.slhaf.partner.core.cognition.ContextBlock; +import work.slhaf.partner.core.cognition.context.BlockContent; +import work.slhaf.partner.core.cognition.context.ContextBlock; import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.runtime.PartnerRunningFlowContext; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/ContextExceptionReporter.java b/Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/ContextExceptionReporter.java index 2afe631c..28d30c22 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/ContextExceptionReporter.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/runtime/exception/ContextExceptionReporter.java @@ -3,9 +3,9 @@ package work.slhaf.partner.runtime.exception; import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; -import work.slhaf.partner.core.cognition.BlockContent; import work.slhaf.partner.core.cognition.CognitionCapability; -import work.slhaf.partner.core.cognition.ContextBlock; +import work.slhaf.partner.core.cognition.context.BlockContent; +import work.slhaf.partner.core.cognition.context.ContextBlock; import work.slhaf.partner.framework.agent.exception.AgentException; import work.slhaf.partner.framework.agent.exception.ExceptionReport; import work.slhaf.partner.framework.agent.exception.ExceptionReporter; diff --git a/Partner-Core/src/test/java/work/slhaf/partner/core/cognition/CognitionCoreTest.java b/Partner-Core/src/test/java/work/slhaf/partner/core/cognition/CognitionCoreTest.java index 2c536485..dff88ca5 100644 --- a/Partner-Core/src/test/java/work/slhaf/partner/core/cognition/CognitionCoreTest.java +++ b/Partner-Core/src/test/java/work/slhaf/partner/core/cognition/CognitionCoreTest.java @@ -3,6 +3,8 @@ package work.slhaf.partner.core.cognition; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; +import work.slhaf.partner.core.cognition.context.ContextBlock; +import work.slhaf.partner.core.cognition.context.ContextCore; import work.slhaf.partner.framework.agent.model.pojo.Message; import java.nio.file.Path; diff --git a/Partner-Core/src/test/java/work/slhaf/partner/core/cognition/ContextWorkspaceTest.kt b/Partner-Core/src/test/java/work/slhaf/partner/core/cognition/ContextWorkspaceTest.kt index 19ef345b..6a0daae4 100644 --- a/Partner-Core/src/test/java/work/slhaf/partner/core/cognition/ContextWorkspaceTest.kt +++ b/Partner-Core/src/test/java/work/slhaf/partner/core/cognition/ContextWorkspaceTest.kt @@ -2,6 +2,9 @@ package work.slhaf.partner.core.cognition import org.junit.jupiter.api.Assertions.* import org.junit.jupiter.api.Test +import work.slhaf.partner.core.cognition.context.BlockContent +import work.slhaf.partner.core.cognition.context.ContextBlock +import work.slhaf.partner.core.cognition.context.ContextWorkspace class ContextWorkspaceTest { diff --git a/Partner-Core/src/test/java/work/slhaf/partner/module/action/executor/ActionExecutorTest.java b/Partner-Core/src/test/java/work/slhaf/partner/module/action/executor/ActionExecutorTest.java index 5a5a668a..0bdef271 100644 --- a/Partner-Core/src/test/java/work/slhaf/partner/module/action/executor/ActionExecutorTest.java +++ b/Partner-Core/src/test/java/work/slhaf/partner/module/action/executor/ActionExecutorTest.java @@ -10,7 +10,7 @@ import work.slhaf.partner.core.action.ActionCore; import work.slhaf.partner.core.action.entity.*; import work.slhaf.partner.core.action.runner.RunnerClient; import work.slhaf.partner.core.cognition.CognitionCapability; -import work.slhaf.partner.core.cognition.ContextWorkspace; +import work.slhaf.partner.core.cognition.context.ContextWorkspace; import work.slhaf.partner.framework.agent.support.Result; import work.slhaf.partner.module.action.executor.entity.ExtractorResult; import work.slhaf.partner.module.action.executor.entity.HistoryAction; diff --git a/Partner-Core/src/test/java/work/slhaf/partner/module/communication/CommunicationProducerTest.java b/Partner-Core/src/test/java/work/slhaf/partner/module/communication/CommunicationProducerTest.java index a71fac34..7cbe12bd 100644 --- a/Partner-Core/src/test/java/work/slhaf/partner/module/communication/CommunicationProducerTest.java +++ b/Partner-Core/src/test/java/work/slhaf/partner/module/communication/CommunicationProducerTest.java @@ -3,7 +3,7 @@ package work.slhaf.partner.module.communication; import org.junit.jupiter.api.Test; import org.w3c.dom.Element; import work.slhaf.partner.core.cognition.CognitionCapability; -import work.slhaf.partner.core.cognition.ContextWorkspace; +import work.slhaf.partner.core.cognition.context.ContextWorkspace; import work.slhaf.partner.framework.agent.model.pojo.Message; import work.slhaf.partner.runtime.PartnerRunningFlowContext; diff --git a/Partner-Core/src/test/java/work/slhaf/partner/module/memory/runtime/MemoryRuntimeTest.java b/Partner-Core/src/test/java/work/slhaf/partner/module/memory/runtime/MemoryRuntimeTest.java index da81c75f..a14e37a3 100644 --- a/Partner-Core/src/test/java/work/slhaf/partner/module/memory/runtime/MemoryRuntimeTest.java +++ b/Partner-Core/src/test/java/work/slhaf/partner/module/memory/runtime/MemoryRuntimeTest.java @@ -8,6 +8,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.w3c.dom.Element; import work.slhaf.partner.core.cognition.CognitionCapability; +import work.slhaf.partner.core.cognition.context.ContextWorkspace; import work.slhaf.partner.core.memory.MemoryCapability; import work.slhaf.partner.core.memory.pojo.MemorySlice; import work.slhaf.partner.core.memory.pojo.MemoryUnit; @@ -65,8 +66,8 @@ class MemoryRuntimeTest { } @Override - public work.slhaf.partner.core.cognition.ContextWorkspace contextWorkspace() { - return new work.slhaf.partner.core.cognition.ContextWorkspace(); + public ContextWorkspace contextWorkspace() { + return new ContextWorkspace(); } @Override