From 7f9d007f07e416bc74a180d6ecca023f8c76d86a Mon Sep 17 00:00:00 2001 From: slhafzjw Date: Sat, 13 Sep 2025 23:37:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=A1=86=E6=9E=B6=E6=97=B6?= =?UTF-8?q?=E5=8F=91=E7=8E=B0=E5=B7=A5=E5=8E=82=E6=B3=A8=E5=86=8C=E9=93=BE?= =?UTF-8?q?=E4=B8=8A=E5=AD=98=E5=9C=A8=E4=B8=80=E4=BA=9B=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E4=B8=8A=E7=9A=84=E9=94=99=E8=AF=AF=EF=BC=8C?= =?UTF-8?q?=E4=BA=8E=E6=98=AF=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E4=B8=BAAgent=E5=90=AF=E5=8A=A8=E9=93=BE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=AE=8C=E6=95=B4=E7=9A=84=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=EF=BC=8C=E5=B9=B6=E5=81=9A=E5=87=BA=E4=BA=86=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E4=BF=AE=E5=A4=8D=E4=B8=8E=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/slhaf/partner/api/agent/Agent.java | 4 + .../agent/factory/AgentRegisterFactory.java | 18 +++- .../capability/CapabilityCheckFactory.java | 38 ++++++- .../capability/CapabilityInjectFactory.java | 23 +++- .../capability/CapabilityRegisterFactory.java | 76 +++++++------ .../factory/config/ConfigLoaderFactory.java | 11 +- .../factory/module/ModuleCheckFactory.java | 48 ++++++--- .../module/ModuleInitHookExecuteFactory.java | 29 +++-- .../factory/module/ModuleProxyFactory.java | 101 ++++++++++-------- .../factory/module/ModuleRegisterFactory.java | 22 +++- .../partner/common/util/ResourcesUtil.java | 2 +- .../memory/selector/MemorySelector.java | 23 +--- .../evaluator/SliceSelectEvaluator.java | 19 ++-- .../extractor/MemorySelectExtractor.java | 27 ++--- .../modules/memory/updater/MemoryUpdater.java | 22 ++-- .../module/modules/task/TaskScheduler.java | 29 ++--- README.md | 2 +- 17 files changed, 315 insertions(+), 179 deletions(-) diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/Agent.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/Agent.java index 45d4fc5c..a9cb8756 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/Agent.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/Agent.java @@ -12,6 +12,10 @@ import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +/** + *

Agent 启动入口

+ * 详细启动流程请参阅{@link AgentRegisterFactory} + */ public final class Agent { public static AgentGatewayStep newAgent(Class clazz) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/AgentRegisterFactory.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/AgentRegisterFactory.java index d84da9cd..472ddb3b 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/AgentRegisterFactory.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/AgentRegisterFactory.java @@ -16,12 +16,20 @@ import work.slhaf.partner.api.agent.factory.module.ModuleRegisterFactory; import work.slhaf.partner.api.agent.factory.module.pojo.MetaModule; import work.slhaf.partner.api.agent.runtime.data.AgentContext; import work.slhaf.partner.api.agent.runtime.config.AgentConfigManager; +import work.slhaf.partner.api.agent.runtime.interaction.flow.AgentRunningFlow; import java.io.File; import java.net.URL; import java.util.ArrayList; import java.util.List; +/** + *

Agent 注册工厂

+ * + *

+ * 具体流程依次按照 {@link AgentRegisterFactory#launch(String)} 方法顺序执行，最终将执行模块列表对应实例交给 {@link AgentConfigManager} ，传递给 {@link AgentRunningFlow} 针对交互做出调用 + *

+ */ public class AgentRegisterFactory { private static final List urls = new ArrayList<>(); @@ -35,14 +43,14 @@ public class AgentRegisterFactory { //流程 //0. 加载配置 new ConfigLoaderFactory().execute(registerContext); - //1. 注册并检查Capability - new CapabilityRegisterFactory().execute(registerContext); - new CapabilityCheckFactory().execute(registerContext); - //2. 注册并检查Module + //1. 注册并检查Module new ModuleCheckFactory().execute(registerContext); new ModuleRegisterFactory().execute(registerContext); - //3. 为module通过动态代理添加PostHook逻辑并进行实例化 + //2. 为module通过动态代理添加PostHook逻辑并进行实例化 new ModuleProxyFactory().execute(registerContext); + //3. 加载检查Capability层内容后进行能力层的内容注册 + new CapabilityCheckFactory().execute(registerContext); + new CapabilityRegisterFactory().execute(registerContext); //. 先一步注入Capability,避免因前hook逻辑存在针对能力的引用而报错 new CapabilityInjectFactory().execute(registerContext); //. 执行模块PreHook逻辑 diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityCheckFactory.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityCheckFactory.java index 5021e59b..00d59a0b 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityCheckFactory.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityCheckFactory.java @@ -9,6 +9,9 @@ import work.slhaf.partner.api.agent.factory.capability.exception.UnMatchedCapabi 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.factory.module.ModuleCheckFactory; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import work.slhaf.partner.api.agent.util.AgentUtil; import java.lang.reflect.Method; @@ -18,7 +21,34 @@ import java.util.stream.Collectors; import static work.slhaf.partner.api.agent.util.AgentUtil.methodSignature; /** - * 执行Capability相关检查 + *

Agent启动流程 4

+ * + *

负责通过反射收集 {@link Capability} 和 {@link CapabilityCore} 注解所在类，并判断是否存在被错误忽略的方法

+ * + *
    + *
  1. + *

    {@link CapabilityCheckFactory#loadCoresAndCapabilities()}

    + * 通过反射收集 {@link Capability} 和 {@link CapabilityCore} 注解所在类为对应集合 + *
    2. + *
  2. + *

    {@link CapabilityCheckFactory#checkCountAndCapabilities()}

    + * 检测 {@link Capability} 与 {@link CapabilityCore} 的数量、对应的能力是否相等。每一个core都将对应一个capability，并通过value属性进行匹配 + *
    3. + *
  3. + *

    {@link CapabilityCheckFactory#checkCapabilityMethods()}

    + * 检测在 {@link Capability} 与 {@link CapabilityCore} 中是否存在对方尚未实现/注册的方法 + *
    4. + *
  4. + *

    {@link CapabilityCheckFactory#checkCoordinatedMethods()}

    + * 检查是否包含协调方法({@link ToCoordinated})，如果存在，则进一步检查在 {@link CoordinateManager} 所注类中是否有提供对应的实现 + *
    5. + *
  5. + *

    {@link CapabilityCheckFactory#checkInjectCapability()}

    + * 检查 {@link InjectCapability} 注解是否只用在 {@link CapabilityHolder} 所标识类的字段上。{@link AgentModule} 与 {@link AgentSubModule} 已经被 {@link CapabilityHolder} 标注 + *
    6. + *
+ * + *

下一步流程请参阅{@link CapabilityRegisterFactory}

*/ public class CapabilityCheckFactory extends AgentBaseFactory { @@ -37,12 +67,18 @@ public class CapabilityCheckFactory extends AgentBaseFactory { @Override protected void run() { + loadCoresAndCapabilities(); checkCountAndCapabilities(); checkCapabilityMethods(); checkCoordinatedMethods(); checkInjectCapability(); } + private void loadCoresAndCapabilities() { + cores.addAll(reflections.getTypesAnnotatedWith(CapabilityCore.class)); + capabilities.addAll(reflections.getTypesAnnotatedWith(Capability.class)); + } + /** * 检查@InjectCapability注解是否只用在@CapabilityHolder所标识类的字段上 */ diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityInjectFactory.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityInjectFactory.java index 5d7a7b50..23fb6092 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityInjectFactory.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityInjectFactory.java @@ -8,6 +8,9 @@ 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 work.slhaf.partner.api.agent.factory.module.ModuleInitHookExecuteFactory; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import java.lang.reflect.Field; import java.lang.reflect.Proxy; @@ -18,9 +21,23 @@ import java.util.function.Function; import static work.slhaf.partner.api.agent.util.AgentUtil.methodSignature; /** - * 负责执行Capability的注入逻辑 - */ -public class CapabilityInjectFactory extends AgentBaseFactory { + *

Agent启动流程 6

+ * + *

负责执行 {@link Capability} 的注入逻辑。

+ * + *

实现方式：

+ *
    + *
  1. 通过动态代理，为 {@link AgentModule} 与 {@link AgentSubModule} 中待注入的 + * 能力接口 类型（即 {@link Capability} 标注的接口类）生成代理对象。 + *
    2. + *
  2. 在代理对象内部，根据调用方法的签名确定路由，将调用转发至对应的具体函数。 + *
    3. + *
  3. 通过此机制，实现了 {@link Capability} 单一语义层面上普通方法与协调方法的统一入口。 + *
    4. + *
+ * + *

下一步流程请参阅 {@link ModuleInitHookExecuteFactory}

+ */public class CapabilityInjectFactory extends AgentBaseFactory { private Reflections reflections; private HashMap> coordinatedMethodsRouterTable; diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityRegisterFactory.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityRegisterFactory.java index f2982e6d..7edb1148 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityRegisterFactory.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/capability/CapabilityRegisterFactory.java @@ -8,6 +8,8 @@ import work.slhaf.partner.api.agent.factory.capability.exception.CoreInstancesCr 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 work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -17,19 +19,48 @@ import java.util.HashMap; import java.util.Set; import java.util.function.Function; -import static cn.hutool.core.util.ClassUtil.isNormalClass; import static work.slhaf.partner.api.agent.util.AgentUtil.methodSignature; /** - * 负责获取@Capability和@CapabilityCore标识的类，并生成函数路由表、设置Core实例用于后续注入 + *

Agent启动流程 5

+ * + *

+ * 负责收集注解 {@link Capability} 和 {@link CapabilityCore} 标识的类，并生成函数路由表、创建core、capability实例，以及放入instanceMap供后续进行注入操作 + *

+ * + *
    + *
  1. + *

    {@link CapabilityRegisterFactory#setCoreInstances()}

    + * 通过反射调用无参构造函数创建core实例，并将实例放入instanceMap供后续使用 + *
    2. + *
  2. + *

    {@link CapabilityRegisterFactory#generateRouterTable()}

    + * 生成函数路由表: + *
      + *
    • + *

      {@link CapabilityRegisterFactory#generateMethodsRouterTable()}

      + * 生成普通方法对应的函数路由表 + *
      • + *
    • + *

      {@link CapabilityRegisterFactory#generateCoordinatedMethodsRouterTable()}

      + * 生成协调方法对应的函数路由表 + *
      • + *
    + *
    3. + *
  3. + * 函数路由表生成完毕、core实例创建完毕之后，将交由下一工厂完成能力(Capability)注入操作，注入到 {@link AgentModule} 与 {@link AgentSubModule} 对应的实例中 + *
    4. + *
+ * + *

下一步流程请参阅{@link CapabilityInjectFactory}

*/ -public final class CapabilityRegisterFactory extends AgentBaseFactory { +public class CapabilityRegisterFactory extends AgentBaseFactory { private Reflections reflections; private HashMap> methodsRouterTable; private HashMap> coordinatedMethodsRouterTable; - private HashMap, Object> capabilityCoreInstances; + private HashMap, Object> coreInstances; private HashMap, Object> capabilityHolderInstances; private Set> cores; private Set> capabilities; @@ -40,38 +71,18 @@ public final class CapabilityRegisterFactory extends AgentBaseFactory { reflections = context.getReflections(); methodsRouterTable = factoryContext.getMethodsRouterTable(); coordinatedMethodsRouterTable = factoryContext.getCoordinatedMethodsRouterTable(); - capabilityCoreInstances = factoryContext.getCapabilityCoreInstances(); + coreInstances = factoryContext.getCapabilityCoreInstances(); cores = factoryContext.getCores(); capabilities = factoryContext.getCapabilities(); capabilityHolderInstances = factoryContext.getCapabilityHolderInstances(); } @Override - protected void run() throws InvocationTargetException, NoSuchMethodException, InstantiationException, IllegalAccessException { - setCapabilityCoreInstances(); - setAnnotatedClasses(); + protected void run() { + setCoreInstances(); generateRouterTable(); } - /** - * 设置CapabilityCore、Capability注解标识类 - */ - private void setAnnotatedClasses() throws InvocationTargetException, NoSuchMethodException, InstantiationException, IllegalAccessException { - cores.addAll(reflections.getTypesAnnotatedWith(CapabilityCore.class)); - capabilities.addAll(reflections.getTypesAnnotatedWith(Capability.class)); - setCapabilityHolderInstances(); - } - - private void setCapabilityHolderInstances() throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException { - for (Class clazz : reflections.getTypesAnnotatedWith(CapabilityHolder.class)) { - if (!isNormalClass(clazz)){ - continue; - } - Object o = clazz.getDeclaredConstructor().newInstance(); - capabilityHolderInstances.put(clazz, o); - } - } - /** * 生成函数路由表 */ @@ -128,17 +139,16 @@ public final class CapabilityRegisterFactory extends AgentBaseFactory { } /** - * 生成普通方法对应的函数路由表 + * 扫描`@Capability`与`@CapabilityMethod`注解的类与方法 + * 将`capabilityValue.methodSignature`作为key,函数对象为通过反射拿到的core实例对应的方法 */ private void generateMethodsRouterTable() { - //扫描`@Capability`与`@CapabilityMethod`注解的类与方法 - //将`capabilityValue.methodSignature`作为key,函数对象为通过反射拿到的core实例对应的方法 cores.forEach(core -> Arrays.stream(core.getMethods()) .filter(method -> method.isAnnotationPresent(CapabilityMethod.class)) .forEach(method -> { Function function = args -> { try { - return method.invoke(capabilityCoreInstances.get(core), args); + return method.invoke(coreInstances.get(core), args); } catch (IllegalAccessException | InvocationTargetException e) { throw new RuntimeException(e); } @@ -154,12 +164,12 @@ public final class CapabilityRegisterFactory extends AgentBaseFactory { /** * 反射获取CapabilityCore实例 */ - private void setCapabilityCoreInstances() { + private void setCoreInstances() { try { for (Class core : cores) { Constructor constructor = core.getDeclaredConstructor(); constructor.setAccessible(true); - capabilityCoreInstances.put(core, constructor.newInstance()); + coreInstances.put(core, constructor.newInstance()); } } catch (InvocationTargetException | NoSuchMethodException | InstantiationException | IllegalAccessException e) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/ConfigLoaderFactory.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/ConfigLoaderFactory.java index d406b76a..d898548a 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/ConfigLoaderFactory.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/config/ConfigLoaderFactory.java @@ -4,6 +4,7 @@ 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.agent.factory.module.ModuleCheckFactory; import work.slhaf.partner.api.agent.runtime.config.AgentConfigManager; import work.slhaf.partner.api.agent.runtime.config.FileAgentConfigManager; import work.slhaf.partner.api.chat.pojo.Message; @@ -11,6 +12,14 @@ import work.slhaf.partner.api.chat.pojo.Message; import java.util.HashMap; import java.util.List; +/** + *

Agent启动流程 0

+ *

+ * 通过指定的 {@link AgentConfigManager} 或者默认的 {@link FileAgentConfigManager} 加载配置文件 + *

+ * + *

下一步流程请参阅{@link ModuleCheckFactory}

+ */ public class ConfigLoaderFactory extends AgentBaseFactory { private AgentConfigManager agentConfigManager; @@ -23,7 +32,7 @@ public class ConfigLoaderFactory extends AgentBaseFactory { modelConfigMap = factoryContext.getModelConfigMap(); modelPromptMap = factoryContext.getModelPromptMap(); - if (AgentConfigManager.INSTANCE == null){ + if (AgentConfigManager.INSTANCE == null) { AgentConfigManager.setINSTANCE(new FileAgentConfigManager()); } diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleCheckFactory.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleCheckFactory.java index d33fea20..9f4eefa9 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleCheckFactory.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleCheckFactory.java @@ -4,10 +4,7 @@ import cn.hutool.core.util.ClassUtil; 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.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.annotation.*; import work.slhaf.partner.api.agent.factory.module.exception.ModuleCheckException; import work.slhaf.partner.api.agent.runtime.config.AgentConfigManager; import work.slhaf.partner.api.agent.runtime.interaction.flow.abstracts.ActivateModel; @@ -21,6 +18,30 @@ import java.util.stream.Collectors; import static work.slhaf.partner.api.agent.util.AgentUtil.getMethodAnnotationTypeSet; +/** + *

Agent启动流程 1

+ * + *

+ * 检查模块部分抽象类与注解、接口的使用方式 + *

+ * + *
    + *
  1. + *

    {@link ModuleCheckFactory#annotationAbstractCheck(Set, Class)}

    + * 所有添加了 {@link AgentModule} 注解的类都将作为Agent的执行模块，为规范模块入口，都必须实现抽象类: {@link AgentRunningModule}; {@link AgentSubModule} 注解所在类则必须实现 {@link AgentRunningSubModule} + *
    2. + *
  2. + *

    {@link ModuleCheckFactory#moduleConstructorsCheck(Set)}

    + * 所有 {@link AgentModule} 与 {@link AgentSubModule} 注解所在类都必须具备空参构造方法，初始化逻辑可放在 @Init 注解所处方法中，将在 Capability 与 subModules 注入后才会执行 + *
    3. + *
  3. + *

    {@link ModuleCheckFactory#activateModelImplCheck()}

    + * 检查实现了 {@link ActivateModel} 的模块数量、名称与prompt是否一致 + *
    4. + *
+ * + *

下一步流程请参阅{@link ModuleRegisterFactory}

+ */ public class ModuleCheckFactory extends AgentBaseFactory { private Reflections reflections; @@ -32,13 +53,14 @@ public class ModuleCheckFactory extends AgentBaseFactory { @Override protected void run() { - Set> types = reflections.getTypesAnnotatedWith(AgentModule.class); - //检查注解AgentModule所在类是否继承了AgentInteractionModule - agentModuleAnnotationCheck(types); + Set> moduleTypes = reflections.getTypesAnnotatedWith(AgentModule.class); + Set> subModuleTypes = reflections.getTypesAnnotatedWith(AgentSubModule.class); + //检查注解AgentModule或AgentSubModule所在类是否继承了对应的抽象类 + annotationAbstractCheck(moduleTypes, AgentRunningModule.class); + annotationAbstractCheck(subModuleTypes, AgentRunningSubModule.class); //检查AgentModule是否具备无参构造方法 - moduleConstructorsCheck(types); - //检查hook注解所在方法是否位于AgentInteractionModule子类/AgentInteractionSubModule子类/ActivateModel子类 - hookLocationCheck(); + moduleConstructorsCheck(moduleTypes); + moduleConstructorsCheck(subModuleTypes); //检查实现了ActivateModel的模块数量、名称与prompt是否一致 activateModelImplCheck(); } @@ -92,7 +114,7 @@ public class ModuleCheckFactory extends AgentBaseFactory { } private void initHookLocationCheck() { - Set> types = getMethodAnnotationTypeSet(AgentModule.class,reflections); + Set> types = getMethodAnnotationTypeSet(AgentModule.class, reflections); checkLocation(types); } @@ -128,12 +150,12 @@ public class ModuleCheckFactory extends AgentBaseFactory { } } - private void agentModuleAnnotationCheck(Set> types) { + private void annotationAbstractCheck(Set> types, Class clazz) { for (Class type : types) { if (type.isAnnotation()) { continue; } - if (AgentRunningModule.class.isAssignableFrom(type) && ClassUtil.isNormalClass(type)) { + if (clazz.isAssignableFrom(type) && ClassUtil.isNormalClass(type)) { continue; } throw new ModuleCheckException("存在未继承AgentInteractionModule.class的AgentModule实现: " + type.getSimpleName()); 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 index 0c11923d..c8d17722 100644 --- 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 @@ -1,6 +1,7 @@ package work.slhaf.partner.api.agent.factory.module; import work.slhaf.partner.api.agent.factory.AgentBaseFactory; +import work.slhaf.partner.api.agent.factory.AgentRegisterFactory; 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; @@ -10,6 +11,7 @@ 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.factory.module.pojo.MetaSubModule; import work.slhaf.partner.api.agent.runtime.interaction.flow.abstracts.AgentRunningModule; +import work.slhaf.partner.api.agent.util.AgentUtil; import java.lang.reflect.InvocationTargetException; import java.util.*; @@ -19,7 +21,22 @@ import static work.slhaf.partner.api.agent.util.AgentUtil.collectExtendedClasses import static work.slhaf.partner.api.agent.util.AgentUtil.methodSignature; /** - * 负责执行前hook逻辑 + *

Agent启动流程 7

+ * + *

负责执行初始化hook逻辑，即 {@link Init} 注解所在方法

+ * + *
    + *
  1. + *

    {@link ModuleInitHookExecuteFactory#collectInitHookMethods(Class)}

    + * 分别遍历前置模块拿到的模块列表({@link ModuleInitHookExecuteFactory#moduleList}, {@link ModuleInitHookExecuteFactory#subModuleList})，通过 {@link AgentUtil#collectExtendedClasses(Class, Class)} 收集到当前模块类的继承链上的所有类后，收集其所有带有 {@link Init} 注解的方法 + *
    2. + *
  2. + *

    {@link ModuleInitHookExecuteFactory#proceedInitMethods(BaseMetaModule, List)}

    + * 收集好初始化方法后，将通过反射执行该方法，所用实例即为前置模块中收集到的执行模块与子模块的 {@link MetaModule} 与 {@link MetaSubModule} 内容 + *
    3. + *
+ * + *

Agent启动流程到此进行完毕。整个工厂执行链中均为针对 {@link AgentRegisterContext} 进行的操作，在 {@link AgentRegisterFactory} 中，将进行最终处理以及将必要内容进行传递。

*/ public class ModuleInitHookExecuteFactory extends AgentBaseFactory { @@ -36,15 +53,15 @@ public class ModuleInitHookExecuteFactory extends AgentBaseFactory { @Override protected void run() { //遍历模块列表，并向上查找@Init注解 - for (MetaModule metaModule : moduleList) { - List initHookMethods = collectInitHookMethods(metaModule.getClazz()); - proceedInitMethods(metaModule, initHookMethods); - } - for (MetaSubModule metaSubModule : subModuleList) { List initHookMethods = collectInitHookMethods(metaSubModule.getClazz()); proceedInitMethods(metaSubModule, initHookMethods); } + + for (MetaModule metaModule : moduleList) { + List initHookMethods = collectInitHookMethods(metaModule.getClazz()); + proceedInitMethods(metaModule, initHookMethods); + } } private void proceedInitMethods(BaseMetaModule metaModule, List initHookMethods) { diff --git a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleProxyFactory.java b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleProxyFactory.java index 0ad84991..9fa617bf 100644 --- a/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleProxyFactory.java +++ b/Partner-Api/src/main/java/work/slhaf/partner/api/agent/factory/module/ModuleProxyFactory.java @@ -4,9 +4,10 @@ import net.bytebuddy.ByteBuddy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.*; import net.bytebuddy.matcher.ElementMatchers; -import org.reflections.Reflections; import work.slhaf.partner.api.agent.factory.AgentBaseFactory; +import work.slhaf.partner.api.agent.factory.capability.CapabilityCheckFactory; import work.slhaf.partner.api.agent.factory.context.AgentRegisterContext; +import work.slhaf.partner.api.agent.factory.context.CapabilityFactoryContext; 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; @@ -18,10 +19,9 @@ 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.factory.module.pojo.MetaSubModule; import work.slhaf.partner.api.agent.runtime.interaction.flow.abstracts.AgentRunningModule; -import work.slhaf.partner.api.agent.runtime.interaction.flow.abstracts.AgentRunningSubModule; +import work.slhaf.partner.api.agent.runtime.interaction.flow.abstracts.Module; import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.*; import java.util.concurrent.Callable; @@ -30,46 +30,85 @@ import java.util.stream.Collectors; import static work.slhaf.partner.api.agent.util.AgentUtil.collectExtendedClasses; /** - * 通过扫描注解@BeforeExecute，获取到各个模块的后hook逻辑并通过动态代理添加到执行逻辑之后 + *

Agent启动流程 3

+ * + *

+ * 扫描前置模块各个hook注解生成代理对象，放入对应的list中并按照类型为键放入 {@link ModuleProxyFactory#capabilityHolderInstances} 中供后续完成能力(capability)注入 + *

+ * + *

    + * + *
  1. + *

    {@link ModuleProxyFactory#createProxiedInstances()}

    + * 根据moduleList中的类型信息，向上查找继承链获取所有hook方法收集为{@link MethodsListRecord}，然后通过ByteBuddy根据收集到的preHook与postHook生成代理对象，放入对应的 {@link MetaModule} 对象以及 instanceMap 中 + *
    2. + *
  2. + *

    {@link ModuleProxyFactory#injectSubModule()}

    + * 通过反射将子模块实例注入到执行模块中带有注解 {@link InjectModule} 的字段 + *
    3. + *
+ * + *

下一步流程请参阅{@link CapabilityCheckFactory}

*/ public class ModuleProxyFactory extends AgentBaseFactory { private List moduleList; private List subModuleList; - private Reflections reflections; + private HashMap, Object> capabilityHolderInstances; private final HashMap, Object> subModuleInstances = new HashMap<>(); private final HashMap, Object> moduleInstances = new HashMap<>(); @Override protected void setVariables(AgentRegisterContext context) { ModuleFactoryContext factoryContext = context.getModuleFactoryContext(); + CapabilityFactoryContext capabilityFactoryContext = context.getCapabilityFactoryContext(); moduleList = factoryContext.getAgentModuleList(); subModuleList = factoryContext.getAgentSubModuleList(); - reflections = context.getReflections(); + capabilityHolderInstances = capabilityFactoryContext.getCapabilityHolderInstances(); } @Override protected void run() { - generateInstances(); - createProxy(); + createProxiedInstances(); injectSubModule(); } private void injectSubModule() { - Set fields = reflections.getFieldsAnnotatedWith(InjectModule.class); - try { - for (Field field : fields) { - field.setAccessible(true); - field.set(moduleInstances.get(field.getDeclaringClass()), subModuleInstances.get(field.getType())); - } - } catch (Exception e) { - throw new ModuleInstanceGenerateFailedException("模块实例注入失败", e); + for (MetaModule module : moduleList) { + Arrays.stream(module.getClazz().getFields()) + .filter(field -> field.isAnnotationPresent(InjectModule.class)) + .forEach(field -> { + try { + field.setAccessible(true); + field.set( + moduleInstances.get(module.getClazz()), + subModuleInstances.get(field.getType()) + ); + } catch (IllegalAccessException e) { + throw new ModuleInstanceGenerateFailedException("模块实例注入失败", e); + } + }); } + } - private void createProxy() { + private void createProxiedInstances() { generateModuleProxy(moduleList); generateModuleProxy(subModuleList); + updateInstanceMap(moduleInstances, moduleList); + updateInstanceMap(subModuleInstances, subModuleList); + updateCapabilityHolderInstances(); + } + + private void updateCapabilityHolderInstances() { + capabilityHolderInstances.putAll(moduleInstances); + capabilityHolderInstances.putAll(subModuleInstances); + } + + private void updateInstanceMap(HashMap, Object> instanceMap, List list) { + for (BaseMetaModule baseMetaModule : list) { + instanceMap.put(baseMetaModule.getClazz(), baseMetaModule.getInstance()); + } } @@ -88,8 +127,8 @@ public class ModuleProxyFactory extends AgentBaseFactory { private void generateProxiedInstances(MethodsListRecord record, BaseMetaModule module) { try { - Class clazz = module.getClazz(); - Class proxyClass = new ByteBuddy() + Class clazz = module.getClazz(); + Class proxyClass = new ByteBuddy() .subclass(clazz) .method(ElementMatchers.isOverriddenFrom(AgentRunningModule.class)) .intercept(MethodDelegation.to(new ModuleProxyInterceptor(record.post, record.pre))) @@ -165,30 +204,6 @@ public class ModuleProxyFactory extends AgentBaseFactory { } } - private void generateInstances() { - for (MetaModule module : moduleList) { - try { - Class clazz = module.getClazz(); - AgentRunningModule instance = clazz.getConstructor().newInstance(); - module.setInstance(instance); - moduleInstances.put(module.getClazz(), instance); - } catch (Exception e) { - throw new ModuleInstanceGenerateFailedException("模块实例构造失败:" + e.getMessage()); - } - } - - for (MetaSubModule module : subModuleList) { - try { - Class clazz = module.getClazz(); - AgentRunningSubModule instance = clazz.getConstructor().newInstance(); - module.setInstance(instance); - subModuleInstances.put(module.getClazz(), instance); - } catch (Exception e) { - throw new ModuleInstanceGenerateFailedException("模块实例构造失败:" + e.getMessage()); - } - } - } - 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 { 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 index d8b15660..491f0895 100644 --- 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 @@ -17,7 +17,27 @@ import java.util.List; import java.util.Set; /** - * 负责扫描@Module注解获取模块实例 + *

Agent启动流程 2

+ * + *

+ * 负责收集 {@link AgentModule} 与 {@link AgentSubModule} 注解所在类的信息，供后续工厂完成动态代理、模块与能力注入 + *

+ * + *

    + *
  1. + *

    {@link ModuleRegisterFactory#setModuleList()}

    + * 扫描 {@link AgentModule} 注解，获取执行模块信息: 类型、模块名称({@link AgentModule#name()})，执行顺序。并按照注解的 {@link AgentModule#order()} 字段进行排序 + *
    2. + *
  2. + *

    {@link ModuleRegisterFactory#setSubModuleList()}

    + * 扫描 {@link AgentSubModule} 注册，获取子模块类型信息 + *
    3. + *
  3. + * 两种模块都将存入各自的list中，供后续模块完成注册与注入 + *
    4. + *
+ * + *

下一步流程请参阅{@link ModuleProxyFactory}

*/ public class ModuleRegisterFactory extends AgentBaseFactory { 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 20292bc4..11dcbec3 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 @@ -1,7 +1,7 @@ package work.slhaf.partner.common.util; import com.alibaba.fastjson2.JSONArray; -import work.slhaf.partner.Agent; +import work.slhaf.partner.api.agent.Agent; import work.slhaf.partner.api.chat.pojo.Message; import java.io.InputStream; 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 1ee9e719..6dfd2852 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 @@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.InjectModule; import work.slhaf.partner.core.cognation.CognationCapability; import work.slhaf.partner.core.common.pojo.MemoryResult; import work.slhaf.partner.core.submodule.cache.CacheCapability; @@ -36,8 +37,6 @@ import java.util.List; @AgentModule(name="memory_selector",order=1) public class MemorySelector extends PreRunningModule { - private static volatile MemorySelector memorySelector; - @InjectCapability private CacheCapability cacheCapability; @InjectCapability @@ -45,26 +44,10 @@ public class MemorySelector extends PreRunningModule { @InjectCapability private CognationCapability cognationCapability; + @InjectModule private SliceSelectEvaluator sliceSelectEvaluator; + @InjectModule private MemorySelectExtractor memorySelectExtractor; - private SessionManager sessionManager; - - private MemorySelector() { - } - - public static MemorySelector getInstance() throws IOException, ClassNotFoundException { - if (memorySelector == null) { - synchronized (MemorySelector.class) { - if (memorySelector == null) { - memorySelector = new MemorySelector(); - memorySelector.setSliceSelectEvaluator(SliceSelectEvaluator.getInstance()); - memorySelector.setMemorySelectExtractor(MemorySelectExtractor.getInstance()); - memorySelector.setSessionManager(SessionManager.getInstance()); - } - } - } - return memorySelector; - } @Override public void execute(PartnerRunningFlowContext runningFlowContext) throws IOException, ClassNotFoundException { 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 e0f8b30f..1c9aca7b 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,6 +6,8 @@ import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; +import work.slhaf.partner.api.agent.factory.module.annotation.Init; import work.slhaf.partner.api.agent.runtime.interaction.flow.abstracts.ActivateModel; import work.slhaf.partner.api.agent.runtime.interaction.flow.abstracts.AgentRunningSubModule; import work.slhaf.partner.common.thread.InteractionThreadPoolExecutor; @@ -30,21 +32,14 @@ import static work.slhaf.partner.common.util.ExtractUtil.extractJson; @EqualsAndHashCode(callSuper = true) @Data @Slf4j +@AgentSubModule public class SliceSelectEvaluator extends AgentRunningSubModule> implements ActivateModel { - private static volatile SliceSelectEvaluator sliceSelectEvaluator; + private InteractionThreadPoolExecutor executor; - public static SliceSelectEvaluator getInstance() throws IOException, ClassNotFoundException { - if (sliceSelectEvaluator == null) { - synchronized (SliceSelectEvaluator.class) { - if (sliceSelectEvaluator == null) { - sliceSelectEvaluator = new SliceSelectEvaluator(); - sliceSelectEvaluator.setExecutor(InteractionThreadPoolExecutor.getInstance()); - log.info("SliceEvaluator注册完毕..."); - } - } - } - return sliceSelectEvaluator; + @Init + public void init() { + executor = InteractionThreadPoolExecutor.getInstance(); } @Override 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 3bad1178..87da2026 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 @@ -6,6 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.factory.module.annotation.Init; import work.slhaf.partner.api.agent.runtime.interaction.flow.abstracts.ActivateModel; import work.slhaf.partner.api.agent.runtime.interaction.flow.abstracts.AgentRunningSubModule; import work.slhaf.partner.api.chat.pojo.Message; @@ -21,7 +22,6 @@ import work.slhaf.partner.module.modules.memory.selector.extractor.data.Extracto import work.slhaf.partner.module.modules.memory.selector.extractor.data.ExtractorMatchData; import work.slhaf.partner.module.modules.memory.selector.extractor.data.ExtractorResult; -import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -31,36 +31,25 @@ import static work.slhaf.partner.common.util.ExtractUtil.fixTopicPath; @EqualsAndHashCode(callSuper = true) @Data @Slf4j -public class MemorySelectExtractor extends AgentRunningSubModule implements ActivateModel { - - private static volatile MemorySelectExtractor memorySelectExtractor; +public class MemorySelectExtractor extends AgentRunningSubModule + implements ActivateModel { @InjectCapability private MemoryCapability memoryCapability; @InjectCapability private CognationCapability cognationCapability; + private SessionManager sessionManager; - private MemorySelectExtractor() { - modelSettings(); - } - - public static MemorySelectExtractor getInstance() throws IOException, ClassNotFoundException { - if (memorySelectExtractor == null) { - synchronized (MemorySelectExtractor.class) { - if (memorySelectExtractor == null) { - memorySelectExtractor = new MemorySelectExtractor(); - memorySelectExtractor.setSessionManager(SessionManager.getInstance()); - } - } - } - return memorySelectExtractor; + @Init + public void init() { + sessionManager = SessionManager.getInstance(); } @Override public ExtractorResult execute(PartnerRunningFlowContext context) { log.debug("[MemorySelectExtractor] 主题提取模块开始..."); - //结构化为指定格式 + // 结构化为指定格式 List chatMessages = new ArrayList<>(); List metaMessages = sessionManager.getSingleMetaMessageMap().get(context.getUserId()); if (metaMessages == null) { 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 93f3ba2d..1095f06f 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 @@ -5,6 +5,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.Init; +import work.slhaf.partner.api.agent.factory.module.annotation.InjectModule; import work.slhaf.partner.api.chat.constant.ChatConstant; import work.slhaf.partner.api.chat.pojo.Message; import work.slhaf.partner.common.thread.InteractionThreadPoolExecutor; @@ -32,6 +35,7 @@ import static work.slhaf.partner.common.util.ExtractUtil.extractUserId; @EqualsAndHashCode(callSuper = true) @Data @Slf4j +@AgentModule(name="memory_updater",order=6) public class MemoryUpdater extends PostRunningModule { private static volatile MemoryUpdater memoryUpdater; @@ -47,25 +51,24 @@ public class MemoryUpdater extends PostRunningModule { private CacheCapability cacheCapability; @InjectCapability private PerceiveCapability perceiveCapability; - private InteractionThreadPoolExecutor executor; + + @InjectModule private MemorySelectExtractor memorySelectExtractor; + @InjectModule private MemorySummarizer memorySummarizer; + private SessionManager sessionManager; + private InteractionThreadPoolExecutor executor; /** * 用于临时存储完整对话记录，在MemoryManager的分离后 */ private List tempMessage; - private MemoryUpdater() { - } - public static MemoryUpdater getInstance() throws IOException, ClassNotFoundException { if (memoryUpdater == null) { synchronized (MemoryUpdater.class) { if (memoryUpdater == null) { memoryUpdater = new MemoryUpdater(); - memoryUpdater.setMemorySelectExtractor(MemorySelectExtractor.getInstance()); - memoryUpdater.setMemorySummarizer(MemorySummarizer.getInstance()); memoryUpdater.setSessionManager(SessionManager.getInstance()); memoryUpdater.setExecutor(InteractionThreadPoolExecutor.getInstance()); memoryUpdater.setScheduledUpdater(); @@ -75,6 +78,13 @@ public class MemoryUpdater extends PostRunningModule { return memoryUpdater; } + @Init + public void init() { + executor = InteractionThreadPoolExecutor.getInstance(); + sessionManager = SessionManager.getInstance(); + setScheduledUpdater(); + } + private void setScheduledUpdater() { executor.execute(() -> { log.info("[MemoryUpdater] 记忆自动更新线程启动"); diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/task/TaskScheduler.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/task/TaskScheduler.java index b12e7404..04ae0c0d 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/task/TaskScheduler.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/task/TaskScheduler.java @@ -2,27 +2,28 @@ package work.slhaf.partner.module.modules.task; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import work.slhaf.partner.api.agent.runtime.interaction.flow.abstracts.AgentRunningModule; import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; -import work.slhaf.partner.runtime.interaction.module.InteractionFlow; @Data @Slf4j -public class TaskScheduler implements InteractionFlow { - private static TaskScheduler taskScheduler; +public class TaskScheduler extends AgentRunningModule { + private static TaskScheduler taskScheduler; - private TaskScheduler(){} + private TaskScheduler() { + } - public static TaskScheduler getInstance() { - if (taskScheduler == null) { - taskScheduler = new TaskScheduler(); - log.info("TaskScheduler注册完毕..."); - } - - return taskScheduler; + public static TaskScheduler getInstance() { + if (taskScheduler == null) { + taskScheduler = new TaskScheduler(); + log.info("TaskScheduler注册完毕..."); } - @Override - public void execute(PartnerRunningFlowContext runningFlowContext) { + return taskScheduler; + } - } + @Override + public void execute(PartnerRunningFlowContext runningFlowContext) { + + } } diff --git a/README.md b/README.md index 55bfc0e1..12e415d8 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ Partner 的目标不是复现某种单一能力，而是尝试在结构中形成 - 系统的正常运作效果取决于各模块中大模型对于`prompt`的遵循能力，目前来看`qwen3`的遵循效果明显较好，但在轮次较多时，也容易出现不遵循的情况。 ## 规划 -- [ ] 完善注解驱动的注册机制 +- [ ] 完成框架与本体的适配工作 - [ ] 实现任务与主动调度模块，目前打算用 `时间轮算法` 实现定时操作 - [ ] 完善具备‘记忆切片、实体图谱、向量召回’的三维记忆融合架构，包含 Episodic + Semantic + Fuzzy 三类记忆 - [ ] 服务端与客户端的通信加上消息队列，防止消息因连接断开而丢失。