diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/action/entity/Action.kt b/Partner-Core/src/main/java/work/slhaf/partner/core/action/entity/Action.kt index 2c7fcc17..8f687ba3 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/action/entity/Action.kt +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/action/entity/Action.kt @@ -1,6 +1,6 @@ package work.slhaf.partner.core.action.entity -import work.slhaf.partner.module.modules.action.executor.entity.HistoryAction +import work.slhaf.partner.module.action.executor.entity.HistoryAction import java.time.Instant import java.time.ZonedDateTime import java.util.* diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/RunnerClient.java b/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/RunnerClient.java index b47eb2fc..6cd9d953 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/RunnerClient.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/RunnerClient.java @@ -10,7 +10,7 @@ import work.slhaf.partner.core.action.entity.MetaAction; import work.slhaf.partner.core.action.entity.MetaAction.Result; import work.slhaf.partner.core.action.entity.MetaActionInfo; import work.slhaf.partner.core.action.exception.ActionInitFailedException; -import work.slhaf.partner.module.modules.action.builtin.BuiltinActionRegistry; +import work.slhaf.partner.module.action.builtin.BuiltinActionRegistry; import java.io.IOException; import java.nio.file.Files; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/builtin/BuiltinActionProvider.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinActionProvider.java similarity index 76% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/builtin/BuiltinActionProvider.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinActionProvider.java index 4d59a45c..715a17bf 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/builtin/BuiltinActionProvider.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinActionProvider.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.builtin; +package work.slhaf.partner.module.action.builtin; import java.util.List; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/builtin/BuiltinActionRegistry.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinActionRegistry.java similarity index 98% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/builtin/BuiltinActionRegistry.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinActionRegistry.java index 607ba8bf..5d3f44dd 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/builtin/BuiltinActionRegistry.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinActionRegistry.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.builtin; +package work.slhaf.partner.module.action.builtin; import lombok.Getter; import lombok.NonNull; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/builtin/BuiltinCapabilityActionProvider.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinCapabilityActionProvider.java similarity index 99% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/builtin/BuiltinCapabilityActionProvider.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinCapabilityActionProvider.java index 3b65dcbe..3f2239d7 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/builtin/BuiltinCapabilityActionProvider.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinCapabilityActionProvider.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.builtin; +package work.slhaf.partner.module.action.builtin; import com.alibaba.fastjson2.JSONObject; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/builtin/BuiltinCommandActionProvider.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinCommandActionProvider.java similarity index 99% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/builtin/BuiltinCommandActionProvider.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinCommandActionProvider.java index c7e2761e..9ae44125 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/builtin/BuiltinCommandActionProvider.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinCommandActionProvider.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.builtin; +package work.slhaf.partner.module.action.builtin; import com.alibaba.fastjson2.JSONObject; import lombok.AllArgsConstructor; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/builtin/BuiltinDynamicActionProvider.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinDynamicActionProvider.java similarity index 98% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/builtin/BuiltinDynamicActionProvider.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinDynamicActionProvider.java index d9eda858..71bfdcc3 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/builtin/BuiltinDynamicActionProvider.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinDynamicActionProvider.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.builtin; +package work.slhaf.partner.module.action.builtin; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; @@ -8,7 +8,7 @@ import work.slhaf.partner.api.agent.factory.component.annotation.AgentComponent; import work.slhaf.partner.api.agent.factory.component.annotation.InjectModule; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.entity.*; -import work.slhaf.partner.module.modules.action.scheduler.ActionScheduler; +import work.slhaf.partner.module.action.scheduler.ActionScheduler; import java.nio.file.Files; import java.nio.file.Path; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/builtin/BuiltinInterventionActionProvider.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinInterventionActionProvider.java similarity index 99% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/builtin/BuiltinInterventionActionProvider.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinInterventionActionProvider.java index e7d2b177..8ac7eaaa 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/builtin/BuiltinInterventionActionProvider.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinInterventionActionProvider.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.builtin; +package work.slhaf.partner.module.action.builtin; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/ActionCorrectionRecognizer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrectionRecognizer.java similarity index 89% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/ActionCorrectionRecognizer.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrectionRecognizer.java index 19ec514e..7a8935f4 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/ActionCorrectionRecognizer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrectionRecognizer.java @@ -1,12 +1,12 @@ -package work.slhaf.partner.module.modules.action.executor; +package work.slhaf.partner.module.action.executor; import com.alibaba.fastjson2.JSONObject; import lombok.val; import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.api.agent.factory.component.abstracts.ActivateModel; import work.slhaf.partner.api.chat.pojo.Message; -import work.slhaf.partner.module.modules.action.executor.entity.CorrectionRecognizerInput; -import work.slhaf.partner.module.modules.action.executor.entity.CorrectionRecognizerResult; +import work.slhaf.partner.module.action.executor.entity.CorrectionRecognizerInput; +import work.slhaf.partner.module.action.executor.entity.CorrectionRecognizerResult; import java.util.List; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/ActionCorrector.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrector.java similarity index 88% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/ActionCorrector.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrector.java index 0b2e3fd9..ba22ea2f 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/ActionCorrector.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionCorrector.java @@ -1,12 +1,12 @@ -package work.slhaf.partner.module.modules.action.executor; +package work.slhaf.partner.module.action.executor; import com.alibaba.fastjson2.JSONObject; import lombok.val; import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.api.agent.factory.component.abstracts.ActivateModel; import work.slhaf.partner.api.chat.pojo.Message; -import work.slhaf.partner.module.modules.action.executor.entity.CorrectorInput; -import work.slhaf.partner.module.modules.action.executor.entity.CorrectorResult; +import work.slhaf.partner.module.action.executor.entity.CorrectorInput; +import work.slhaf.partner.module.action.executor.entity.CorrectorResult; import java.util.List; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/ActionExecutor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionExecutor.java similarity index 99% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/ActionExecutor.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionExecutor.java index b0da8a82..0494d977 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/ActionExecutor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionExecutor.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.executor; +package work.slhaf.partner.module.action.executor; import lombok.val; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; @@ -11,7 +11,7 @@ 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.memory.MemoryCapability; -import work.slhaf.partner.module.modules.action.executor.entity.*; +import work.slhaf.partner.module.action.executor.entity.*; import java.util.ArrayList; import java.util.List; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/ExecutingActionBlockManager.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ExecutingActionBlockManager.java similarity index 99% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/ExecutingActionBlockManager.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ExecutingActionBlockManager.java index f410bc5c..54f98d50 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/ExecutingActionBlockManager.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ExecutingActionBlockManager.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.executor; +package work.slhaf.partner.module.action.executor; import kotlin.Unit; import org.jetbrains.annotations.NotNull; @@ -9,7 +9,7 @@ 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.module.modules.action.executor.entity.HistoryAction; +import work.slhaf.partner.module.action.executor.entity.HistoryAction; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/ParamsExtractor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ParamsExtractor.java similarity index 88% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/ParamsExtractor.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ParamsExtractor.java index 782fe375..0be5696b 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/ParamsExtractor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ParamsExtractor.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.executor; +package work.slhaf.partner.module.action.executor; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; @@ -6,9 +6,9 @@ import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentMod import work.slhaf.partner.api.agent.factory.component.abstracts.ActivateModel; import work.slhaf.partner.api.chat.pojo.Message; import work.slhaf.partner.core.action.entity.MetaActionInfo; -import work.slhaf.partner.module.modules.action.executor.entity.ExtractorInput; -import work.slhaf.partner.module.modules.action.executor.entity.ExtractorResult; -import work.slhaf.partner.module.modules.action.executor.entity.HistoryAction; +import work.slhaf.partner.module.action.executor.entity.ExtractorInput; +import work.slhaf.partner.module.action.executor.entity.ExtractorResult; +import work.slhaf.partner.module.action.executor.entity.HistoryAction; import java.util.HashMap; import java.util.List; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/CorrectionRecognizerInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/CorrectionRecognizerInput.java similarity index 91% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/CorrectionRecognizerInput.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/CorrectionRecognizerInput.java index 29de1b0e..c3f2ccad 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/CorrectionRecognizerInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/CorrectionRecognizerInput.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.executor.entity; +package work.slhaf.partner.module.action.executor.entity; import lombok.Builder; import lombok.Data; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/CorrectionRecognizerMetaActionSnapshot.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/CorrectionRecognizerMetaActionSnapshot.java similarity index 79% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/CorrectionRecognizerMetaActionSnapshot.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/CorrectionRecognizerMetaActionSnapshot.java index a77bbf53..1a56d4be 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/CorrectionRecognizerMetaActionSnapshot.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/CorrectionRecognizerMetaActionSnapshot.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.executor.entity; +package work.slhaf.partner.module.action.executor.entity; import lombok.Builder; import lombok.Data; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/CorrectionRecognizerResult.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/CorrectionRecognizerResult.java similarity index 67% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/CorrectionRecognizerResult.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/CorrectionRecognizerResult.java index e356294e..1e733b3d 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/CorrectionRecognizerResult.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/CorrectionRecognizerResult.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.executor.entity; +package work.slhaf.partner.module.action.executor.entity; import lombok.Data; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/CorrectorInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/CorrectorInput.java similarity index 89% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/CorrectorInput.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/CorrectorInput.java index b728e54b..2e26af03 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/CorrectorInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/CorrectorInput.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.executor.entity; +package work.slhaf.partner.module.action.executor.entity; import lombok.Builder; import lombok.Data; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/CorrectorResult.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/CorrectorResult.java similarity index 79% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/CorrectorResult.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/CorrectorResult.java index 25d4c950..7ad2d862 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/CorrectorResult.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/CorrectorResult.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.executor.entity; +package work.slhaf.partner.module.action.executor.entity; import lombok.Data; import work.slhaf.partner.core.action.entity.intervention.MetaIntervention; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/ExtractorInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/ExtractorInput.java similarity index 92% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/ExtractorInput.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/ExtractorInput.java index cc274428..9cc84330 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/ExtractorInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/ExtractorInput.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.executor.entity; +package work.slhaf.partner.module.action.executor.entity; import lombok.Data; import work.slhaf.partner.api.chat.pojo.Message; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/ExtractorResult.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/ExtractorResult.java similarity index 69% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/ExtractorResult.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/ExtractorResult.java index 14e90d41..cfeb74c4 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/ExtractorResult.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/ExtractorResult.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.executor.entity; +package work.slhaf.partner.module.action.executor.entity; import lombok.Data; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/HistoryAction.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/HistoryAction.java similarity index 56% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/HistoryAction.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/HistoryAction.java index dbc120b4..3f9b1f42 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/entity/HistoryAction.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/entity/HistoryAction.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.executor.entity; +package work.slhaf.partner.module.action.executor.entity; public record HistoryAction(String actionKey, String description, String result) { } diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/exception/ActionExecutingFailedException.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/exception/ActionExecutingFailedException.java similarity index 84% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/exception/ActionExecutingFailedException.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/exception/ActionExecutingFailedException.java index 62365a94..59b4a078 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/executor/exception/ActionExecutingFailedException.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/exception/ActionExecutingFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.executor.exception; +package work.slhaf.partner.module.action.executor.exception; import work.slhaf.partner.api.agent.runtime.exception.AgentRuntimeException; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/ActionPlanner.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/ActionPlanner.java similarity index 96% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/ActionPlanner.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/ActionPlanner.java index 082ce48c..1d876f80 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/ActionPlanner.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/ActionPlanner.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.planner; +package work.slhaf.partner.module.action.planner; import kotlin.Unit; import org.jetbrains.annotations.NotNull; @@ -17,13 +17,13 @@ import work.slhaf.partner.core.action.entity.cache.CacheAdjustMetaData; 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.module.modules.action.executor.ActionExecutor; -import work.slhaf.partner.module.modules.action.planner.evaluator.ActionEvaluator; -import work.slhaf.partner.module.modules.action.planner.evaluator.entity.EvaluatorInput; -import work.slhaf.partner.module.modules.action.planner.evaluator.entity.EvaluatorResult; -import work.slhaf.partner.module.modules.action.planner.extractor.ActionExtractor; -import work.slhaf.partner.module.modules.action.planner.extractor.entity.ExtractorResult; -import work.slhaf.partner.module.modules.action.scheduler.ActionScheduler; +import work.slhaf.partner.module.action.executor.ActionExecutor; +import work.slhaf.partner.module.action.planner.evaluator.ActionEvaluator; +import work.slhaf.partner.module.action.planner.evaluator.entity.EvaluatorInput; +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 java.util.*; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/evaluator/ActionEvaluator.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/ActionEvaluator.java similarity index 94% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/evaluator/ActionEvaluator.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/ActionEvaluator.java index 1b9f0c7f..b69e1546 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/evaluator/ActionEvaluator.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/ActionEvaluator.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.planner.evaluator; +package work.slhaf.partner.module.action.planner.evaluator; import kotlin.Unit; import org.jetbrains.annotations.NotNull; @@ -15,8 +15,8 @@ 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.module.modules.action.planner.evaluator.entity.EvaluatorInput; -import work.slhaf.partner.module.modules.action.planner.evaluator.entity.EvaluatorResult; +import work.slhaf.partner.module.action.planner.evaluator.entity.EvaluatorInput; +import work.slhaf.partner.module.action.planner.evaluator.entity.EvaluatorResult; import java.util.ArrayList; import java.util.List; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/evaluator/entity/EvaluatorBatchInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/entity/EvaluatorBatchInput.java similarity index 84% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/evaluator/entity/EvaluatorBatchInput.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/entity/EvaluatorBatchInput.java index 5bf20704..4f49eb47 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/evaluator/entity/EvaluatorBatchInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/entity/EvaluatorBatchInput.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.planner.evaluator.entity; +package work.slhaf.partner.module.action.planner.evaluator.entity; import lombok.Data; import work.slhaf.partner.api.chat.pojo.Message; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/evaluator/entity/EvaluatorInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/entity/EvaluatorInput.java similarity index 61% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/evaluator/entity/EvaluatorInput.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/entity/EvaluatorInput.java index 881d791b..44008496 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/evaluator/entity/EvaluatorInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/entity/EvaluatorInput.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.planner.evaluator.entity; +package work.slhaf.partner.module.action.planner.evaluator.entity; import lombok.Data; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/evaluator/entity/EvaluatorResult.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/entity/EvaluatorResult.java similarity index 90% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/evaluator/entity/EvaluatorResult.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/entity/EvaluatorResult.java index 13749bbe..a5fc130c 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/evaluator/entity/EvaluatorResult.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/entity/EvaluatorResult.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.planner.evaluator.entity; +package work.slhaf.partner.module.action.planner.evaluator.entity; import lombok.Data; import work.slhaf.partner.core.action.entity.SchedulableExecutableAction; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/extractor/ActionExtractor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/ActionExtractor.java similarity index 92% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/extractor/ActionExtractor.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/ActionExtractor.java index 336debec..01c3eb84 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/extractor/ActionExtractor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/ActionExtractor.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.planner.extractor; +package work.slhaf.partner.module.action.planner.extractor; import org.jetbrains.annotations.NotNull; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; @@ -8,7 +8,7 @@ import work.slhaf.partner.api.chat.pojo.Message; 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.module.modules.action.planner.extractor.entity.ExtractorResult; +import work.slhaf.partner.module.action.planner.extractor.entity.ExtractorResult; import java.util.List; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/extractor/entity/ExtractorInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/entity/ExtractorInput.java similarity index 72% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/extractor/entity/ExtractorInput.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/entity/ExtractorInput.java index bd42536c..228a4c5a 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/extractor/entity/ExtractorInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/entity/ExtractorInput.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.planner.extractor.entity; +package work.slhaf.partner.module.action.planner.extractor.entity; import lombok.Data; import work.slhaf.partner.api.chat.pojo.Message; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/extractor/entity/ExtractorResult.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/entity/ExtractorResult.java similarity index 69% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/extractor/entity/ExtractorResult.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/entity/ExtractorResult.java index fd13d86c..5300e4f6 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/planner/extractor/entity/ExtractorResult.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/entity/ExtractorResult.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.planner.extractor.entity; +package work.slhaf.partner.module.action.planner.extractor.entity; import lombok.Data; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/scheduler/ActionScheduler.kt b/Partner-Core/src/main/java/work/slhaf/partner/module/action/scheduler/ActionScheduler.kt similarity index 99% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/scheduler/ActionScheduler.kt rename to Partner-Core/src/main/java/work/slhaf/partner/module/action/scheduler/ActionScheduler.kt index 1153e0f4..d194f03d 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/action/scheduler/ActionScheduler.kt +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/scheduler/ActionScheduler.kt @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.scheduler +package work.slhaf.partner.module.action.scheduler import com.cronutils.model.CronType import com.cronutils.model.definition.CronDefinition @@ -19,7 +19,7 @@ import work.slhaf.partner.core.action.ActionCapability import work.slhaf.partner.core.action.entity.Action import work.slhaf.partner.core.action.entity.Schedulable import work.slhaf.partner.core.action.entity.SchedulableExecutableAction -import work.slhaf.partner.module.modules.action.executor.ActionExecutor +import work.slhaf.partner.module.action.executor.ActionExecutor import java.io.Closeable import java.time.Duration import java.time.ZonedDateTime diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/common/model/ModelConstant.java b/Partner-Core/src/main/java/work/slhaf/partner/module/common/model/ModelConstant.java deleted file mode 100644 index f736ef03..00000000 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/common/model/ModelConstant.java +++ /dev/null @@ -1,16 +0,0 @@ -package work.slhaf.partner.module.common.model; - -public class ModelConstant { - - public static class Prompt { - public static final String MEMORY = "memory"; - public static final String SCHEDULE = "schedule"; - public static final String CORE = "core"; - public static final String PERCEIVE = "perceive"; - } - - public static class CharacterPrefix { - public static final String SYSTEM = "[SYSTEM] "; - } - -} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/core/CommunicationProducer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/core/CommunicationProducer.java similarity index 99% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/core/CommunicationProducer.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/core/CommunicationProducer.java index dc2b9fa2..d1b3ff9d 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/core/CommunicationProducer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/core/CommunicationProducer.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.core; +package work.slhaf.partner.module.core; import com.alibaba.fastjson2.JSONObject; import lombok.Data; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/runtime/MemoryRuntime.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/runtime/MemoryRuntime.java similarity index 99% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/runtime/MemoryRuntime.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/memory/runtime/MemoryRuntime.java index 8e33c45e..08f5baf5 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/runtime/MemoryRuntime.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/runtime/MemoryRuntime.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.memory.runtime; +package work.slhaf.partner.module.memory.runtime; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/MemorySelector.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/MemorySelector.java similarity index 88% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/MemorySelector.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/MemorySelector.java index 7a4fa356..4d1094dc 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/MemorySelector.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/MemorySelector.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.memory.selector; +package work.slhaf.partner.module.memory.selector; import com.alibaba.fastjson2.JSONObject; import lombok.Data; @@ -11,12 +11,12 @@ 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.module.modules.memory.runtime.MemoryRuntime; -import work.slhaf.partner.module.modules.memory.selector.evaluator.SliceSelectEvaluator; -import work.slhaf.partner.module.modules.memory.selector.evaluator.entity.EvaluatorInput; -import work.slhaf.partner.module.modules.memory.selector.extractor.MemorySelectExtractor; -import work.slhaf.partner.module.modules.memory.selector.extractor.entity.ExtractorMatchData; -import work.slhaf.partner.module.modules.memory.selector.extractor.entity.ExtractorResult; +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; +import work.slhaf.partner.module.memory.selector.extractor.MemorySelectExtractor; +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 java.time.LocalDate; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/SliceSelectEvaluator.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/SliceSelectEvaluator.java similarity index 90% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/SliceSelectEvaluator.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/SliceSelectEvaluator.java index 0d707d36..c23c8b2f 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/SliceSelectEvaluator.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/SliceSelectEvaluator.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.memory.selector.evaluator; +package work.slhaf.partner.module.memory.selector.evaluator; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSONObject; @@ -10,10 +10,10 @@ import work.slhaf.partner.api.agent.factory.component.annotation.Init; import work.slhaf.partner.api.chat.pojo.Message; import work.slhaf.partner.common.thread.InteractionThreadPoolExecutor; import work.slhaf.partner.core.memory.pojo.ActivatedMemorySlice; -import work.slhaf.partner.module.modules.memory.selector.evaluator.entity.EvaluatorBatchInput; -import work.slhaf.partner.module.modules.memory.selector.evaluator.entity.EvaluatorInput; -import work.slhaf.partner.module.modules.memory.selector.evaluator.entity.EvaluatorResult; -import work.slhaf.partner.module.modules.memory.selector.evaluator.entity.SliceSummary; +import work.slhaf.partner.module.memory.selector.evaluator.entity.EvaluatorBatchInput; +import work.slhaf.partner.module.memory.selector.evaluator.entity.EvaluatorInput; +import work.slhaf.partner.module.memory.selector.evaluator.entity.EvaluatorResult; +import work.slhaf.partner.module.memory.selector.evaluator.entity.SliceSummary; import java.util.*; import java.util.concurrent.Callable; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/entity/EvaluatorBatchInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/entity/EvaluatorBatchInput.java similarity index 78% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/entity/EvaluatorBatchInput.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/entity/EvaluatorBatchInput.java index d38427a1..32efddfb 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/entity/EvaluatorBatchInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/entity/EvaluatorBatchInput.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.memory.selector.evaluator.entity; +package work.slhaf.partner.module.memory.selector.evaluator.entity; import lombok.Builder; import lombok.Data; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/entity/EvaluatorInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/entity/EvaluatorInput.java similarity index 81% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/entity/EvaluatorInput.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/entity/EvaluatorInput.java index ce950540..8860cefc 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/entity/EvaluatorInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/entity/EvaluatorInput.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.memory.selector.evaluator.entity; +package work.slhaf.partner.module.memory.selector.evaluator.entity; import lombok.Builder; import lombok.Data; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/entity/EvaluatorResult.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/entity/EvaluatorResult.java similarity index 60% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/entity/EvaluatorResult.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/entity/EvaluatorResult.java index d7ab99ee..59d49438 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/entity/EvaluatorResult.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/entity/EvaluatorResult.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.memory.selector.evaluator.entity; +package work.slhaf.partner.module.memory.selector.evaluator.entity; import lombok.Data; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/entity/SliceSummary.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/entity/SliceSummary.java similarity index 68% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/entity/SliceSummary.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/entity/SliceSummary.java index 92e36f2e..8a05532e 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/entity/SliceSummary.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/entity/SliceSummary.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.memory.selector.evaluator.entity; +package work.slhaf.partner.module.memory.selector.evaluator.entity; import lombok.Data; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/MemorySelectExtractor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/MemorySelectExtractor.java similarity index 88% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/MemorySelectExtractor.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/MemorySelectExtractor.java index a7df4ad3..ed276327 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/MemorySelectExtractor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/MemorySelectExtractor.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.memory.selector.extractor; +package work.slhaf.partner.module.memory.selector.extractor; import cn.hutool.json.JSONUtil; import lombok.Data; @@ -11,10 +11,10 @@ import work.slhaf.partner.api.chat.pojo.Message; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.memory.MemoryCapability; import work.slhaf.partner.core.memory.pojo.ActivatedMemorySlice; -import work.slhaf.partner.module.modules.memory.runtime.MemoryRuntime; -import work.slhaf.partner.module.modules.memory.selector.extractor.entity.ExtractorInput; -import work.slhaf.partner.module.modules.memory.selector.extractor.entity.ExtractorMatchData; -import work.slhaf.partner.module.modules.memory.selector.extractor.entity.ExtractorResult; +import work.slhaf.partner.module.memory.runtime.MemoryRuntime; +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 java.util.List; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/entity/ExtractorInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/entity/ExtractorInput.java similarity index 85% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/entity/ExtractorInput.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/entity/ExtractorInput.java index 28c12b16..5dbd2e13 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/entity/ExtractorInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/entity/ExtractorInput.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.memory.selector.extractor.entity; +package work.slhaf.partner.module.memory.selector.extractor.entity; import lombok.Builder; import lombok.Data; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/entity/ExtractorMatchData.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/entity/ExtractorMatchData.java similarity index 77% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/entity/ExtractorMatchData.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/entity/ExtractorMatchData.java index d425efba..12f64aac 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/entity/ExtractorMatchData.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/entity/ExtractorMatchData.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.memory.selector.extractor.entity; +package work.slhaf.partner.module.memory.selector.extractor.entity; import lombok.Data; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/entity/ExtractorResult.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/entity/ExtractorResult.java similarity index 67% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/entity/ExtractorResult.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/entity/ExtractorResult.java index d5bc6302..c2ccc4cf 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/entity/ExtractorResult.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/entity/ExtractorResult.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.memory.selector.extractor.entity; +package work.slhaf.partner.module.memory.selector.extractor.entity; import lombok.Data; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/MemoryUpdater.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/MemoryUpdater.java similarity index 92% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/MemoryUpdater.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/MemoryUpdater.java index 022b87e3..45cd45bf 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/MemoryUpdater.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/MemoryUpdater.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.memory.updater; +package work.slhaf.partner.module.memory.updater; import com.alibaba.fastjson2.JSONObject; import kotlin.Unit; @@ -17,12 +17,12 @@ import work.slhaf.partner.core.memory.MemoryCapability; import work.slhaf.partner.core.memory.pojo.MemorySlice; import work.slhaf.partner.core.memory.pojo.MemoryUnit; import work.slhaf.partner.core.perceive.PerceiveCapability; -import work.slhaf.partner.module.modules.action.scheduler.ActionScheduler; -import work.slhaf.partner.module.modules.memory.runtime.MemoryRuntime; -import work.slhaf.partner.module.modules.memory.updater.summarizer.MultiSummarizer; -import work.slhaf.partner.module.modules.memory.updater.summarizer.SingleSummarizer; -import work.slhaf.partner.module.modules.memory.updater.summarizer.entity.SummarizeInput; -import work.slhaf.partner.module.modules.memory.updater.summarizer.entity.SummarizeResult; +import work.slhaf.partner.module.action.scheduler.ActionScheduler; +import work.slhaf.partner.module.memory.runtime.MemoryRuntime; +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 java.util.ArrayList; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/exception/UnExpectedMessageCountException.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/exception/UnExpectedMessageCountException.java similarity index 70% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/exception/UnExpectedMessageCountException.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/exception/UnExpectedMessageCountException.java index bc560382..e286e0d1 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/exception/UnExpectedMessageCountException.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/exception/UnExpectedMessageCountException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.memory.updater.exception; +package work.slhaf.partner.module.memory.updater.exception; public class UnExpectedMessageCountException extends RuntimeException { public UnExpectedMessageCountException(String message) { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/MultiSummarizer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/MultiSummarizer.java similarity index 87% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/MultiSummarizer.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/MultiSummarizer.java index ebb4f188..ec1fe56e 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/MultiSummarizer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/MultiSummarizer.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.memory.updater.summarizer; +package work.slhaf.partner.module.memory.updater.summarizer; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSONObject; @@ -7,8 +7,8 @@ import lombok.EqualsAndHashCode; import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.api.agent.factory.component.abstracts.ActivateModel; import work.slhaf.partner.api.chat.pojo.Message; -import work.slhaf.partner.module.modules.memory.updater.summarizer.entity.SummarizeInput; -import work.slhaf.partner.module.modules.memory.updater.summarizer.entity.SummarizeResult; +import work.slhaf.partner.module.memory.updater.summarizer.entity.SummarizeInput; +import work.slhaf.partner.module.memory.updater.summarizer.entity.SummarizeResult; import java.util.ArrayList; import java.util.List; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/SingleSummarizer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/SingleSummarizer.java similarity index 97% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/SingleSummarizer.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/SingleSummarizer.java index 58cfbf6d..b346855a 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/SingleSummarizer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/SingleSummarizer.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.memory.updater.summarizer; +package work.slhaf.partner.module.memory.updater.summarizer; import com.alibaba.fastjson2.JSONObject; import lombok.Data; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/TotalSummarizer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/TotalSummarizer.java similarity index 93% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/TotalSummarizer.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/TotalSummarizer.java index 3f8d83ba..e77dc51b 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/TotalSummarizer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/TotalSummarizer.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.memory.updater.summarizer; +package work.slhaf.partner.module.memory.updater.summarizer; import cn.hutool.json.JSONUtil; import lombok.Data; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/entity/SummarizeInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/entity/SummarizeInput.java similarity index 77% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/entity/SummarizeInput.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/entity/SummarizeInput.java index 6fddd484..332d3930 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/entity/SummarizeInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/entity/SummarizeInput.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.memory.updater.summarizer.entity; +package work.slhaf.partner.module.memory.updater.summarizer.entity; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/entity/SummarizeResult.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/entity/SummarizeResult.java similarity index 70% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/entity/SummarizeResult.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/entity/SummarizeResult.java index dc606a7b..26c7c034 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/entity/SummarizeResult.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/entity/SummarizeResult.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.memory.updater.summarizer.entity; +package work.slhaf.partner.module.memory.updater.summarizer.entity; import lombok.Data; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/PerceiveMonitor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/perceive/PerceiveMonitor.java similarity index 97% rename from Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/PerceiveMonitor.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/perceive/PerceiveMonitor.java index e7ddadc8..0e39710b 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/PerceiveMonitor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/perceive/PerceiveMonitor.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.perceive; +package work.slhaf.partner.module.perceive; import lombok.Setter; import org.jetbrains.annotations.NotNull; diff --git a/Partner-Core/src/test/java/work/slhaf/partner/core/action/runner/LocalRunnerClientTest.java b/Partner-Core/src/test/java/work/slhaf/partner/core/action/runner/LocalRunnerClientTest.java index 9b379b87..6ccbb6ee 100644 --- a/Partner-Core/src/test/java/work/slhaf/partner/core/action/runner/LocalRunnerClientTest.java +++ b/Partner-Core/src/test/java/work/slhaf/partner/core/action/runner/LocalRunnerClientTest.java @@ -11,7 +11,7 @@ import work.slhaf.partner.core.action.entity.MetaActionInfo; import work.slhaf.partner.core.action.runner.policy.ExecutionPolicy; import work.slhaf.partner.core.action.runner.policy.ExecutionPolicyRegistry; import work.slhaf.partner.core.action.runner.policy.WrappedLaunchSpec; -import work.slhaf.partner.module.modules.action.builtin.BuiltinActionRegistry; +import work.slhaf.partner.module.action.builtin.BuiltinActionRegistry; import java.io.IOException; import java.nio.file.Files; diff --git a/Partner-Core/src/test/java/work/slhaf/partner/module/modules/action/builtin/BuiltinActionRegistryTest.java b/Partner-Core/src/test/java/work/slhaf/partner/module/action/builtin/BuiltinActionRegistryTest.java similarity index 98% rename from Partner-Core/src/test/java/work/slhaf/partner/module/modules/action/builtin/BuiltinActionRegistryTest.java rename to Partner-Core/src/test/java/work/slhaf/partner/module/action/builtin/BuiltinActionRegistryTest.java index 2f65c02d..ed979081 100644 --- a/Partner-Core/src/test/java/work/slhaf/partner/module/modules/action/builtin/BuiltinActionRegistryTest.java +++ b/Partner-Core/src/test/java/work/slhaf/partner/module/action/builtin/BuiltinActionRegistryTest.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.builtin; +package work.slhaf.partner.module.action.builtin; import com.alibaba.fastjson2.JSONObject; import org.junit.jupiter.api.Assertions; diff --git a/Partner-Core/src/test/java/work/slhaf/partner/module/modules/action/builtin/BuiltinCommandActionProviderTest.java b/Partner-Core/src/test/java/work/slhaf/partner/module/action/builtin/BuiltinCommandActionProviderTest.java similarity index 98% rename from Partner-Core/src/test/java/work/slhaf/partner/module/modules/action/builtin/BuiltinCommandActionProviderTest.java rename to Partner-Core/src/test/java/work/slhaf/partner/module/action/builtin/BuiltinCommandActionProviderTest.java index 47b345b1..e418ed8b 100644 --- a/Partner-Core/src/test/java/work/slhaf/partner/module/modules/action/builtin/BuiltinCommandActionProviderTest.java +++ b/Partner-Core/src/test/java/work/slhaf/partner/module/action/builtin/BuiltinCommandActionProviderTest.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.builtin; +package work.slhaf.partner.module.action.builtin; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; diff --git a/Partner-Core/src/test/java/work/slhaf/partner/module/modules/action/builtin/BuiltinDynamicActionProviderTest.java b/Partner-Core/src/test/java/work/slhaf/partner/module/action/builtin/BuiltinDynamicActionProviderTest.java similarity index 98% rename from Partner-Core/src/test/java/work/slhaf/partner/module/modules/action/builtin/BuiltinDynamicActionProviderTest.java rename to Partner-Core/src/test/java/work/slhaf/partner/module/action/builtin/BuiltinDynamicActionProviderTest.java index d01d6745..c35502de 100644 --- a/Partner-Core/src/test/java/work/slhaf/partner/module/modules/action/builtin/BuiltinDynamicActionProviderTest.java +++ b/Partner-Core/src/test/java/work/slhaf/partner/module/action/builtin/BuiltinDynamicActionProviderTest.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.builtin; +package work.slhaf.partner.module.action.builtin; import com.alibaba.fastjson2.JSONObject; import org.junit.jupiter.api.Assertions; @@ -12,7 +12,7 @@ import work.slhaf.partner.core.action.entity.MetaAction; import work.slhaf.partner.core.action.entity.MetaActionInfo; import work.slhaf.partner.core.action.entity.StateAction; import work.slhaf.partner.core.action.runner.RunnerClient; -import work.slhaf.partner.module.modules.action.scheduler.ActionScheduler; +import work.slhaf.partner.module.action.scheduler.ActionScheduler; import java.io.IOException; import java.lang.reflect.Field; diff --git a/Partner-Core/src/test/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionSchedulerTest.kt b/Partner-Core/src/test/java/work/slhaf/partner/module/action/dispatcher/executor/ActionSchedulerTest.kt similarity index 98% rename from Partner-Core/src/test/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionSchedulerTest.kt rename to Partner-Core/src/test/java/work/slhaf/partner/module/action/dispatcher/executor/ActionSchedulerTest.kt index c002f191..5da5bbca 100644 --- a/Partner-Core/src/test/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionSchedulerTest.kt +++ b/Partner-Core/src/test/java/work/slhaf/partner/module/action/dispatcher/executor/ActionSchedulerTest.kt @@ -1,4 +1,4 @@ -package work.slhaf.partner.module.modules.action.dispatcher.executor +package work.slhaf.partner.module.action.dispatcher.executor import kotlinx.coroutines.* import kotlinx.coroutines.flow.MutableStateFlow @@ -18,8 +18,8 @@ import work.slhaf.partner.core.action.entity.Action import work.slhaf.partner.core.action.entity.ExecutableAction import work.slhaf.partner.core.action.entity.Schedulable import work.slhaf.partner.core.action.entity.SchedulableExecutableAction -import work.slhaf.partner.module.modules.action.executor.ActionExecutor -import work.slhaf.partner.module.modules.action.scheduler.ActionScheduler +import work.slhaf.partner.module.action.executor.ActionExecutor +import work.slhaf.partner.module.action.scheduler.ActionScheduler import java.time.ZonedDateTime import java.time.temporal.ChronoUnit