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 3c5d5c78..094af895 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,7 +1,7 @@ package work.slhaf.partner.core.cognition; import work.slhaf.partner.api.agent.factory.capability.annotation.Capability; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.pojo.Message; import java.util.List; import java.util.concurrent.locks.Lock; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/CognitionCore.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/CognitionCore.java index 95888db5..2df921eb 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/CognitionCore.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognition/CognitionCore.java @@ -6,8 +6,8 @@ import lombok.Setter; import lombok.extern.slf4j.Slf4j; import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityCore; import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityMethod; +import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.api.agent.runtime.interaction.AgentRuntime; -import work.slhaf.partner.api.chat.pojo.Message; import work.slhaf.partner.core.PartnerCore; import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; 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/ResolvedContext.kt index 57b8c813..0caa4679 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/ResolvedContext.kt @@ -1,7 +1,7 @@ package work.slhaf.partner.core.cognition import org.w3c.dom.Document -import work.slhaf.partner.api.chat.pojo.Message +import work.slhaf.partner.api.agent.model.pojo.Message import java.io.StringWriter import javax.xml.parsers.DocumentBuilderFactory import javax.xml.transform.OutputKeys diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/MemoryUnit.java b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/MemoryUnit.java index 6e43e5be..8aac71c7 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/MemoryUnit.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/memory/pojo/MemoryUnit.java @@ -2,7 +2,7 @@ package work.slhaf.partner.core.memory.pojo; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.api.common.entity.PersistableObject; import java.io.Serial; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/TaskBlock.kt b/Partner-Core/src/main/java/work/slhaf/partner/module/TaskBlock.kt index e4f53e14..fd116494 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/TaskBlock.kt +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/TaskBlock.kt @@ -1,6 +1,6 @@ package work.slhaf.partner.module -import work.slhaf.partner.api.chat.pojo.Message +import work.slhaf.partner.api.agent.model.pojo.Message import work.slhaf.partner.common.base.Block abstract class TaskBlock @JvmOverloads constructor( 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 47cb3e9c..4a214ef7 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 @@ -6,8 +6,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.chat.ActivateModel; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.ActivateModel; +import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.cognition.ContextBlock; import work.slhaf.partner.module.TaskBlock; 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 c8d31a5e..2b59bbc1 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,8 +6,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.chat.ActivateModel; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.ActivateModel; +import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.cognition.ContextBlock; import work.slhaf.partner.module.TaskBlock; 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 84dff8c1..f78cfa06 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,8 +6,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.chat.ActivateModel; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.ActivateModel; +import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.action.entity.MetaActionInfo; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.cognition.ContextBlock; 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 e68324a2..b637279c 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 @@ -7,8 +7,8 @@ import org.w3c.dom.Element; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.api.agent.factory.component.annotation.Init; -import work.slhaf.partner.api.chat.ActivateModel; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.ActivateModel; +import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.ActionCore; import work.slhaf.partner.core.cognition.BlockContent; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/entity/EvaluatorBatchInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/entity/EvaluatorBatchInput.java index 08bce2e7..4ba7308e 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/entity/EvaluatorBatchInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/evaluator/entity/EvaluatorBatchInput.java @@ -1,7 +1,7 @@ package work.slhaf.partner.module.action.planner.evaluator.entity; import lombok.Data; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.module.memory.selector.ActivatedMemorySlice; import java.util.List; 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 3610c12f..2294b0f0 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 @@ -3,8 +3,8 @@ package work.slhaf.partner.module.action.planner.extractor; import org.jetbrains.annotations.NotNull; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.chat.ActivateModel; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.ActivateModel; +import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.cognition.ContextBlock; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/entity/ExtractorInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/entity/ExtractorInput.java index 228a4c5a..7ee08881 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/entity/ExtractorInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/extractor/entity/ExtractorInput.java @@ -1,7 +1,7 @@ package work.slhaf.partner.module.action.planner.extractor.entity; import lombok.Data; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.pojo.Message; import java.util.List; 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 c0902ae4..2b802c02 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 @@ -9,9 +9,9 @@ import org.w3c.dom.Element; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.api.agent.factory.component.annotation.Init; -import work.slhaf.partner.api.chat.ActivateModel; -import work.slhaf.partner.api.chat.StreamChatMessageConsumer; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.ActivateModel; +import work.slhaf.partner.api.agent.model.StreamChatMessageConsumer; +import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.cognition.*; import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/communication/DialogRollingService.java b/Partner-Core/src/main/java/work/slhaf/partner/module/communication/DialogRollingService.java index 9de70ed4..25ac9705 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/communication/DialogRollingService.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/communication/DialogRollingService.java @@ -7,8 +7,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.chat.ActivateModel; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.ActivateModel; +import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.cognition.BlockContent; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.cognition.ContextBlock; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/communication/ReplyDispatcher.kt b/Partner-Core/src/main/java/work/slhaf/partner/module/communication/ReplyDispatcher.kt index 0dd4abc9..891ca7bd 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/communication/ReplyDispatcher.kt +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/communication/ReplyDispatcher.kt @@ -2,10 +2,10 @@ package work.slhaf.partner.module.communication import kotlinx.coroutines.* import kotlinx.coroutines.channels.Channel +import work.slhaf.partner.api.agent.model.StreamChatMessageConsumer import work.slhaf.partner.api.agent.runtime.interaction.AgentRuntime import work.slhaf.partner.api.agent.runtime.interaction.data.InteractionEvent.EventStatus import work.slhaf.partner.api.agent.runtime.interaction.data.Reply -import work.slhaf.partner.api.chat.StreamChatMessageConsumer import kotlin.time.Duration.Companion.milliseconds object ReplyDispatcher { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/runtime/MemoryRuntime.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/runtime/MemoryRuntime.java index 1f35bffd..f482b361 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/runtime/MemoryRuntime.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/runtime/MemoryRuntime.java @@ -6,8 +6,8 @@ import org.apache.commons.io.FileUtils; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.api.agent.factory.component.annotation.Init; +import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.api.agent.runtime.config.AgentConfigLoader; -import work.slhaf.partner.api.chat.pojo.Message; import work.slhaf.partner.api.common.entity.PersistableObject; import work.slhaf.partner.common.config.PartnerAgentConfigLoader; import work.slhaf.partner.core.cognition.CognitionCapability; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/ActivatedMemorySlice.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/ActivatedMemorySlice.java index 5d86ee9e..472d78d6 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/ActivatedMemorySlice.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/ActivatedMemorySlice.java @@ -3,7 +3,7 @@ package work.slhaf.partner.module.memory.selector; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.api.common.entity.PersistableObject; import java.io.Serial; 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 69c652cb..ac4c038c 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 @@ -9,7 +9,7 @@ import org.w3c.dom.Element; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.api.agent.factory.component.annotation.InjectModule; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.ActionCore; import work.slhaf.partner.core.cognition.BlockContent; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/SliceSelectEvaluator.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/SliceSelectEvaluator.java index f8386ef5..55f07e35 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/SliceSelectEvaluator.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/evaluator/SliceSelectEvaluator.java @@ -9,8 +9,8 @@ import org.w3c.dom.Element; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.api.agent.factory.component.annotation.Init; -import work.slhaf.partner.api.chat.ActivateModel; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.ActivateModel; +import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.ActionCore; import work.slhaf.partner.core.cognition.CognitionCapability; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/MemorySelectExtractor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/MemorySelectExtractor.java index a7bfec32..d5116328 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/MemorySelectExtractor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/extractor/MemorySelectExtractor.java @@ -9,8 +9,8 @@ import org.w3c.dom.Element; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.api.agent.factory.component.annotation.InjectModule; -import work.slhaf.partner.api.chat.ActivateModel; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.ActivateModel; +import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.cognition.CognitionCapability; import work.slhaf.partner.core.cognition.ContextBlock; import work.slhaf.partner.module.TaskBlock; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/MemoryUpdater.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/MemoryUpdater.java index 9dbb95b3..58848276 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/MemoryUpdater.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/MemoryUpdater.java @@ -9,7 +9,7 @@ import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapabili import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.api.agent.factory.component.annotation.Init; import work.slhaf.partner.api.agent.factory.component.annotation.InjectModule; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.ActionCore; import work.slhaf.partner.core.action.entity.Schedulable; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/MultiSummarizer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/MultiSummarizer.java index 67c76a74..9b0c0ece 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/MultiSummarizer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/MultiSummarizer.java @@ -5,8 +5,8 @@ import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.chat.ActivateModel; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.ActivateModel; +import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.module.memory.updater.summarizer.entity.SummarizeInput; import work.slhaf.partner.module.memory.updater.summarizer.entity.SummarizeResult; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/SingleSummarizer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/SingleSummarizer.java index 70f3eeef..8f5c2e49 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/SingleSummarizer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/SingleSummarizer.java @@ -6,8 +6,8 @@ import lombok.EqualsAndHashCode; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; import work.slhaf.partner.api.agent.factory.component.annotation.Init; -import work.slhaf.partner.api.chat.ActivateModel; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.ActivateModel; +import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.core.action.ActionCapability; import work.slhaf.partner.core.action.ActionCore; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/TotalSummarizer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/TotalSummarizer.java index 1930cc2b..ad805e3c 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/TotalSummarizer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/TotalSummarizer.java @@ -4,8 +4,8 @@ import cn.hutool.json.JSONUtil; import lombok.Data; import lombok.EqualsAndHashCode; import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule; -import work.slhaf.partner.api.chat.ActivateModel; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.ActivateModel; +import work.slhaf.partner.api.agent.model.pojo.Message; import java.util.HashMap; import java.util.List; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/entity/SummarizeInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/entity/SummarizeInput.java index 332d3930..bc4ecb3c 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/entity/SummarizeInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/updater/summarizer/entity/SummarizeInput.java @@ -2,7 +2,7 @@ package work.slhaf.partner.module.memory.updater.summarizer.entity; import lombok.AllArgsConstructor; import lombok.Data; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.pojo.Message; import java.util.List; diff --git a/Partner-Core/src/test/java/work/slhaf/partner/core/memory/MemoryCoreTest.java b/Partner-Core/src/test/java/work/slhaf/partner/core/memory/MemoryCoreTest.java index 45e84d1d..b5ea2872 100644 --- a/Partner-Core/src/test/java/work/slhaf/partner/core/memory/MemoryCoreTest.java +++ b/Partner-Core/src/test/java/work/slhaf/partner/core/memory/MemoryCoreTest.java @@ -2,8 +2,8 @@ package work.slhaf.partner.core.memory; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; +import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.api.agent.runtime.config.AgentConfigLoader; -import work.slhaf.partner.api.chat.pojo.Message; import work.slhaf.partner.common.config.Config; import work.slhaf.partner.common.config.PartnerAgentConfigLoader; import work.slhaf.partner.core.memory.pojo.MemorySlice; 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 d90bda09..ef3fb504 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 @@ -2,8 +2,8 @@ package work.slhaf.partner.module.memory.runtime; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; +import work.slhaf.partner.api.agent.model.pojo.Message; import work.slhaf.partner.api.agent.runtime.config.AgentConfigLoader; -import work.slhaf.partner.api.chat.pojo.Message; import work.slhaf.partner.common.config.Config; import work.slhaf.partner.common.config.PartnerAgentConfigLoader; import work.slhaf.partner.core.memory.MemoryCapability; diff --git a/Partner-Core/src/test/java/work/slhaf/partner/module/memory/updater/MemoryUpdaterTest.java b/Partner-Core/src/test/java/work/slhaf/partner/module/memory/updater/MemoryUpdaterTest.java index 42e6b6d9..faca37ae 100644 --- a/Partner-Core/src/test/java/work/slhaf/partner/module/memory/updater/MemoryUpdaterTest.java +++ b/Partner-Core/src/test/java/work/slhaf/partner/module/memory/updater/MemoryUpdaterTest.java @@ -1,7 +1,7 @@ package work.slhaf.partner.module.memory.updater; import org.junit.jupiter.api.Test; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.pojo.Message; 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-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/ComponentRegisterFactory.kt b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/ComponentRegisterFactory.kt index e5ffba40..cccf19af 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/ComponentRegisterFactory.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/component/ComponentRegisterFactory.kt @@ -11,7 +11,7 @@ import work.slhaf.partner.api.agent.factory.config.pojo.ModelConfig import work.slhaf.partner.api.agent.factory.context.AgentContext import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext import work.slhaf.partner.api.agent.factory.context.ModuleContextData -import work.slhaf.partner.api.chat.ActivateModel +import work.slhaf.partner.api.agent.model.ActivateModel import java.lang.reflect.Modifier import java.time.ZonedDateTime diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/chat/ActivateModel.kt b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/ActivateModel.kt similarity index 92% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/chat/ActivateModel.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/ActivateModel.kt index d626492e..ecd5338b 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/chat/ActivateModel.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/ActivateModel.kt @@ -1,7 +1,7 @@ -package work.slhaf.partner.api.chat +package work.slhaf.partner.api.agent.model import work.slhaf.partner.api.agent.factory.component.abstracts.AbstractAgentModule -import work.slhaf.partner.api.chat.pojo.Message +import work.slhaf.partner.api.agent.model.pojo.Message interface ActivateModel { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/chat/ModelRuntimeRegistry.kt b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/ModelRuntimeRegistry.kt similarity index 88% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/chat/ModelRuntimeRegistry.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/ModelRuntimeRegistry.kt index baf1e04c..cc4f4168 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/chat/ModelRuntimeRegistry.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/ModelRuntimeRegistry.kt @@ -1,8 +1,8 @@ -package work.slhaf.partner.api.chat +package work.slhaf.partner.api.agent.model -import work.slhaf.partner.api.chat.provider.ModelProvider -import work.slhaf.partner.api.chat.provider.ProviderOverride -import work.slhaf.partner.api.chat.provider.openai.OpenAiCompatibleProvider +import work.slhaf.partner.api.agent.model.provider.ModelProvider +import work.slhaf.partner.api.agent.model.provider.ProviderOverride +import work.slhaf.partner.api.agent.model.provider.openai.OpenAiCompatibleProvider object ModelRuntimeRegistry { diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/chat/StreamChatMessageConsumer.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/StreamChatMessageConsumer.java similarity index 89% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/chat/StreamChatMessageConsumer.java rename to Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/StreamChatMessageConsumer.java index 603ae279..09dcf849 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/chat/StreamChatMessageConsumer.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/StreamChatMessageConsumer.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.chat; +package work.slhaf.partner.api.agent.model; public abstract class StreamChatMessageConsumer { private final StringBuilder responseText = new StringBuilder(); diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/chat/pojo/Message.kt b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/pojo/Message.kt similarity index 95% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/chat/pojo/Message.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/pojo/Message.kt index d3340d8c..a31165dd 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/chat/pojo/Message.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/pojo/Message.kt @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.chat.pojo +package work.slhaf.partner.api.agent.model.pojo import com.alibaba.fastjson2.annotation.JSONCreator import com.alibaba.fastjson2.annotation.JSONField diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/chat/provider/ModelProvider.kt b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/provider/ModelProvider.kt similarity index 77% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/chat/provider/ModelProvider.kt rename to Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/provider/ModelProvider.kt index 408052a0..5a981ad3 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/chat/provider/ModelProvider.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/provider/ModelProvider.kt @@ -1,8 +1,8 @@ -package work.slhaf.partner.api.chat.provider +package work.slhaf.partner.api.agent.model.provider import com.alibaba.fastjson2.JSONObject -import work.slhaf.partner.api.chat.StreamChatMessageConsumer -import work.slhaf.partner.api.chat.pojo.Message +import work.slhaf.partner.api.agent.model.StreamChatMessageConsumer +import work.slhaf.partner.api.agent.model.pojo.Message abstract class ModelProvider @JvmOverloads constructor( val override: ProviderOverride? = null diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/chat/provider/openai/OpenAiCompatibleProvider.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/provider/openai/OpenAiCompatibleProvider.java similarity index 93% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/chat/provider/openai/OpenAiCompatibleProvider.java rename to Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/provider/openai/OpenAiCompatibleProvider.java index c6afb844..2e795863 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/chat/provider/openai/OpenAiCompatibleProvider.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/provider/openai/OpenAiCompatibleProvider.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.chat.provider.openai; +package work.slhaf.partner.api.agent.model.provider.openai; import com.alibaba.fastjson2.JSONObject; import com.openai.client.OpenAIClient; @@ -7,10 +7,10 @@ import com.openai.core.JsonValue; import com.openai.core.http.StreamResponse; import com.openai.models.chat.completions.*; import org.jetbrains.annotations.NotNull; -import work.slhaf.partner.api.chat.StreamChatMessageConsumer; -import work.slhaf.partner.api.chat.pojo.Message; -import work.slhaf.partner.api.chat.provider.ModelProvider; -import work.slhaf.partner.api.chat.provider.ProviderOverride; +import work.slhaf.partner.api.agent.model.StreamChatMessageConsumer; +import work.slhaf.partner.api.agent.model.pojo.Message; +import work.slhaf.partner.api.agent.model.provider.ModelProvider; +import work.slhaf.partner.api.agent.model.provider.ProviderOverride; import java.time.Duration; import java.util.List; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/chat/provider/openai/OpenAiMessageAdapter.java b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/provider/openai/OpenAiMessageAdapter.java similarity index 92% rename from Partner-Framework/src/main/java/work/slhaf/partner/api/chat/provider/openai/OpenAiMessageAdapter.java rename to Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/provider/openai/OpenAiMessageAdapter.java index 827b7d8b..bcc3b077 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/api/chat/provider/openai/OpenAiMessageAdapter.java +++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/model/provider/openai/OpenAiMessageAdapter.java @@ -1,10 +1,10 @@ -package work.slhaf.partner.api.chat.provider.openai; +package work.slhaf.partner.api.agent.model.provider.openai; import com.openai.models.chat.completions.ChatCompletionAssistantMessageParam; import com.openai.models.chat.completions.ChatCompletionMessageParam; import com.openai.models.chat.completions.ChatCompletionSystemMessageParam; import com.openai.models.chat.completions.ChatCompletionUserMessageParam; -import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.agent.model.pojo.Message; import java.util.ArrayList; import java.util.List; diff --git a/Partner-Framework/src/test/java/work/slhaf/partner/api/chat/pojo/MessageTest.java b/Partner-Framework/src/test/java/work/slhaf/partner/api/model/pojo/MessageTest.java similarity index 87% rename from Partner-Framework/src/test/java/work/slhaf/partner/api/chat/pojo/MessageTest.java rename to Partner-Framework/src/test/java/work/slhaf/partner/api/model/pojo/MessageTest.java index 17c3d421..dcb104bd 100644 --- a/Partner-Framework/src/test/java/work/slhaf/partner/api/chat/pojo/MessageTest.java +++ b/Partner-Framework/src/test/java/work/slhaf/partner/api/model/pojo/MessageTest.java @@ -1,8 +1,9 @@ -package work.slhaf.partner.api.chat.pojo; +package work.slhaf.partner.api.model.pojo; import com.alibaba.fastjson2.JSON; import org.junit.jupiter.api.Test; -import work.slhaf.partner.api.chat.provider.openai.OpenAiMessageAdapter; +import work.slhaf.partner.api.agent.model.pojo.Message; +import work.slhaf.partner.api.agent.model.provider.openai.OpenAiMessageAdapter; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows;