diff --git a/.idea/misc.xml b/.idea/misc.xml index 14dcb2b0..c1c2d2d2 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,10 +1,13 @@ - - - - + + + + + + + diff --git a/.xcodemap/config/xcodemap-class-filter.yaml b/.xcodemap/config/xcodemap-class-filter.yaml index dd20cb7d..1090bb64 100644 --- a/.xcodemap/config/xcodemap-class-filter.yaml +++ b/.xcodemap/config/xcodemap-class-filter.yaml @@ -1,4 +1,5 @@ autoDetectedPackages: +- factory - module - work.slhaf enableAutoDetect: true diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/Agent.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/Agent.java similarity index 79% rename from Partner-Api/src/main/java/work/slhaf/partner/api/Agent.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/Agent.java index b80dfcb8..9808742b 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/Agent.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/Agent.java @@ -1,10 +1,10 @@ -package work.slhaf.partner.api; +package work.slhaf.partner.api.agent; -import work.slhaf.partner.api.exception.AgentLaunchFailedException; -import work.slhaf.partner.api.factory.AgentRegisterFactory; -import work.slhaf.partner.api.factory.module.pojo.MetaModule; -import work.slhaf.partner.api.flow.AgentInteraction; -import work.slhaf.partner.api.flow.entity.InteractionFlowContext; +import work.slhaf.partner.api.agent.exception.AgentLaunchFailedException; +import work.slhaf.partner.api.agent.factory.AgentRegisterFactory; +import work.slhaf.partner.api.agent.factory.module.pojo.MetaModule; +import work.slhaf.partner.api.agent.flow.AgentInteraction; +import work.slhaf.partner.api.agent.flow.entity.InteractionFlowContext; import java.util.ArrayList; import java.util.List; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/entity/AgentContext.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/entity/AgentContext.java similarity index 83% rename from Partner-Api/src/main/java/work/slhaf/partner/api/entity/AgentContext.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/entity/AgentContext.java index c8c5dfc2..332045c5 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/entity/AgentContext.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/entity/AgentContext.java @@ -1,7 +1,7 @@ -package work.slhaf.partner.api.entity; +package work.slhaf.partner.api.agent.entity; import lombok.Data; -import work.slhaf.partner.api.factory.module.pojo.MetaModule; +import work.slhaf.partner.api.agent.factory.module.pojo.MetaModule; import java.util.HashMap; import java.util.List; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/exception/AgentLaunchFailedException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/exception/AgentLaunchFailedException.java similarity index 86% rename from Partner-Api/src/main/java/work/slhaf/partner/api/exception/AgentLaunchFailedException.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/exception/AgentLaunchFailedException.java index 77b41aff..f3ac30f5 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/exception/AgentLaunchFailedException.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/exception/AgentLaunchFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.exception; +package work.slhaf.partner.api.agent.exception; public class AgentLaunchFailedException extends RuntimeException { public AgentLaunchFailedException(String message, Throwable cause) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/AgentBaseFactory.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/AgentBaseFactory.java similarity index 71% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/AgentBaseFactory.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/AgentBaseFactory.java index 5e9735d8..e4b371e0 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/AgentBaseFactory.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/AgentBaseFactory.java @@ -1,7 +1,7 @@ -package work.slhaf.partner.api.factory; +package work.slhaf.partner.api.agent.factory; -import work.slhaf.partner.api.factory.capability.exception.CapabilityFactoryExecuteFailedException; -import work.slhaf.partner.api.factory.context.AgentRegisterContext; +import work.slhaf.partner.api.agent.factory.capability.exception.CapabilityFactoryExecuteFailedException; +import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext; import java.lang.reflect.InvocationTargetException; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/AgentRegisterFactory.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/AgentRegisterFactory.java similarity index 70% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/AgentRegisterFactory.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/AgentRegisterFactory.java index c53c762a..14ba808f 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/AgentRegisterFactory.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/AgentRegisterFactory.java @@ -1,18 +1,18 @@ -package work.slhaf.partner.api.factory; +package work.slhaf.partner.api.agent.factory; import org.reflections.util.ClasspathHelper; -import work.slhaf.partner.api.factory.capability.CapabilityCheckFactory; -import work.slhaf.partner.api.factory.capability.CapabilityInjectFactory; -import work.slhaf.partner.api.factory.capability.CapabilityRegisterFactory; -import work.slhaf.partner.api.factory.config.ConfigLoaderFactory; -import work.slhaf.partner.api.factory.context.AgentRegisterContext; -import work.slhaf.partner.api.factory.exception.ExternalModuleLoadFailedException; -import work.slhaf.partner.api.factory.exception.ExternalModulePathNotExistException; -import work.slhaf.partner.api.factory.module.ModuleCheckFactory; -import work.slhaf.partner.api.factory.module.ModulePreHookExecuteFactory; -import work.slhaf.partner.api.factory.module.ModuleProxyFactory; -import work.slhaf.partner.api.factory.module.ModuleRegisterFactory; -import work.slhaf.partner.api.factory.module.pojo.MetaModule; +import work.slhaf.partner.api.agent.factory.capability.CapabilityCheckFactory; +import work.slhaf.partner.api.agent.factory.capability.CapabilityInjectFactory; +import work.slhaf.partner.api.agent.factory.capability.CapabilityRegisterFactory; +import work.slhaf.partner.api.agent.factory.config.ConfigLoaderFactory; +import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext; +import work.slhaf.partner.api.agent.factory.exception.ExternalModuleLoadFailedException; +import work.slhaf.partner.api.agent.factory.exception.ExternalModulePathNotExistException; +import work.slhaf.partner.api.agent.factory.module.ModuleCheckFactory; +import work.slhaf.partner.api.agent.factory.module.ModuleInitHookExecuteFactory; +import work.slhaf.partner.api.agent.factory.module.ModuleProxyFactory; +import work.slhaf.partner.api.agent.factory.module.ModuleRegisterFactory; +import work.slhaf.partner.api.agent.factory.module.pojo.MetaModule; import java.io.File; import java.net.URL; @@ -43,7 +43,7 @@ public class AgentRegisterFactory { //. 先一步注入Capability,避免因前hook逻辑存在针对能力的引用而报错 new CapabilityInjectFactory().execute(registerContext); //. 执行模块PreHook逻辑 - new ModulePreHookExecuteFactory().execute(registerContext); + new ModuleInitHookExecuteFactory().execute(registerContext); return registerContext.getModuleFactoryContext().getModuleList(); } diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/CapabilityCheckFactory.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityCheckFactory.java similarity index 91% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/CapabilityCheckFactory.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityCheckFactory.java index a3103483..5021e59b 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/CapabilityCheckFactory.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityCheckFactory.java @@ -1,21 +1,21 @@ -package work.slhaf.partner.api.factory.capability; +package work.slhaf.partner.api.agent.factory.capability; import org.reflections.Reflections; -import work.slhaf.partner.api.common.util.AgentUtil; -import work.slhaf.partner.api.factory.AgentBaseFactory; -import work.slhaf.partner.api.factory.capability.annotation.*; -import work.slhaf.partner.api.factory.capability.exception.DuplicateCapabilityException; -import work.slhaf.partner.api.factory.capability.exception.UnMatchedCapabilityException; -import work.slhaf.partner.api.factory.capability.exception.UnMatchedCapabilityMethodException; -import work.slhaf.partner.api.factory.capability.exception.UnMatchedCoordinatedMethodException; -import work.slhaf.partner.api.factory.context.AgentRegisterContext; -import work.slhaf.partner.api.factory.context.CapabilityFactoryContext; +import work.slhaf.partner.api.agent.factory.AgentBaseFactory; +import work.slhaf.partner.api.agent.factory.capability.annotation.*; +import work.slhaf.partner.api.agent.factory.capability.exception.DuplicateCapabilityException; +import work.slhaf.partner.api.agent.factory.capability.exception.UnMatchedCapabilityException; +import work.slhaf.partner.api.agent.factory.capability.exception.UnMatchedCapabilityMethodException; +import work.slhaf.partner.api.agent.factory.capability.exception.UnMatchedCoordinatedMethodException; +import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext; +import work.slhaf.partner.api.agent.factory.context.CapabilityFactoryContext; +import work.slhaf.partner.api.agent.util.AgentUtil; import java.lang.reflect.Method; import java.util.*; import java.util.stream.Collectors; -import static work.slhaf.partner.api.common.util.AgentUtil.methodSignature; +import static work.slhaf.partner.api.agent.util.AgentUtil.methodSignature; /** * 执行Capability相关检查 diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/CapabilityInjectFactory.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityInjectFactory.java similarity index 79% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/CapabilityInjectFactory.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityInjectFactory.java index f4457697..5d7a7b50 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/CapabilityInjectFactory.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityInjectFactory.java @@ -1,13 +1,13 @@ -package work.slhaf.partner.api.factory.capability; +package work.slhaf.partner.api.agent.factory.capability; import org.reflections.Reflections; -import work.slhaf.partner.api.factory.AgentBaseFactory; -import work.slhaf.partner.api.factory.capability.annotation.Capability; -import work.slhaf.partner.api.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.factory.capability.annotation.ToCoordinated; -import work.slhaf.partner.api.factory.capability.exception.ProxySetFailedExceptionCapability; -import work.slhaf.partner.api.factory.context.AgentRegisterContext; -import work.slhaf.partner.api.factory.context.CapabilityFactoryContext; +import work.slhaf.partner.api.agent.factory.AgentBaseFactory; +import work.slhaf.partner.api.agent.factory.capability.annotation.Capability; +import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.factory.capability.annotation.ToCoordinated; +import work.slhaf.partner.api.agent.factory.capability.exception.ProxySetFailedExceptionCapability; +import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext; +import work.slhaf.partner.api.agent.factory.context.CapabilityFactoryContext; import java.lang.reflect.Field; import java.lang.reflect.Proxy; @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.Set; import java.util.function.Function; -import static work.slhaf.partner.api.common.util.AgentUtil.methodSignature; +import static work.slhaf.partner.api.agent.util.AgentUtil.methodSignature; /** * 负责执行Capability的注入逻辑 diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/CapabilityRegisterFactory.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityRegisterFactory.java similarity index 90% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/CapabilityRegisterFactory.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityRegisterFactory.java index d8e0dd96..f2982e6d 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/CapabilityRegisterFactory.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityRegisterFactory.java @@ -1,13 +1,13 @@ -package work.slhaf.partner.api.factory.capability; +package work.slhaf.partner.api.agent.factory.capability; import org.reflections.Reflections; -import work.slhaf.partner.api.factory.AgentBaseFactory; -import work.slhaf.partner.api.factory.capability.annotation.*; -import work.slhaf.partner.api.factory.capability.exception.CapabilityFactoryExecuteFailedException; -import work.slhaf.partner.api.factory.capability.exception.CoreInstancesCreateFailedExceptionCapability; -import work.slhaf.partner.api.factory.capability.exception.DuplicateMethodException; -import work.slhaf.partner.api.factory.context.AgentRegisterContext; -import work.slhaf.partner.api.factory.context.CapabilityFactoryContext; +import work.slhaf.partner.api.agent.factory.AgentBaseFactory; +import work.slhaf.partner.api.agent.factory.capability.annotation.*; +import work.slhaf.partner.api.agent.factory.capability.exception.CapabilityFactoryExecuteFailedException; +import work.slhaf.partner.api.agent.factory.capability.exception.CoreInstancesCreateFailedExceptionCapability; +import work.slhaf.partner.api.agent.factory.capability.exception.DuplicateMethodException; +import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext; +import work.slhaf.partner.api.agent.factory.context.CapabilityFactoryContext; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -18,7 +18,7 @@ import java.util.Set; import java.util.function.Function; import static cn.hutool.core.util.ClassUtil.isNormalClass; -import static work.slhaf.partner.api.common.util.AgentUtil.methodSignature; +import static work.slhaf.partner.api.agent.util.AgentUtil.methodSignature; /** diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/Capability.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/Capability.java similarity index 84% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/Capability.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/Capability.java index cce9c585..3417a2aa 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/Capability.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/Capability.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.capability.annotation; +package work.slhaf.partner.api.agent.factory.capability.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/CapabilityCore.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/CapabilityCore.java similarity index 84% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/CapabilityCore.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/CapabilityCore.java index 44f0fe02..521ec5bf 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/CapabilityCore.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/CapabilityCore.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.capability.annotation; +package work.slhaf.partner.api.agent.factory.capability.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/CapabilityHolder.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/CapabilityHolder.java similarity index 68% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/CapabilityHolder.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/CapabilityHolder.java index c686f115..4ed0f477 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/CapabilityHolder.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/CapabilityHolder.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.capability.annotation; +package work.slhaf.partner.api.agent.factory.capability.annotation; import java.lang.annotation.*; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/CapabilityMethod.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/CapabilityMethod.java similarity index 79% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/CapabilityMethod.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/CapabilityMethod.java index bf0957d3..fa6667ff 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/CapabilityMethod.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/CapabilityMethod.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.capability.annotation; +package work.slhaf.partner.api.agent.factory.capability.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/CoordinateManager.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/CoordinateManager.java similarity index 79% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/CoordinateManager.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/CoordinateManager.java index b1bb6116..9d9c673c 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/CoordinateManager.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/CoordinateManager.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.capability.annotation; +package work.slhaf.partner.api.agent.factory.capability.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/Coordinated.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/Coordinated.java similarity index 84% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/Coordinated.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/Coordinated.java index 47fcf7a8..4cebac43 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/Coordinated.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/Coordinated.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.capability.annotation; +package work.slhaf.partner.api.agent.factory.capability.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/InjectCapability.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/InjectCapability.java similarity index 81% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/InjectCapability.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/InjectCapability.java index 78179240..51bf991d 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/InjectCapability.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/InjectCapability.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.capability.annotation; +package work.slhaf.partner.api.agent.factory.capability.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/ToCoordinated.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/ToCoordinated.java similarity index 87% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/ToCoordinated.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/ToCoordinated.java index a4dcec69..cb103f4d 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/annotation/ToCoordinated.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/annotation/ToCoordinated.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.capability.annotation; +package work.slhaf.partner.api.agent.factory.capability.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/CapabilityCheckFailedException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/CapabilityCheckFailedException.java similarity index 83% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/CapabilityCheckFailedException.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/CapabilityCheckFailedException.java index 7c72f484..7647f3be 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/CapabilityCheckFailedException.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/CapabilityCheckFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.capability.exception; +package work.slhaf.partner.api.agent.factory.capability.exception; public class CapabilityCheckFailedException extends RuntimeException { public CapabilityCheckFailedException(String message) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/CapabilityFactoryExecuteFailedException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/CapabilityFactoryExecuteFailedException.java similarity index 85% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/CapabilityFactoryExecuteFailedException.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/CapabilityFactoryExecuteFailedException.java index e24815c7..d233d471 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/CapabilityFactoryExecuteFailedException.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/CapabilityFactoryExecuteFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.capability.exception; +package work.slhaf.partner.api.agent.factory.capability.exception; public class CapabilityFactoryExecuteFailedException extends RuntimeException { public CapabilityFactoryExecuteFailedException(String message) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/CoreInstancesCreateFailedExceptionCapability.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/CoreInstancesCreateFailedExceptionCapability.java similarity index 83% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/CoreInstancesCreateFailedExceptionCapability.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/CoreInstancesCreateFailedExceptionCapability.java index ad470d69..ab3bbe98 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/CoreInstancesCreateFailedExceptionCapability.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/CoreInstancesCreateFailedExceptionCapability.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.capability.exception; +package work.slhaf.partner.api.agent.factory.capability.exception; public class CoreInstancesCreateFailedExceptionCapability extends CapabilityFactoryExecuteFailedException { public CoreInstancesCreateFailedExceptionCapability(String message) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/DuplicateCapabilityException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/DuplicateCapabilityException.java similarity index 81% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/DuplicateCapabilityException.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/DuplicateCapabilityException.java index a2b8dc4b..6fc92733 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/DuplicateCapabilityException.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/DuplicateCapabilityException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.capability.exception; +package work.slhaf.partner.api.agent.factory.capability.exception; public class DuplicateCapabilityException extends CapabilityCheckFailedException { public DuplicateCapabilityException(String message) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/DuplicateMethodException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/DuplicateMethodException.java similarity index 80% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/DuplicateMethodException.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/DuplicateMethodException.java index 518be014..5cb3cfd4 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/DuplicateMethodException.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/DuplicateMethodException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.capability.exception; +package work.slhaf.partner.api.agent.factory.capability.exception; public class DuplicateMethodException extends CapabilityCheckFailedException{ public DuplicateMethodException(String message) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/EmptyCapabilityHolderException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/EmptyCapabilityHolderException.java similarity index 81% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/EmptyCapabilityHolderException.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/EmptyCapabilityHolderException.java index 32924d15..411c2e6a 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/EmptyCapabilityHolderException.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/EmptyCapabilityHolderException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.capability.exception; +package work.slhaf.partner.api.agent.factory.capability.exception; public class EmptyCapabilityHolderException extends CapabilityCheckFailedException{ public EmptyCapabilityHolderException(String message) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/ProxySetFailedExceptionCapability.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/ProxySetFailedExceptionCapability.java similarity index 81% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/ProxySetFailedExceptionCapability.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/ProxySetFailedExceptionCapability.java index 3f7170b0..219421e9 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/ProxySetFailedExceptionCapability.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/ProxySetFailedExceptionCapability.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.capability.exception; +package work.slhaf.partner.api.agent.factory.capability.exception; public class ProxySetFailedExceptionCapability extends CapabilityFactoryExecuteFailedException { public ProxySetFailedExceptionCapability(String message) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/UnMatchedCapabilityException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/UnMatchedCapabilityException.java similarity index 81% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/UnMatchedCapabilityException.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/UnMatchedCapabilityException.java index d1314f93..20b62111 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/UnMatchedCapabilityException.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/UnMatchedCapabilityException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.capability.exception; +package work.slhaf.partner.api.agent.factory.capability.exception; public class UnMatchedCapabilityException extends CapabilityCheckFailedException{ public UnMatchedCapabilityException(String message) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/UnMatchedCapabilityMethodException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/UnMatchedCapabilityMethodException.java similarity index 81% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/UnMatchedCapabilityMethodException.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/UnMatchedCapabilityMethodException.java index 5255a67f..eda9eb68 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/UnMatchedCapabilityMethodException.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/UnMatchedCapabilityMethodException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.capability.exception; +package work.slhaf.partner.api.agent.factory.capability.exception; public class UnMatchedCapabilityMethodException extends CapabilityCheckFailedException { public UnMatchedCapabilityMethodException(String message) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/UnMatchedCoordinatedMethodException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/UnMatchedCoordinatedMethodException.java similarity index 82% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/UnMatchedCoordinatedMethodException.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/UnMatchedCoordinatedMethodException.java index 82bc75c3..d5e26214 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/capability/exception/UnMatchedCoordinatedMethodException.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/exception/UnMatchedCoordinatedMethodException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.capability.exception; +package work.slhaf.partner.api.agent.factory.capability.exception; public class UnMatchedCoordinatedMethodException extends CapabilityCheckFailedException { public UnMatchedCoordinatedMethodException(String message) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/ConfigLoaderFactory.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/ConfigLoaderFactory.java similarity index 70% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/ConfigLoaderFactory.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/ConfigLoaderFactory.java index c195c109..f35736ac 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/ConfigLoaderFactory.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/ConfigLoaderFactory.java @@ -1,11 +1,11 @@ -package work.slhaf.partner.api.factory.config; +package work.slhaf.partner.api.agent.factory.config; import lombok.Setter; -import work.slhaf.partner.api.common.chat.pojo.Message; -import work.slhaf.partner.api.factory.AgentBaseFactory; -import work.slhaf.partner.api.factory.config.pojo.ModelConfig; -import work.slhaf.partner.api.factory.context.AgentRegisterContext; -import work.slhaf.partner.api.factory.context.ConfigFactoryContext; +import work.slhaf.partner.api.agent.factory.AgentBaseFactory; +import work.slhaf.partner.api.agent.factory.config.pojo.ModelConfig; +import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext; +import work.slhaf.partner.api.agent.factory.context.ConfigFactoryContext; +import work.slhaf.partner.api.chat.pojo.Message; import java.util.HashMap; import java.util.List; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/DefaultModelConfigManager.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/DefaultModelConfigManager.java similarity index 78% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/DefaultModelConfigManager.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/DefaultModelConfigManager.java index 32607721..27b57a02 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/DefaultModelConfigManager.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/DefaultModelConfigManager.java @@ -1,14 +1,14 @@ -package work.slhaf.partner.api.factory.config; +package work.slhaf.partner.api.agent.factory.config; import cn.hutool.json.JSONUtil; -import work.slhaf.partner.api.common.chat.pojo.Message; -import work.slhaf.partner.api.factory.config.exception.ModelConfigDirNotExistException; -import work.slhaf.partner.api.factory.config.exception.ModelConfigNotExistException; -import work.slhaf.partner.api.factory.config.exception.ModelPromptDirNotExistException; -import work.slhaf.partner.api.factory.config.exception.ModelPromptNotExistException; -import work.slhaf.partner.api.factory.config.pojo.ModelConfig; -import work.slhaf.partner.api.factory.config.pojo.PrimaryModelConfig; -import work.slhaf.partner.api.factory.config.pojo.PrimaryModelPrompt; +import work.slhaf.partner.api.agent.factory.config.exception.ModelConfigDirNotExistException; +import work.slhaf.partner.api.agent.factory.config.exception.ModelConfigNotExistException; +import work.slhaf.partner.api.agent.factory.config.exception.ModelPromptDirNotExistException; +import work.slhaf.partner.api.agent.factory.config.exception.ModelPromptNotExistException; +import work.slhaf.partner.api.agent.factory.config.pojo.ModelConfig; +import work.slhaf.partner.api.agent.factory.config.pojo.PrimaryModelConfig; +import work.slhaf.partner.api.agent.factory.config.pojo.PrimaryModelPrompt; +import work.slhaf.partner.api.chat.pojo.Message; import java.io.File; import java.nio.charset.StandardCharsets; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/ModelConfigManager.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/ModelConfigManager.java similarity index 88% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/ModelConfigManager.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/ModelConfigManager.java index 7e3223b9..2072d22b 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/ModelConfigManager.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/ModelConfigManager.java @@ -1,11 +1,11 @@ -package work.slhaf.partner.api.factory.config; +package work.slhaf.partner.api.agent.factory.config; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.common.chat.pojo.Message; -import work.slhaf.partner.api.factory.config.exception.ModelConfigNotExistException; -import work.slhaf.partner.api.factory.config.exception.ModelPromptNotExistException; -import work.slhaf.partner.api.factory.config.pojo.ModelConfig; +import work.slhaf.partner.api.agent.factory.config.exception.ModelConfigNotExistException; +import work.slhaf.partner.api.agent.factory.config.exception.ModelPromptNotExistException; +import work.slhaf.partner.api.agent.factory.config.pojo.ModelConfig; +import work.slhaf.partner.api.chat.pojo.Message; import java.util.HashMap; import java.util.HashSet; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/exception/ModelConfigDirNotExistException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ModelConfigDirNotExistException.java similarity index 82% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/exception/ModelConfigDirNotExistException.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ModelConfigDirNotExistException.java index abf98d85..cc3cf903 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/exception/ModelConfigDirNotExistException.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ModelConfigDirNotExistException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.config.exception; +package work.slhaf.partner.api.agent.factory.config.exception; public class ModelConfigDirNotExistException extends ModelConfigFactoryFailedException{ public ModelConfigDirNotExistException(String message, Throwable cause) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/exception/ModelConfigFactoryFailedException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ModelConfigFactoryFailedException.java similarity index 85% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/exception/ModelConfigFactoryFailedException.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ModelConfigFactoryFailedException.java index 1fa74632..1d6a5a10 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/exception/ModelConfigFactoryFailedException.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ModelConfigFactoryFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.config.exception; +package work.slhaf.partner.api.agent.factory.config.exception; public class ModelConfigFactoryFailedException extends RuntimeException { public ModelConfigFactoryFailedException(String message, Throwable cause) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/exception/ModelConfigNotExistException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ModelConfigNotExistException.java similarity index 81% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/exception/ModelConfigNotExistException.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ModelConfigNotExistException.java index 108338cb..0ad1c1ad 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/exception/ModelConfigNotExistException.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ModelConfigNotExistException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.config.exception; +package work.slhaf.partner.api.agent.factory.config.exception; public class ModelConfigNotExistException extends ModelConfigFactoryFailedException { public ModelConfigNotExistException(String message, Throwable e) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/exception/ModelPromptDirNotExistException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ModelPromptDirNotExistException.java similarity index 82% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/exception/ModelPromptDirNotExistException.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ModelPromptDirNotExistException.java index 367f8527..bd6aaee3 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/exception/ModelPromptDirNotExistException.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ModelPromptDirNotExistException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.config.exception; +package work.slhaf.partner.api.agent.factory.config.exception; public class ModelPromptDirNotExistException extends ModelConfigFactoryFailedException{ public ModelPromptDirNotExistException(String message, Throwable cause) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/exception/ModelPromptNotExistException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ModelPromptNotExistException.java similarity index 82% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/exception/ModelPromptNotExistException.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ModelPromptNotExistException.java index 5d900e9c..c76693be 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/exception/ModelPromptNotExistException.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/exception/ModelPromptNotExistException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.config.exception; +package work.slhaf.partner.api.agent.factory.config.exception; public class ModelPromptNotExistException extends ModelConfigFactoryFailedException{ public ModelPromptNotExistException(String message) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/pojo/ModelConfig.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/pojo/ModelConfig.java similarity index 70% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/pojo/ModelConfig.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/pojo/ModelConfig.java index 4fc6bbd2..f54d3f91 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/pojo/ModelConfig.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/pojo/ModelConfig.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.config.pojo; +package work.slhaf.partner.api.agent.factory.config.pojo; import lombok.Data; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/pojo/PrimaryModelConfig.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/pojo/PrimaryModelConfig.java similarity index 68% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/pojo/PrimaryModelConfig.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/pojo/PrimaryModelConfig.java index db47b0e6..352487f1 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/pojo/PrimaryModelConfig.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/pojo/PrimaryModelConfig.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.config.pojo; +package work.slhaf.partner.api.agent.factory.config.pojo; import lombok.Data; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/pojo/PrimaryModelPrompt.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/pojo/PrimaryModelPrompt.java similarity index 57% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/pojo/PrimaryModelPrompt.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/pojo/PrimaryModelPrompt.java index 3694cc45..fc395ebb 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/config/pojo/PrimaryModelPrompt.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/pojo/PrimaryModelPrompt.java @@ -1,7 +1,7 @@ -package work.slhaf.partner.api.factory.config.pojo; +package work.slhaf.partner.api.agent.factory.config.pojo; import lombok.Data; -import work.slhaf.partner.api.common.chat.pojo.Message; +import work.slhaf.partner.api.chat.pojo.Message; import java.util.List; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/context/AgentRegisterContext.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/context/AgentRegisterContext.java similarity index 94% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/context/AgentRegisterContext.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/context/AgentRegisterContext.java index 4ada2fd5..09a61800 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/context/AgentRegisterContext.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/context/AgentRegisterContext.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.context; +package work.slhaf.partner.api.agent.factory.context; import lombok.Data; import org.reflections.Reflections; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/context/CapabilityFactoryContext.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/context/CapabilityFactoryContext.java similarity index 91% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/context/CapabilityFactoryContext.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/context/CapabilityFactoryContext.java index 85033d39..67ca8430 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/context/CapabilityFactoryContext.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/context/CapabilityFactoryContext.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.context; +package work.slhaf.partner.api.agent.factory.context; import lombok.Data; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/context/ConfigFactoryContext.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/context/ConfigFactoryContext.java similarity index 60% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/context/ConfigFactoryContext.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/context/ConfigFactoryContext.java index 17ff36ac..1edd322c 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/context/ConfigFactoryContext.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/context/ConfigFactoryContext.java @@ -1,8 +1,8 @@ -package work.slhaf.partner.api.factory.context; +package work.slhaf.partner.api.agent.factory.context; import lombok.Data; -import work.slhaf.partner.api.common.chat.pojo.Message; -import work.slhaf.partner.api.factory.config.pojo.ModelConfig; +import work.slhaf.partner.api.agent.factory.config.pojo.ModelConfig; +import work.slhaf.partner.api.chat.pojo.Message; import java.util.HashMap; import java.util.List; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/context/ModuleFactoryContext.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/context/ModuleFactoryContext.java new file mode 100644 index 00000000..0311215f --- /dev/null +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/context/ModuleFactoryContext.java @@ -0,0 +1,12 @@ +package work.slhaf.partner.api.agent.factory.context; + +import lombok.Data; +import work.slhaf.partner.api.agent.factory.module.pojo.MetaModule; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class ModuleFactoryContext { + private List moduleList = new ArrayList<>(); +} diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/exception/AgentRegisterFactoryFailedException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/exception/AgentRegisterFactoryFailedException.java similarity index 86% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/exception/AgentRegisterFactoryFailedException.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/exception/AgentRegisterFactoryFailedException.java index 14b5a7c9..6821807a 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/exception/AgentRegisterFactoryFailedException.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/exception/AgentRegisterFactoryFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.exception; +package work.slhaf.partner.api.agent.factory.exception; public class AgentRegisterFactoryFailedException extends RuntimeException { public AgentRegisterFactoryFailedException(String message, Throwable cause) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/exception/ExternalModuleLoadFailedException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/exception/ExternalModuleLoadFailedException.java similarity index 84% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/exception/ExternalModuleLoadFailedException.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/exception/ExternalModuleLoadFailedException.java index a49e6168..08cfa084 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/exception/ExternalModuleLoadFailedException.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/exception/ExternalModuleLoadFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.exception; +package work.slhaf.partner.api.agent.factory.exception; public class ExternalModuleLoadFailedException extends AgentRegisterFactoryFailedException{ public ExternalModuleLoadFailedException(String message, Throwable cause) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/exception/ExternalModulePathNotExistException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/exception/ExternalModulePathNotExistException.java similarity index 84% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/exception/ExternalModulePathNotExistException.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/exception/ExternalModulePathNotExistException.java index 55563014..80df5514 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/exception/ExternalModulePathNotExistException.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/exception/ExternalModulePathNotExistException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.exception; +package work.slhaf.partner.api.agent.factory.exception; public class ExternalModulePathNotExistException extends AgentRegisterFactoryFailedException { public ExternalModulePathNotExistException(String message) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/ModuleCheckFactory.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleCheckFactory.java similarity index 85% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/ModuleCheckFactory.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleCheckFactory.java index 3fe5eecc..d423d7af 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/ModuleCheckFactory.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleCheckFactory.java @@ -1,18 +1,18 @@ -package work.slhaf.partner.api.factory.module; +package work.slhaf.partner.api.agent.factory.module; import cn.hutool.core.util.ClassUtil; import org.reflections.Reflections; -import work.slhaf.partner.api.factory.AgentBaseFactory; -import work.slhaf.partner.api.factory.config.ModelConfigManager; -import work.slhaf.partner.api.factory.context.AgentRegisterContext; -import work.slhaf.partner.api.factory.module.annotation.AfterExecute; -import work.slhaf.partner.api.factory.module.annotation.AgentModule; -import work.slhaf.partner.api.factory.module.annotation.BeforeExecute; -import work.slhaf.partner.api.factory.module.annotation.Init; -import work.slhaf.partner.api.factory.module.exception.ModuleCheckException; -import work.slhaf.partner.api.flow.abstracts.ActivateModel; -import work.slhaf.partner.api.flow.abstracts.AgentInteractionModule; -import work.slhaf.partner.api.flow.abstracts.AgentInteractionSubModule; +import work.slhaf.partner.api.agent.factory.AgentBaseFactory; +import work.slhaf.partner.api.agent.factory.config.ModelConfigManager; +import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext; +import work.slhaf.partner.api.agent.factory.module.annotation.AfterExecute; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.BeforeExecute; +import work.slhaf.partner.api.agent.factory.module.annotation.Init; +import work.slhaf.partner.api.agent.factory.module.exception.ModuleCheckException; +import work.slhaf.partner.api.agent.flow.abstracts.ActivateModel; +import work.slhaf.partner.api.agent.flow.abstracts.AgentInteractionModule; +import work.slhaf.partner.api.agent.flow.abstracts.AgentInteractionSubModule; import java.lang.reflect.Method; import java.util.HashSet; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleInitHookExecuteFactory.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleInitHookExecuteFactory.java new file mode 100644 index 00000000..157104fa --- /dev/null +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleInitHookExecuteFactory.java @@ -0,0 +1,69 @@ +package work.slhaf.partner.api.agent.factory.module; + +import work.slhaf.partner.api.agent.factory.AgentBaseFactory; +import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext; +import work.slhaf.partner.api.agent.factory.context.ModuleFactoryContext; +import work.slhaf.partner.api.agent.factory.module.annotation.Init; +import work.slhaf.partner.api.agent.factory.module.exception.ModuleInitHookExecuteFailedException; +import work.slhaf.partner.api.agent.factory.module.pojo.MetaMethod; +import work.slhaf.partner.api.agent.factory.module.pojo.MetaModule; +import work.slhaf.partner.api.agent.flow.abstracts.AgentInteractionModule; + +import java.lang.reflect.InvocationTargetException; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import static work.slhaf.partner.api.agent.util.AgentUtil.collectExtendedClasses; +import static work.slhaf.partner.api.agent.util.AgentUtil.methodSignature; + +/** + * 负责执行前hook逻辑 + */ +public class ModuleInitHookExecuteFactory extends AgentBaseFactory { + + private List moduleList; + + @Override + protected void setVariables(AgentRegisterContext context) { + ModuleFactoryContext factoryContext = context.getModuleFactoryContext(); + moduleList = factoryContext.getModuleList(); + } + + @Override + protected void run() throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException { + //遍历模块列表，并向上查找@Init注解 + for (MetaModule metaModule : moduleList) { + List initHookMethods = collectInitHookMethods(metaModule.getClazz()); + proceedInitMethods(metaModule, initHookMethods); + } + } + + private void proceedInitMethods(MetaModule metaModule, List initHookMethods) { + for (MetaMethod metaMethod : initHookMethods) { + try { + metaMethod.getMethod().invoke(metaModule.getInstance()); + } catch (IllegalAccessException | InvocationTargetException e) { + throw new ModuleInitHookExecuteFailedException("模块的init hook方法执行失败! 模块: " + metaModule.getName() + " 方法签名: " + methodSignature(metaMethod.getMethod()), e); + } + } + } + + private List collectInitHookMethods(Class clazz) { + Set> classes = collectExtendedClasses(clazz, AgentInteractionModule.class); + return classes.stream() + .map(Class::getDeclaredMethods) + .flatMap(Arrays::stream) + .filter(method -> method.isAnnotationPresent(Init.class)) + .map(method -> { + MetaMethod metaMethod = new MetaMethod(); + metaMethod.setMethod(method); + metaMethod.setOrder(method.getAnnotation(Init.class).order()); + return metaMethod; + }) + .sorted(Comparator.comparing(MetaMethod::getOrder)) + .collect(Collectors.toList()); + } +} diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/ModuleProxyFactory.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleProxyFactory.java similarity index 70% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/ModuleProxyFactory.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleProxyFactory.java index f89088a9..a38adcb8 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/ModuleProxyFactory.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleProxyFactory.java @@ -1,19 +1,19 @@ -package work.slhaf.partner.api.factory.module; +package work.slhaf.partner.api.agent.factory.module; import net.bytebuddy.ByteBuddy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.*; import net.bytebuddy.matcher.ElementMatchers; -import work.slhaf.partner.api.factory.AgentBaseFactory; -import work.slhaf.partner.api.factory.context.AgentRegisterContext; -import work.slhaf.partner.api.factory.context.ModuleFactoryContext; -import work.slhaf.partner.api.factory.module.annotation.AfterExecute; -import work.slhaf.partner.api.factory.module.annotation.BeforeExecute; -import work.slhaf.partner.api.factory.module.exception.ModuleInstanceGenerateFailedException; -import work.slhaf.partner.api.factory.module.exception.ModuleProxyGenerateFailedException; -import work.slhaf.partner.api.factory.module.pojo.MetaMethod; -import work.slhaf.partner.api.factory.module.pojo.MetaModule; -import work.slhaf.partner.api.flow.abstracts.AgentInteractionModule; +import work.slhaf.partner.api.agent.factory.AgentBaseFactory; +import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext; +import work.slhaf.partner.api.agent.factory.context.ModuleFactoryContext; +import work.slhaf.partner.api.agent.factory.module.annotation.AfterExecute; +import work.slhaf.partner.api.agent.factory.module.annotation.BeforeExecute; +import work.slhaf.partner.api.agent.factory.module.exception.ModuleInstanceGenerateFailedException; +import work.slhaf.partner.api.agent.factory.module.exception.ModuleProxyGenerateFailedException; +import work.slhaf.partner.api.agent.factory.module.pojo.MetaMethod; +import work.slhaf.partner.api.agent.factory.module.pojo.MetaModule; +import work.slhaf.partner.api.agent.flow.abstracts.AgentInteractionModule; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -21,6 +21,8 @@ import java.util.*; import java.util.concurrent.Callable; import java.util.stream.Collectors; +import static work.slhaf.partner.api.agent.util.AgentUtil.collectExtendedClasses; + /** * 通过扫描注解@BeforeExecute，获取到各个模块的后hook逻辑并通过动态代理添加到执行逻辑之后 */ @@ -45,7 +47,7 @@ public class ModuleProxyFactory extends AgentBaseFactory { Class clazz = module.getClazz(); try { MethodsListRecord record = collectHookMethods(clazz); - //生成实例， + //生成实例 generateProxiedInstances(record, module); } catch (Exception e) { throw new ModuleProxyGenerateFailedException("创建代理对象失败: " + clazz.getSimpleName(), e); @@ -75,7 +77,7 @@ public class ModuleProxyFactory extends AgentBaseFactory { //获取该类本身的hook逻辑 collectHookMethods(post, pre, clazz); //获取它所继承、实现的抽象类或接口, 以AgentInteractionModule、ActiveModel为终点 - Set> classes = collectSuperClasses(clazz); + Set> classes = collectExtendedClasses(clazz, AgentInteractionModule.class); //获取这些类中的hook逻辑 collectHookMethods(post, pre, classes); return new MethodsListRecord(post, pre); @@ -89,7 +91,7 @@ public class ModuleProxyFactory extends AgentBaseFactory { } private void collectPostHookMethods(List post, Class type) { - Set collectedPostHookMethod = Arrays.stream(type.getMethods()) + Set collectedPostHookMethod = Arrays.stream(type.getDeclaredMethods()) .filter(method -> method.isAnnotationPresent(AfterExecute.class)) .map(method -> { MetaMethod metaMethod = new MetaMethod(); @@ -102,7 +104,7 @@ public class ModuleProxyFactory extends AgentBaseFactory { } private void collectPreHookMethods(List pre, Class type) { - Set collectedPreHookMethods = Arrays.stream(type.getMethods()) + Set collectedPreHookMethods = Arrays.stream(type.getDeclaredMethods()) .filter(method -> method.isAnnotationPresent(BeforeExecute.class)) .map(method -> { MetaMethod metaMethod = new MetaMethod(); @@ -114,29 +116,6 @@ public class ModuleProxyFactory extends AgentBaseFactory { pre.addAll(collectedPreHookMethods); } - private Set> collectSuperClasses(Class clazz) { - Set> classes = new HashSet<>(); - collectSuperClasses(classes, clazz); - return classes; - } - - private void collectSuperClasses(Set> classes, Class clazz) { - Class superclass = clazz.getSuperclass(); - if (superclass == null || superclass == AgentInteractionModule.class) { - return; - } - collectSuperClasses(classes, superclass); - classes.add(superclass); - collectInterfaces(clazz, classes); - } - - private void collectInterfaces(Class clazz, Set> classes) { - for (Class type : clazz.getInterfaces()) { - if (classes.add(type)) { - collectInterfaces(type, classes); - } - } - } private void collectHookMethods(List post, List pre, Class clazz) { Method[] methods = clazz.getMethods(); @@ -167,28 +146,19 @@ public class ModuleProxyFactory extends AgentBaseFactory { } } - private static class ModuleProxyInterceptor { - - private final List postHookMethods; - private final List preHookMethods; - - private ModuleProxyInterceptor(List postHookMethods, List preHookMethods) { - this.postHookMethods = postHookMethods; - this.preHookMethods = preHookMethods; - } - + private record ModuleProxyInterceptor(List postHookMethods, List preHookMethods) { @RuntimeType - public Object intercept(@Origin Method method, @AllArguments Object[] allArguments, @SuperCall Callable zuper, @This Object proxy) throws Exception { - for (MetaMethod metaMethod : preHookMethods) { - metaMethod.getMethod().invoke(proxy); + public Object intercept(@Origin Method method, @AllArguments Object[] allArguments, @SuperCall Callable zuper, @This Object proxy) throws Exception { + for (MetaMethod metaMethod : preHookMethods) { + metaMethod.getMethod().invoke(proxy); + } + Object res = zuper.call(); + for (MetaMethod metaMethod : postHookMethods) { + metaMethod.getMethod().invoke(proxy); + } + return res; } - Object res = zuper.call(); - for (MetaMethod metaMethod : postHookMethods) { - metaMethod.getMethod().invoke(proxy); - } - return res; } - } record MethodsListRecord(List post, List pre) { public MethodsListRecord { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleRegisterFactory.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleRegisterFactory.java new file mode 100644 index 00000000..2e1b5bd9 --- /dev/null +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleRegisterFactory.java @@ -0,0 +1,48 @@ +package work.slhaf.partner.api.agent.factory.module; + +import org.reflections.Reflections; +import work.slhaf.partner.api.agent.factory.AgentBaseFactory; +import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext; +import work.slhaf.partner.api.agent.factory.context.ModuleFactoryContext; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.pojo.MetaModule; + +import java.util.Comparator; +import java.util.List; +import java.util.Set; + +/** + * 负责扫描@Module注解获取模块实例 + */ +public class ModuleRegisterFactory extends AgentBaseFactory { + + private Reflections reflections; + private List moduleList; + + @Override + protected void setVariables(AgentRegisterContext context) { + ModuleFactoryContext factoryContext = context.getModuleFactoryContext(); + reflections = context.getReflections(); + moduleList = factoryContext.getModuleList(); + } + + @Override + protected void run() { + setModuleList(); + } + + private void setModuleList() { + //反射扫描获取@AgentModule所在类, 该部分为Agent流程执行模块 + Set> modules = reflections.getTypesAnnotatedWith(AgentModule.class); + for (Class module : modules) { + AgentModule agentModule = module.getAnnotation(AgentModule.class); + MetaModule metaModule = new MetaModule(); + metaModule.setName(agentModule.name()); + metaModule.setOrder(agentModule.order()); + metaModule.setClazz(module); + moduleList.add(metaModule); + } + moduleList.sort(Comparator.comparing(MetaModule::getOrder)); + + } +} diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/annotation/AfterExecute.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AfterExecute.java similarity index 88% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/annotation/AfterExecute.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AfterExecute.java index 2ee78d7e..fc461e5c 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/annotation/AfterExecute.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AfterExecute.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.module.annotation; +package work.slhaf.partner.api.agent.factory.module.annotation; import java.lang.annotation.ElementType; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/annotation/AgentModule.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AgentModule.java similarity index 83% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/annotation/AgentModule.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AgentModule.java index 294ae8fe..d318a1c0 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/annotation/AgentModule.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/AgentModule.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.module.annotation; +package work.slhaf.partner.api.agent.factory.module.annotation; import java.lang.annotation.*; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/annotation/BeforeExecute.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/BeforeExecute.java similarity index 88% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/annotation/BeforeExecute.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/BeforeExecute.java index 54102223..977c95fb 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/annotation/BeforeExecute.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/BeforeExecute.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.module.annotation; +package work.slhaf.partner.api.agent.factory.module.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/annotation/CoreModule.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/CoreModule.java similarity index 52% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/annotation/CoreModule.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/CoreModule.java index e6986138..3f826649 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/annotation/CoreModule.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/CoreModule.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.module.annotation; +package work.slhaf.partner.api.agent.factory.module.annotation; @AgentModule(name = "core",order = 5) public @interface CoreModule { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/annotation/Init.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/Init.java similarity index 81% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/annotation/Init.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/Init.java index 8ecee244..b7c936a0 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/annotation/Init.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/annotation/Init.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.module.annotation; +package work.slhaf.partner.api.agent.factory.module.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/exception/ModuleCheckException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/exception/ModuleCheckException.java similarity index 80% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/exception/ModuleCheckException.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/exception/ModuleCheckException.java index 5235f146..aa101bbc 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/exception/ModuleCheckException.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/exception/ModuleCheckException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.module.exception; +package work.slhaf.partner.api.agent.factory.module.exception; public class ModuleCheckException extends ModuleFactoryFailedException{ public ModuleCheckException(String message) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/exception/ModuleFactoryFailedException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/exception/ModuleFactoryFailedException.java similarity index 84% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/exception/ModuleFactoryFailedException.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/exception/ModuleFactoryFailedException.java index 976fcb82..e58200b1 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/exception/ModuleFactoryFailedException.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/exception/ModuleFactoryFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.module.exception; +package work.slhaf.partner.api.agent.factory.module.exception; public class ModuleFactoryFailedException extends RuntimeException { public ModuleFactoryFailedException(String message) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/exception/ModuleInitHookExecuteFailedException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/exception/ModuleInitHookExecuteFailedException.java new file mode 100644 index 00000000..7f5b7f81 --- /dev/null +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/exception/ModuleInitHookExecuteFailedException.java @@ -0,0 +1,11 @@ +package work.slhaf.partner.api.agent.factory.module.exception; + +public class ModuleInitHookExecuteFailedException extends ModuleFactoryFailedException{ + public ModuleInitHookExecuteFailedException(String message) { + super(message); + } + + public ModuleInitHookExecuteFailedException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/exception/ModuleInstanceGenerateFailedException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/exception/ModuleInstanceGenerateFailedException.java similarity index 83% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/exception/ModuleInstanceGenerateFailedException.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/exception/ModuleInstanceGenerateFailedException.java index e7591588..ebb97545 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/exception/ModuleInstanceGenerateFailedException.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/exception/ModuleInstanceGenerateFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.module.exception; +package work.slhaf.partner.api.agent.factory.module.exception; public class ModuleInstanceGenerateFailedException extends ModuleFactoryFailedException{ public ModuleInstanceGenerateFailedException(String message) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/exception/ModuleProxyGenerateFailedException.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/exception/ModuleProxyGenerateFailedException.java similarity index 82% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/exception/ModuleProxyGenerateFailedException.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/exception/ModuleProxyGenerateFailedException.java index 2f95cd25..2b97d48e 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/exception/ModuleProxyGenerateFailedException.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/exception/ModuleProxyGenerateFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.module.exception; +package work.slhaf.partner.api.agent.factory.module.exception; public class ModuleProxyGenerateFailedException extends ModuleFactoryFailedException{ public ModuleProxyGenerateFailedException(String message) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/pojo/MetaMethod.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaMethod.java similarity index 70% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/pojo/MetaMethod.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaMethod.java index d8f11fdf..a52a9020 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/pojo/MetaMethod.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaMethod.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.module.pojo; +package work.slhaf.partner.api.agent.factory.module.pojo; import lombok.Data; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/pojo/MetaModule.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaModule.java similarity index 73% rename from Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/pojo/MetaModule.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaModule.java index e4d74ccf..ed0ed46a 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/pojo/MetaModule.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/pojo/MetaModule.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.factory.module.pojo; +package work.slhaf.partner.api.agent.factory.module.pojo; import lombok.Data; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/flow/AgentInteraction.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/flow/AgentInteraction.java similarity index 66% rename from Partner-Api/src/main/java/work/slhaf/partner/api/flow/AgentInteraction.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/flow/AgentInteraction.java index 8e190be1..db17268d 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/flow/AgentInteraction.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/flow/AgentInteraction.java @@ -1,7 +1,7 @@ -package work.slhaf.partner.api.flow; +package work.slhaf.partner.api.agent.flow; -import work.slhaf.partner.api.factory.module.pojo.MetaModule; -import work.slhaf.partner.api.flow.entity.InteractionFlowContext; +import work.slhaf.partner.api.agent.factory.module.pojo.MetaModule; +import work.slhaf.partner.api.agent.flow.entity.InteractionFlowContext; import java.util.List; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/flow/abstracts/ActivateModel.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/flow/abstracts/ActivateModel.java similarity index 69% rename from Partner-Api/src/main/java/work/slhaf/partner/api/flow/abstracts/ActivateModel.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/flow/abstracts/ActivateModel.java index dfd805ee..9c46c9ae 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/flow/abstracts/ActivateModel.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/flow/abstracts/ActivateModel.java @@ -1,20 +1,22 @@ -package work.slhaf.partner.api.flow.abstracts; +package work.slhaf.partner.api.agent.flow.abstracts; -import work.slhaf.partner.api.common.chat.ChatClient; -import work.slhaf.partner.api.common.chat.Model; -import work.slhaf.partner.api.common.chat.constant.ChatConstant; -import work.slhaf.partner.api.common.chat.pojo.ChatResponse; -import work.slhaf.partner.api.common.chat.pojo.Message; -import work.slhaf.partner.api.factory.config.ModelConfigManager; -import work.slhaf.partner.api.factory.config.pojo.ModelConfig; -import work.slhaf.partner.api.factory.module.annotation.BeforeExecute; +import work.slhaf.partner.api.agent.factory.config.ModelConfigManager; +import work.slhaf.partner.api.agent.factory.config.pojo.ModelConfig; +import work.slhaf.partner.api.agent.factory.module.annotation.Init; +import work.slhaf.partner.api.agent.flow.entity.Model; +import work.slhaf.partner.api.chat.ChatClient; +import work.slhaf.partner.api.chat.constant.ChatConstant; +import work.slhaf.partner.api.chat.pojo.ChatResponse; +import work.slhaf.partner.api.chat.pojo.Message; import java.util.ArrayList; import java.util.List; public interface ActivateModel { - @BeforeExecute + ModelConfigManager modelConfigManager = ModelConfigManager.INSTANCE; + + @Init default void modelSettings() { Model model = new Model(); ModelConfig modelConfig = ModelConfigManager.INSTANCE.loadModelConfig(modelKey()); @@ -23,13 +25,14 @@ public interface ActivateModel { } private List loadSpecificPrompt(String modelKey) { - - return null; + return modelConfigManager.loadModelPrompt(modelKey); } private List loadSpecificPromptAndBasicPrompt(String modelKey) { - - return null; + List messages = new ArrayList<>(); + messages.addAll(modelConfigManager.loadModelPrompt("basic")); + messages.addAll(modelConfigManager.loadModelPrompt(modelKey)); + return messages; } default ChatResponse chat() { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/flow/abstracts/AgentInteractionModule.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/flow/abstracts/AgentInteractionModule.java similarity index 57% rename from Partner-Api/src/main/java/work/slhaf/partner/api/flow/abstracts/AgentInteractionModule.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/flow/abstracts/AgentInteractionModule.java index 43dcf97a..5c5baf96 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/flow/abstracts/AgentInteractionModule.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/flow/abstracts/AgentInteractionModule.java @@ -1,6 +1,6 @@ -package work.slhaf.partner.api.flow.abstracts; +package work.slhaf.partner.api.agent.flow.abstracts; -import work.slhaf.partner.api.flow.entity.InteractionFlowContext; +import work.slhaf.partner.api.agent.flow.entity.InteractionFlowContext; /** * 流程执行模块基类 diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/flow/abstracts/AgentInteractionSubModule.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/flow/abstracts/AgentInteractionSubModule.java similarity index 79% rename from Partner-Api/src/main/java/work/slhaf/partner/api/flow/abstracts/AgentInteractionSubModule.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/flow/abstracts/AgentInteractionSubModule.java index ab243ed7..61800030 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/flow/abstracts/AgentInteractionSubModule.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/flow/abstracts/AgentInteractionSubModule.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.flow.abstracts; +package work.slhaf.partner.api.agent.flow.abstracts; /** diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/flow/abstracts/Module.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/flow/abstracts/Module.java new file mode 100644 index 00000000..844625d3 --- /dev/null +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/flow/abstracts/Module.java @@ -0,0 +1,18 @@ +package work.slhaf.partner.api.agent.flow.abstracts; + +import lombok.Getter; +import lombok.Setter; +import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityHolder; +import work.slhaf.partner.api.agent.flow.entity.Model; + +/** + * 模块基类 + */ +@CapabilityHolder +public abstract class Module { + + @Getter + @Setter + protected Model model = new Model(); + +} diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/flow/entity/InteractionFlowContext.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/flow/entity/InteractionFlowContext.java similarity index 67% rename from Partner-Api/src/main/java/work/slhaf/partner/api/flow/entity/InteractionFlowContext.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/flow/entity/InteractionFlowContext.java index 5e10cba4..ab0bb1f1 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/flow/entity/InteractionFlowContext.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/flow/entity/InteractionFlowContext.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.flow.entity; +package work.slhaf.partner.api.agent.flow.entity; import lombok.Data; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/Model.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/flow/entity/Model.java similarity index 57% rename from Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/Model.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/agent/flow/entity/Model.java index a6d4ff78..fec5a7b3 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/Model.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/flow/entity/Model.java @@ -1,7 +1,8 @@ -package work.slhaf.partner.api.common.chat; +package work.slhaf.partner.api.agent.flow.entity; import lombok.Data; -import work.slhaf.partner.api.common.chat.pojo.Message; +import work.slhaf.partner.api.chat.ChatClient; +import work.slhaf.partner.api.chat.pojo.Message; import java.util.List; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/util/AgentUtil.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/util/AgentUtil.java new file mode 100644 index 00000000..57999b7f --- /dev/null +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/util/AgentUtil.java @@ -0,0 +1,45 @@ +package work.slhaf.partner.api.agent.util; + +import java.lang.reflect.Method; +import java.util.HashSet; +import java.util.Set; + +public final class AgentUtil { + + public static String methodSignature(Method method) { + StringBuilder sb = new StringBuilder(); + sb.append("("); + sb.append(method.getReturnType().getName()).append(" "); + sb.append(method.getName()).append("("); + Class[] paramTypes = method.getParameterTypes(); + for (int i = 0; i < paramTypes.length; i++) { + sb.append(paramTypes[i].getName()); + if (i < paramTypes.length - 1) sb.append(","); + } + sb.append(")").append(")"); + return sb.toString(); + } + + public static Set> collectExtendedClasses(Class clazz, Class targetClass) { + Set> classes = new HashSet<>(); + collectExtendedClasses(classes, clazz, targetClass); + return classes; + } + + private static void collectExtendedClasses(Set> classes, Class clazz, Class target) { + Class superclass = clazz.getSuperclass(); + if (superclass == null || superclass == target) { + return; + } + collectExtendedClasses(classes, superclass, target); + classes.add(superclass); + collectInterfaces(clazz, classes); + } + + private static void collectInterfaces(Class clazz, Set> classes) { + for (Class type : clazz.getInterfaces()) { + if (classes.add(type)) { + collectInterfaces(type, classes); + } + } + }} diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/ChatClient.java b/Partner-Api/src/main/java/work/slhaf/partner/api/chat/ChatClient.java similarity index 84% rename from Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/ChatClient.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/chat/ChatClient.java index 2909c3f8..ac23418e 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/ChatClient.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/chat/ChatClient.java @@ -1,15 +1,15 @@ -package work.slhaf.partner.api.common.chat; +package work.slhaf.partner.api.chat; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import cn.hutool.json.JSONUtil; import lombok.Data; import lombok.NoArgsConstructor; -import work.slhaf.partner.api.common.chat.constant.ChatConstant; -import work.slhaf.partner.api.common.chat.pojo.ChatBody; -import work.slhaf.partner.api.common.chat.pojo.ChatResponse; -import work.slhaf.partner.api.common.chat.pojo.Message; -import work.slhaf.partner.api.common.chat.pojo.PrimaryChatResponse; +import work.slhaf.partner.api.chat.constant.ChatConstant; +import work.slhaf.partner.api.chat.pojo.ChatBody; +import work.slhaf.partner.api.chat.pojo.ChatResponse; +import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.chat.pojo.PrimaryChatResponse; import java.util.List; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/constant/ChatConstant.java b/Partner-Api/src/main/java/work/slhaf/partner/api/chat/constant/ChatConstant.java similarity index 88% rename from Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/constant/ChatConstant.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/chat/constant/ChatConstant.java index b68b24aa..eaa3be2d 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/constant/ChatConstant.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/chat/constant/ChatConstant.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.common.chat.constant; +package work.slhaf.partner.api.chat.constant; public class ChatConstant { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/pojo/ChatBody.java b/Partner-Api/src/main/java/work/slhaf/partner/api/chat/pojo/ChatBody.java similarity index 90% rename from Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/pojo/ChatBody.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/chat/pojo/ChatBody.java index 49ad1809..0a098214 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/pojo/ChatBody.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/chat/pojo/ChatBody.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.common.chat.pojo; +package work.slhaf.partner.api.chat.pojo; import lombok.*; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/pojo/ChatResponse.java b/Partner-Api/src/main/java/work/slhaf/partner/api/chat/pojo/ChatResponse.java similarity index 86% rename from Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/pojo/ChatResponse.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/chat/pojo/ChatResponse.java index ac67d849..42f12106 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/pojo/ChatResponse.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/chat/pojo/ChatResponse.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.common.chat.pojo; +package work.slhaf.partner.api.chat.pojo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/pojo/Message.java b/Partner-Api/src/main/java/work/slhaf/partner/api/chat/pojo/Message.java similarity index 88% rename from Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/pojo/Message.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/chat/pojo/Message.java index 14e0f401..c199b3e3 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/pojo/Message.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/chat/pojo/Message.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.common.chat.pojo; +package work.slhaf.partner.api.chat.pojo; import lombok.*; import work.slhaf.partner.api.common.entity.PersistableObject; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/pojo/MetaMessage.java b/Partner-Api/src/main/java/work/slhaf/partner/api/chat/pojo/MetaMessage.java similarity index 89% rename from Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/pojo/MetaMessage.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/chat/pojo/MetaMessage.java index 4dfebbe7..746b44f2 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/pojo/MetaMessage.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/chat/pojo/MetaMessage.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.common.chat.pojo; +package work.slhaf.partner.api.chat.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/pojo/PrimaryChatResponse.java b/Partner-Api/src/main/java/work/slhaf/partner/api/chat/pojo/PrimaryChatResponse.java similarity index 97% rename from Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/pojo/PrimaryChatResponse.java rename to Partner-Api/src/main/java/work/slhaf/partner/api/chat/pojo/PrimaryChatResponse.java index f7a59b39..e1303c36 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/common/chat/pojo/PrimaryChatResponse.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/chat/pojo/PrimaryChatResponse.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.api.common.chat.pojo; +package work.slhaf.partner.api.chat.pojo; import lombok.Getter; import lombok.Setter; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/common/util/AgentUtil.java b/Partner-Api/src/main/java/work/slhaf/partner/api/common/util/AgentUtil.java deleted file mode 100644 index b703831f..00000000 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/common/util/AgentUtil.java +++ /dev/null @@ -1,19 +0,0 @@ -package work.slhaf.partner.api.common.util; - -import java.lang.reflect.Method; - -public final class AgentUtil { - public static String methodSignature(Method method) { - StringBuilder sb = new StringBuilder(); - sb.append("("); - sb.append(method.getReturnType().getName()).append(" "); - sb.append(method.getName()).append("("); - Class[] paramTypes = method.getParameterTypes(); - for (int i = 0; i < paramTypes.length; i++) { - sb.append(paramTypes[i].getName()); - if (i < paramTypes.length - 1) sb.append(","); - } - sb.append(")").append(")"); - return sb.toString(); - } -} diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/context/ModuleFactoryContext.java b/Partner-Api/src/main/java/work/slhaf/partner/api/factory/context/ModuleFactoryContext.java deleted file mode 100644 index 4eae4d6e..00000000 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/context/ModuleFactoryContext.java +++ /dev/null @@ -1,16 +0,0 @@ -package work.slhaf.partner.api.factory.context; - -import lombok.Data; -import work.slhaf.partner.api.factory.module.pojo.MetaMethod; -import work.slhaf.partner.api.factory.module.pojo.MetaModule; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Set; - -@Data -public class ModuleFactoryContext { - private List moduleList = new ArrayList<>(); - private HashMap,Set> initHookMethods = new HashMap<>(); -} diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/ModulePreHookExecuteFactory.java b/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/ModulePreHookExecuteFactory.java deleted file mode 100644 index 5a007c71..00000000 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/ModulePreHookExecuteFactory.java +++ /dev/null @@ -1,21 +0,0 @@ -package work.slhaf.partner.api.factory.module; - -import work.slhaf.partner.api.factory.AgentBaseFactory; -import work.slhaf.partner.api.factory.context.AgentRegisterContext; - -import java.lang.reflect.InvocationTargetException; - -/** - * 负责执行前hook逻辑 - */ -public class ModulePreHookExecuteFactory extends AgentBaseFactory { - @Override - protected void setVariables(AgentRegisterContext context) { - - } - - @Override - protected void run() throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException { - - } -} diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/ModuleRegisterFactory.java b/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/ModuleRegisterFactory.java deleted file mode 100644 index 8517107c..00000000 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/factory/module/ModuleRegisterFactory.java +++ /dev/null @@ -1,75 +0,0 @@ -package work.slhaf.partner.api.factory.module; - -import org.reflections.Reflections; -import work.slhaf.partner.api.factory.AgentBaseFactory; -import work.slhaf.partner.api.factory.context.AgentRegisterContext; -import work.slhaf.partner.api.factory.context.ModuleFactoryContext; -import work.slhaf.partner.api.factory.module.annotation.AgentModule; -import work.slhaf.partner.api.factory.module.annotation.Init; -import work.slhaf.partner.api.factory.module.pojo.MetaMethod; -import work.slhaf.partner.api.factory.module.pojo.MetaModule; - -import java.lang.reflect.Method; -import java.util.*; - -/** - * 负责扫描@Module注解获取模块实例 - */ -public class ModuleRegisterFactory extends AgentBaseFactory { - - private Reflections reflections; - private List moduleList; - private HashMap, Set> initHookMethods; - - @Override - protected void setVariables(AgentRegisterContext context) { - ModuleFactoryContext factoryContext = context.getModuleFactoryContext(); - reflections = context.getReflections(); - moduleList = factoryContext.getModuleList(); - initHookMethods = factoryContext.getInitHookMethods(); - } - - @Override - protected void run() { - setModuleList(); - setInitMethods(); - } - - - private void setInitMethods() { - Set methods = reflections.getMethodsAnnotatedWith(Init.class); - for (Method method : methods) { - MetaMethod metaMethod = new MetaMethod(); - metaMethod.setMethod(method); - metaMethod.setOrder(method.getAnnotation(Init.class).order()); - - addMetaMethod(method, metaMethod, initHookMethods); - } - } - - private void addMetaMethod(Method method, MetaMethod metaMethod, HashMap, Set> preHookMethods) { - Class clazz = method.getDeclaringClass(); - if (preHookMethods.containsKey(clazz)) { - preHookMethods.get(clazz).add(metaMethod); - } else { - HashSet metaMethods = new HashSet<>(); - metaMethods.add(metaMethod); - preHookMethods.put(clazz, metaMethods); - } - } - - private void setModuleList() { - //反射扫描获取@AgentModule所在类, 该部分为Agent流程执行模块 - Set> modules = reflections.getTypesAnnotatedWith(AgentModule.class); - for (Class module : modules) { - AgentModule agentModule = module.getAnnotation(AgentModule.class); - MetaModule metaModule = new MetaModule(); - metaModule.setName(agentModule.name()); - metaModule.setOrder(agentModule.order()); - metaModule.setClazz(module); - moduleList.add(metaModule); - } - moduleList.sort(Comparator.comparing(MetaModule::getOrder)); - - } -} diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/flow/abstracts/Module.java b/Partner-Api/src/main/java/work/slhaf/partner/api/flow/abstracts/Module.java deleted file mode 100644 index abe47ea7..00000000 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/flow/abstracts/Module.java +++ /dev/null @@ -1,18 +0,0 @@ -package work.slhaf.partner.api.flow.abstracts; - -import lombok.Getter; -import lombok.Setter; -import work.slhaf.partner.api.common.chat.Model; -import work.slhaf.partner.api.factory.capability.annotation.CapabilityHolder; - -/** - * 模块基类 - */ -@CapabilityHolder -public abstract class Module { - - @Getter - @Setter - protected Model model = new Model(); - -} diff --git a/Partner-Api/src/test/java/TestApplication.java b/Partner-Api/src/test/java/TestApplication.java deleted file mode 100644 index efd75139..00000000 --- a/Partner-Api/src/test/java/TestApplication.java +++ /dev/null @@ -1,7 +0,0 @@ -import work.slhaf.partner.api.Agent; - -public class TestApplication { - public static void main(String[] args) { - Agent.newAgent(TestApplication.class,null).run(); - } -} diff --git a/Partner-Api/src/test/java/factory/AgentRegisterTest.java b/Partner-Api/src/test/java/factory/AgentRegisterTest.java new file mode 100644 index 00000000..15bf25b5 --- /dev/null +++ b/Partner-Api/src/test/java/factory/AgentRegisterTest.java @@ -0,0 +1,7 @@ +package factory; + +public class AgentRegisterTest { + public static void main(String[] args) { + + } +} diff --git a/Partner-Api/src/test/java/module/ModuleProxyTest.java b/Partner-Api/src/test/java/module/ModuleProxyTest.java index 2dc3a0fd..fe1a1fc8 100644 --- a/Partner-Api/src/test/java/module/ModuleProxyTest.java +++ b/Partner-Api/src/test/java/module/ModuleProxyTest.java @@ -4,7 +4,7 @@ import net.bytebuddy.ByteBuddy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.matcher.ElementMatchers; import org.junit.jupiter.api.Test; -import work.slhaf.partner.api.flow.abstracts.AgentInteractionModule; +import work.slhaf.partner.api.agent.flow.abstracts.AgentInteractionModule; import java.lang.reflect.InvocationTargetException; diff --git a/Partner-Api/src/test/java/module/MyAgentInteractionModule.java b/Partner-Api/src/test/java/module/MyAgentInteractionModule.java index f911fce5..effa6251 100644 --- a/Partner-Api/src/test/java/module/MyAgentInteractionModule.java +++ b/Partner-Api/src/test/java/module/MyAgentInteractionModule.java @@ -1,7 +1,7 @@ package module; -import work.slhaf.partner.api.flow.abstracts.AgentInteractionModule; -import work.slhaf.partner.api.flow.entity.InteractionFlowContext; +import work.slhaf.partner.api.agent.flow.abstracts.AgentInteractionModule; +import work.slhaf.partner.api.agent.flow.entity.InteractionFlowContext; public class MyAgentInteractionModule extends AgentInteractionModule { @Override diff --git a/Partner-Main/src/main/java/work/slhaf/partner/common/util/ResourcesUtil.java b/Partner-Main/src/main/java/work/slhaf/partner/common/util/ResourcesUtil.java index e3cceb83..20292bc4 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/common/util/ResourcesUtil.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/common/util/ResourcesUtil.java @@ -2,7 +2,7 @@ package work.slhaf.partner.common.util; import com.alibaba.fastjson2.JSONArray; import work.slhaf.partner.Agent; -import work.slhaf.partner.api.common.chat.pojo.Message; +import work.slhaf.partner.api.chat.pojo.Message; import java.io.InputStream; import java.nio.charset.StandardCharsets; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/CoordinatedManager.java b/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/CoordinatedManager.java index a40a4a9e..f8f02b23 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/CoordinatedManager.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/CoordinatedManager.java @@ -2,9 +2,9 @@ package work.slhaf.partner.core.cognation; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.common.chat.constant.ChatConstant; -import work.slhaf.partner.api.factory.capability.annotation.CoordinateManager; -import work.slhaf.partner.api.factory.capability.annotation.Coordinated; +import work.slhaf.partner.api.agent.factory.capability.annotation.CoordinateManager; +import work.slhaf.partner.api.agent.factory.capability.annotation.Coordinated; +import work.slhaf.partner.api.chat.constant.ChatConstant; import work.slhaf.partner.common.exception_handler.GlobalExceptionHandler; import work.slhaf.partner.common.exception_handler.pojo.GlobalException; import work.slhaf.partner.core.cognation.cognation.CognationCore; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/cognation/CognationCapability.java b/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/cognation/CognationCapability.java index 5cf4e0d3..b46c0168 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/cognation/CognationCapability.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/cognation/CognationCapability.java @@ -1,9 +1,9 @@ package work.slhaf.partner.core.cognation.cognation; -import work.slhaf.partner.api.common.chat.pojo.Message; -import work.slhaf.partner.api.factory.capability.annotation.Capability; -import work.slhaf.partner.api.factory.capability.annotation.CapabilityMethod; -import work.slhaf.partner.api.factory.capability.annotation.ToCoordinated; +import work.slhaf.partner.api.agent.factory.capability.annotation.Capability; +import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityMethod; +import work.slhaf.partner.api.agent.factory.capability.annotation.ToCoordinated; +import work.slhaf.partner.api.chat.pojo.Message; import work.slhaf.partner.core.cognation.submodule.memory.pojo.EvaluatedSlice; import java.util.HashMap; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/cognation/CognationCore.java b/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/cognation/CognationCore.java index 8302e89e..5fb7e081 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/cognation/CognationCore.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/cognation/CognationCore.java @@ -4,9 +4,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; -import work.slhaf.partner.api.common.chat.pojo.Message; +import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityCore; +import work.slhaf.partner.api.chat.pojo.Message; import work.slhaf.partner.api.common.entity.PersistableObject; -import work.slhaf.partner.api.factory.capability.annotation.CapabilityCore; import work.slhaf.partner.core.cognation.cognation.pojo.ActiveData; import work.slhaf.partner.core.cognation.submodule.cache.CacheCore; import work.slhaf.partner.core.cognation.submodule.memory.MemoryCore; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/cache/CacheCapability.java b/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/cache/CacheCapability.java index 93630fbf..09d8229f 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/cache/CacheCapability.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/cache/CacheCapability.java @@ -1,6 +1,6 @@ package work.slhaf.partner.core.cognation.submodule.cache; -import work.slhaf.partner.api.factory.capability.annotation.Capability; +import work.slhaf.partner.api.agent.factory.capability.annotation.Capability; import java.time.LocalDateTime; import java.util.HashMap; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/cache/CacheCore.java b/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/cache/CacheCore.java index 2adb9f4f..5507eea6 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/cache/CacheCore.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/cache/CacheCore.java @@ -3,9 +3,9 @@ package work.slhaf.partner.core.cognation.submodule.cache; import lombok.EqualsAndHashCode; import lombok.Getter; 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.common.entity.PersistableObject; -import work.slhaf.partner.api.factory.capability.annotation.CapabilityCore; -import work.slhaf.partner.api.factory.capability.annotation.CapabilityMethod; import work.slhaf.partner.core.cognation.common.pojo.MemoryResult; import work.slhaf.partner.core.cognation.submodule.memory.pojo.MemorySlice; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/MemoryCapability.java b/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/MemoryCapability.java index cb35be9f..0e9c48f1 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/MemoryCapability.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/MemoryCapability.java @@ -1,7 +1,7 @@ package work.slhaf.partner.core.cognation.submodule.memory; -import work.slhaf.partner.api.factory.capability.annotation.Capability; -import work.slhaf.partner.api.factory.capability.annotation.ToCoordinated; +import work.slhaf.partner.api.agent.factory.capability.annotation.Capability; +import work.slhaf.partner.api.agent.factory.capability.annotation.ToCoordinated; import work.slhaf.partner.core.cognation.common.pojo.MemoryResult; import work.slhaf.partner.core.cognation.submodule.memory.pojo.MemorySlice; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/MemoryCore.java b/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/MemoryCore.java index f99a377d..4b46615d 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/MemoryCore.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/MemoryCore.java @@ -2,9 +2,9 @@ package work.slhaf.partner.core.cognation.submodule.memory; import lombok.Data; import lombok.EqualsAndHashCode; +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.common.entity.PersistableObject; -import work.slhaf.partner.api.factory.capability.annotation.CapabilityCore; -import work.slhaf.partner.api.factory.capability.annotation.CapabilityMethod; import work.slhaf.partner.core.cognation.common.pojo.MemoryResult; import work.slhaf.partner.core.cognation.common.pojo.MemorySliceResult; import work.slhaf.partner.core.cognation.submodule.memory.exception.UnExistedDateIndexException; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/pojo/MemorySlice.java b/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/pojo/MemorySlice.java index 36719fea..533cb6ec 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/pojo/MemorySlice.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/pojo/MemorySlice.java @@ -3,7 +3,7 @@ package work.slhaf.partner.core.cognation.submodule.memory.pojo; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import work.slhaf.partner.api.common.chat.pojo.Message; +import work.slhaf.partner.api.chat.pojo.Message; import work.slhaf.partner.api.common.entity.PersistableObject; import java.io.Serial; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/perceive/PerceiveCapability.java b/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/perceive/PerceiveCapability.java index 13d119f4..ba38e7e5 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/perceive/PerceiveCapability.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/perceive/PerceiveCapability.java @@ -1,6 +1,6 @@ package work.slhaf.partner.core.cognation.submodule.perceive; -import work.slhaf.partner.api.factory.capability.annotation.Capability; +import work.slhaf.partner.api.agent.factory.capability.annotation.Capability; import work.slhaf.partner.core.cognation.submodule.perceive.pojo.User; @Capability(value = "perceive") diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/perceive/PerceiveCore.java b/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/perceive/PerceiveCore.java index 3345c12b..18039010 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/perceive/PerceiveCore.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/submodule/perceive/PerceiveCore.java @@ -2,9 +2,9 @@ package work.slhaf.partner.core.cognation.submodule.perceive; import lombok.Data; import lombok.EqualsAndHashCode; +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.common.entity.PersistableObject; -import work.slhaf.partner.api.factory.capability.annotation.CapabilityCore; -import work.slhaf.partner.api.factory.capability.annotation.CapabilityMethod; import work.slhaf.partner.core.cognation.cognation.exception.UserNotExistsException; import work.slhaf.partner.core.cognation.submodule.perceive.pojo.User; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/session/SessionManager.java b/Partner-Main/src/main/java/work/slhaf/partner/core/session/SessionManager.java index b3f561c5..5347114a 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/session/SessionManager.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/session/SessionManager.java @@ -4,8 +4,8 @@ import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.common.chat.pojo.Message; -import work.slhaf.partner.api.common.chat.pojo.MetaMessage; +import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.chat.pojo.MetaMessage; import work.slhaf.partner.api.common.entity.PersistableObject; import work.slhaf.partner.common.config.Config; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/core/CoreModel.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/core/CoreModel.java index c17c6cf0..c6451fc0 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/core/CoreModel.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/core/CoreModel.java @@ -4,12 +4,12 @@ import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.common.chat.constant.ChatConstant; -import work.slhaf.partner.api.common.chat.pojo.ChatResponse; -import work.slhaf.partner.api.common.chat.pojo.Message; -import work.slhaf.partner.api.common.chat.pojo.MetaMessage; -import work.slhaf.partner.api.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.flow.abstracts.ActivateModel; +import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.flow.abstracts.ActivateModel; +import work.slhaf.partner.api.chat.constant.ChatConstant; +import work.slhaf.partner.api.chat.pojo.ChatResponse; +import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.chat.pojo.MetaMessage; import work.slhaf.partner.core.cognation.cognation.CognationCapability; import work.slhaf.partner.core.interaction.data.context.InteractionContext; import work.slhaf.partner.core.session.SessionManager; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/MemorySelector.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/MemorySelector.java index ffe2855d..e4ddbfad 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/MemorySelector.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/MemorySelector.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.core.cognation.cognation.CognationCapability; import work.slhaf.partner.core.cognation.common.pojo.MemoryResult; import work.slhaf.partner.core.cognation.submodule.cache.CacheCapability; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/SliceSelectEvaluator.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/SliceSelectEvaluator.java index 1468af5d..1aeb9bec 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/SliceSelectEvaluator.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/SliceSelectEvaluator.java @@ -6,8 +6,8 @@ import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.flow.abstracts.ActivateModel; -import work.slhaf.partner.api.flow.abstracts.AgentInteractionSubModule; +import work.slhaf.partner.api.agent.flow.abstracts.ActivateModel; +import work.slhaf.partner.api.agent.flow.abstracts.AgentInteractionSubModule; import work.slhaf.partner.common.thread.InteractionThreadPoolExecutor; import work.slhaf.partner.core.cognation.common.pojo.MemoryResult; import work.slhaf.partner.core.cognation.common.pojo.MemorySliceResult; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/data/EvaluatorBatchInput.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/data/EvaluatorBatchInput.java index f6c6c775..2395be66 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/data/EvaluatorBatchInput.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/data/EvaluatorBatchInput.java @@ -2,7 +2,7 @@ package work.slhaf.partner.module.modules.memory.selector.evaluator.data; import lombok.Builder; import lombok.Data; -import work.slhaf.partner.api.common.chat.pojo.Message; +import work.slhaf.partner.api.chat.pojo.Message; import java.util.List; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/data/EvaluatorInput.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/data/EvaluatorInput.java index 7a494d66..7bdf037d 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/data/EvaluatorInput.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/data/EvaluatorInput.java @@ -2,7 +2,7 @@ package work.slhaf.partner.module.modules.memory.selector.evaluator.data; import lombok.Builder; import lombok.Data; -import work.slhaf.partner.api.common.chat.pojo.Message; +import work.slhaf.partner.api.chat.pojo.Message; import work.slhaf.partner.core.cognation.common.pojo.MemoryResult; import java.util.List; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/MemorySelectExtractor.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/MemorySelectExtractor.java index 6309a6e7..73835e08 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/MemorySelectExtractor.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/MemorySelectExtractor.java @@ -5,11 +5,11 @@ import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.common.chat.pojo.Message; -import work.slhaf.partner.api.common.chat.pojo.MetaMessage; -import work.slhaf.partner.api.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.flow.abstracts.ActivateModel; -import work.slhaf.partner.api.flow.abstracts.AgentInteractionSubModule; +import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.flow.abstracts.ActivateModel; +import work.slhaf.partner.api.agent.flow.abstracts.AgentInteractionSubModule; +import work.slhaf.partner.api.chat.pojo.Message; +import work.slhaf.partner.api.chat.pojo.MetaMessage; import work.slhaf.partner.common.exception_handler.GlobalExceptionHandler; import work.slhaf.partner.common.exception_handler.pojo.GlobalException; import work.slhaf.partner.core.cognation.cognation.CognationCapability; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/data/ExtractorInput.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/data/ExtractorInput.java index 80a032c4..96125729 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/data/ExtractorInput.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/data/ExtractorInput.java @@ -2,7 +2,7 @@ package work.slhaf.partner.module.modules.memory.selector.extractor.data; import lombok.Builder; import lombok.Data; -import work.slhaf.partner.api.common.chat.pojo.Message; +import work.slhaf.partner.api.chat.pojo.Message; import work.slhaf.partner.core.cognation.submodule.memory.pojo.EvaluatedSlice; import java.time.LocalDate; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/MemoryUpdater.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/MemoryUpdater.java index facc5ca9..140f728b 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/MemoryUpdater.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/MemoryUpdater.java @@ -4,9 +4,9 @@ import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.common.chat.constant.ChatConstant; -import work.slhaf.partner.api.common.chat.pojo.Message; -import work.slhaf.partner.api.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.chat.constant.ChatConstant; +import work.slhaf.partner.api.chat.pojo.Message; import work.slhaf.partner.common.thread.InteractionThreadPoolExecutor; import work.slhaf.partner.core.cognation.cognation.CognationCapability; import work.slhaf.partner.core.cognation.submodule.cache.CacheCapability; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/MemorySummarizer.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/MemorySummarizer.java index 5f95fe38..632816ad 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/MemorySummarizer.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/MemorySummarizer.java @@ -3,7 +3,7 @@ package work.slhaf.partner.module.modules.memory.updater.summarizer; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.flow.abstracts.AgentInteractionSubModule; +import work.slhaf.partner.api.agent.flow.abstracts.AgentInteractionSubModule; import work.slhaf.partner.common.thread.InteractionThreadPoolExecutor; import work.slhaf.partner.module.modules.memory.updater.summarizer.data.SummarizeInput; import work.slhaf.partner.module.modules.memory.updater.summarizer.data.SummarizeResult; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/MultiSummarizer.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/MultiSummarizer.java index 77b8dde3..702d5ff4 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/MultiSummarizer.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/MultiSummarizer.java @@ -5,9 +5,9 @@ import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.common.chat.pojo.ChatResponse; -import work.slhaf.partner.api.flow.abstracts.ActivateModel; -import work.slhaf.partner.api.flow.abstracts.AgentInteractionSubModule; +import work.slhaf.partner.api.agent.flow.abstracts.ActivateModel; +import work.slhaf.partner.api.agent.flow.abstracts.AgentInteractionSubModule; +import work.slhaf.partner.api.chat.pojo.ChatResponse; import work.slhaf.partner.module.modules.memory.updater.summarizer.data.SummarizeInput; import work.slhaf.partner.module.modules.memory.updater.summarizer.data.SummarizeResult; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/SingleSummarizer.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/SingleSummarizer.java index 65c1cdf6..c0f5ab9b 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/SingleSummarizer.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/SingleSummarizer.java @@ -4,11 +4,11 @@ import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.common.chat.constant.ChatConstant; -import work.slhaf.partner.api.common.chat.pojo.ChatResponse; -import work.slhaf.partner.api.common.chat.pojo.Message; -import work.slhaf.partner.api.flow.abstracts.ActivateModel; -import work.slhaf.partner.api.flow.abstracts.AgentInteractionSubModule; +import work.slhaf.partner.api.agent.flow.abstracts.ActivateModel; +import work.slhaf.partner.api.agent.flow.abstracts.AgentInteractionSubModule; +import work.slhaf.partner.api.chat.constant.ChatConstant; +import work.slhaf.partner.api.chat.pojo.ChatResponse; +import work.slhaf.partner.api.chat.pojo.Message; import work.slhaf.partner.common.thread.InteractionThreadPoolExecutor; import java.util.ArrayList; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/TotalSummarizer.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/TotalSummarizer.java index 9bb06c96..286176e9 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/TotalSummarizer.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/TotalSummarizer.java @@ -5,9 +5,9 @@ import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.common.chat.pojo.ChatResponse; -import work.slhaf.partner.api.flow.abstracts.ActivateModel; -import work.slhaf.partner.api.flow.abstracts.AgentInteractionSubModule; +import work.slhaf.partner.api.agent.flow.abstracts.ActivateModel; +import work.slhaf.partner.api.agent.flow.abstracts.AgentInteractionSubModule; +import work.slhaf.partner.api.chat.pojo.ChatResponse; import java.util.HashMap; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/data/SummarizeInput.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/data/SummarizeInput.java index 0df51623..1c1d3d08 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/data/SummarizeInput.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/data/SummarizeInput.java @@ -2,7 +2,7 @@ package work.slhaf.partner.module.modules.memory.updater.summarizer.data; import lombok.AllArgsConstructor; import lombok.Data; -import work.slhaf.partner.api.common.chat.pojo.Message; +import work.slhaf.partner.api.chat.pojo.Message; import java.util.List; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/selector/PerceiveSelector.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/selector/PerceiveSelector.java index a1c5eca9..fe7932c2 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/selector/PerceiveSelector.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/selector/PerceiveSelector.java @@ -2,7 +2,7 @@ package work.slhaf.partner.module.modules.perceive.selector; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.core.cognation.submodule.perceive.PerceiveCapability; import work.slhaf.partner.core.cognation.submodule.perceive.pojo.User; import work.slhaf.partner.core.interaction.data.context.InteractionContext; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/updater/PerceiveUpdater.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/updater/PerceiveUpdater.java index e84b7bfa..4ddb0b6a 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/updater/PerceiveUpdater.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/updater/PerceiveUpdater.java @@ -3,7 +3,7 @@ package work.slhaf.partner.module.modules.perceive.updater; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.common.thread.InteractionThreadPoolExecutor; import work.slhaf.partner.core.cognation.cognation.CognationCapability; import work.slhaf.partner.core.cognation.submodule.perceive.PerceiveCapability; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/updater/relation_extractor/RelationExtractor.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/updater/relation_extractor/RelationExtractor.java index 88f9d5b0..6ed4f681 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/updater/relation_extractor/RelationExtractor.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/updater/relation_extractor/RelationExtractor.java @@ -3,10 +3,10 @@ package work.slhaf.partner.module.modules.perceive.updater.relation_extractor; import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.partner.api.common.chat.pojo.ChatResponse; -import work.slhaf.partner.api.common.chat.pojo.Message; -import work.slhaf.partner.api.flow.abstracts.ActivateModel; -import work.slhaf.partner.api.flow.abstracts.AgentInteractionSubModule; +import work.slhaf.partner.api.agent.flow.abstracts.ActivateModel; +import work.slhaf.partner.api.agent.flow.abstracts.AgentInteractionSubModule; +import work.slhaf.partner.api.chat.pojo.ChatResponse; +import work.slhaf.partner.api.chat.pojo.Message; import work.slhaf.partner.core.cognation.cognation.CognationCapability; import work.slhaf.partner.core.cognation.submodule.perceive.PerceiveCapability; import work.slhaf.partner.core.cognation.submodule.perceive.pojo.User; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/updater/relation_extractor/pojo/RelationExtractInput.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/updater/relation_extractor/pojo/RelationExtractInput.java index fb749748..fef6b732 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/updater/relation_extractor/pojo/RelationExtractInput.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/updater/relation_extractor/pojo/RelationExtractInput.java @@ -1,7 +1,7 @@ package work.slhaf.partner.module.modules.perceive.updater.relation_extractor.pojo; import lombok.Data; -import work.slhaf.partner.api.common.chat.pojo.Message; +import work.slhaf.partner.api.chat.pojo.Message; import java.util.HashMap; import java.util.List; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/updater/static_extractor/StaticMemoryExtractor.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/updater/static_extractor/StaticMemoryExtractor.java index f46eb9d9..128edf8d 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/updater/static_extractor/StaticMemoryExtractor.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/updater/static_extractor/StaticMemoryExtractor.java @@ -4,10 +4,10 @@ import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.partner.api.common.chat.pojo.ChatResponse; -import work.slhaf.partner.api.factory.capability.annotation.InjectCapability; -import work.slhaf.partner.api.flow.abstracts.ActivateModel; -import work.slhaf.partner.api.flow.abstracts.AgentInteractionSubModule; +import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.flow.abstracts.ActivateModel; +import work.slhaf.partner.api.agent.flow.abstracts.AgentInteractionSubModule; +import work.slhaf.partner.api.chat.pojo.ChatResponse; import work.slhaf.partner.core.cognation.cognation.CognationCapability; import work.slhaf.partner.core.cognation.submodule.perceive.PerceiveCapability; import work.slhaf.partner.core.interaction.data.context.InteractionContext; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/updater/static_extractor/data/StaticMemoryExtractInput.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/updater/static_extractor/data/StaticMemoryExtractInput.java index ec551d30..5fd6fde3 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/updater/static_extractor/data/StaticMemoryExtractInput.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/perceive/updater/static_extractor/data/StaticMemoryExtractInput.java @@ -2,7 +2,7 @@ package work.slhaf.partner.module.modules.perceive.updater.static_extractor.data import lombok.Builder; import lombok.Data; -import work.slhaf.partner.api.common.chat.pojo.Message; +import work.slhaf.partner.api.chat.pojo.Message; import java.util.List; import java.util.Map; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/process/PostprocessExecutor.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/process/PostprocessExecutor.java index df4b3e20..329562f1 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/process/PostprocessExecutor.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/process/PostprocessExecutor.java @@ -3,7 +3,7 @@ package work.slhaf.partner.module.modules.process; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.core.cognation.cognation.CognationCapability; import work.slhaf.partner.core.interaction.data.context.InteractionContext; import work.slhaf.partner.module.common.module.PostModule; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/process/PreprocessExecutor.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/process/PreprocessExecutor.java index e3b37140..e8ecab8e 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/process/PreprocessExecutor.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/process/PreprocessExecutor.java @@ -2,8 +2,8 @@ package work.slhaf.partner.module.modules.process; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.factory.capability.annotation.CapabilityHolder; -import work.slhaf.partner.api.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityHolder; +import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.core.cognation.cognation.CognationCapability; import work.slhaf.partner.core.cognation.submodule.perceive.PerceiveCapability; import work.slhaf.partner.core.cognation.submodule.perceive.pojo.User; diff --git a/Partner-Main/src/test/java/SelfAwarenessTest.java b/Partner-Main/src/test/java/SelfAwarenessTest.java index e7602626..aacba430 100644 --- a/Partner-Main/src/test/java/SelfAwarenessTest.java +++ b/Partner-Main/src/test/java/SelfAwarenessTest.java @@ -1,9 +1,9 @@ import cn.hutool.json.JSONUtil; import org.junit.jupiter.api.Test; -import work.slhaf.partner.api.common.chat.ChatClient; -import work.slhaf.partner.api.common.chat.constant.ChatConstant; -import work.slhaf.partner.api.common.chat.pojo.ChatResponse; -import work.slhaf.partner.api.common.chat.pojo.Message; +import work.slhaf.partner.api.chat.ChatClient; +import work.slhaf.partner.api.chat.constant.ChatConstant; +import work.slhaf.partner.api.chat.pojo.ChatResponse; +import work.slhaf.partner.api.chat.pojo.Message; import work.slhaf.partner.common.config.ModelConfig; import work.slhaf.partner.common.util.ResourcesUtil; import work.slhaf.partner.module.common.model.ModelConstant; diff --git a/Partner-Test-Demo/src/main/java/work/slhaf/Main.java b/Partner-Test-Demo/src/main/java/work/slhaf/Main.java deleted file mode 100644 index d1303a05..00000000 --- a/Partner-Test-Demo/src/main/java/work/slhaf/Main.java +++ /dev/null @@ -1,10 +0,0 @@ -package work.slhaf; - -import work.slhaf.demo.TestModule; - -public class Main { - public static void main(String[] args) { - TestModule testModule = new TestModule(); - testModule.execute(); - } -} \ No newline at end of file diff --git a/Partner-Test-Demo/src/main/java/work/slhaf/demo/AgentDemoApplication.java b/Partner-Test-Demo/src/main/java/work/slhaf/demo/AgentDemoApplication.java new file mode 100644 index 00000000..f0499b0c --- /dev/null +++ b/Partner-Test-Demo/src/main/java/work/slhaf/demo/AgentDemoApplication.java @@ -0,0 +1,12 @@ +package work.slhaf.demo; + + +import work.slhaf.demo.flow.AgentDemoFlowContext; +import work.slhaf.partner.api.agent.Agent; + +public class AgentDemoApplication { + public static void main(String[] args) { + Agent.newAgent(AgentDemoApplication.class, new AgentDemoFlowContext()) + .run(); + } +} \ No newline at end of file diff --git a/Partner-Test-Demo/src/main/java/work/slhaf/demo/MyCognationManager.java b/Partner-Test-Demo/src/main/java/work/slhaf/demo/MyCognationManager.java deleted file mode 100644 index d4719799..00000000 --- a/Partner-Test-Demo/src/main/java/work/slhaf/demo/MyCognationManager.java +++ /dev/null @@ -1,16 +0,0 @@ -package work.slhaf.demo; - - -import work.slhaf.partner.api.factory.capability.annotation.CoordinateManager; -import work.slhaf.partner.api.factory.capability.annotation.Coordinated; - -import java.util.List; - -@CoordinateManager -public class MyCognationManager { - - @Coordinated(capability = "memory") - public List selectMemory(String path) { - return List.of("1", "2", path); - } -} diff --git a/Partner-Test-Demo/src/main/java/work/slhaf/demo/TestModule.java b/Partner-Test-Demo/src/main/java/work/slhaf/demo/TestModule.java deleted file mode 100644 index 833c245b..00000000 --- a/Partner-Test-Demo/src/main/java/work/slhaf/demo/TestModule.java +++ /dev/null @@ -1,16 +0,0 @@ -package work.slhaf.demo; - -import work.slhaf.demo.ability.MemoryCapability; -import work.slhaf.partner.api.factory.capability.annotation.CapabilityHolder; -import work.slhaf.partner.api.factory.capability.annotation.InjectCapability; - -@CapabilityHolder -public class TestModule { - @InjectCapability - private MemoryCapability capability; - - public void execute(){ - System.out.println("111"); - System.out.println(capability.selectMemory("zjw")); - } -} diff --git a/Partner-Test-Demo/src/main/java/work/slhaf/demo/ability/CacheCapability.java b/Partner-Test-Demo/src/main/java/work/slhaf/demo/ability/CacheCapability.java deleted file mode 100644 index a0049e60..00000000 --- a/Partner-Test-Demo/src/main/java/work/slhaf/demo/ability/CacheCapability.java +++ /dev/null @@ -1,18 +0,0 @@ -package work.slhaf.demo.ability; - - - -import work.slhaf.partner.api.factory.capability.annotation.Capability; - -import java.time.LocalDateTime; -import java.util.HashMap; -import java.util.concurrent.ConcurrentHashMap; - -@Capability(value = "cache") -public interface CacheCapability { - HashMap getDialogMap(); - ConcurrentHashMap getUserDialogMap(String userId); - void updateDialogMap(LocalDateTime dateTime, String newDialogCache); - String getDialogMapStr(); - String getUserDialogMapStr(String userId,int id); -} diff --git a/Partner-Test-Demo/src/main/java/work/slhaf/demo/ability/MemoryCapability.java b/Partner-Test-Demo/src/main/java/work/slhaf/demo/ability/MemoryCapability.java deleted file mode 100644 index 58156171..00000000 --- a/Partner-Test-Demo/src/main/java/work/slhaf/demo/ability/MemoryCapability.java +++ /dev/null @@ -1,16 +0,0 @@ -package work.slhaf.demo.ability; - - -import work.slhaf.partner.api.factory.capability.annotation.Capability; -import work.slhaf.partner.api.factory.capability.annotation.ToCoordinated; - -import java.util.List; - -@Capability(value = "memory") -public interface MemoryCapability { - void cleanSelectedSliceFilter(); - String getTopicTree(); - List listMemory(String userId); - @ToCoordinated - List selectMemory(String path); -} diff --git a/Partner-Test-Demo/src/main/java/work/slhaf/demo/ability/PerceiveCapability.java b/Partner-Test-Demo/src/main/java/work/slhaf/demo/ability/PerceiveCapability.java deleted file mode 100644 index 541d38af..00000000 --- a/Partner-Test-Demo/src/main/java/work/slhaf/demo/ability/PerceiveCapability.java +++ /dev/null @@ -1,11 +0,0 @@ -package work.slhaf.demo.ability; - - -import work.slhaf.partner.api.factory.capability.annotation.Capability; - -@Capability(value = "perceive") -public interface PerceiveCapability { - String getUser(String id); - String addUser(String userInfo, String platform, String userNickName); - void updateUser(String user); -} diff --git a/Partner-Test-Demo/src/main/java/work/slhaf/demo/core/CacheCore.java b/Partner-Test-Demo/src/main/java/work/slhaf/demo/core/CacheCore.java deleted file mode 100644 index 5946d26d..00000000 --- a/Partner-Test-Demo/src/main/java/work/slhaf/demo/core/CacheCore.java +++ /dev/null @@ -1,54 +0,0 @@ -package work.slhaf.demo.core; - -import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.factory.capability.annotation.CapabilityCore; -import work.slhaf.partner.api.factory.capability.annotation.CapabilityMethod; - -import java.time.LocalDateTime; -import java.util.HashMap; -import java.util.concurrent.ConcurrentHashMap; - -@CapabilityCore(value = "cache") -@Slf4j -public class CacheCore { - - public static volatile CacheCore cacheCore; - - private CacheCore() { - cacheCore = this; - } - - public static CacheCore getInstance() { - return cacheCore; - } - - @CapabilityMethod - public HashMap getDialogMap() { - log.info("cache: getDialogMap"); - return new HashMap<>(); - } - - @CapabilityMethod - public ConcurrentHashMap getUserDialogMap(String userId) { - log.info("cache: getUserDialogMap"); - return new ConcurrentHashMap<>(); - } - - @CapabilityMethod - public void updateDialogMap(LocalDateTime dateTime, String newDialogCache) { - log.info("cache: updateDialogMap"); - } - - @CapabilityMethod - public String getDialogMapStr() { - log.info("cache: getDialogMapStr"); - return ""; - } - - @CapabilityMethod - public String getUserDialogMapStr(String userId,int id) { - log.info("cache: getUserDialogMapStr"); - return userId+id; - } - -} diff --git a/Partner-Test-Demo/src/main/java/work/slhaf/demo/core/MemoryCore.java b/Partner-Test-Demo/src/main/java/work/slhaf/demo/core/MemoryCore.java deleted file mode 100644 index 8934f03f..00000000 --- a/Partner-Test-Demo/src/main/java/work/slhaf/demo/core/MemoryCore.java +++ /dev/null @@ -1,40 +0,0 @@ -package work.slhaf.demo.core; - -import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.factory.capability.annotation.CapabilityCore; -import work.slhaf.partner.api.factory.capability.annotation.CapabilityMethod; - -import java.util.ArrayList; -import java.util.List; - -@CapabilityCore(value = "memory") -@Slf4j -public class MemoryCore { - - public static volatile MemoryCore memoryCore; - - private MemoryCore() { - memoryCore = this; - } - - public static MemoryCore getInstance() { - return memoryCore; - } - - @CapabilityMethod - public void cleanSelectedSliceFilter(){ - log.info("memory: cleanSelectedSliceFilter"); - } - - @CapabilityMethod - public String getTopicTree(){ - log.info("memory: getTopicTree"); - return ""; - } - - @CapabilityMethod - public List listMemory(String userId){ - log.info("memory: listMemory"); - return new ArrayList<>(); - } -} diff --git a/Partner-Test-Demo/src/main/java/work/slhaf/demo/core/PerceiveCore.java b/Partner-Test-Demo/src/main/java/work/slhaf/demo/core/PerceiveCore.java deleted file mode 100644 index cf34d363..00000000 --- a/Partner-Test-Demo/src/main/java/work/slhaf/demo/core/PerceiveCore.java +++ /dev/null @@ -1,38 +0,0 @@ -package work.slhaf.demo.core; - -import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.factory.capability.annotation.CapabilityCore; -import work.slhaf.partner.api.factory.capability.annotation.CapabilityMethod; - -@CapabilityCore(value = "perceive") -@Slf4j -public class PerceiveCore { - - public static volatile PerceiveCore perceiveCore; - - private PerceiveCore() { - perceiveCore = this; - } - - public static PerceiveCore getInstance() { - return perceiveCore; - } - - @CapabilityMethod - public String getUser(String id){ - log.info("perceive: getUser"); - return ""; - } - - @CapabilityMethod - public String addUser(String userInfo, String platform, String userNickName){ - log.info("perceive: addUser"); - return ""; - } - - @CapabilityMethod - public void updateUser(String user){ - log.info("perceive: updateUser"); - } - -} diff --git a/Partner-Test-Demo/src/main/java/work/slhaf/demo/flow/AgentDemoFlowContext.java b/Partner-Test-Demo/src/main/java/work/slhaf/demo/flow/AgentDemoFlowContext.java new file mode 100644 index 00000000..0cabc5cd --- /dev/null +++ b/Partner-Test-Demo/src/main/java/work/slhaf/demo/flow/AgentDemoFlowContext.java @@ -0,0 +1,6 @@ +package work.slhaf.demo.flow; + +import work.slhaf.partner.api.agent.flow.entity.InteractionFlowContext; + +public class AgentDemoFlowContext extends InteractionFlowContext { +} diff --git a/Partner-Test-Demo/src/main/java/work/slhaf/demo/module/ATestModule.java b/Partner-Test-Demo/src/main/java/work/slhaf/demo/module/ATestModule.java new file mode 100644 index 00000000..4516310c --- /dev/null +++ b/Partner-Test-Demo/src/main/java/work/slhaf/demo/module/ATestModule.java @@ -0,0 +1,7 @@ +package work.slhaf.demo.module; + +import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; + +@AgentModule(name = "module_a",order = 0) +public class ATestModule { +} diff --git a/Partner-Test-Demo/src/main/java/work/slhaf/demo/service/TestCoordinateManager.java b/Partner-Test-Demo/src/main/java/work/slhaf/demo/service/TestCoordinateManager.java new file mode 100644 index 00000000..60310041 --- /dev/null +++ b/Partner-Test-Demo/src/main/java/work/slhaf/demo/service/TestCoordinateManager.java @@ -0,0 +1,18 @@ +package work.slhaf.demo.service; + +import work.slhaf.demo.service.core.BTestCore; +import work.slhaf.demo.service.core.CTestCore; +import work.slhaf.partner.api.agent.factory.capability.annotation.CoordinateManager; +import work.slhaf.partner.api.agent.factory.capability.annotation.Coordinated; + +@CoordinateManager +public class TestCoordinateManager { + private BTestCore bTestCore = new BTestCore(); + private CTestCore cTestCore = new CTestCore(); + + @Coordinated(capability = "test_c") + public void testMethodCoordinate(String input){ + String resultB = bTestCore.testCoordinateSubMethod(); + cTestCore.testCoordinateSubMethod(resultB); + } +} diff --git a/Partner-Test-Demo/src/main/java/work/slhaf/demo/service/capability/ATestCapability.java b/Partner-Test-Demo/src/main/java/work/slhaf/demo/service/capability/ATestCapability.java new file mode 100644 index 00000000..badc06e6 --- /dev/null +++ b/Partner-Test-Demo/src/main/java/work/slhaf/demo/service/capability/ATestCapability.java @@ -0,0 +1,9 @@ +package work.slhaf.demo.service.capability; + +import work.slhaf.partner.api.agent.factory.capability.annotation.Capability; + +@Capability("test_a") +public interface ATestCapability { + void testMethodNormalA(); + String testMethodNormalB(); +} diff --git a/Partner-Test-Demo/src/main/java/work/slhaf/demo/service/capability/BTestCapability.java b/Partner-Test-Demo/src/main/java/work/slhaf/demo/service/capability/BTestCapability.java new file mode 100644 index 00000000..552adf7e --- /dev/null +++ b/Partner-Test-Demo/src/main/java/work/slhaf/demo/service/capability/BTestCapability.java @@ -0,0 +1,8 @@ +package work.slhaf.demo.service.capability; + +import work.slhaf.partner.api.agent.factory.capability.annotation.Capability; + +@Capability("test_b") +public interface BTestCapability { + void testMethodNormalA(); +} diff --git a/Partner-Test-Demo/src/main/java/work/slhaf/demo/service/capability/CTestCapability.java b/Partner-Test-Demo/src/main/java/work/slhaf/demo/service/capability/CTestCapability.java new file mode 100644 index 00000000..f0b41af9 --- /dev/null +++ b/Partner-Test-Demo/src/main/java/work/slhaf/demo/service/capability/CTestCapability.java @@ -0,0 +1,12 @@ +package work.slhaf.demo.service.capability; + +import work.slhaf.partner.api.agent.factory.capability.annotation.Capability; +import work.slhaf.partner.api.agent.factory.capability.annotation.ToCoordinated; + +@Capability("test_c") +public interface CTestCapability { + void testMethodNormalA(String input); + + @ToCoordinated + void testMethodCoordinate(String input); +} diff --git a/Partner-Test-Demo/src/main/java/work/slhaf/demo/service/core/ATestCore.java b/Partner-Test-Demo/src/main/java/work/slhaf/demo/service/core/ATestCore.java new file mode 100644 index 00000000..99f30719 --- /dev/null +++ b/Partner-Test-Demo/src/main/java/work/slhaf/demo/service/core/ATestCore.java @@ -0,0 +1,19 @@ +package work.slhaf.demo.service.core; + +import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityCore; +import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityMethod; + +@CapabilityCore("test_a") +public class ATestCore { + + @CapabilityMethod + public void testMethodNormalA(){ + System.out.println("ATestCore::testMethodNormalA"); + } + + @CapabilityMethod + public String testMethodNormalB(){ + return "ATestCore::testMethodNormalB"; + } + +} diff --git a/Partner-Test-Demo/src/main/java/work/slhaf/demo/service/core/BTestCore.java b/Partner-Test-Demo/src/main/java/work/slhaf/demo/service/core/BTestCore.java new file mode 100644 index 00000000..893b95b3 --- /dev/null +++ b/Partner-Test-Demo/src/main/java/work/slhaf/demo/service/core/BTestCore.java @@ -0,0 +1,17 @@ +package work.slhaf.demo.service.core; + +import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityCore; +import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityMethod; + +@CapabilityCore("test_b") +public class BTestCore { + + @CapabilityMethod + public void testMethodNormalA(){ + System.out.println("BTestCore::testMethodNormalA"); + } + + public String testCoordinateSubMethod(){ + return "BTestCore::testMethodCoordinate"; + } +} diff --git a/Partner-Test-Demo/src/main/java/work/slhaf/demo/service/core/CTestCore.java b/Partner-Test-Demo/src/main/java/work/slhaf/demo/service/core/CTestCore.java new file mode 100644 index 00000000..1bdd551e --- /dev/null +++ b/Partner-Test-Demo/src/main/java/work/slhaf/demo/service/core/CTestCore.java @@ -0,0 +1,17 @@ +package work.slhaf.demo.service.core; + +import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityCore; +import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityMethod; + +@CapabilityCore("test_c") +public class CTestCore { + + @CapabilityMethod + public void testMethodNormalA(String input){ + System.out.println("CTestCore::testMethodNormalA, input: " + input); + } + + public void testCoordinateSubMethod(String input){ + System.out.println("CTestCore::testMethodCoordinate, input: " + input); + } +} diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml index 84a10b19..1795f402 100644 --- a/dependency-reduced-pom.xml +++ b/dependency-reduced-pom.xml @@ -12,7 +12,7 @@ - work.slhaf.Main + work.slhaf.demo.AgentDemoApplication @@ -29,7 +29,7 @@ - work.slhaf.Main + work.slhaf.demo.AgentDemoApplication diff --git a/pom.xml b/pom.xml index 07fa185d..3245d701 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ - work.slhaf.Main + work.slhaf.demo.AgentDemoApplication @@ -48,7 +48,7 @@ - work.slhaf.Main + work.slhaf.demo.AgentDemoApplication